included config.predictable

josdejong · Jul 12, 2023 · 5b07776 · 5b07776
1 parent 436e566
commit 5b07776
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/type/matrix/MatrixIndex.js b/src/type/matrix/MatrixIndex.js
@@ -4,9 +4,9 @@ import { isInteger } from '../../utils/number.js'
 import { factory } from '../../utils/factory.js'
 
 const name = 'Index'
-const dependencies = ['ImmutableDenseMatrix']
+const dependencies = ['config', 'ImmutableDenseMatrix']
 
-export const createIndexClass = /* #__PURE__ */ factory(name, dependencies, ({ ImmutableDenseMatrix }) => {
+export const createIndexClass = /* #__PURE__ */ factory(name, dependencies, ({ config, ImmutableDenseMatrix }) => {
  /**
  * Create an index. An Index can store ranges and sets for multiple dimensions.
  * Matrix.get, Matrix.set, and math.subset accept an Index as input.
@@ -48,7 +48,7 @@ export const createIndexClass = /* #__PURE__ */ factory(name, dependencies, ({ I
  // size
  const size = m.size()
  // scalar
- if (size.length !== 1 || size[0] !== 1) {
+ if (config.predictable || (size.length !== 1 || size[0] !== 1)) {
  this._isScalar = false
  }
  } else if (typeof arg === 'number') {

diff --git a/test/unit-tests/function/matrix/subset.test.js b/test/unit-tests/function/matrix/subset.test.js
@@ -4,6 +4,7 @@ const subset = math.subset
 const matrix = math.matrix
 const Range = math.Range
 const index = math.index
+const mathPredictable = math.create({ predictable: true })
 
 describe('subset', function () {
  const a = [[1, 2], [3, 4]]
@@ -19,6 +20,7 @@ describe('subset', function () {
  assert.deepStrictEqual(subset(a, index([true, true], 1)), [[2], [4]])
  assert.deepStrictEqual(subset(a, index([false, true], [true, false])), 3)
  assert.deepStrictEqual(subset([math.bignumber(2)], index([true])), math.bignumber(2))
+ assert.deepStrictEqual(subset(a, mathPredictable.index([false, true], [true, false])), [[3]])
  })
 
  it('should return an empty value with an empty index', function () {