@pie-framework/math-validation 1.0.8 → 1.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -2
- package/lib/mathjs.js.map +1 -1
- package/lib/symbolic/compare-compound-inequations.js +2 -2
- package/lib/symbolic/compare-compound-inequations.js.map +1 -1
- package/lib/symbolic/compare-equations.d.ts +1 -1
- package/lib/symbolic/compare-equations.js +47 -6
- package/lib/symbolic/compare-equations.js.map +1 -1
- package/lib/symbolic/index.js +41 -18
- package/lib/symbolic/index.js.map +1 -1
- package/lib/symbolic/utils.d.ts +5 -1
- package/lib/symbolic/utils.js +80 -16
- package/lib/symbolic/utils.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -15,7 +15,7 @@ yarn demo
|
|
|
15
15
|
Then go to `http://localhost:$PORT/demo`
|
|
16
16
|
|
|
17
17
|
|
|
18
|
-
##
|
|
18
|
+
## Tests
|
|
19
19
|
|
|
20
20
|
```shell
|
|
21
21
|
yarn jest
|
|
@@ -61,6 +61,7 @@ It can determine mathematical equivalence between:
|
|
|
61
61
|
|
|
62
62
|
- linear equations in one variable
|
|
63
63
|
- linear equations in two variables
|
|
64
|
+
- quadratic equations
|
|
64
65
|
- 2-way inequalities in one or two variables
|
|
65
66
|
- compound inequalities in one variable
|
|
66
67
|
- trigonometric identities and functions
|
|
@@ -76,7 +77,7 @@ It can also handle degrees, radians and gradians
|
|
|
76
77
|
* faster math evaluation
|
|
77
78
|
|
|
78
79
|
|
|
79
|
-
##
|
|
80
|
+
## Modes
|
|
80
81
|
|
|
81
82
|
There are 2 modes - literal and symbolic
|
|
82
83
|
|
package/lib/mathjs.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mathjs.js","sourceRoot":"","sources":["../src/mathjs.ts"],"names":[],"mappings":";;;AAAA,mCAAqC;AACxB,QAAA,MAAM,GAAG,eAAM,CAAC,YAAG,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;AAC3C,aAAK,GAAK,cAAM,OAAC;
|
|
1
|
+
{"version":3,"file":"mathjs.js","sourceRoot":"","sources":["../src/mathjs.ts"],"names":[],"mappings":";;;AAAA,mCAAqC;AACxB,QAAA,MAAM,GAAG,eAAM,CAAC,YAAG,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;AAC3C,aAAK,GAAK,cAAM,OAAC;AAEhC,aAAa;AACA,QAAA,QAAQ,GAAG,cAAM,CAAC,QAAQ,CAAC"}
|
|
@@ -30,8 +30,8 @@ exports.splitInequality = splitInequality;
|
|
|
30
30
|
const getLimit = (expressionsPair, limitType) => {
|
|
31
31
|
const expressionR = utils_1.transformEqualityInExpression(expressionsPair.right);
|
|
32
32
|
const expressionL = utils_1.transformEqualityInExpression(expressionsPair.left);
|
|
33
|
-
const xFirstInequality = utils_1.solveLinearEquation(utils_1.getCoefficients(expressionR));
|
|
34
|
-
const xSecondInequality = utils_1.solveLinearEquation(utils_1.getCoefficients(expressionL));
|
|
33
|
+
const xFirstInequality = utils_1.solveLinearEquation(utils_1.getCoefficients(expressionR, true));
|
|
34
|
+
const xSecondInequality = utils_1.solveLinearEquation(utils_1.getCoefficients(expressionL, true));
|
|
35
35
|
if (limitType === "inferior") {
|
|
36
36
|
return Math.min(xFirstInequality, xSecondInequality);
|
|
37
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compare-compound-inequations.js","sourceRoot":"","sources":["../../src/symbolic/compare-compound-inequations.ts"],"names":[],"mappings":";;;AAAA,sCAAmC;AAEnC,mCAOiB;AAEjB,MAAM,CAAC,GAAQ,eAAM,CAAC;AAYtB,MAAM,SAAS,GAAG,CAAC,QAAgB,EAAE,EAAE;IACrC,QAAQ,QAAQ,EAAE;QAChB,KAAK,SAAS;YACZ,OAAO,GAAG,CAAC;QACb,KAAK,WAAW;YACd,OAAO,IAAI,CAAC;QACd,KAAK,QAAQ;YACX,OAAO,GAAG,CAAC;QACb,KAAK,UAAU;YACb,OAAO,IAAI,CAAC;QACd,KAAK,OAAO;YACV,OAAO,IAAI,CAAC;QACd,KAAK,SAAS;YACZ,OAAO,IAAI,CAAC;KACf;AACH,CAAC,CAAC;AAEF,4IAA4I;AACrI,MAAM,eAAe,GAAG,CAAC,kBAAuB,EAAY,EAAE,CAAC,CAAC;IACrE,IAAI,EAAE,IAAI,CAAC,CAAC,YAAY,CACtB,SAAS,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAC7C,kBAAkB,CAAC,YAAY,CAAC,CAAC,CAAC,EAClC,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAC7D;IACD,KAAK,EAAE,IAAI,CAAC,CAAC,YAAY,CACvB,SAAS,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAC7C,kBAAkB,CAAC,YAAY,CAAC,CAAC,CAAC,EAClC,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAC7D;CACF,CAAC,CAAC;AAXU,QAAA,eAAe,mBAWzB;AAEH,wCAAwC;AACjC,MAAM,QAAQ,GAAG,CACtB,eAAyB,EACzB,SAAiB,EACT,EAAE;IACV,MAAM,WAAW,GAAG,qCAA6B,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;IACzE,MAAM,WAAW,GAAG,qCAA6B,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IAExE,MAAM,gBAAgB,GAAG,2BAAmB,CAAC,uBAAe,CAAC,WAAW,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"compare-compound-inequations.js","sourceRoot":"","sources":["../../src/symbolic/compare-compound-inequations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { MathNode } from "mathjs";
|
|
2
|
-
export declare const compareEquations: (firstEquation: MathNode, secondEquation: MathNode, isInequality: boolean) =>
|
|
2
|
+
export declare const compareEquations: (firstEquation: MathNode, secondEquation: MathNode, isInequality: boolean) => any;
|
|
@@ -4,6 +4,10 @@ exports.compareEquations = void 0;
|
|
|
4
4
|
const mathjs_1 = require("../mathjs");
|
|
5
5
|
const utils_1 = require("./utils");
|
|
6
6
|
const m = mathjs_1.mathjs;
|
|
7
|
+
const compareCoefficients = (firstEqCoeff, secondEqCoeff) => Array.isArray(firstEqCoeff) &&
|
|
8
|
+
Array.isArray(secondEqCoeff) &&
|
|
9
|
+
firstEqCoeff.length === secondEqCoeff.length &&
|
|
10
|
+
firstEqCoeff.every((val, index) => val === secondEqCoeff[index]);
|
|
7
11
|
const compareEquations = (firstEquation, secondEquation, isInequality) => {
|
|
8
12
|
let equivalence = false;
|
|
9
13
|
if (utils_1.expressionsCanBeCompared(firstEquation, secondEquation)) {
|
|
@@ -19,22 +23,59 @@ const compareEquations = (firstEquation, secondEquation, isInequality) => {
|
|
|
19
23
|
}
|
|
20
24
|
let firstEquationCoefficients;
|
|
21
25
|
let secondEquationCoefficients;
|
|
22
|
-
// if both equations are linear in one variable then we solve "x" for both. If x has the same value then equations are equivalent
|
|
23
26
|
if (firstEquationVariablesName.length === 1) {
|
|
24
|
-
firstEquationCoefficients = utils_1.getCoefficients(firstExpression);
|
|
25
|
-
secondEquationCoefficients = utils_1.getCoefficients(secondExpression);
|
|
27
|
+
firstEquationCoefficients = utils_1.getCoefficients(firstExpression, isInequality);
|
|
28
|
+
secondEquationCoefficients = utils_1.getCoefficients(secondExpression, isInequality);
|
|
29
|
+
// if coefficients are equal, there is no need for further calculations => equations are equivalent
|
|
30
|
+
if (compareCoefficients(firstEquationCoefficients, secondEquationCoefficients)) {
|
|
31
|
+
return true;
|
|
32
|
+
}
|
|
33
|
+
// check for second-order polynomial equation such as ax^2 + bx + c = 0 where a is not zero
|
|
34
|
+
if ((firstEquationCoefficients.length === 3 &&
|
|
35
|
+
secondEquationCoefficients.length === 3 &&
|
|
36
|
+
!isInequality &&
|
|
37
|
+
firstEquationCoefficients[0] !== 0) ||
|
|
38
|
+
(firstEquationCoefficients.length === 4 &&
|
|
39
|
+
firstEquationCoefficients[0] === 0 &&
|
|
40
|
+
secondEquationCoefficients[0] === 0)) {
|
|
41
|
+
if (firstEquationCoefficients[0] === 0) {
|
|
42
|
+
firstEquationCoefficients = firstEquationCoefficients.splice(1, 3);
|
|
43
|
+
secondEquationCoefficients = secondEquationCoefficients.splice(1, 3);
|
|
44
|
+
}
|
|
45
|
+
let rootsFirstEquation = utils_1.solveQuadraticEquation(firstEquationCoefficients);
|
|
46
|
+
let rootsSecondEquation = utils_1.solveQuadraticEquation(secondEquationCoefficients);
|
|
47
|
+
let firstRoot = m.complex(rootsFirstEquation);
|
|
48
|
+
let secondRoot = m.complex(rootsSecondEquation);
|
|
49
|
+
if (rootsFirstEquation[0].im === 0 && rootsFirstEquation[1].im === 0) {
|
|
50
|
+
return ((firstRoot[0].equals(secondRoot[0]) &&
|
|
51
|
+
firstRoot[1].equals(secondRoot[1])) ||
|
|
52
|
+
(firstRoot[0].equals(secondRoot[1]) &&
|
|
53
|
+
firstRoot[1].equals(secondRoot[0])));
|
|
54
|
+
}
|
|
55
|
+
//@ts-ignore
|
|
56
|
+
return (rootsFirstEquation[0].re === rootsSecondEquation[0].re &&
|
|
57
|
+
rootsFirstEquation[1].re === rootsSecondEquation[1].re &&
|
|
58
|
+
rootsFirstEquation[0].im.toFixed(13) ===
|
|
59
|
+
rootsSecondEquation[0].im.toFixed(13) &&
|
|
60
|
+
rootsFirstEquation[1].im.toFixed(13) ===
|
|
61
|
+
rootsSecondEquation[1].im.toFixed(13));
|
|
62
|
+
}
|
|
63
|
+
// if both equations are linear in one variable then we solve "x" for both. If x has the same value then equations are equivalent
|
|
64
|
+
// solve linear equations
|
|
26
65
|
const solutionForFirstEquation = utils_1.solveLinearEquation(firstEquationCoefficients);
|
|
27
66
|
const solutionForSecondEquation = utils_1.solveLinearEquation(secondEquationCoefficients);
|
|
28
|
-
equivalence =
|
|
67
|
+
equivalence =
|
|
68
|
+
solutionForFirstEquation === solutionForSecondEquation &&
|
|
69
|
+
solutionForFirstEquation !== undefined;
|
|
29
70
|
}
|
|
30
71
|
// if both equations are linear in two variabled then we give value "1" for both "x". Doing this we get a linear equation in one variable "y". Then we solve "y" for both. If y has the same value then equations are equivalent
|
|
31
72
|
if (firstEquationVariablesName.length === 2) {
|
|
32
73
|
let x = firstEquationVariablesName[0];
|
|
33
74
|
// solve expression for x=1
|
|
34
75
|
let expraNoX = utils_1.setXToOne(firstExpression, x);
|
|
35
|
-
firstEquationCoefficients = utils_1.getCoefficients(expraNoX);
|
|
76
|
+
firstEquationCoefficients = utils_1.getCoefficients(expraNoX, isInequality);
|
|
36
77
|
let exprbNoX = utils_1.setXToOne(secondExpression, x);
|
|
37
|
-
secondEquationCoefficients = utils_1.getCoefficients(exprbNoX);
|
|
78
|
+
secondEquationCoefficients = utils_1.getCoefficients(exprbNoX, isInequality);
|
|
38
79
|
// find y for both equations, where x equals 1
|
|
39
80
|
let yFromFirstExpression = utils_1.solveLinearEquation(firstEquationCoefficients);
|
|
40
81
|
let yFromSecondExpression = utils_1.solveLinearEquation(secondEquationCoefficients);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compare-equations.js","sourceRoot":"","sources":["../../src/symbolic/compare-equations.ts"],"names":[],"mappings":";;;AAAA,sCAAmC;AAEnC,
|
|
1
|
+
{"version":3,"file":"compare-equations.js","sourceRoot":"","sources":["../../src/symbolic/compare-equations.ts"],"names":[],"mappings":"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"}
|
package/lib/symbolic/index.js
CHANGED
|
@@ -14,17 +14,15 @@ const { simplify: ms, rationalize } = mathjs_1.mathjs;
|
|
|
14
14
|
const SIMPLIFY_RULES = [
|
|
15
15
|
{ l: "n1^(1/n2)", r: "nthRoot(n1, n2)" },
|
|
16
16
|
{ l: "sqrt(n1)", r: "nthRoot(n1, 2)" },
|
|
17
|
-
{ l: "(n^2)/n", r: "n" },
|
|
18
|
-
{ l: "n-n", r: "0" },
|
|
19
|
-
{ l: "(n^2) + n", r: "n * (n + 1)" },
|
|
20
|
-
{ l: "((n^n1) + n)/n", r: "n^(n1-1)+1" },
|
|
21
|
-
{ l: "(n^2) + 2n", r: "n * (n + 2)" },
|
|
22
17
|
{ l: "(v1-v2)/n", r: "v1/n-v2/n" },
|
|
23
18
|
{ l: "(v1-n)/n", r: "v1/n-1" },
|
|
24
19
|
{ l: "n/n1-c1", r: "(n-c1*n1)/n1" },
|
|
25
20
|
{ l: "i^2", r: "-1" },
|
|
26
21
|
{ l: "pi", r: "3.141592653589793" },
|
|
27
|
-
|
|
22
|
+
{ l: "n/(n*n1)", r: "1/n1" },
|
|
23
|
+
{ l: "c1/(c2*(n3))", r: "(c1/c2)*(1/n3)" },
|
|
24
|
+
{ l: "n1/(n(n+1)+1(n+1))", r: "n1/((n+1)^2)" },
|
|
25
|
+
// perfect square formula
|
|
28
26
|
{ l: "(n1 + n2) ^ 2", r: "(n1 ^ 2) + 2*n1*n2 + (n2 ^ 2)" },
|
|
29
27
|
{ l: "tzn(n1, n2)", r: "n1" },
|
|
30
28
|
{ l: "n1/(-n2)", r: "-(n1/n2)" },
|
|
@@ -59,42 +57,67 @@ exports.simplify = simplify;
|
|
|
59
57
|
const normalize = (a) => {
|
|
60
58
|
let r = a;
|
|
61
59
|
let onlyConstant = true;
|
|
60
|
+
let containsFunctionNode = false;
|
|
62
61
|
let containsArrayNode = false;
|
|
62
|
+
let pi = false;
|
|
63
|
+
let containsInverseFlag = false;
|
|
63
64
|
r.traverse(function (node, path, parent) {
|
|
64
65
|
if (node.isArrayNode) {
|
|
65
66
|
containsArrayNode = true;
|
|
66
67
|
node.items = node.items.map((item) => exports.simplify(item));
|
|
67
68
|
}
|
|
69
|
+
if (node.isSymbolNode) {
|
|
70
|
+
pi = pi || node.name === "pi";
|
|
71
|
+
containsInverseFlag = containsInverseFlag || node.name === "f^{-1}";
|
|
72
|
+
}
|
|
68
73
|
});
|
|
69
|
-
if (r.
|
|
74
|
+
if (r.args) {
|
|
70
75
|
r.args = r.args.map((arg) => {
|
|
71
|
-
if (!arg.isFunctionNode &&
|
|
76
|
+
if (!arg.isFunctionNode &&
|
|
77
|
+
!arg.isArrayNode &&
|
|
78
|
+
!containsInverseFlag &&
|
|
79
|
+
!pi) {
|
|
72
80
|
try {
|
|
73
|
-
arg =
|
|
81
|
+
arg = exports.simplify(arg);
|
|
74
82
|
}
|
|
75
83
|
catch (e) {
|
|
76
84
|
// ok;
|
|
77
85
|
}
|
|
78
86
|
}
|
|
87
|
+
containsFunctionNode = containsFunctionNode || arg.isFunctionNode;
|
|
79
88
|
onlyConstant = onlyConstant && !!arg.isConstantNode;
|
|
80
89
|
return arg;
|
|
81
90
|
});
|
|
91
|
+
if (containsFunctionNode || containsInverseFlag) {
|
|
92
|
+
r.args = r.args.map((arg) => {
|
|
93
|
+
if (!arg.isFunctionNode && !arg.isArrayNode) {
|
|
94
|
+
try {
|
|
95
|
+
arg = rationalize(exports.simplify(arg), {}, true).expression;
|
|
96
|
+
}
|
|
97
|
+
catch (e) {
|
|
98
|
+
// ok;
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
return arg;
|
|
102
|
+
});
|
|
103
|
+
}
|
|
82
104
|
}
|
|
83
|
-
|
|
84
|
-
onlyConstant = false;
|
|
105
|
+
if (r.fn !== "equal") {
|
|
85
106
|
try {
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
catch (e) {
|
|
89
|
-
// ok;
|
|
90
|
-
//console.log(e, "failed to rationalize");
|
|
107
|
+
onlyConstant = false;
|
|
108
|
+
r = rationalize(r, {}, true).expression;
|
|
91
109
|
}
|
|
110
|
+
catch (_a) { }
|
|
92
111
|
}
|
|
93
112
|
if (r.conditionals && r.params) {
|
|
94
113
|
r.params = r.params.map((param) => node_sort_1.sort(exports.simplify(param)));
|
|
95
114
|
}
|
|
96
|
-
|
|
97
|
-
|
|
115
|
+
if (!containsArrayNode && !onlyConstant) {
|
|
116
|
+
// overcome TypeError
|
|
117
|
+
try {
|
|
118
|
+
r = exports.simplify(r);
|
|
119
|
+
}
|
|
120
|
+
catch (e) { }
|
|
98
121
|
}
|
|
99
122
|
log("[normalize] input: ", a.toString(), "output: ", r.toString());
|
|
100
123
|
// check for infinity
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/symbolic/index.ts"],"names":[],"mappings":";;;AAAA,gCAAgC;AAChC,sCAAmC;AAEnC,4CAAoC;AACpC,2DAAuD;AACvD,iFAA4E;AAE5E,MAAM,CAAC,GAAQ,eAAM,CAAC;AACtB,MAAM,GAAG,GAAG,YAAM,CAAC,aAAa,CAAC,CAAC;AAClC,MAAM,gBAAgB,GAAG,mBAAmB,CAAC;AAC7C,MAAM,gBAAgB,GAAG,CAAC,mBAAmB,CAAC;AAI9C,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,WAAW,EAAE,GAAG,eAAM,CAAC;AAE7C,MAAM,cAAc,GAAG;IACrB,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,iBAAiB,EAAE;IACxC,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,gBAAgB,EAAE;IACtC,EAAE,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/symbolic/index.ts"],"names":[],"mappings":";;;AAAA,gCAAgC;AAChC,sCAAmC;AAEnC,4CAAoC;AACpC,2DAAuD;AACvD,iFAA4E;AAE5E,MAAM,CAAC,GAAQ,eAAM,CAAC;AACtB,MAAM,GAAG,GAAG,YAAM,CAAC,aAAa,CAAC,CAAC;AAClC,MAAM,gBAAgB,GAAG,mBAAmB,CAAC;AAC7C,MAAM,gBAAgB,GAAG,CAAC,mBAAmB,CAAC;AAI9C,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,WAAW,EAAE,GAAG,eAAM,CAAC;AAE7C,MAAM,cAAc,GAAG;IACrB,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,iBAAiB,EAAE;IACxC,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,gBAAgB,EAAE;IACtC,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,EAAE;IAClC,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE;IAC9B,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,cAAc,EAAE;IACnC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE;IACrB,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,mBAAmB,EAAE;IACnC,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE;IAC5B,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,gBAAgB,EAAE;IAC1C,EAAE,CAAC,EAAE,oBAAoB,EAAE,CAAC,EAAE,cAAc,EAAE;IAE9C,yBAAyB;IACzB,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE,+BAA+B,EAAE;IAE1D,EAAE,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,IAAI,EAAE;IAC7B,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,UAAU,EAAE;IAChC,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,GAAG,EAAE;IAE1B,4GAA4G;IAC5G,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE,QAAQ,EAAE;IACnC,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE;IAC9B,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE;IAC9B,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,eAAe,EAAE;IACnD,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,eAAe,EAAE;IAErC,wDAAwD;IAExD,4CAA4C;IAC5C,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE,cAAc,EAAE;IACzC,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE,cAAc,EAAE;IACzC,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE,cAAc,EAAE;IACzC,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE,cAAc,EAAE;IACzC,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE,cAAc,EAAE;IACzC,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE,cAAc,EAAE;IAEzC,oFAAoF;IACpF,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,KAAK,EAAE;IAC/B,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,KAAK,EAAE;IAC/B,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,KAAK,EAAE;CAChC,CAAC;AAEK,MAAM,QAAQ,GAAG,CAAC,CAAC,EAAE,EAAE;IAC5B,MAAM,KAAK,GAAG,cAAc,CAAC,MAAM,CAAE,EAAU,CAAC,KAAK,CAAC,CAAC;IACvD,OAAO,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,2BAA2B;AAClD,CAAC,CAAC;AAHW,QAAA,QAAQ,YAGnB;AAEF,MAAM,SAAS,GAAG,CAAC,CAA0B,EAAE,EAAE;IAC/C,IAAI,CAAC,GAA4B,CAAC,CAAC;IACnC,IAAI,YAAY,GAAG,IAAI,CAAC;IACxB,IAAI,oBAAoB,GAAG,KAAK,CAAC;IACjC,IAAI,iBAAiB,GAAG,KAAK,CAAC;IAC9B,IAAI,EAAE,GAAG,KAAK,CAAC;IACf,IAAI,mBAAmB,GAAG,KAAK,CAAC;IAEhC,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,EAAE,IAAI,EAAE,MAAM;QACrC,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,iBAAiB,GAAG,IAAI,CAAC;YACzB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;SACvD;QAED,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,EAAE,GAAG,EAAE,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC;YAC9B,mBAAmB,GAAG,mBAAmB,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC;SACrE;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,CAAC,IAAI,EAAE;QACV,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC1B,IACE,CAAC,GAAG,CAAC,cAAc;gBACnB,CAAC,GAAG,CAAC,WAAW;gBAChB,CAAC,mBAAmB;gBACpB,CAAC,EAAE,EACH;gBACA,IAAI;oBACF,GAAG,GAAG,gBAAQ,CAAC,GAAG,CAAC,CAAC;iBACrB;gBAAC,OAAO,CAAC,EAAE;oBACV,MAAM;iBACP;aACF;YAED,oBAAoB,GAAG,oBAAoB,IAAI,GAAG,CAAC,cAAc,CAAC;YAElE,YAAY,GAAG,YAAY,IAAI,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC;YAEpD,OAAO,GAAG,CAAC;QACb,CAAC,CAAC,CAAC;QAEH,IAAI,oBAAoB,IAAI,mBAAmB,EAAE;YAC/C,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC1B,IAAI,CAAC,GAAG,CAAC,cAAc,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE;oBAC3C,IAAI;wBACF,GAAG,GAAG,WAAW,CAAC,gBAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC,UAAU,CAAC;qBACvD;oBAAC,OAAO,CAAC,EAAE;wBACV,MAAM;qBACP;iBACF;gBAED,OAAO,GAAG,CAAC;YACb,CAAC,CAAC,CAAC;SACJ;KACF;IAED,IAAI,CAAC,CAAC,EAAE,KAAK,OAAO,EAAE;QACpB,IAAI;YACF,YAAY,GAAG,KAAK,CAAC;YACrB,CAAC,GAAG,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC,UAAU,CAAC;SACzC;QAAC,WAAM,GAAE;KACX;IAED,IAAI,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,MAAM,EAAE;QAC9B,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,gBAAI,CAAC,gBAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KAC3D;IAED,IAAI,CAAC,iBAAiB,IAAI,CAAC,YAAY,EAAE;QACvC,qBAAqB;QACrB,IAAI;YACF,CAAC,GAAG,gBAAQ,CAAC,CAAC,CAAC,CAAC;SACjB;QAAC,OAAO,CAAC,EAAE,GAAE;KACf;IAED,GAAG,CAAC,qBAAqB,EAAE,CAAC,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IAEnE,qBAAqB;IACrB,IACE,CAAC,CAAC,QAAQ,EAAE,KAAK,UAAU;QAC3B,CAAC,CAAC,CAAC,QAAQ,EAAE,IAAI,gBAAgB;QACjC,CAAC,CAAC,CAAC,QAAQ,EAAE,IAAI,gBAAgB,EACjC;QACA,CAAC,GAAG,IAAI,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;KAClC;IAED,IAAI,CAAC,CAAC,KAAK,EAAE;QACX,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC;KAC/D;SAAM,IAAI,CAAC,CAAC,EAAE,KAAK,YAAY,EAAE;QAChC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,QAAQ,CAC9B,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC,GAAG,KAAK,CAC5C,CAAC;QACF,CAAC,GAAG,gBAAQ,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,OAAO,CAAC,CAAC;AACX,CAAC,CAAC;AAEK,MAAM,WAAW,GAAG,CAAC,CAAM,EAAE,CAAM,EAAE,EAAE;;IAC5C,IAAI,EAAY,CAAC;IACjB,IAAI,EAAY,CAAC;IAEjB,+CAA+C;IAE/C,EAAE,GAAG,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAExD,EAAE,GAAG,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAExD,GAAG,CAAC,eAAe,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;IAE1D,MAAM,eAAe,GAAG,gBAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,WAAW,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC;IAE5D,IAAI,QAAQ,GAAG,WAAW,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,eAAe,CAAC;IAE/D,IAAI,QAAQ,EAAE;QACZ,OAAO,IAAI,CAAC;KACb;IAED,oCAAoC;IACpC,IAAI,EAAE,CAAC,EAAE,KAAK,OAAO,IAAI,EAAE,CAAC,EAAE,KAAK,OAAO,EAAE;QAC1C,OAAO,oCAAgB,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;KACxC;IAED,wEAAwE;IACxE,IACE,CAAC,EAAE,CAAC,EAAE,KAAK,QAAQ,IAAI,EAAE,CAAC,EAAE,KAAK,QAAQ,CAAC;QAC1C,CAAC,EAAE,CAAC,EAAE,KAAK,UAAU,IAAI,EAAE,CAAC,EAAE,KAAK,UAAU,CAAC,EAC9C;QACA,gHAAgH;QAChH,mFAAmF;QACnF,qHAAqH;QACrH,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC;QAChB,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC;QAChB,EAAE,CAAC,EAAE,GAAG,GAAG,CAAC;QACZ,EAAE,CAAC,EAAE,GAAG,GAAG,CAAC;QAEZ,OAAO,oCAAgB,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;KACvC;IAED,qDAAqD;IACrD;IACE,YAAY;IACZ,CAAA,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,YAAY,0CAAE,MAAM,OAAK,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,YAAY,0CAAE,MAAM,CAAA;QACrD,YAAY;QACZ,CAAA,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,YAAY,0CAAE,MAAM,MAAK,CAAC;QAC9B,YAAY;QACZ,CAAA,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,YAAY,0CAAE,QAAQ,EAAE,OAAK,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,YAAY,0CAAE,QAAQ,EAAE,CAAA,EAC7D;QACA,MAAM,MAAM,GAAG;YACb,SAAS;YACT,WAAW;YACX,QAAQ;YACR,UAAU;YACV,OAAO;YACP,SAAS;SACV,CAAC;QAEF,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;QAC5C,YAAY;QACZ,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAChC,CAAC;QAEF,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;QAC5C,YAAY;QACZ,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAChC,CAAC;QAEF,IAAI,eAAe,IAAI,eAAe,EAAE;YACtC,OAAO,yDAA0B,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;SAC3C;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AA5EW,QAAA,WAAW,eA4EtB"}
|
package/lib/symbolic/utils.d.ts
CHANGED
|
@@ -2,7 +2,11 @@ import { MathNode } from "mathjs";
|
|
|
2
2
|
export declare const expressionsCanBeCompared: (firstEquation: MathNode, secondEquation: MathNode) => boolean;
|
|
3
3
|
export declare const transformEqualityInExpression: (equality: MathNode) => MathNode;
|
|
4
4
|
export declare const getVariables: (equation: MathNode) => string[];
|
|
5
|
-
export declare const getCoefficients: (equation: MathNode) => any;
|
|
5
|
+
export declare const getCoefficients: (equation: MathNode, isInequality: boolean) => any;
|
|
6
6
|
export declare const setXToOne: (equation: any, variableName: string) => any;
|
|
7
|
+
export declare const solveQuadraticEquation: (coefficients: number[]) => {
|
|
8
|
+
re: any;
|
|
9
|
+
im: number;
|
|
10
|
+
}[];
|
|
7
11
|
export declare const solveLinearEquation: (coefficients: number[]) => number;
|
|
8
12
|
export declare const equationsHaveTheSameVariables: (firstEquationVariables: string[], secondEquationVariables: string[]) => boolean;
|
package/lib/symbolic/utils.js
CHANGED
|
@@ -1,19 +1,31 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.equationsHaveTheSameVariables = exports.solveLinearEquation = exports.setXToOne = exports.getCoefficients = exports.getVariables = exports.transformEqualityInExpression = exports.expressionsCanBeCompared = void 0;
|
|
3
|
+
exports.equationsHaveTheSameVariables = exports.solveLinearEquation = exports.solveQuadraticEquation = exports.setXToOne = exports.getCoefficients = exports.getVariables = exports.transformEqualityInExpression = exports.expressionsCanBeCompared = void 0;
|
|
4
4
|
const mathjs_1 = require("../mathjs");
|
|
5
5
|
const _1 = require("./");
|
|
6
6
|
const { simplify } = mathjs_1.mathjs;
|
|
7
7
|
const m = mathjs_1.mathjs;
|
|
8
|
-
|
|
8
|
+
let simplifyRules = [
|
|
9
|
+
{ l: "-((n1)*(n2))", r: "(n1)*(n2)" },
|
|
10
|
+
{ l: "(n1-n2)/n3", r: "n1/n3-n2/n3" },
|
|
11
|
+
{ l: "(n1+n2)/n3", r: "n1/n3+n2/n3" },
|
|
12
|
+
{ l: "(n1-n2)*n3/n4", r: "(n1*n3)/n4-(n2*n3)/n4" },
|
|
13
|
+
{ l: "(n1+n2)*n3/n4", r: "(n1*n3)/n4+(n2*n3)/n4" },
|
|
14
|
+
];
|
|
15
|
+
const customRound = (number) => Math.round(number * 10000000000000) / 10000000000000;
|
|
16
|
+
// expressions can be compared if we have at least one symbol node and has no function node or array; do not treat math series as equations
|
|
9
17
|
const expressionsCanBeCompared = (firstEquation, secondEquation) => {
|
|
10
18
|
let noFunctionOrArray = true;
|
|
11
19
|
let firstSymbolNode = false;
|
|
12
20
|
let symbolNode = false;
|
|
21
|
+
let seriesNode = false;
|
|
13
22
|
firstEquation.traverse(function (node, path, parent) {
|
|
23
|
+
if (node.isSymbolNode) {
|
|
24
|
+
firstSymbolNode = true;
|
|
25
|
+
seriesNode = seriesNode || node.name.includes("[");
|
|
26
|
+
}
|
|
14
27
|
noFunctionOrArray =
|
|
15
28
|
noFunctionOrArray || node.isFunctionNode || node.isArrayNode;
|
|
16
|
-
firstSymbolNode = firstSymbolNode || node.isSymbolNode;
|
|
17
29
|
});
|
|
18
30
|
secondEquation.traverse(function (node, path, parent) {
|
|
19
31
|
if (node.isFunctionNode || node.isArrayNode) {
|
|
@@ -22,7 +34,7 @@ const expressionsCanBeCompared = (firstEquation, secondEquation) => {
|
|
|
22
34
|
if (node.isSymbolNode && firstSymbolNode)
|
|
23
35
|
symbolNode = true;
|
|
24
36
|
});
|
|
25
|
-
return noFunctionOrArray && symbolNode;
|
|
37
|
+
return noFunctionOrArray && symbolNode && !seriesNode;
|
|
26
38
|
};
|
|
27
39
|
exports.expressionsCanBeCompared = expressionsCanBeCompared;
|
|
28
40
|
// move the terms of the equations to the left hand side
|
|
@@ -43,21 +55,26 @@ const getVariables = (equation) => {
|
|
|
43
55
|
return variableNames.sort();
|
|
44
56
|
};
|
|
45
57
|
exports.getVariables = getVariables;
|
|
46
|
-
const getCoefficients = (equation) => {
|
|
58
|
+
const getCoefficients = (equation, isInequality) => {
|
|
47
59
|
// coefficients will be determined if equation has only one variable
|
|
48
60
|
try {
|
|
49
61
|
const rationalizedEquation = m.rationalize(equation, {}, true);
|
|
50
|
-
|
|
62
|
+
let coefficients = rationalizedEquation.coefficients;
|
|
63
|
+
let allNegatives = coefficients.every((coefficient) => coefficient < 0);
|
|
64
|
+
return allNegatives
|
|
65
|
+
? coefficients.map((coefficient) => Math.abs(coefficient))
|
|
66
|
+
: coefficients;
|
|
51
67
|
}
|
|
52
68
|
catch (e) {
|
|
53
69
|
// rationalize may fail if variable is isolated in a fraction
|
|
54
70
|
// we give it another try to rationalize after applying a new round of simplify to separate the variable
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
{ l: "(
|
|
60
|
-
|
|
71
|
+
if (isInequality) {
|
|
72
|
+
equation = simplify(equation, simplifyRules);
|
|
73
|
+
}
|
|
74
|
+
else {
|
|
75
|
+
simplifyRules.push({ l: "-(n)", r: "n" });
|
|
76
|
+
equation = simplify(equation, simplifyRules);
|
|
77
|
+
}
|
|
61
78
|
try {
|
|
62
79
|
const rationalizedEquation = m.rationalize(equation, {}, true);
|
|
63
80
|
return rationalizedEquation.coefficients;
|
|
@@ -74,7 +91,56 @@ const setXToOne = (equation, variableName) => equation.transform(function (node,
|
|
|
74
91
|
return node;
|
|
75
92
|
});
|
|
76
93
|
exports.setXToOne = setXToOne;
|
|
77
|
-
//
|
|
94
|
+
// quadratic equation solver for a second-order polynomial equation such as ax^2 + bx + c = 0 for x, where a is not zero
|
|
95
|
+
// quadratic formula
|
|
96
|
+
const solveQuadraticEquation = (coefficients) => {
|
|
97
|
+
const [c, b, a] = coefficients;
|
|
98
|
+
const discriminant = b * b - 4 * a * c;
|
|
99
|
+
let addDiscriminant;
|
|
100
|
+
let subtractDiscriminant;
|
|
101
|
+
try {
|
|
102
|
+
addDiscriminant = m.compile(m.fraction(-b + m.sqrt(discriminant)) / (2 * a));
|
|
103
|
+
}
|
|
104
|
+
catch (_a) {
|
|
105
|
+
addDiscriminant = m.compile("(-b+sqrt(discriminant))/(2*a)");
|
|
106
|
+
}
|
|
107
|
+
try {
|
|
108
|
+
subtractDiscriminant = m.compile(m.fraction(-b - m.sqrt(discriminant)) / (2 * a));
|
|
109
|
+
}
|
|
110
|
+
catch (_b) {
|
|
111
|
+
subtractDiscriminant = m.compile("(-b-sqrt(discriminant))/(2*a)");
|
|
112
|
+
}
|
|
113
|
+
let firstRoot = addDiscriminant.evaluate({
|
|
114
|
+
discriminant: discriminant,
|
|
115
|
+
a: a,
|
|
116
|
+
b: b,
|
|
117
|
+
});
|
|
118
|
+
let secondRoot = subtractDiscriminant.evaluate({
|
|
119
|
+
discriminant: discriminant,
|
|
120
|
+
a: a,
|
|
121
|
+
b: b,
|
|
122
|
+
});
|
|
123
|
+
// roots are real numbers
|
|
124
|
+
if (!firstRoot.im) {
|
|
125
|
+
firstRoot = customRound(firstRoot);
|
|
126
|
+
secondRoot = customRound(secondRoot);
|
|
127
|
+
return [
|
|
128
|
+
{ re: firstRoot, im: 0 },
|
|
129
|
+
{ re: secondRoot, im: 0 },
|
|
130
|
+
];
|
|
131
|
+
}
|
|
132
|
+
return [
|
|
133
|
+
{
|
|
134
|
+
re: customRound(firstRoot.re),
|
|
135
|
+
im: customRound(firstRoot.im),
|
|
136
|
+
},
|
|
137
|
+
{
|
|
138
|
+
re: customRound(secondRoot.re),
|
|
139
|
+
im: customRound(secondRoot.im),
|
|
140
|
+
},
|
|
141
|
+
];
|
|
142
|
+
};
|
|
143
|
+
exports.solveQuadraticEquation = solveQuadraticEquation;
|
|
78
144
|
// solve x
|
|
79
145
|
const solveLinearEquation = (coefficients) => {
|
|
80
146
|
let result;
|
|
@@ -92,9 +158,7 @@ const solveLinearEquation = (coefficients) => {
|
|
|
92
158
|
return 0;
|
|
93
159
|
}
|
|
94
160
|
// equation with no solution : if coefficient for x is 0 => division by zero => result == -Infinity
|
|
95
|
-
result =
|
|
96
|
-
Math.round(m.divide(coefficients[0], -1 * coefficients[1]) * 10000) /
|
|
97
|
-
10000;
|
|
161
|
+
result = customRound(m.divide(coefficients[0], -1 * coefficients[1]));
|
|
98
162
|
}
|
|
99
163
|
return result;
|
|
100
164
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/symbolic/utils.ts"],"names":[],"mappings":";;;AAAA,sCAAmC;AAEnC,yBAAgD;AAChD,MAAM,EAAE,QAAQ,EAAE,GAAG,eAAM,CAAC;AAE5B,MAAM,CAAC,GAAQ,eAAM,CAAC;AAEtB,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/symbolic/utils.ts"],"names":[],"mappings":"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"}
|