Use fix for the math.js counterpart of trunc

Author: ricktu288

src/core/propertyUtils/equationConversion.js

@@ -92,7 +92,7 @@ const FN1 = {
   round: 'round',
   sign: 'sign',
   sgn: 'sign',
-  trunc: 'trunc',
+  trunc: 'fix',
   abs: 'abs'
 };
 
@@ -480,7 +480,7 @@ class TexExprParser {
     if (cmd === 'mathrm') {
       const raw = this.readBraceGroupRaw().trim();
       if (raw !== 'trunc') this.throwUnexpected();
-      return this.parseFnCall('trunc', 'trunc');
+      return this.parseFnCall('fix', 'trunc');
     }
 
     if (Object.prototype.hasOwnProperty.call(GREEK_SYMBOL, cmd)) {
@@ -678,7 +678,7 @@ export function mathJSToLatex(mathJSStr) {
             return '\\operatorname{floor}\\left(' + args[0].toTex(options) + '\\right)';
           case 'ceil':
             return '\\operatorname{ceil}\\left(' + args[0].toTex(options) + '\\right)';
-          case 'trunc':
+          case 'fix':
             return '\\operatorname{trunc}\\left(' + args[0].toTex(options) + '\\right)';
           case 'round':
             return '\\operatorname{round}\\left(' + args[0].toTex(options) + '\\right)';

src/core/sceneObjs/BaseCustomSurface.js

@@ -45,7 +45,7 @@ import Simulator from '../Simulator.js';
 class BaseCustomSurface extends BaseSceneObj {
 
   static getPropertySchema(objData, scene) {
-    const outRaysInfo = '<ul><li>' + i18next.t('simulator:sceneObjs.common.eqnInfo.mathjs') + '<br><code>+ - * / ^ sqrt sin cos tan sec csc cot sinh cosh tanh log exp asin acos atan asinh acosh atanh floor round ceil max min abs sign</code></li><li>' + i18next.t('simulator:sceneObjs.common.eqnInfo.customFunctions') + '</li><li>' + i18next.t('simulator:sceneObjs.BaseCustomSurface.info.angles', { theta_0: 'θ<sub>0</sub> (<code>theta_0</code>)', theta_j: 'θ<sub>j</sub>' }) + '</li><li>' + i18next.t('simulator:sceneObjs.BaseCustomSurface.info.brightnesses', { P_0: 'P<sub>0</sub> (<code>P_0</code>)', P_j: 'P<sub>j</sub>' }) + '</li><li>' + i18next.t('simulator:sceneObjs.BaseCustomSurface.info.previousFormulas') + '</li><li>' + i18next.t('simulator:sceneObjs.BaseCustomSurface.info.otherParams', { lambda: '<code>lambda</code>', p: '<code>p</code>' }) + '</li><li>' + i18next.t(`simulator:sceneObjs.${objData.type}.info.incidentPos`, { t: '<code>t</code>' }) + '</li><li>' + i18next.t('simulator:sceneObjs.BaseCustomSurface.info.coating', { n_0: '<code>n_0</code>', n_1: '<code>n_1</code>' }) + '</li><li>' + i18next.t('simulator:sceneObjs.BaseCustomSurface.info.twoSides') + '</li></ul>';
+    const outRaysInfo = '<ul><li>' + i18next.t('simulator:sceneObjs.common.eqnInfo.mathjs') + '<br><code>+ - * / ^ sqrt sin cos tan sec csc cot sinh cosh tanh log exp asin acos atan asinh acosh atanh floor round ceil fix max min abs sign</code></li><li>' + i18next.t('simulator:sceneObjs.common.eqnInfo.customFunctions') + '</li><li>' + i18next.t('simulator:sceneObjs.BaseCustomSurface.info.angles', { theta_0: 'θ<sub>0</sub> (<code>theta_0</code>)', theta_j: 'θ<sub>j</sub>' }) + '</li><li>' + i18next.t('simulator:sceneObjs.BaseCustomSurface.info.brightnesses', { P_0: 'P<sub>0</sub> (<code>P_0</code>)', P_j: 'P<sub>j</sub>' }) + '</li><li>' + i18next.t('simulator:sceneObjs.BaseCustomSurface.info.previousFormulas') + '</li><li>' + i18next.t('simulator:sceneObjs.BaseCustomSurface.info.otherParams', { lambda: '<code>lambda</code>', p: '<code>p</code>' }) + '</li><li>' + i18next.t(`simulator:sceneObjs.${objData.type}.info.incidentPos`, { t: '<code>t</code>' }) + '</li><li>' + i18next.t('simulator:sceneObjs.BaseCustomSurface.info.coating', { n_0: '<code>n_0</code>', n_1: '<code>n_1</code>' }) + '</li><li>' + i18next.t('simulator:sceneObjs.BaseCustomSurface.info.twoSides') + '</li></ul>';
 
     return [
       ...super.getPropertySchema(objData, scene),

src/core/sceneObjs/BaseGrinGlass.js

@@ -53,7 +53,7 @@ class BaseGrinGlass extends BaseGlass {
   static getPropertySchema(objData, scene) {
     const refIndexFnInfo = '<ul><li>' + i18next.t('simulator:sceneObjs.common.eqnInfo.mathjs') + '<br><code>+ - * / ^ sqrt sin cos tan sec csc cot sinh cosh tanh log asin acos atan asinh acosh atanh</code></li><li>' + i18next.t('simulator:sceneObjs.common.eqnInfo.customFunctions') + '</li><li>' + i18next.t('simulator:sceneObjs.BaseGrinGlass.refIndexFnInfo.lambda', { lambda: '<code>lambda</code>' }) + '</li><li>' + i18next.t('simulator:sceneObjs.BaseGrinGlass.refIndexFnInfo.diff') + '</li></ul>';
 
-    const absorptionFnInfo = '<ul><li>' + i18next.t('simulator:sceneObjs.BaseGrinGlass.absorptionFnInfo.absorption') + '</li><li>' + i18next.t('simulator:sceneObjs.common.eqnInfo.mathjs') + '<br><code>+ - * / ^ sqrt sin cos tan sec csc cot sinh cosh tanh log exp asin acos atan asinh acosh atanh floor round ceil max min abs sign</code></li><li>' + i18next.t('simulator:sceneObjs.common.eqnInfo.customFunctions') + '</li></ul>';
+    const absorptionFnInfo = '<ul><li>' + i18next.t('simulator:sceneObjs.BaseGrinGlass.absorptionFnInfo.absorption') + '</li><li>' + i18next.t('simulator:sceneObjs.common.eqnInfo.mathjs') + '<br><code>+ - * / ^ sqrt sin cos tan sec csc cot sinh cosh tanh log exp asin acos atan asinh acosh atanh floor round ceil fix max min abs sign</code></li><li>' + i18next.t('simulator:sceneObjs.common.eqnInfo.customFunctions') + '</li></ul>';
 
     const intersectTolInfo = '<p>' + i18next.t(`simulator:sceneObjs.${objData.type}.epsInfo.units`) + '</p><p>' + i18next.t(`simulator:sceneObjs.${objData.type}.epsInfo.functions`) + '</p>';
 

src/core/sceneObjs/ParamCurveObjMixin.js

@@ -55,7 +55,7 @@ export function curveTypePropertyInfoHtml() {
 const ParamCurveObjMixin = Base => class extends Base {
 
   static getPropertySchema(objData, scene) {
-    const info = '<ul><li>' + i18next.t('simulator:sceneObjs.common.eqnInfo.mathjs') + '<br><code>+ - * / ^ sqrt sin cos tan sec csc cot sinh cosh tanh log exp asin acos atan asinh acosh atanh floor round ceil max min abs sign</code></li><li>' + i18next.t('simulator:sceneObjs.common.eqnInfo.customFunctions') + '</li></ul>';
+    const info = '<ul><li>' + i18next.t('simulator:sceneObjs.common.eqnInfo.mathjs') + '<br><code>+ - * / ^ sqrt sin cos tan sec csc cot sinh cosh tanh log exp asin acos atan asinh acosh atanh floor round ceil fix max min abs sign</code></li><li>' + i18next.t('simulator:sceneObjs.common.eqnInfo.customFunctions') + '</li></ul>';
     const curveTypeOptions = {
       polygonal: i18next.t('simulator:sceneObjs.ParamCurveObjMixin.curveTypes.polygonal'),
       smoothNormal: i18next.t('simulator:sceneObjs.ParamCurveObjMixin.curveTypes.smoothNormal'),

src/core/sceneObjs/glass/CustomGlass.js

@@ -79,7 +79,7 @@ class CustomGlass extends LineObjMixin(BaseGlass) {
   }
 
   static getPropertySchema(objData, scene) {
-    const info = '<ul><li>' + i18next.t('simulator:sceneObjs.common.eqnInfo.mathjs') + '<br><code>+ - * / ^ sqrt sin cos tan sec csc cot sinh cosh tanh log exp asin acos atan asinh acosh atanh floor round ceil max min abs sign</code></li><li>' + i18next.t('simulator:sceneObjs.common.eqnInfo.customFunctions') + '</li></ul>';
+    const info = '<ul><li>' + i18next.t('simulator:sceneObjs.common.eqnInfo.mathjs') + '<br><code>+ - * / ^ sqrt sin cos tan sec csc cot sinh cosh tanh log exp asin acos atan asinh acosh atanh floor round ceil fix max min abs sign</code></li><li>' + i18next.t('simulator:sceneObjs.common.eqnInfo.customFunctions') + '</li></ul>';
     const curveTypeOptions = {
       polygonal: i18next.t('simulator:sceneObjs.ParamCurveObjMixin.curveTypes.polygonal'),
       smoothNormal: i18next.t('simulator:sceneObjs.ParamCurveObjMixin.curveTypes.smoothNormal'),

src/core/sceneObjs/mirror/CustomMirror.js

@@ -79,7 +79,7 @@ class CustomMirror extends LineObjMixin(BaseFilter) {
   }
 
   static getPropertySchema(objData, scene) {
-    const eqnInfo = '<ul><li>' + i18next.t('simulator:sceneObjs.common.eqnInfo.mathjs') + '<br><code>+ - * / ^ sqrt sin cos tan sec csc cot sinh cosh tanh log exp asin acos atan asinh acosh atanh floor round ceil max min abs sign</code></li><li>' + i18next.t('simulator:sceneObjs.common.eqnInfo.customFunctions') + '</li></ul>';
+    const eqnInfo = '<ul><li>' + i18next.t('simulator:sceneObjs.common.eqnInfo.mathjs') + '<br><code>+ - * / ^ sqrt sin cos tan sec csc cot sinh cosh tanh log exp asin acos atan asinh acosh atanh floor round ceil fix max min abs sign</code></li><li>' + i18next.t('simulator:sceneObjs.common.eqnInfo.customFunctions') + '</li></ul>';
     const curveTypeOptions = {
       polygonal: i18next.t('simulator:sceneObjs.ParamCurveObjMixin.curveTypes.polygonal'),
       smoothNormal: i18next.t('simulator:sceneObjs.ParamCurveObjMixin.curveTypes.smoothNormal'),

src/core/sceneObjs/special/ModuleObj.js

@@ -677,7 +677,7 @@ class ModuleObj extends BaseSceneObj {
             case 'ceil':
               return '\\operatorname{ceil}\\left(' + args[0].toTex(options) + '\\right)';
 
-            case 'trunc':
+            case 'fix':
               return '\\operatorname{trunc}\\left(' + args[0].toTex(options) + '\\right)';
 
             case 'round':

test/propertyUtils/equationConversion.test.js

@@ -124,7 +124,7 @@ describe('equationConversion', () => {
       ['sign(x)', '\\operatorname{sign}'],
       ['max(x,y)', '\\max'],
       ['min(x,y)', '\\min'],
-      ['trunc(x)', '\\operatorname{trunc}']
+      ['fix(x)', '\\operatorname{trunc}']
     ];
 
     it.each(cases)('%s contains %s', (expr, needle) => {
@@ -173,7 +173,8 @@ describe('equationConversion', () => {
       'acos(x)',
       'atan(x)',
       'abs(x)',
-      'x + y'
+      'x + y',
+      'fix(x)'
     ];
 
     it.each(stable)('%s', (expr) => {
@@ -274,6 +275,10 @@ describe('equationConversion', () => {
       expect(latexToMathJS(mathJSToLatex('sign(x)'))).toContain('sign');
     });
 
+    it('maps \\operatorname{trunc} from MathQuill to math.js fix', () => {
+      expect(latexToMathJS(String.raw`\operatorname{trunc}\left(x\right)`)).toBe('fix(x)');
+    });
+
     it('round-trips exp / max / min from mathJSToLatex', () => {
       expect(latexToMathJS(mathJSToLatex('exp(x)'))).toContain('exp');
       expect(latexToMathJS(mathJSToLatex('max(x,y)'))).toContain('max');