math-exercises 2.2.79 → 2.2.80
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/lib/exercises/math/calculLitteral/inequations/firstDegreeInequationsType0.d.ts +5 -1
- package/lib/exercises/math/calculLitteral/inequations/firstDegreeInequationsType0.d.ts.map +1 -1
- package/lib/exercises/math/calculLitteral/inequations/firstDegreeInequationsType0.js +95 -20
- package/lib/exercises/math/calculLitteral/inequations/firstDegreeInequationsType1.d.ts +4 -1
- package/lib/exercises/math/calculLitteral/inequations/firstDegreeInequationsType1.d.ts.map +1 -1
- package/lib/exercises/math/calculLitteral/inequations/firstDegreeInequationsType1.js +104 -26
- package/lib/exercises/math/derivation/derivative/lnDerivativeOne.d.ts.map +1 -1
- package/lib/exercises/math/derivation/derivative/lnDerivativeOne.js +17 -7
- package/lib/exercises/math/derivation/derivative/lnDerivativeThree.d.ts.map +1 -1
- package/lib/exercises/math/derivation/derivative/lnDerivativeThree.js +46 -27
- package/lib/exercises/math/derivation/derivative/lnDerivativeTwo.js +1 -1
- package/lib/exercises/math/derivation/derivative/secondDerivativeOfExpoFunction.js +1 -1
- package/lib/exercises/math/functions/affines/signFunction.d.ts.map +1 -1
- package/lib/exercises/math/functions/affines/signFunction.js +66 -27
- package/lib/exercises/math/functions/basics/graphicInequation.d.ts.map +1 -1
- package/lib/exercises/math/functions/basics/graphicInequation.js +57 -36
- package/lib/exercises/math/functions/exponential/expEquation.js +1 -1
- package/lib/exercises/math/functions/integral/integralFractions.js +1 -1
- package/lib/exercises/math/functions/logarithm/log10Simplifying.d.ts.map +1 -1
- package/lib/exercises/math/functions/logarithm/log10Simplifying.js +6 -2
- package/lib/exercises/math/functions/logarithm/logEquation.d.ts.map +1 -1
- package/lib/exercises/math/functions/logarithm/logEquation.js +22 -14
- package/lib/exercises/math/functions/logarithm/logPowerEquation.d.ts.map +1 -1
- package/lib/exercises/math/functions/logarithm/logPowerEquation.js +14 -12
- package/lib/exercises/math/functions/logarithm/logSimplifiying.d.ts.map +1 -1
- package/lib/exercises/math/functions/logarithm/logSimplifiying.js +36 -16
- package/lib/exercises/math/geometry/vectors/vectorLinearCombination.js +4 -4
- package/lib/exercises/math/matrices/matrixInversibilityDomain.js +1 -0
- package/lib/exercises/math/primitive/logarithmePrimitive.d.ts.map +1 -1
- package/lib/exercises/math/primitive/logarithmePrimitive.js +11 -3
- package/lib/exercises/math/sets/intervals/inequalityToInterval.d.ts.map +1 -1
- package/lib/exercises/math/sets/intervals/inequalityToInterval.js +11 -11
- package/lib/exercises/options/inequationSolutionFormat.d.ts +3 -0
- package/lib/exercises/options/inequationSolutionFormat.d.ts.map +1 -0
- package/lib/exercises/options/inequationSolutionFormat.js +12 -0
- package/lib/exercises/pc/pH.js +1 -1
- package/lib/index.d.ts +6 -2
- package/lib/index.d.ts.map +1 -1
- package/lib/math/numbers/integer/integer.d.ts +1 -1
- package/lib/math/numbers/reals/real.d.ts +1 -1
- package/lib/tree/nodes/algebraicNode.d.ts +1 -0
- package/lib/tree/nodes/algebraicNode.d.ts.map +1 -1
- package/lib/tree/nodes/inequations/inequationNode.d.ts +5 -2
- package/lib/tree/nodes/inequations/inequationNode.d.ts.map +1 -1
- package/lib/tree/nodes/inequations/inequationNode.js +40 -3
- package/lib/tree/nodes/numbers/numberNode.d.ts +2 -2
- package/lib/tree/nodes/numbers/numberNode.d.ts.map +1 -1
- package/lib/tree/nodes/numbers/numberNode.js +7 -1
- package/lib/tree/nodes/sets/intervalNode.d.ts +2 -2
- package/lib/tree/nodes/sets/intervalNode.d.ts.map +1 -1
- package/lib/tree/nodes/sets/intervalNode.js +2 -2
- package/lib/tree/nodes/sets/setNode.d.ts +1 -0
- package/lib/tree/nodes/sets/setNode.d.ts.map +1 -1
- package/lib/tree/nodes/sets/unionIntervalNode.d.ts +1 -1
- package/lib/tree/nodes/sets/unionIntervalNode.d.ts.map +1 -1
- package/lib/tree/nodes/sets/unionIntervalNode.js +1 -1
- package/lib/tree/parsers/inequationParser.d.ts +7 -0
- package/lib/tree/parsers/inequationParser.d.ts.map +1 -0
- package/lib/tree/parsers/inequationParser.js +30 -0
- package/lib/tree/parsers/intervalParser.d.ts.map +1 -1
- package/lib/tree/parsers/intervalParser.js +32 -26
- package/lib/tree/parsers/latexParser.d.ts.map +1 -1
- package/lib/tree/parsers/latexParser.js +29 -6
- package/lib/tree/parsers/powerParser.d.ts +1 -1
- package/lib/tree/parsers/rationalParser.d.ts +1 -1
- package/lib/tree/parsers/unionIntervalParser.d.ts +9 -0
- package/lib/tree/parsers/unionIntervalParser.d.ts.map +1 -0
- package/lib/tree/parsers/unionIntervalParser.js +26 -0
- package/lib/types/keyIds.d.ts +1 -1
- package/lib/types/keyIds.d.ts.map +1 -1
- package/package.json +1 -1
package/lib/index.d.ts
CHANGED
|
@@ -341,11 +341,15 @@ declare const mathExercises: (Exercise<{
|
|
|
341
341
|
b: number;
|
|
342
342
|
c: number;
|
|
343
343
|
ineqType: import("./math/inequations/inequation").InegalitySymbols;
|
|
344
|
-
}, {
|
|
344
|
+
}, {
|
|
345
|
+
inequationSolutionFormat: string;
|
|
346
|
+
}> | Exercise<{
|
|
345
347
|
a: number;
|
|
346
348
|
b: number;
|
|
347
349
|
ineqType: import("./math/inequations/inequation").InegalitySymbols;
|
|
348
|
-
}, {
|
|
350
|
+
}, {
|
|
351
|
+
inequationSolutionFormat: string;
|
|
352
|
+
}> | Exercise<{
|
|
349
353
|
ineqType: import("./math/inequations/inequation").InegalitySymbols;
|
|
350
354
|
a: number;
|
|
351
355
|
b: number;
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAG1D,OAAO,yBAAyB,CAAC;AAEjC,QAAA,MAAM,aAAa
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ export declare class Integer implements Nombre {
|
|
|
15
15
|
constructor(value: number, tex?: string);
|
|
16
16
|
equals(n: Nombre): boolean;
|
|
17
17
|
toTree(): NumberNode;
|
|
18
|
-
times(n: number | Nombre):
|
|
18
|
+
times(n: number | Nombre): Decimal | Integer;
|
|
19
19
|
round(precision: number): Integer;
|
|
20
20
|
divide(nb: Nombre): Nombre;
|
|
21
21
|
multiply(nb: Nombre): Rational | Integer;
|
|
@@ -2,7 +2,7 @@ import { AlgebraicNode } from "../../../tree/nodes/algebraicNode";
|
|
|
2
2
|
import { SqrtNode } from "../../../tree/nodes/functions/sqrtNode";
|
|
3
3
|
import { Nombre, NumberType } from "../nombre";
|
|
4
4
|
export declare abstract class RealConstructor {
|
|
5
|
-
static random():
|
|
5
|
+
static random(): SquareRoot | Real;
|
|
6
6
|
}
|
|
7
7
|
export declare class Real implements Nombre {
|
|
8
8
|
value: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"algebraicNode.d.ts","sourceRoot":"","sources":["../../../src/tree/nodes/algebraicNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAE3C,MAAM,MAAM,eAAe,GAAG;IAC5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"algebraicNode.d.ts","sourceRoot":"","sources":["../../../src/tree/nodes/algebraicNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAE3C,MAAM,MAAM,eAAe,GAAG;IAC5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAC;AACF,MAAM,WAAW,aAAc,SAAQ,IAAI;IACzC,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,MAAM,CAAC;IACpD,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,KAAK,aAAa,CAAC;IAC7E,iBAAiB,EAAE,CAAC,IAAI,CAAC,EAAE,WAAW,KAAK,aAAa,EAAE,CAAC;IAC3D,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAE,eAAe,KAAK,aAAa,CAAC;IACpD,MAAM,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,OAAO,CAAC;IACzC,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,aAAa,CAAC;CACjD;AAED,eAAO,MAAM,eAAe,SAAU,IAAI,0BACA,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { InegalitySymbols } from "../../../math/inequations/inequation";
|
|
2
2
|
import { Node, NodeIds, NodeOptions, NodeType } from "../node";
|
|
3
3
|
import { IntervalNode } from "../sets/intervalNode";
|
|
4
|
-
import { AlgebraicNode } from "../algebraicNode";
|
|
4
|
+
import { AlgebraicNode, SimplifyOptions } from "../algebraicNode";
|
|
5
|
+
import { Affine } from "../../../math/polynomials/affine";
|
|
5
6
|
export declare class InequationNode implements Node {
|
|
6
7
|
opts?: NodeOptions | undefined;
|
|
7
8
|
type: NodeType;
|
|
@@ -18,12 +19,14 @@ export declare class InequationNode implements Node {
|
|
|
18
19
|
};
|
|
19
20
|
toInterval(): IntervalNode;
|
|
20
21
|
toReversed(): InequationNode;
|
|
22
|
+
toSwitched(): InequationNode;
|
|
21
23
|
toAllValidTexs(): string[];
|
|
22
24
|
toEquivalentNodes(opts?: NodeOptions | undefined): InequationNode[];
|
|
23
25
|
toMathString(): string;
|
|
24
26
|
toMathjs(): string;
|
|
25
27
|
toAllTexs(): string[];
|
|
26
28
|
toTex(): string;
|
|
27
|
-
simplify():
|
|
29
|
+
simplify(opts?: SimplifyOptions): InequationNode;
|
|
28
30
|
}
|
|
31
|
+
export declare const firstDegreeInequationResolutionTex: (affine: Affine, order: InegalitySymbols, right: AlgebraicNode) => string;
|
|
29
32
|
//# sourceMappingURL=inequationNode.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inequationNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/inequations/inequationNode.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAEjB,MAAM,mCAAmC,CAAC;AAK3C,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG/D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"inequationNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/inequations/inequationNode.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAEjB,MAAM,mCAAmC,CAAC;AAK3C,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG/D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAMvD,qBAAa,cAAe,YAAW,IAAI;IACzC,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IAC/B,IAAI,EAAE,QAAQ,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,OAAO,EAAE,gBAAgB,EAAE,CAAC;gBAE1B,QAAQ,EAAE,aAAa,EAAE,EACzB,OAAO,EAAE,gBAAgB,EAAE,GAAG,gBAAgB;IAuBhD,aAAa;;;;;;;IAOb,UAAU;IA6CV,UAAU;IAQV,UAAU;IAMV,cAAc;IAGd,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS;IAYhD,YAAY;IAGZ,QAAQ;IAGR,SAAS;IAGT,KAAK;IAGL,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,cAAc;CAcjD;AAED,eAAO,MAAM,kCAAkC,WACrC,MAAM,SACP,gBAAgB,SAChB,aAAa,WAuBrB,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.InequationNode = void 0;
|
|
3
|
+
exports.firstDegreeInequationResolutionTex = exports.InequationNode = void 0;
|
|
4
4
|
const inequation_1 = require("../../../math/inequations/inequation");
|
|
5
5
|
const cartesianProducts_1 = require("../../../utils/arrays/cartesianProducts");
|
|
6
6
|
const isLetter_1 = require("../../../utils/strings/isLetter");
|
|
@@ -8,6 +8,9 @@ const node_1 = require("../node");
|
|
|
8
8
|
const infiniteNode_1 = require("../numbers/infiniteNode");
|
|
9
9
|
const closure_1 = require("../sets/closure");
|
|
10
10
|
const intervalNode_1 = require("../sets/intervalNode");
|
|
11
|
+
const alignTex_1 = require("../../../utils/latex/alignTex");
|
|
12
|
+
const fractionNode_1 = require("../operators/fractionNode");
|
|
13
|
+
const substractNode_1 = require("../operators/substractNode");
|
|
11
14
|
class InequationNode {
|
|
12
15
|
constructor(children, symbols) {
|
|
13
16
|
if (children.length < 2)
|
|
@@ -81,6 +84,9 @@ class InequationNode {
|
|
|
81
84
|
const newSymbols = this.symbols.map((el) => new inequation_1.InequationSymbol(el).reversed());
|
|
82
85
|
return new InequationNode(newChildren, newSymbols);
|
|
83
86
|
}
|
|
87
|
+
toSwitched() {
|
|
88
|
+
return new InequationNode(this.children, this.symbols.map((el) => new inequation_1.InequationSymbol(el).reversed()));
|
|
89
|
+
}
|
|
84
90
|
toAllValidTexs() {
|
|
85
91
|
return this.toEquivalentNodes().map((node) => node.toTex());
|
|
86
92
|
}
|
|
@@ -108,8 +114,39 @@ class InequationNode {
|
|
|
108
114
|
toTex() {
|
|
109
115
|
return this.tex;
|
|
110
116
|
}
|
|
111
|
-
simplify() {
|
|
112
|
-
|
|
117
|
+
simplify(opts) {
|
|
118
|
+
if (this.children.length === 2 &&
|
|
119
|
+
this.children[0].isNumeric &&
|
|
120
|
+
!this.children[1].isNumeric) {
|
|
121
|
+
return this.toReversed().simplify(opts);
|
|
122
|
+
}
|
|
123
|
+
return new InequationNode(this.children.map((el) => el.simplify(opts)), this.symbols);
|
|
113
124
|
}
|
|
114
125
|
}
|
|
115
126
|
exports.InequationNode = InequationNode;
|
|
127
|
+
const firstDegreeInequationResolutionTex = (affine, order, right) => {
|
|
128
|
+
if (!right.isNumeric)
|
|
129
|
+
throw Error("unimplemented general resolution");
|
|
130
|
+
const b = affine.b;
|
|
131
|
+
const a = affine.a;
|
|
132
|
+
if (a === 1 && b === 0)
|
|
133
|
+
return new InequationNode([affine.toTree(), right], [order]).toTex();
|
|
134
|
+
const steps = [[affine.toTex(), order, right.toTex()]];
|
|
135
|
+
if (b !== 0)
|
|
136
|
+
steps.push([
|
|
137
|
+
affine.add(-b).toTex(),
|
|
138
|
+
order,
|
|
139
|
+
(0, substractNode_1.substract)(right, b).simplify().toTex(),
|
|
140
|
+
]);
|
|
141
|
+
if (a !== 1) {
|
|
142
|
+
if (a < 0)
|
|
143
|
+
order = new inequation_1.InequationSymbol(order).reversed();
|
|
144
|
+
steps.push([
|
|
145
|
+
affine.variable,
|
|
146
|
+
order,
|
|
147
|
+
(0, fractionNode_1.frac)((0, substractNode_1.substract)(right, b), a).simplify().toTex(),
|
|
148
|
+
]);
|
|
149
|
+
}
|
|
150
|
+
return (0, alignTex_1.alignTex)(steps);
|
|
151
|
+
};
|
|
152
|
+
exports.firstDegreeInequationResolutionTex = firstDegreeInequationResolutionTex;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Node, NodeIds, NodeOptions, NodeType, ToTexOptions } from "../node";
|
|
2
|
-
import { AlgebraicNode } from "../algebraicNode";
|
|
2
|
+
import { AlgebraicNode, SimplifyOptions } from "../algebraicNode";
|
|
3
3
|
import { OppositeNode } from "../functions/oppositeNode";
|
|
4
4
|
export declare function isNumberNode(a: Node): a is NumberNode;
|
|
5
5
|
export declare function isNumberOrOppositeNumberNode(a: Node): a is NumberNode | OppositeNode<NumberNode>;
|
|
@@ -24,7 +24,7 @@ export declare class NumberNode implements AlgebraicNode {
|
|
|
24
24
|
toAllValidTexs(): string[];
|
|
25
25
|
toEquivalentNodes(): this[];
|
|
26
26
|
evaluate(vars?: Record<string, number>): number;
|
|
27
|
-
simplify():
|
|
27
|
+
simplify(opts?: SimplifyOptions): NumberNode | import("../operators/fractionNode").FractionNode | OppositeNode<import("../operators/fractionNode").FractionNode>;
|
|
28
28
|
equals(node: AlgebraicNode): boolean;
|
|
29
29
|
toDetailedEvaluation(vars: Record<string, AlgebraicNode>): this;
|
|
30
30
|
derivative(varName?: string | undefined): AlgebraicNode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"numberNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/numbers/numberNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"numberNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/numbers/numberNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGlE,OAAO,EAAE,YAAY,EAAkB,MAAM,2BAA2B,CAAC;AAEzE,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,UAAU,CAErD;AACD,wBAAgB,4BAA4B,CAC1C,CAAC,EAAE,IAAI,GACN,CAAC,IAAI,UAAU,GAAG,YAAY,CAAC,UAAU,CAAC,CAE5C;AACD,8BAAsB,qBAAqB;IACzC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAM,EAAO;CAGhE;AACD,qBAAa,UAAW,YAAW,aAAa;IAC9C,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,QAAQ,CAAmB;IACjC,SAAS,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,WAAW,CAAC;gBAEjB,KAAK,EAAE,MAAM,EACb,GAAG,CAAC,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,WAAW;IASpB,YAAY,IAAI,MAAM;IAGtB,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,MAAM;IAKrC,QAAQ;IAGR,aAAa;;;;IAMb,cAAc;IAOd,iBAAiB;IAGjB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAGtC,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe;IAQ/B,MAAM,CAAC,IAAI,EAAE,aAAa;IAG1B,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAGxD,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS;CAGxC"}
|
|
@@ -5,6 +5,7 @@ const node_1 = require("../node");
|
|
|
5
5
|
const randint_1 = require("../../../math/utils/random/randint");
|
|
6
6
|
const colorize_1 = require("../../../utils/latex/colorize");
|
|
7
7
|
const oppositeNode_1 = require("../functions/oppositeNode");
|
|
8
|
+
const decimal_1 = require("../../../math/numbers/decimals/decimal");
|
|
8
9
|
function isNumberNode(a) {
|
|
9
10
|
return a.type === node_1.NodeType.number;
|
|
10
11
|
}
|
|
@@ -59,7 +60,12 @@ class NumberNode {
|
|
|
59
60
|
evaluate(vars) {
|
|
60
61
|
return this.value;
|
|
61
62
|
}
|
|
62
|
-
simplify() {
|
|
63
|
+
simplify(opts) {
|
|
64
|
+
if (opts?.decimalToFractions) {
|
|
65
|
+
if (this.value % 1 !== 0) {
|
|
66
|
+
return new decimal_1.Decimal(this.value).toRational().toTree();
|
|
67
|
+
}
|
|
68
|
+
}
|
|
63
69
|
return this;
|
|
64
70
|
}
|
|
65
71
|
equals(node) {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AlgebraicNode } from "../algebraicNode";
|
|
1
|
+
import { AlgebraicNode, SimplifyOptions } from "../algebraicNode";
|
|
2
2
|
import { InequationNode } from "../inequations/inequationNode";
|
|
3
3
|
import { Node, NodeIds, NodeOptions, NodeType } from "../node";
|
|
4
4
|
import { NodeIdentifiers } from "../nodeConstructor";
|
|
@@ -36,6 +36,6 @@ export declare class IntervalNode implements SetNode {
|
|
|
36
36
|
toAllTexs(opts?: NodeOptions): string[];
|
|
37
37
|
toIdentifiers(): IntervalNodeIdentifiers;
|
|
38
38
|
toText(isPlural: boolean, isFeminine: boolean): string;
|
|
39
|
-
simplify():
|
|
39
|
+
simplify(opts?: SimplifyOptions): IntervalNode;
|
|
40
40
|
}
|
|
41
41
|
//# sourceMappingURL=intervalNode.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"intervalNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/sets/intervalNode.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"intervalNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/sets/intervalNode.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAIrD,OAAO,EAAW,WAAW,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAa,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AACD,MAAM,MAAM,uBAAuB,GAAG;IACpC,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,eAAe,CAAC;IAC3B,UAAU,EAAE,eAAe,CAAC;IAC5B,OAAO,EAAE,WAAW,CAAC;IACrB,IAAI,CAAC,EAAE,WAAW,CAAC;CACpB,CAAC;AACF,qBAAa,YAAa,YAAW,OAAO;IAC1C,IAAI,EAAE,QAAQ,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IAC/B,OAAO,EAAE,WAAW,CAAC;IACrB,CAAC,EAAE,aAAa,CAAC;IACjB,CAAC,EAAE,aAAa,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;gBAEf,CAAC,EAAE,aAAa,EAChB,CAAC,EAAE,aAAa,EAChB,OAAO,EAAE,WAAW,EACpB,IAAI,CAAC,EAAE,WAAW;IAWpB,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW;IAMjC,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW;IAoBpC,YAAY,CAAC,WAAW,CAAC,EAAE,aAAa;IA4BxC,YAAY;IAIZ,QAAQ;IAIR,iBAAiB;IAGjB,qBAAqB;IAGrB,sBAAsB;IAGtB,wBAAwB;IAYxB,YAAY;IAkCZ,KAAK;IAWL,SAAS,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAOvC,aAAa,IAAI,uBAAuB;IAUxC,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO;IAiB7C,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe;CAQhC"}
|
|
@@ -137,8 +137,8 @@ class IntervalNode {
|
|
|
137
137
|
: `supérieur${conjugaison} à $${this.a.toTex()}$`
|
|
138
138
|
: `compris entre $${this.a.toTex()}$ ${closure_1.Closure.isLeftOpen(this.closure) ? "exclu" : "inclus"} et $${this.b.toTex()}$ ${closure_1.Closure.isRightOpen(this.closure) ? "exclu" : "inclus"}`;
|
|
139
139
|
}
|
|
140
|
-
simplify() {
|
|
141
|
-
return this;
|
|
140
|
+
simplify(opts) {
|
|
141
|
+
return new IntervalNode(this.a.simplify(opts), this.b.simplify(opts), this.closure, this.opts);
|
|
142
142
|
}
|
|
143
143
|
}
|
|
144
144
|
exports.IntervalNode = IntervalNode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/sets/setNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAY,MAAM,SAAS,CAAC;AAEtD,oBAAY,MAAM;IAChB,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,KAAK,IAAA;CACN;AACD,MAAM,WAAW,OAAQ,SAAQ,IAAI;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB,EAAE,CAAC,IAAI,CAAC,EAAE,WAAW,KAAK,OAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"setNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/sets/setNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAY,MAAM,SAAS,CAAC;AAEtD,oBAAY,MAAM;IAChB,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,KAAK,IAAA;CACN;AACD,MAAM,WAAW,OAAQ,SAAQ,IAAI;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB,EAAE,CAAC,IAAI,CAAC,EAAE,WAAW,KAAK,OAAO,EAAE,CAAC;IACrD,QAAQ,EAAE,MAAM,OAAO,CAAC;CACzB;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,OAAO,CAE/C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unionIntervalNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/sets/unionIntervalNode.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAI/D,OAAO,EAAE,MAAM,EAAE,OAAO,EAAa,MAAM,WAAW,CAAC;AAEvD,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,iBAAiB,CAEnE;AACD,8BAAsB,wBAAwB;IAC5C,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,aAAa;CAMlC;AACD,qBAAa,iBAAkB,YAAW,IAAI;IAC5C,IAAI,EAAE,QAAQ,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IAC/B,IAAI,EAAE,OAAO,EAAE,CAAC;gBACJ,IAAI,EAAE,OAAO,EAAE,EAAE,IAAI,CAAC,EAAE,WAAW;IAO/C,cAAc;IAId,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW;IAcpC,YAAY;IAIZ,QAAQ;IAIR,KAAK;IAGL,aAAa;;;;;;IAMb,QAAQ;
|
|
1
|
+
{"version":3,"file":"unionIntervalNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/sets/unionIntervalNode.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAI/D,OAAO,EAAE,MAAM,EAAE,OAAO,EAAa,MAAM,WAAW,CAAC;AAEvD,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,iBAAiB,CAEnE;AACD,8BAAsB,wBAAwB;IAC5C,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,aAAa;CAMlC;AACD,qBAAa,iBAAkB,YAAW,IAAI;IAC5C,IAAI,EAAE,QAAQ,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IAC/B,IAAI,EAAE,OAAO,EAAE,CAAC;gBACJ,IAAI,EAAE,OAAO,EAAE,EAAE,IAAI,CAAC,EAAE,WAAW;IAO/C,cAAc;IAId,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW;IAcpC,YAAY;IAIZ,QAAQ;IAIR,KAAK;IAGL,aAAa;;;;;;IAMb,QAAQ;CAMT"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"inequationParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/inequationParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AAGrE,KAAK,IAAI,GAAG;IACV,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAS,MAAM,SAAS,IAAI,2BAyBxD,CAAC"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.inequationParser = void 0;
|
|
4
|
+
const inequationNode_1 = require("../nodes/inequations/inequationNode");
|
|
5
|
+
const latexParser_1 = require("./latexParser");
|
|
6
|
+
const inequationParser = (ans, opts) => {
|
|
7
|
+
try {
|
|
8
|
+
const variable = opts?.variable ?? "x";
|
|
9
|
+
const ineqType = ans.match(/<|>|\\le|\\ge/g);
|
|
10
|
+
//? pour l'instant on ne parse que les ineq de premier ordre (un seul symbole)
|
|
11
|
+
if (ineqType?.length !== 1)
|
|
12
|
+
return false;
|
|
13
|
+
const splitted = ans.split(ineqType[0]).filter((s) => s !== "");
|
|
14
|
+
//? on autorise l'oubli de la variable, genre "<5" par ex
|
|
15
|
+
if (splitted.length === 1) {
|
|
16
|
+
const parsed = (0, latexParser_1.parseAlgebraic)(splitted[0]);
|
|
17
|
+
if (!parsed)
|
|
18
|
+
return false;
|
|
19
|
+
return new inequationNode_1.InequationNode([variable.toTree(), parsed], ineqType[0]);
|
|
20
|
+
}
|
|
21
|
+
const children = splitted.map((s) => (0, latexParser_1.parseAlgebraic)(s));
|
|
22
|
+
if (children.some((c) => !c))
|
|
23
|
+
return false;
|
|
24
|
+
return new inequationNode_1.InequationNode([...children], ineqType[0]);
|
|
25
|
+
}
|
|
26
|
+
catch (err) {
|
|
27
|
+
return false;
|
|
28
|
+
}
|
|
29
|
+
};
|
|
30
|
+
exports.inequationParser = inequationParser;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"intervalParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/intervalParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAG1D,KAAK,IAAI,GAAG;IACV,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AACF,eAAO,MAAM,cAAc,QAAS,MAAM,SAAS,IAAI,
|
|
1
|
+
{"version":3,"file":"intervalParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/intervalParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAG1D,KAAK,IAAI,GAAG;IACV,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AACF,eAAO,MAAM,cAAc,QAAS,MAAM,SAAS,IAAI,yBA8CtD,CAAC"}
|
|
@@ -5,34 +5,40 @@ const closure_1 = require("../nodes/sets/closure");
|
|
|
5
5
|
const intervalNode_1 = require("../nodes/sets/intervalNode");
|
|
6
6
|
const latexParser_1 = require("./latexParser");
|
|
7
7
|
const intervalParser = (ans, opts) => {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
bornes = formated.split(",");
|
|
27
|
-
if (bornes.length !== 2)
|
|
8
|
+
try {
|
|
9
|
+
const allowCommaInsteadOfSemicolon = opts?.allowCommaInsteadOfSemicolon ?? false;
|
|
10
|
+
const allowNoBrackets = opts?.allowNoBrackets ?? false;
|
|
11
|
+
let formated = ans.replaceAll("\\ ", "");
|
|
12
|
+
if (allowNoBrackets && !["]", "["].includes(formated[0])) {
|
|
13
|
+
formated = "[" + formated;
|
|
14
|
+
}
|
|
15
|
+
if (allowNoBrackets &&
|
|
16
|
+
!["]", "["].includes(formated[formated.length - 1])) {
|
|
17
|
+
formated = formated + "]";
|
|
18
|
+
}
|
|
19
|
+
const leftBracket = formated[0];
|
|
20
|
+
const rightBracket = formated[formated.length - 1];
|
|
21
|
+
if ((!allowNoBrackets && !["]", "["].includes(leftBracket)) ||
|
|
22
|
+
!["]", "["].includes(rightBracket))
|
|
23
|
+
return false;
|
|
24
|
+
let bornes = formated.split(";");
|
|
25
|
+
if (!allowCommaInsteadOfSemicolon && bornes.length !== 2)
|
|
28
26
|
return false;
|
|
27
|
+
if (bornes.length !== 2) {
|
|
28
|
+
bornes = formated.split(",");
|
|
29
|
+
if (bornes.length !== 2)
|
|
30
|
+
return false;
|
|
31
|
+
}
|
|
32
|
+
const aParsed = (0, latexParser_1.parseAlgebraic)(bornes[0]);
|
|
33
|
+
if (!aParsed)
|
|
34
|
+
return false;
|
|
35
|
+
const bParsed = (0, latexParser_1.parseAlgebraic)(bornes[1]);
|
|
36
|
+
if (!bParsed)
|
|
37
|
+
return false;
|
|
38
|
+
return new intervalNode_1.IntervalNode(aParsed, bParsed, closure_1.Closure.fromBrackets(leftBracket, rightBracket));
|
|
29
39
|
}
|
|
30
|
-
|
|
31
|
-
if (!aParsed)
|
|
40
|
+
catch (e) {
|
|
32
41
|
return false;
|
|
33
|
-
|
|
34
|
-
if (!bParsed)
|
|
35
|
-
return false;
|
|
36
|
-
return new intervalNode_1.IntervalNode(aParsed, bParsed, closure_1.Closure.fromBrackets(leftBracket, rightBracket));
|
|
42
|
+
}
|
|
37
43
|
};
|
|
38
44
|
exports.intervalParser = intervalParser;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"latexParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/latexParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"latexParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/latexParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAKzD,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AA4DrE,eAAO,MAAM,QAAQ,UAAW,MAAM,aAoCrC,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAC;AACF,eAAO,MAAM,cAAc,UAAW,MAAM,SAAS,aAAa,kBAyBjE,CAAC;AAEF,eAAO,MAAM,UAAU,UAAW,MAAM,+CA2CvC,CAAC"}
|
|
@@ -2,9 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.parseLatex = exports.parseAlgebraic = exports.tokenize = void 0;
|
|
4
4
|
const equalNode_1 = require("../nodes/equations/equalNode");
|
|
5
|
+
const log10Node_1 = require("../nodes/functions/log10Node");
|
|
6
|
+
const logNode_1 = require("../nodes/functions/logNode");
|
|
5
7
|
const oppositeNode_1 = require("../nodes/functions/oppositeNode");
|
|
6
8
|
const sqrtNode_1 = require("../nodes/functions/sqrtNode");
|
|
7
9
|
const inequationNode_1 = require("../nodes/inequations/inequationNode");
|
|
10
|
+
const infiniteNode_1 = require("../nodes/numbers/infiniteNode");
|
|
8
11
|
const numberNode_1 = require("../nodes/numbers/numberNode");
|
|
9
12
|
const piNode_1 = require("../nodes/numbers/piNode");
|
|
10
13
|
const addNode_1 = require("../nodes/operators/addNode");
|
|
@@ -25,7 +28,12 @@ const functions = [
|
|
|
25
28
|
];
|
|
26
29
|
const operators = ["+", "-", "\\div", "\\times", "^"];
|
|
27
30
|
//cmds childless, like \\pi
|
|
28
|
-
|
|
31
|
+
//will all turn into constants ?
|
|
32
|
+
const symbols = [
|
|
33
|
+
{ tex: "\\pi", node: piNode_1.PiNode },
|
|
34
|
+
{ tex: "+\\infty", node: infiniteNode_1.PlusInfinityNode },
|
|
35
|
+
{ tex: "-\\infty", node: infiniteNode_1.MinusInfinityNode },
|
|
36
|
+
];
|
|
29
37
|
//separators between trees
|
|
30
38
|
const separators = ["=", "<", ">", "\\leq", "\\geq"];
|
|
31
39
|
//le nombre de parentheses est il respecté
|
|
@@ -57,12 +65,19 @@ const tokenize = (latex) => {
|
|
|
57
65
|
const char = latex[i];
|
|
58
66
|
if (char === " ")
|
|
59
67
|
continue;
|
|
60
|
-
const
|
|
61
|
-
|
|
68
|
+
const substring = latex.substring(i);
|
|
69
|
+
//on check d'abord +-\infty, car sinon ils sont confondus avec des add/sub
|
|
70
|
+
const inftyMatch = substring.match(/^[+-]\\infty/);
|
|
71
|
+
if (inftyMatch) {
|
|
72
|
+
tokens.push(inftyMatch[0]);
|
|
73
|
+
i += inftyMatch[0].length - 1;
|
|
74
|
+
continue;
|
|
75
|
+
}
|
|
76
|
+
const charMatch = char.match(/[\+\-\(\)\^a-zA-Z_=<>\{\}]/);
|
|
77
|
+
if (charMatch) {
|
|
62
78
|
tokens.push(char);
|
|
63
79
|
continue;
|
|
64
80
|
}
|
|
65
|
-
const substring = latex.substring(i);
|
|
66
81
|
const nbMatch = substring.match(/^[0-9]+,?[0-9]*/); //x nombres éventuellement séparés par une virgule
|
|
67
82
|
if (nbMatch) {
|
|
68
83
|
tokens.push(nbMatch[0].replace(",", "."));
|
|
@@ -204,8 +219,8 @@ const buildTree = (tokens) => {
|
|
|
204
219
|
}
|
|
205
220
|
};
|
|
206
221
|
const buildTreeForSameDepthTokens = (tokens) => {
|
|
207
|
-
//? à ce stade les tokens sont soit des charactères soit des nodes déjà build (par buildTree)
|
|
208
|
-
//? ici on
|
|
222
|
+
//? à ce stade les tokens sont soit des charactères soit des nodes déjà build (par buildTree de profondeur plus grande)
|
|
223
|
+
//? ici on est dans une profondeur unique
|
|
209
224
|
let tempTokens = [];
|
|
210
225
|
for (let i = 0; i < tokens.length; i++) {
|
|
211
226
|
const token = tokens[i];
|
|
@@ -243,6 +258,14 @@ const buildTreeForSameDepthTokens = (tokens) => {
|
|
|
243
258
|
if (typeof tempTokens[i + 1] === "string")
|
|
244
259
|
throw Error(`Function child has not been parsed at index ${i}`);
|
|
245
260
|
switch (token) {
|
|
261
|
+
case "\\ln":
|
|
262
|
+
tempTokens[i] = new logNode_1.LogNode(tempTokens[i + 1]);
|
|
263
|
+
tempTokens.splice(i + 1, 1);
|
|
264
|
+
break;
|
|
265
|
+
case "\\log":
|
|
266
|
+
tempTokens[i] = new log10Node_1.Log10Node(tempTokens[i + 1]);
|
|
267
|
+
tempTokens.splice(i + 1, 1);
|
|
268
|
+
break;
|
|
246
269
|
case "\\sqrt":
|
|
247
270
|
tempTokens[i] = new sqrtNode_1.SqrtNode(tempTokens[i + 1]);
|
|
248
271
|
tempTokens.splice(i + 1, 1);
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const powerParser: (ans: string) => false | import("../nodes/
|
|
1
|
+
export declare const powerParser: (ans: string) => false | import("../nodes/operators/fractionNode").FractionNode | import("../nodes/functions/sqrtNode").SqrtNode | import("../nodes/operators/powerNode").PowerNode;
|
|
2
2
|
//# sourceMappingURL=powerParser.d.ts.map
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { FractionNode } from "../nodes/operators/fractionNode";
|
|
2
|
-
export declare const rationalParser: (ans: string) => false | import("../nodes/numbers/constantNode").ConstantNode | import("../nodes/numbers/numberNode").NumberNode | import("../nodes/functions/oppositeNode").OppositeNode<import("../nodes/algebraicNode").AlgebraicNode
|
|
2
|
+
export declare const rationalParser: (ans: string) => false | import("../nodes/numbers/constantNode").ConstantNode | import("../nodes/numbers/numberNode").NumberNode | FractionNode | import("../nodes/functions/oppositeNode").OppositeNode<import("../nodes/algebraicNode").AlgebraicNode>;
|
|
3
3
|
//# sourceMappingURL=rationalParser.d.ts.map
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { IntervalNode } from "../nodes/sets/intervalNode";
|
|
2
|
+
import { UnionIntervalNode } from "../nodes/sets/unionIntervalNode";
|
|
3
|
+
type Opts = {
|
|
4
|
+
allowCommaInsteadOfSemicolon?: boolean;
|
|
5
|
+
allowNoBrackets?: boolean;
|
|
6
|
+
};
|
|
7
|
+
export declare const unionIntervalParser: (ans: string, opts?: Opts) => false | UnionIntervalNode | IntervalNode;
|
|
8
|
+
export {};
|
|
9
|
+
//# sourceMappingURL=unionIntervalParser.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"unionIntervalParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/unionIntervalParser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAIpE,KAAK,IAAI,GAAG;IACV,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AACF,eAAO,MAAM,mBAAmB,QAAS,MAAM,SAAS,IAAI,6CAe3D,CAAC"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.unionIntervalParser = void 0;
|
|
4
|
+
const unionIntervalNode_1 = require("../nodes/sets/unionIntervalNode");
|
|
5
|
+
const intervalParser_1 = require("./intervalParser");
|
|
6
|
+
const unionIntervalParser = (ans, opts) => {
|
|
7
|
+
try {
|
|
8
|
+
const intervals = [];
|
|
9
|
+
const splitted = ans.split("\\cup");
|
|
10
|
+
splitted.forEach((s) => {
|
|
11
|
+
const parsed = (0, intervalParser_1.intervalParser)(s, opts);
|
|
12
|
+
if (!parsed)
|
|
13
|
+
return;
|
|
14
|
+
intervals.push(parsed);
|
|
15
|
+
});
|
|
16
|
+
if (intervals.length === 0)
|
|
17
|
+
return false;
|
|
18
|
+
if (intervals.length === 1)
|
|
19
|
+
return intervals[0];
|
|
20
|
+
return new unionIntervalNode_1.UnionIntervalNode(intervals);
|
|
21
|
+
}
|
|
22
|
+
catch (err) {
|
|
23
|
+
return false;
|
|
24
|
+
}
|
|
25
|
+
};
|
|
26
|
+
exports.unionIntervalParser = unionIntervalParser;
|
package/lib/types/keyIds.d.ts
CHANGED
|
@@ -14,7 +14,7 @@ export type KeyId =
|
|
|
14
14
|
/**sets */
|
|
15
15
|
| "belongs" | "notin" | "cap" | "cup" | "lbrace" | "rbrace" | "lbracket" | "lbracketNoSpace" | "rbracket" | "rbracketNoSpace" | "varnothing" | "naturals" | "integers" | "rationals" | "decimals" | "reals" | "complex" | "ast" | "del" | "right" | "left" | "rightarrow" | "overrightarrow" | "infty"
|
|
16
16
|
/**fcts */
|
|
17
|
-
| "log" | "ln" | "exp" | "epower" | "sin" | "cos" | "tan" | "arccos" | "arcsin" | "arctan" | "abs" | "fx" | "fParenthesis"
|
|
17
|
+
| "log" | "ln" | "exp" | "epower" | "sin" | "cos" | "tan" | "arccos" | "arcsin" | "arctan" | "abs" | "fx" | "fParenthesis" | "lnBrackets" | "logBrackets"
|
|
18
18
|
/**sequences */
|
|
19
19
|
| "un" | "unplus1"
|
|
20
20
|
/**probas */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyIds.d.ts","sourceRoot":"","sources":["../../src/types/keyIds.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,KAAK;AACf,gBAAgB;AACd,YAAY,GACZ,aAAa,GACb,mBAAmB,GACnB,oBAAoB;AACtB,WAAW;GACT,IAAI,GACJ,KAAK,GACL,SAAS,GACT,IAAI,GACJ,KAAK,GACL,IAAI,GACJ,IAAI,GACJ,SAAS,GACT,OAAO,GACP,eAAe;AAEjB,aAAa;GACX,QAAQ,GACR,OAAO,GACP,MAAM,GACN,YAAY,GACZ,KAAK,GACL,OAAO,GACP,QAAQ,GACR,KAAK;AAEP,WAAW;GACT,IAAI,GACJ,IAAI,GACJ,OAAO;AAET,cAAc;GACZ,gBAAgB,GAChB,QAAQ,GACR,SAAS,GACT,SAAS;AAEX,gBAAgB;GACd,MAAM,GACN,OAAO,GACP,OAAO,GACP,MAAM,GACN,QAAQ,GACR,MAAM,GACN,SAAS,GACT,QAAQ,GACR,MAAM,GACN,OAAO,GACP,SAAS,GACT,iBAAiB,GACjB,uBAAuB,GACvB,kBAAkB,GAClB,yBAAyB,GACzB,OAAO,GACP,OAAO,GACP,WAAW,GACX,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,QAAQ,GACR,SAAS,GACT,OAAO,GACP,YAAY;AAEd,UAAU;GACR,SAAS,GACT,OAAO,GACP,KAAK,GACL,KAAK,GACL,QAAQ,GACR,QAAQ,GACR,UAAU,GACV,iBAAiB,GACjB,UAAU,GACV,iBAAiB,GACjB,YAAY,GACZ,UAAU,GACV,UAAU,GACV,WAAW,GACX,UAAU,GACV,OAAO,GACP,SAAS,GACT,KAAK,GACL,KAAK,GACL,OAAO,GACP,MAAM,GACN,YAAY,GACZ,gBAAgB,GAChB,OAAO;AAET,UAAU;GACR,KAAK,GACL,IAAI,GACJ,KAAK,GACL,QAAQ,GACR,KAAK,GACL,KAAK,GACL,KAAK,GACL,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,KAAK,GACL,IAAI,GACJ,cAAc;
|
|
1
|
+
{"version":3,"file":"keyIds.d.ts","sourceRoot":"","sources":["../../src/types/keyIds.ts"],"names":[],"mappings":"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"}
|