mirror of
https://github.com/josdejong/mathjs.git
synced 2026-01-25 15:07:57 +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>
111 lines
3.3 KiB
JavaScript
111 lines
3.3 KiB
JavaScript
import { factory } from '../../utils/factory.js'
|
|
import { createAlgorithm02 } from '../../type/matrix/utils/algorithm02.js'
|
|
import { createAlgorithm09 } from '../../type/matrix/utils/algorithm09.js'
|
|
import { createAlgorithm11 } from '../../type/matrix/utils/algorithm11.js'
|
|
import { createAlgorithm13 } from '../../type/matrix/utils/algorithm13.js'
|
|
import { createAlgorithm14 } from '../../type/matrix/utils/algorithm14.js'
|
|
|
|
const name = 'dotMultiply'
|
|
const dependencies = [
|
|
'typed',
|
|
'matrix',
|
|
'equalScalar',
|
|
'multiplyScalar'
|
|
]
|
|
|
|
export const createDotMultiply = /* #__PURE__ */ factory(name, dependencies, ({ typed, matrix, equalScalar, multiplyScalar }) => {
|
|
const algorithm02 = createAlgorithm02({ typed, equalScalar })
|
|
const algorithm09 = createAlgorithm09({ typed, equalScalar })
|
|
const algorithm11 = createAlgorithm11({ typed, equalScalar })
|
|
const algorithm13 = createAlgorithm13({ typed })
|
|
const algorithm14 = createAlgorithm14({ typed })
|
|
|
|
/**
|
|
* Multiply two matrices element wise. The function accepts both matrices and
|
|
* scalar values.
|
|
*
|
|
* Syntax:
|
|
*
|
|
* math.dotMultiply(x, y)
|
|
*
|
|
* Examples:
|
|
*
|
|
* math.dotMultiply(2, 4) // returns 8
|
|
*
|
|
* a = [[9, 5], [6, 1]]
|
|
* b = [[3, 2], [5, 2]]
|
|
*
|
|
* math.dotMultiply(a, b) // returns [[27, 10], [30, 2]]
|
|
* math.multiply(a, b) // returns [[52, 28], [23, 14]]
|
|
*
|
|
* See also:
|
|
*
|
|
* multiply, divide, dotDivide
|
|
*
|
|
* @param {number | BigNumber | Fraction | Complex | Unit | Array | Matrix} x Left hand value
|
|
* @param {number | BigNumber | Fraction | Complex | Unit | Array | Matrix} y Right hand value
|
|
* @return {number | BigNumber | Fraction | Complex | Unit | Array | Matrix} Multiplication of `x` and `y`
|
|
*/
|
|
return typed(name, {
|
|
|
|
'any, any': multiplyScalar,
|
|
|
|
'SparseMatrix, SparseMatrix': function (x, y) {
|
|
return algorithm09(x, y, multiplyScalar, false)
|
|
},
|
|
|
|
'SparseMatrix, DenseMatrix': function (x, y) {
|
|
return algorithm02(y, x, multiplyScalar, true)
|
|
},
|
|
|
|
'DenseMatrix, SparseMatrix': function (x, y) {
|
|
return algorithm02(x, y, multiplyScalar, false)
|
|
},
|
|
|
|
'DenseMatrix, DenseMatrix': function (x, y) {
|
|
return algorithm13(x, y, multiplyScalar)
|
|
},
|
|
|
|
'Array, Array': function (x, y) {
|
|
// use matrix implementation
|
|
return this(matrix(x), matrix(y)).valueOf()
|
|
},
|
|
|
|
'Array, Matrix': function (x, y) {
|
|
// use matrix implementation
|
|
return this(matrix(x), y)
|
|
},
|
|
|
|
'Matrix, Array': function (x, y) {
|
|
// use matrix implementation
|
|
return this(x, matrix(y))
|
|
},
|
|
|
|
'SparseMatrix, any': function (x, y) {
|
|
return algorithm11(x, y, multiplyScalar, false)
|
|
},
|
|
|
|
'DenseMatrix, any': function (x, y) {
|
|
return algorithm14(x, y, multiplyScalar, false)
|
|
},
|
|
|
|
'any, SparseMatrix': function (x, y) {
|
|
return algorithm11(y, x, multiplyScalar, true)
|
|
},
|
|
|
|
'any, DenseMatrix': function (x, y) {
|
|
return algorithm14(y, x, multiplyScalar, true)
|
|
},
|
|
|
|
'Array, any': function (x, y) {
|
|
// use matrix implementation
|
|
return algorithm14(matrix(x), y, multiplyScalar, false).valueOf()
|
|
},
|
|
|
|
'any, Array': function (x, y) {
|
|
// use matrix implementation
|
|
return algorithm14(matrix(y), x, multiplyScalar, true).valueOf()
|
|
}
|
|
})
|
|
})
|