extend isnan and withintolerance to complex numbers

Author: christianp

runtime/scripts/jme-builtins.js

@@ -1026,6 +1026,9 @@ newBuiltin('countsigfigs', [TString], TNum, function(s) {
     return math.countSigFigs(util.cleanNumber(s));
 });
 newBuiltin('isnan', [TNum], TBool, function(n) {
+    if(n.complex) {
+        return isNaN(n.re) || isNaN(n.im);
+    }
     return isNaN(n);
 });
 newBuiltin('matchnumber', [TString, sig.listof(sig.type('string'))], TList, function(s, styles) {

runtime/scripts/jme.js

@@ -694,6 +694,8 @@ var jme = Numbas.jme = /** @lends Numbas.jme */ {
                         }
                     } else if(v instanceof math.ComplexDecimal) {
                         return new jme.types.TDecimal(v);
+                    } else if(typeof v == 'object' && v && v.complex && v.hasOwnProperty('re') && v.hasOwnProperty('im')) {
+                        return new jme.types.TNum(v);
                     } else if(v instanceof Decimal) {
                         return new jme.types.TDecimal(v);
                     } else if(v instanceof math.Fraction) {

runtime/scripts/math.js

@@ -1317,6 +1317,11 @@ var math = Numbas.math = /** @lends Numbas.math */ {
      * @returns {boolean}
      */
     withinTolerance: function(a, b, tolerance) {
+        if(a.complex || b.complex) {
+            a = a.complex ? a : math.complex(a,0);
+            b = b.complex ? b : math.complex(b,0);
+            return math.withinTolerance(a.re, b.re, tolerance) && math.withinTolerance(a.im, b.im, tolerance);
+        }
         if(tolerance == 0) {
             return math.eq(a, b);
         } else {

tests/jme-runtime.js

@@ -3510,6 +3510,11 @@ var math = Numbas.math = /** @lends Numbas.math */ {
      * @returns {boolean}
      */
     withinTolerance: function(a, b, tolerance) {
+        if(a.complex || b.complex) {
+            a = a.complex ? a : math.complex(a,0);
+            b = b.complex ? b : math.complex(b,0);
+            return math.withinTolerance(a.re, b.re, tolerance) && math.withinTolerance(a.im, b.im, tolerance);
+        }
         if(tolerance == 0) {
             return math.eq(a, b);
         } else {
@@ -9509,6 +9514,8 @@ var jme = Numbas.jme = /** @lends Numbas.jme */ {
                         }
                     } else if(v instanceof math.ComplexDecimal) {
                         return new jme.types.TDecimal(v);
+                    } else if(typeof v == 'object' && v && v.complex && v.hasOwnProperty('re') && v.hasOwnProperty('im')) {
+                        return new jme.types.TNum(v);
                     } else if(v instanceof Decimal) {
                         return new jme.types.TDecimal(v);
                     } else if(v instanceof math.Fraction) {
@@ -11181,6 +11188,9 @@ Scope.prototype = /** @lends Numbas.jme.Scope.prototype */ {
      */
     getFunction: function(name) {
         name = jme.normaliseName(name, this);
+        if(jme.funcSynonyms[name]) {
+            name = jme.funcSynonyms[name];
+        }
         if(!this._resolved_functions[name]) {
             var scope = this;
             var o = [];
@@ -15658,6 +15668,9 @@ newBuiltin('countsigfigs', [TString], TNum, function(s) {
     return math.countSigFigs(util.cleanNumber(s));
 });
 newBuiltin('isnan', [TNum], TBool, function(n) {
+    if(n.complex) {
+        return isNaN(n.re) || isNaN(n.im);
+    }
     return isNaN(n);
 });
 newBuiltin('matchnumber', [TString, sig.listof(sig.type('string'))], TList, function(s, styles) {

tests/jme/doc-tests.mjs

@@ -699,6 +699,14 @@ export default
                     {
                         "in": "withintolerance(pi,22/7,0.1)",
                         "out": "true"
+                    },
+                    {
+                        "in": "withintolerance(1 + 0.11i, 1 + 1/10 i, 0.02)",
+                        "out": "true"
+                    },
+                    {
+                        "in": "withintolerance(1 + 0.11i, 2 + 1/10 i, 0.02)",
+                        "out": "false"
                     }
                 ]
             },

tests/jme/jme-tests.mjs

@@ -529,6 +529,10 @@ Numbas.queueScript('jme_tests',['qunit','jme','jme-rules','jme-display','jme-cal
         n.precision = -30;
         var dn = jme.castToType(n, 'decimal').value;
         assert.equal(dn+'', '314159265358979334144', 'Can convert a number with negative decimal places precision to a decimal, without throwing an error.');
+
+        assert.notOk(evaluate('isnan(i)').value, 'i is not NaN');
+        assert.ok(evaluate('isnan(nan * i)').value, 'nan*i is NaN');
+        assert.ok(evaluate('isnan(nan + i)').value, 'nan + i is NaN');
     });
 
     QUnit.test('jme.enumerate_signatures', function(assert) {

tests/locales.js

@@ -5932,7 +5932,7 @@ Numbas.locale = {
     "suspend.you can resume": "Du kan fortsette eksamen neste gang du starter denne aktiviteten.",
     "suspend.resume": "Fortsett",
     "result.exit": "Avslutt eksamen",
-    "result.print": "Skriv ut denne oversikten",
+    "result.print": "Skriv ut detaljert resultat",
     "result.exam summary": "Eksamen oversikt",
     "result.performance summary": "Resultatsammendrag",
     "result.exam start": "Eksamen start:",
@@ -6446,7 +6446,8 @@ Numbas.locale = {
     "worksheet.left": "Left",
     "worksheet.bottom": "Bottom",
     "worksheet.right": "Right"
-}}
+}
+}
 ,
         "nl-nl": {translation: 
 {

tests/numbas-runtime.js

@@ -3511,6 +3511,11 @@ var math = Numbas.math = /** @lends Numbas.math */ {
      * @returns {boolean}
      */
     withinTolerance: function(a, b, tolerance) {
+        if(a.complex || b.complex) {
+            a = a.complex ? a : math.complex(a,0);
+            b = b.complex ? b : math.complex(b,0);
+            return math.withinTolerance(a.re, b.re, tolerance) && math.withinTolerance(a.im, b.im, tolerance);
+        }
         if(tolerance == 0) {
             return math.eq(a, b);
         } else {
@@ -8845,6 +8850,8 @@ var jme = Numbas.jme = /** @lends Numbas.jme */ {
                         }
                     } else if(v instanceof math.ComplexDecimal) {
                         return new jme.types.TDecimal(v);
+                    } else if(typeof v == 'object' && v && v.complex && v.hasOwnProperty('re') && v.hasOwnProperty('im')) {
+                        return new jme.types.TNum(v);
                     } else if(v instanceof Decimal) {
                         return new jme.types.TDecimal(v);
                     } else if(v instanceof math.Fraction) {
@@ -14997,6 +15004,9 @@ newBuiltin('countsigfigs', [TString], TNum, function(s) {
     return math.countSigFigs(util.cleanNumber(s));
 });
 newBuiltin('isnan', [TNum], TBool, function(n) {
+    if(n.complex) {
+        return isNaN(n.re) || isNaN(n.im);
+    }
     return isNaN(n);
 });
 newBuiltin('matchnumber', [TString, sig.listof(sig.type('string'))], TList, function(s, styles) {