Merge branch 'develop' into fix/percent-additions

Author: philpeng1

AUTHORS

@@ -278,7 +278,7 @@ kyle-compute <kyle@intelvis.ai>
 DongKwanKho <70864292+dodokw@users.noreply.github.com>
 Ikem Peter <ikempeter2020@gmail.com>
 Josh Kelley <joshkel@gmail.com>
-Nils Dietrich <nils.dietrich@enervance.de>
 Richard Taylor <richard.taylor@claconnect.com>
+NilsDietrich <61544566+NilsDietrich@users.noreply.github.com>
 
 # Generated by tools/update-authors.js

HISTORY.md

@@ -10,6 +10,9 @@
   Thanks @NilsDietrich.
 - Fix: #3564 Avoid error throws when mapping/filtering empty arrays/matrices.
   (#3567). Thanks @richardt-cla.
+- Fix: #3574 respect tolerances in function `isInteger` (#3575). 
+  Thanks @gwhitney.
+- Fix: #3562 serializing units missing an internal property (#3572).
 
 # 2025-10-10, 15.0.0
 

src/function/relational/equal.js

@@ -10,15 +10,14 @@ const dependencies = [
   'matrix',
   'equalScalar',
   'DenseMatrix',
-  'concat',
   'SparseMatrix'
 ]
 
 export const createEqual = /* #__PURE__ */ factory(name, dependencies, ({ typed, matrix, equalScalar, DenseMatrix, concat, SparseMatrix }) => {
   const matAlgo03xDSf = createMatAlgo03xDSf({ typed })
   const matAlgo07xSSf = createMatAlgo07xSSf({ typed, SparseMatrix })
   const matAlgo12xSfs = createMatAlgo12xSfs({ typed, DenseMatrix })
-  const matrixAlgorithmSuite = createMatrixAlgorithmSuite({ typed, matrix, concat })
+  const matrixAlgorithmSuite = createMatrixAlgorithmSuite({ typed, matrix })
 
   /**
    * Test whether two values are equal.

src/function/utils/isInteger.js

@@ -1,11 +1,12 @@
 import { deepMap } from '../../utils/collection.js'
-import { isInteger as isIntegerNumber } from '../../utils/number.js'
 import { factory } from '../../utils/factory.js'
 
 const name = 'isInteger'
-const dependencies = ['typed']
+const dependencies = ['typed', 'equal']
 
-export const createIsInteger = /* #__PURE__ */ factory(name, dependencies, ({ typed }) => {
+export const createIsInteger = /* #__PURE__ */ factory(name, dependencies, ({
+  typed, equal
+}) => {
   /**
    * Test whether a value is an integer number.
    * The function supports `number`, `BigNumber`, and `Fraction`.
@@ -36,19 +37,13 @@ export const createIsInteger = /* #__PURE__ */ factory(name, dependencies, ({ ty
    *                    Throws an error in case of an unknown data type.
    */
   return typed(name, {
-    number: isIntegerNumber, // TODO: what to do with isInteger(add(0.1, 0.2))  ?
+    number: n => Number.isFinite(n) ? equal(n, Math.round(n)) : false,
 
-    BigNumber: function (x) {
-      return x.isInt()
-    },
+    BigNumber: b => b.isFinite() ? equal(b.round(), b) : false,
 
-    bigint: function (x) {
-      return true
-    },
+    bigint: b => true,
 
-    Fraction: function (x) {
-      return x.d === 1n
-    },
+    Fraction: r => r.d === 1n,
 
     'Array | Matrix': typed.referToSelf(self => x => deepMap(x, self))
   })

src/type/unit/Unit.js

@@ -20,7 +20,6 @@ const dependencies = [
   'equal',
   'isNumeric',
   'format',
-  'toBest',
   'number',
   'Complex',
   'BigNumber',
@@ -41,13 +40,15 @@ export const createUnitClass = /* #__PURE__ */ factory(name, dependencies, ({
   equal,
   isNumeric,
   format,
-  toBest,
   number,
   Complex,
   BigNumber,
   Fraction
 }) => {
   const toNumber = number
+  const fixPrefixDefault = false
+  const skipAutomaticSimplificationDefault = true
+
   /**
    * A unit can be constructed in the following ways:
    *
@@ -76,13 +77,13 @@ export const createUnitClass = /* #__PURE__ */ factory(name, dependencies, ({
       throw new TypeError('First parameter in Unit constructor must be number, BigNumber, Fraction, Complex, or undefined')
     }
 
-    this.fixPrefix = false // if true, function format will not search for the
+    this.fixPrefix = fixPrefixDefault // if true, function format will not search for the
     // best prefix but leave it as initially provided.
     // fixPrefix is set true by the method Unit.to
 
     // The justification behind this is that if the constructor is explicitly called,
     // the caller wishes the units to be returned exactly as supplied.
-    this.skipAutomaticSimplification = true
+    this.skipAutomaticSimplification = skipAutomaticSimplificationDefault
 
     if (valuelessUnit === undefined) {
       this.units = []
@@ -916,14 +917,15 @@ export const createUnitClass = /* #__PURE__ */ factory(name, dependencies, ({
    * Get a JSON representation of the unit
    * @memberof Unit
    * @returns {Object} Returns a JSON object structured as:
-   *                   `{"mathjs": "Unit", "value": 2, "unit": "cm", "fixPrefix": false}`
+   *                   `{"mathjs": "Unit", "value": 2, "unit": "cm", "fixPrefix": false, "skipSimp": true}`
    */
   Unit.prototype.toJSON = function () {
     return {
       mathjs: 'Unit',
       value: this._denormalize(this.value),
       unit: this.units.length > 0 ? this.formatUnits() : null,
-      fixPrefix: this.fixPrefix
+      fixPrefix: this.fixPrefix,
+      skipSimp: this.skipAutomaticSimplification
     }
   }
 
@@ -936,7 +938,8 @@ export const createUnitClass = /* #__PURE__ */ factory(name, dependencies, ({
    */
   Unit.fromJSON = function (json) {
     const unit = new Unit(json.value, json.unit ?? undefined)
-    unit.fixPrefix = json.fixPrefix || false
+    unit.fixPrefix = json.fixPrefix ?? fixPrefixDefault
+    unit.skipAutomaticSimplification = json.skipSimp ?? skipAutomaticSimplificationDefault
     return unit
   }
 

test/unit-tests/function/utils/isInteger.test.js

@@ -14,7 +14,9 @@ describe('isInteger', function () {
     assert.strictEqual(isInteger(Infinity), false)
     assert.strictEqual(isInteger(-Infinity), false)
     assert.strictEqual(isInteger(NaN), false)
-    assert.strictEqual(isInteger(0.1 + 0.2), false) // TODO: what to do with round off errors?
+    assert.strictEqual(isInteger(0.1 + 0.2), false)
+    assert.strictEqual(isInteger((0.1 + 0.2) * 10), true)
+    assert.strictEqual(isInteger((0.1 + 0.2) * 10 - 3), true)
   })
 
   it('should test whether a bigint is an integer', function () {
@@ -37,6 +39,8 @@ describe('isInteger', function () {
     assert.strictEqual(isInteger(bignumber(Infinity)), false)
     assert.strictEqual(isInteger(bignumber(-Infinity)), false)
     assert.strictEqual(isInteger(bignumber(NaN)), false)
+    assert.strictEqual(isInteger(bignumber((0.1 + 0.2) * 10)), true)
+    assert.strictEqual(isInteger(bignumber((0.1 + 0.2) * 10 - 3)), true)
   })
 
   it('should test whether a Fraction is an integer', function () {

test/unit-tests/json/replacer.test.js

@@ -74,21 +74,21 @@ describe('replacer', function () {
 
   it('should stringify a Unit', function () {
     const u = new math.Unit(5, 'cm')
-    const json = '{"mathjs":"Unit","value":5,"unit":"cm","fixPrefix":false}'
+    const json = '{"mathjs":"Unit","value":5,"unit":"cm","fixPrefix":false,"skipSimp":true}'
     assert.deepStrictEqual(JSON.stringify(u), json)
     assert.deepStrictEqual(JSON.stringify(u, replacer), json)
   })
 
   it('should stringify a Unit with a value only', function () {
     const u = new math.Unit(5)
-    const json = '{"mathjs":"Unit","value":5,"unit":null,"fixPrefix":false}'
+    const json = '{"mathjs":"Unit","value":5,"unit":null,"fixPrefix":false,"skipSimp":true}'
     assert.deepStrictEqual(JSON.stringify(u), json)
     assert.deepStrictEqual(JSON.stringify(u, replacer), json)
   })
 
   it('should stringify a Unit without a value', function () {
     const u = new math.Unit(null, 'cm')
-    const json = '{"mathjs":"Unit","value":null,"unit":"cm","fixPrefix":false}'
+    const json = '{"mathjs":"Unit","value":null,"unit":"cm","fixPrefix":false,"skipSimp":true}'
     assert.deepStrictEqual(JSON.stringify(u), json)
     assert.deepStrictEqual(JSON.stringify(u, replacer), json)
   })

test/unit-tests/json/reviver.test.js

@@ -79,7 +79,7 @@ describe('reviver', function () {
   })
 
   it('should parse a stringified Unit', function () {
-    const json = '{"mathjs":"Unit","value":5,"unit":"cm","fixPrefix":false}'
+    const json = '{"mathjs":"Unit","value":5,"unit":"cm","fixPrefix":false,"skipSimp":true}'
     const u = new math.Unit(5, 'cm')
 
     const obj = JSON.parse(json, reviver)
@@ -89,7 +89,7 @@ describe('reviver', function () {
   })
 
   it('should parse a stringified Unit with a value only', function () {
-    const json = '{"mathjs":"Unit","value":5,"unit":null,"fixPrefix":false}'
+    const json = '{"mathjs":"Unit","value":5,"unit":null,"fixPrefix":false,"skipSimp":true}'
     const u = new math.Unit(5)
 
     const obj = JSON.parse(json, reviver)
@@ -99,7 +99,7 @@ describe('reviver', function () {
   })
 
   it('should parse a stringified Unit without a value', function () {
-    const json = '{"mathjs":"Unit","value":null,"unit":"cm","fixPrefix":false}'
+    const json = '{"mathjs":"Unit","value":null,"unit":"cm","fixPrefix":false,"skipSimp":true}'
     const u = new math.Unit(null, 'cm')
 
     const obj = JSON.parse(json, reviver)

test/unit-tests/type/unit/Unit.test.js

@@ -651,64 +651,87 @@ describe('Unit', function () {
   describe('json', function () {
     it('toJSON', function () {
       assert.deepStrictEqual(new Unit(5, 'cm').toJSON(),
-        { mathjs: 'Unit', value: 5, unit: 'cm', fixPrefix: false })
+        { mathjs: 'Unit', value: 5, unit: 'cm', fixPrefix: false, skipSimp: true })
       assert.deepStrictEqual(new Unit(5, 'cm').to('mm').toJSON(),
-        { mathjs: 'Unit', value: 50, unit: 'mm', fixPrefix: true })
+        { mathjs: 'Unit', value: 50, unit: 'mm', fixPrefix: true, skipSimp: true })
       assert.deepStrictEqual(new Unit(5, 'kN').to('kg m s ^ -2').toJSON(),
-        { mathjs: 'Unit', value: 5000, unit: '(kg m) / s^2', fixPrefix: true })
+        { mathjs: 'Unit', value: 5000, unit: '(kg m) / s^2', fixPrefix: true, skipSimp: true })
       assert.deepStrictEqual(new Unit(math.fraction(0.375), 'cm').toJSON(),
         {
           mathjs: 'Unit',
           value: math.fraction(0.375), // Note that value is not serialized at this point, that will be done by JSON.stringify
           unit: 'cm',
-          fixPrefix: false
+          fixPrefix: false,
+          skipSimp: true
         })
       approxDeepEqual(new Unit(math.complex(2, 4), 'g').toJSON(),
         {
           mathjs: 'Unit',
           value: math.complex(2, 4),
           unit: 'g',
-          fixPrefix: false
+          fixPrefix: false,
+          skipSimp: true
+        })
+
+      assert.deepStrictEqual(math.evaluate('2 kg * 3 in^2').toJSON(),
+        {
+          mathjs: 'Unit',
+          value: 6,
+          unit: 'kg in^2',
+          fixPrefix: false,
+          skipSimp: false
         })
 
       const str = JSON.stringify(new Unit(math.fraction(0.375), 'cm'))
-      assert.deepStrictEqual(str, '{"mathjs":"Unit","value":{"mathjs":"Fraction","n":"3","d":"8"},"unit":"cm","fixPrefix":false}')
+      assert.deepStrictEqual(str, '{"mathjs":"Unit","value":{"mathjs":"Fraction","n":"3","d":"8"},"unit":"cm","fixPrefix":false,"skipSimp":true}')
 
       const cmpx = JSON.stringify(new Unit(math.complex(2, 4), 'g'))
-      assert.strictEqual(cmpx, '{"mathjs":"Unit","value":{"mathjs":"Complex","re":2,"im":4},"unit":"g","fixPrefix":false}')
+      assert.strictEqual(cmpx, '{"mathjs":"Unit","value":{"mathjs":"Complex","re":2,"im":4},"unit":"g","fixPrefix":false,"skipSimp":true}')
     })
 
     it('fromJSON', function () {
       const u1 = new Unit(5, 'cm')
-      const u2 = Unit.fromJSON({ mathjs: 'Unit', value: 5, unit: 'cm', fixPrefix: false })
+      const u2 = Unit.fromJSON({ mathjs: 'Unit', value: 5, unit: 'cm', fixPrefix: false, skipSimp: true })
       assert.ok(u2 instanceof Unit)
       assert.deepStrictEqual(u2, u1)
 
       const u3 = new Unit(5, 'cm').to('mm')
-      const u4 = Unit.fromJSON({ mathjs: 'Unit', value: 50, unit: 'mm', fixPrefix: true })
+      const u4 = Unit.fromJSON({ mathjs: 'Unit', value: 50, unit: 'mm', fixPrefix: true, skipSimp: true })
       assert.ok(u4 instanceof Unit)
       assert.deepStrictEqual(u4, u3)
 
       const u5 = new Unit(5, 'kN').to('kg m/s^2')
-      const u6 = Unit.fromJSON({ mathjs: 'Unit', value: 5000, unit: 'kg m s^-2', fixPrefix: true })
+      const u6 = Unit.fromJSON({ mathjs: 'Unit', value: 5000, unit: 'kg m s^-2', fixPrefix: true, skipSimp: true })
       assert.ok(u6 instanceof Unit)
       assert.deepStrictEqual(u5, u6)
 
       const u7 = Unit.fromJSON({
         mathjs: 'Unit',
         value: math.fraction(0.375), // Note that value is already a Fraction at this point, that will be done by JSON.parse(str, reviver)
         unit: 'cm',
-        fixPrefix: false
+        fixPrefix: false,
+        skipSimp: true
       })
       assert.deepStrictEqual(u7, new Unit(math.fraction(0.375), 'cm'))
 
       const u8 = Unit.fromJSON({
         mathjs: 'Unit',
         value: math.complex(2, 4),
         unit: 'g',
-        fixPrefix: false
+        fixPrefix: false,
+        skipSimp: true
       })
       assert.deepStrictEqual(u8, new Unit(math.complex(2, 4), 'g'))
+
+      const u9 = Unit.fromJSON({
+        mathjs: 'Unit',
+        value: 6,
+        unit: 'kg in^2',
+        fixPrefix: false,
+        skipSimp: false
+      })
+      const u10 = math.evaluate('2 kg * 3 in^2')
+      assert.deepStrictEqual(u9, u10)
     })
 
     it('toJSON -> fromJSON should recover an "equal" unit', function () {