jmeDecimal: only convert to exponential notation when plaindecimal is…

… false fixes #1027, I think. There's still a lingering issue that decimal values are subbed in "plain", so the simplification step leads to them being rounded off as normal `number` values. But this at least resolves the big inaccuracy.
numbas · Aug 15, 2023 · 6387d40 · 6387d40
1 parent 72b0d83
commit 6387d40
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/runtime/scripts/jme-display.js b/runtime/scripts/jme-display.js
@@ -2307,12 +2307,12 @@ JMEifier.prototype = {
             }
         } else if(n instanceof Decimal) {
             var out = math.niceDecimal(n,options);
-            if(out.length>20) {
-                out = n.toExponential().replace(/e\+0$/,'');
-            }
             if(this.settings.plaindecimal) {
                 return out;
             } else { 
+                if(out.length > 20) {
+                    out = n.toExponential().replace(/e\+0$/,'');
+                }
                 return 'dec("'+out+'")';
             }
         } else {

diff --git a/tests/jme-runtime.js b/tests/jme-runtime.js
@@ -18111,12 +18111,12 @@ JMEifier.prototype = {
             }
         } else if(n instanceof Decimal) {
             var out = math.niceDecimal(n,options);
-            if(out.length>20) {
-                out = n.toExponential().replace(/e\+0$/,'');
-            }
             if(this.settings.plaindecimal) {
                 return out;
             } else { 
+                if(out.length > 20) {
+                    out = n.toExponential().replace(/e\+0$/,'');
+                }
                 return 'dec("'+out+'")';
             }
         } else {

diff --git a/tests/numbas-runtime.js b/tests/numbas-runtime.js
@@ -18100,12 +18100,12 @@ JMEifier.prototype = {
             }
         } else if(n instanceof Decimal) {
             var out = math.niceDecimal(n,options);
-            if(out.length>20) {
-                out = n.toExponential().replace(/e\+0$/,'');
-            }
             if(this.settings.plaindecimal) {
                 return out;
             } else { 
+                if(out.length > 20) {
+                    out = n.toExponential().replace(/e\+0$/,'');
+                }
                 return 'dec("'+out+'")';
             }
         } else {

diff --git a/tests/parts/part-tests.mjs b/tests/parts/part-tests.mjs
@@ -453,6 +453,16 @@ Numbas.queueScript('part_tests',['qunit','json','jme','localisation','parts/numb
         }
     );
 
+    QUnit.test('Decimal values aren\'t substituted with scientific notation', function(assert) {
+        var data = {
+            "type": "jme",
+            "marks": 1,
+            "answer": "{dec(\"1.234567890123456e-1\")}",
+        };
+        var p = createPartFromJSON(data);
+        assert.equal(p.getCorrectAnswer(p.getScope()), '0.1234567890123456');
+    });
+
     question_unit_test("Expression is case-sensitive",
         {
             "name":"case sensitivity",