mirror of
https://github.com/josdejong/mathjs.git
synced 2026-01-18 14:59:29 +00:00
* Add `.js` extension to source file imports * Specify package `exports` in `package.json` Specify package type as `commonjs` (It's good to be specific) * Move all compiled scripts into `lib` directory Remove ./number.js (You can use the compiled ones in `./lib/*`) Tell node that the `esm` directory is type `module` and enable tree shaking. Remove unused files from packages `files` property * Allow importing of package.json * Make library ESM first * - Fix merge conflicts - Refactor `bundleAny` into `defaultInstance.js` and `browserBundle.cjs` - Refactor unit tests to be able to run with plain nodejs (no transpiling) - Fix browser examples * Fix browser and browserstack tests * Fix running unit tests on Node 10 (which has no support for modules) * Fix node.js examples (those are still commonjs) * Remove the need for `browserBundle.cjs` * Generate minified bundle only * [Security] Bump node-fetch from 2.6.0 to 2.6.1 (#1963) Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.6.0 to 2.6.1. **This update includes a security fix.** - [Release notes](https://github.com/bitinn/node-fetch/releases) - [Changelog](https://github.com/node-fetch/node-fetch/blob/master/docs/CHANGELOG.md) - [Commits](https://github.com/bitinn/node-fetch/compare/v2.6.0...v2.6.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Cleanup console.log * Add integration tests to test the entry points (commonjs/esm, full/number only) * Create backward compatibility error messages in the files moved/removed since v8 * Describe breaking changes in HISTORY.md * Bump karma from 5.2.1 to 5.2.2 (#1965) Bumps [karma](https://github.com/karma-runner/karma) from 5.2.1 to 5.2.2. - [Release notes](https://github.com/karma-runner/karma/releases) - [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md) - [Commits](https://github.com/karma-runner/karma/compare/v5.2.1...v5.2.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Lee Langley-Rees <lee@greenimp.co.uk> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
136 lines
4.1 KiB
JavaScript
136 lines
4.1 KiB
JavaScript
import { isBigNumber, isMatrix, isNumber } from '../../utils/is.js'
|
|
import { clone } from '../../utils/object.js'
|
|
import { arraySize } from '../../utils/array.js'
|
|
import { IndexError } from '../../error/IndexError.js'
|
|
import { DimensionError } from '../../error/DimensionError.js'
|
|
import { factory } from '../../utils/factory.js'
|
|
|
|
const name = 'concat'
|
|
const dependencies = ['typed', 'matrix', 'isInteger']
|
|
|
|
export const createConcat = /* #__PURE__ */ factory(name, dependencies, ({ typed, matrix, isInteger }) => {
|
|
/**
|
|
* Concatenate two or more matrices.
|
|
*
|
|
* Syntax:
|
|
*
|
|
* math.concat(A, B, C, ...)
|
|
* math.concat(A, B, C, ..., dim)
|
|
*
|
|
* Where:
|
|
*
|
|
* - `dim: number` is a zero-based dimension over which to concatenate the matrices.
|
|
* By default the last dimension of the matrices.
|
|
*
|
|
* Examples:
|
|
*
|
|
* const A = [[1, 2], [5, 6]]
|
|
* const B = [[3, 4], [7, 8]]
|
|
*
|
|
* math.concat(A, B) // returns [[1, 2, 3, 4], [5, 6, 7, 8]]
|
|
* math.concat(A, B, 0) // returns [[1, 2], [5, 6], [3, 4], [7, 8]]
|
|
* math.concat('hello', ' ', 'world') // returns 'hello world'
|
|
*
|
|
* See also:
|
|
*
|
|
* size, squeeze, subset, transpose
|
|
*
|
|
* @param {... Array | Matrix} args Two or more matrices
|
|
* @return {Array | Matrix} Concatenated matrix
|
|
*/
|
|
return typed(name, {
|
|
// TODO: change signature to '...Array | Matrix, dim?' when supported
|
|
'...Array | Matrix | number | BigNumber': function (args) {
|
|
let i
|
|
const len = args.length
|
|
let dim = -1 // zero-based dimension
|
|
let prevDim
|
|
let asMatrix = false
|
|
const matrices = [] // contains multi dimensional arrays
|
|
|
|
for (i = 0; i < len; i++) {
|
|
const arg = args[i]
|
|
|
|
// test whether we need to return a Matrix (if not we return an Array)
|
|
if (isMatrix(arg)) {
|
|
asMatrix = true
|
|
}
|
|
|
|
if (isNumber(arg) || isBigNumber(arg)) {
|
|
if (i !== len - 1) {
|
|
throw new Error('Dimension must be specified as last argument')
|
|
}
|
|
|
|
// last argument contains the dimension on which to concatenate
|
|
prevDim = dim
|
|
dim = arg.valueOf() // change BigNumber to number
|
|
|
|
if (!isInteger(dim)) {
|
|
throw new TypeError('Integer number expected for dimension')
|
|
}
|
|
|
|
if (dim < 0 || (i > 0 && dim > prevDim)) {
|
|
// TODO: would be more clear when throwing a DimensionError here
|
|
throw new IndexError(dim, prevDim + 1)
|
|
}
|
|
} else {
|
|
// this is a matrix or array
|
|
const m = clone(arg).valueOf()
|
|
const size = arraySize(m)
|
|
matrices[i] = m
|
|
prevDim = dim
|
|
dim = size.length - 1
|
|
|
|
// verify whether each of the matrices has the same number of dimensions
|
|
if (i > 0 && dim !== prevDim) {
|
|
throw new DimensionError(prevDim + 1, dim + 1)
|
|
}
|
|
}
|
|
}
|
|
|
|
if (matrices.length === 0) {
|
|
throw new SyntaxError('At least one matrix expected')
|
|
}
|
|
|
|
let res = matrices.shift()
|
|
while (matrices.length) {
|
|
res = _concat(res, matrices.shift(), dim, 0)
|
|
}
|
|
|
|
return asMatrix ? matrix(res) : res
|
|
},
|
|
|
|
'...string': function (args) {
|
|
return args.join('')
|
|
}
|
|
})
|
|
})
|
|
|
|
/**
|
|
* Recursively concatenate two matrices.
|
|
* The contents of the matrices is not cloned.
|
|
* @param {Array} a Multi dimensional array
|
|
* @param {Array} b Multi dimensional array
|
|
* @param {number} concatDim The dimension on which to concatenate (zero-based)
|
|
* @param {number} dim The current dim (zero-based)
|
|
* @return {Array} c The concatenated matrix
|
|
* @private
|
|
*/
|
|
function _concat (a, b, concatDim, dim) {
|
|
if (dim < concatDim) {
|
|
// recurse into next dimension
|
|
if (a.length !== b.length) {
|
|
throw new DimensionError(a.length, b.length)
|
|
}
|
|
|
|
const c = []
|
|
for (let i = 0; i < a.length; i++) {
|
|
c[i] = _concat(a[i], b[i], concatDim, dim + 1)
|
|
}
|
|
return c
|
|
} else {
|
|
// concatenate this dimension
|
|
return a.concat(b)
|
|
}
|
|
}
|