math-exercises 2.2.77 → 2.2.79

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.
Files changed (106) hide show
  1. package/lib/exercises/math/derivation/derivative/firstDegreeDerivative.d.ts.map +1 -1
  2. package/lib/exercises/math/derivation/derivative/firstDegreeDerivative.js +44 -5
  3. package/lib/exercises/math/derivation/derivative/rootFunctionDerivative.d.ts.map +1 -1
  4. package/lib/exercises/math/derivation/derivative/rootFunctionDerivative.js +57 -26
  5. package/lib/exercises/math/derivation/derivative/secondDegreeDerivative.d.ts.map +1 -1
  6. package/lib/exercises/math/derivation/derivative/secondDegreeDerivative.js +50 -8
  7. package/lib/exercises/math/derivation/derivative/thirdDegreeDerivative.d.ts.map +1 -1
  8. package/lib/exercises/math/derivation/derivative/thirdDegreeDerivative.js +67 -13
  9. package/lib/exercises/math/derivation/derivative/usualderivative.d.ts.map +1 -1
  10. package/lib/exercises/math/derivation/derivative/usualderivative.js +1 -2
  11. package/lib/exercises/math/functions/exponentials/exponentialsVariations.d.ts +9 -0
  12. package/lib/exercises/math/functions/exponentials/exponentialsVariations.d.ts.map +1 -0
  13. package/lib/exercises/math/functions/exponentials/exponentialsVariations.js +124 -0
  14. package/lib/exercises/math/functions/exponentials/index.d.ts +2 -0
  15. package/lib/exercises/math/functions/exponentials/index.d.ts.map +1 -0
  16. package/lib/exercises/math/functions/exponentials/index.js +17 -0
  17. package/lib/exercises/math/functions/index.d.ts +1 -0
  18. package/lib/exercises/math/functions/index.d.ts.map +1 -1
  19. package/lib/exercises/math/functions/index.js +1 -0
  20. package/lib/exercises/math/geometry/areas/rectangleArea.d.ts.map +1 -1
  21. package/lib/exercises/math/geometry/areas/rectangleArea.js +5 -2
  22. package/lib/exercises/math/geometry/euclidianConstructions/buildPointFromAxialSymetry.d.ts +10 -0
  23. package/lib/exercises/math/geometry/euclidianConstructions/buildPointFromAxialSymetry.d.ts.map +1 -0
  24. package/lib/exercises/math/geometry/euclidianConstructions/buildPointFromAxialSymetry.js +107 -0
  25. package/lib/exercises/math/geometry/euclidianConstructions/index.d.ts +1 -0
  26. package/lib/exercises/math/geometry/euclidianConstructions/index.d.ts.map +1 -1
  27. package/lib/exercises/math/geometry/euclidianConstructions/index.js +1 -0
  28. package/lib/exercises/math/index.d.ts +1 -0
  29. package/lib/exercises/math/index.d.ts.map +1 -1
  30. package/lib/exercises/math/index.js +1 -0
  31. package/lib/exercises/math/percent/applyPercent.d.ts.map +1 -1
  32. package/lib/exercises/math/percent/applyPercent.js +2 -0
  33. package/lib/exercises/math/percent/findEndValueAfterEvolution.d.ts +8 -0
  34. package/lib/exercises/math/percent/findEndValueAfterEvolution.d.ts.map +1 -0
  35. package/lib/exercises/math/percent/findEndValueAfterEvolution.js +104 -0
  36. package/lib/exercises/math/percent/index.d.ts +1 -0
  37. package/lib/exercises/math/percent/index.d.ts.map +1 -1
  38. package/lib/exercises/math/percent/index.js +1 -0
  39. package/lib/exercises/math/powers/index.d.ts +1 -0
  40. package/lib/exercises/math/powers/index.d.ts.map +1 -1
  41. package/lib/exercises/math/powers/index.js +1 -0
  42. package/lib/exercises/math/powers/powersMixOperations.d.ts +11 -0
  43. package/lib/exercises/math/powers/powersMixOperations.d.ts.map +1 -0
  44. package/lib/exercises/math/powers/powersMixOperations.js +99 -0
  45. package/lib/exercises/math/sampling/confidenceInterval.d.ts +9 -0
  46. package/lib/exercises/math/sampling/confidenceInterval.d.ts.map +1 -0
  47. package/lib/exercises/math/sampling/confidenceInterval.js +134 -0
  48. package/lib/exercises/math/sampling/fluctuationInterval.d.ts +9 -0
  49. package/lib/exercises/math/sampling/fluctuationInterval.d.ts.map +1 -0
  50. package/lib/exercises/math/sampling/fluctuationInterval.js +131 -0
  51. package/lib/exercises/math/sampling/index.d.ts +4 -0
  52. package/lib/exercises/math/sampling/index.d.ts.map +1 -0
  53. package/lib/exercises/math/sampling/index.js +19 -0
  54. package/lib/exercises/math/sampling/isSamplingRepresentative.d.ts +11 -0
  55. package/lib/exercises/math/sampling/isSamplingRepresentative.d.ts.map +1 -0
  56. package/lib/exercises/math/sampling/isSamplingRepresentative.js +116 -0
  57. package/lib/exercises/math/sequences/geometric/geometricVariations.d.ts +9 -0
  58. package/lib/exercises/math/sequences/geometric/geometricVariations.d.ts.map +1 -0
  59. package/lib/exercises/math/sequences/geometric/geometricVariations.js +124 -0
  60. package/lib/exercises/math/sequences/geometric/index.d.ts +1 -0
  61. package/lib/exercises/math/sequences/geometric/index.d.ts.map +1 -1
  62. package/lib/exercises/math/sequences/geometric/index.js +1 -0
  63. package/lib/exercises/utils/geogebra/toGGBCommandsProps.d.ts +1 -0
  64. package/lib/exercises/utils/geogebra/toGGBCommandsProps.d.ts.map +1 -1
  65. package/lib/exercises/utils/geogebra/toolBarConstructor.js +2 -2
  66. package/lib/geogebra/parsers/parseGGBPoints.js +1 -1
  67. package/lib/index.d.ts +32 -0
  68. package/lib/index.d.ts.map +1 -1
  69. package/lib/math/geometry/circle.d.ts +10 -0
  70. package/lib/math/geometry/circle.d.ts.map +1 -0
  71. package/lib/math/geometry/circle.js +33 -0
  72. package/lib/math/geometry/line.d.ts +1 -1
  73. package/lib/math/geometry/line.d.ts.map +1 -1
  74. package/lib/math/geometry/line.js +10 -7
  75. package/lib/math/geometry/point.d.ts +3 -0
  76. package/lib/math/geometry/point.d.ts.map +1 -1
  77. package/lib/math/geometry/point.js +11 -12
  78. package/lib/math/numbers/rationals/rational.d.ts +3 -1
  79. package/lib/math/numbers/rationals/rational.d.ts.map +1 -1
  80. package/lib/math/numbers/rationals/rational.js +3 -1
  81. package/lib/playground.d.ts.map +1 -1
  82. package/lib/playground.js +6 -1
  83. package/lib/tree/nodes/operators/addNode.d.ts.map +1 -1
  84. package/lib/tree/nodes/operators/addNode.js +15 -1
  85. package/lib/tree/nodes/operators/fractionNode.d.ts.map +1 -1
  86. package/lib/tree/nodes/operators/fractionNode.js +8 -0
  87. package/lib/tree/nodes/operators/multiplyNode.d.ts.map +1 -1
  88. package/lib/tree/nodes/operators/multiplyNode.js +4 -0
  89. package/lib/tree/nodes/polynomials/monomNode.d.ts +6 -0
  90. package/lib/tree/nodes/polynomials/monomNode.d.ts.map +1 -1
  91. package/lib/tree/nodes/polynomials/monomNode.js +126 -2
  92. package/lib/tree/parsers/affineParser.d.ts.map +1 -1
  93. package/lib/tree/parsers/affineParser.js +2 -1
  94. package/lib/tree/parsers/intervalParser.d.ts +8 -0
  95. package/lib/tree/parsers/intervalParser.d.ts.map +1 -0
  96. package/lib/tree/parsers/intervalParser.js +38 -0
  97. package/lib/tree/parsers/monomParser.d.ts +1 -3
  98. package/lib/tree/parsers/monomParser.d.ts.map +1 -1
  99. package/lib/tree/parsers/monomParser.js +7 -129
  100. package/lib/tree/parsers/polynomialParser.d.ts.map +1 -1
  101. package/lib/tree/parsers/polynomialParser.js +2 -1
  102. package/lib/tree/parsers/powerParser.d.ts +1 -1
  103. package/lib/tree/parsers/powerParser.d.ts.map +1 -1
  104. package/lib/tree/parsers/powerParser.js +2 -1
  105. package/lib/tree/parsers/trinomParser.js +2 -2
  106. package/package.json +1 -1
@@ -172,12 +172,8 @@ class Line {
172
172
  toTexNoLeftRight() {
173
173
  return this.name.replace("\\left", "").replace("\\right", "");
174
174
  }
175
- toGGBCommands(shouldBuildPoints, { isFixed = true, showLabel = false, showUnderlyingPointsLabel = true, } = {}) {
176
- const commands = [
177
- `${this.ggbName}=Line(${this.pointA.name},${this.pointB.name})`,
178
- `SetFixed(${this.ggbName},${isFixed ? "true" : "false"})`,
179
- `ShowLabel(${this.ggbName},${showLabel ? "true" : "false"})`,
180
- ];
175
+ toGGBCommands(shouldBuildPoints, { isFixed = true, showLabel = false, showUnderlyingPointsLabel = true, showUnderlyingPoints = true, } = {}) {
176
+ const commands = [];
181
177
  if (shouldBuildPoints) {
182
178
  const ACommands = this.pointA.toGGBCommand({
183
179
  isFixed,
@@ -187,8 +183,15 @@ class Line {
187
183
  isFixed,
188
184
  showLabel: showUnderlyingPointsLabel,
189
185
  });
190
- commands.unshift(...ACommands, ...BCommands);
186
+ commands.push(...ACommands, ...BCommands, `${this.ggbName}=Line(${this.pointA.name},${this.pointB.name})`);
187
+ }
188
+ else {
189
+ commands.push(`${this.ggbName}=Line(${this.pointA.toMathString()},${this.pointB.toMathString()})`);
191
190
  }
191
+ commands.push(...[
192
+ `SetFixed(${this.ggbName},${isFixed ? "true" : "false"})`,
193
+ `ShowLabel(${this.ggbName},${showLabel ? "true" : "false"})`,
194
+ ]);
192
195
  return commands;
193
196
  }
194
197
  intersect(line, intersectName) {
@@ -1,6 +1,7 @@
1
1
  import { AlgebraicNode } from "../../tree/nodes/algebraicNode";
2
2
  import { ToGGBCommandsProps } from "../../exercises/utils/geogebra/toGGBCommandsProps";
3
3
  import { NodeIdentifiers } from "../../tree/nodes/nodeConstructor";
4
+ import { Line } from "./line";
4
5
  export type PointIdentifiers = {
5
6
  id: "point";
6
7
  name: string;
@@ -43,5 +44,7 @@ export declare class Point {
43
44
  toGGBCommand({ isFixed, showLabel, style, size, color, }?: ToGGBCommandsProps): string[];
44
45
  rotate(angle: number, center: Point): Point;
45
46
  centralSymetric(center: Point, name?: string): Point;
47
+ project(line: Line, name?: string): Point;
48
+ axialSymetric(line: Line, name?: string): Point;
46
49
  }
47
50
  //# sourceMappingURL=point.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"point.d.ts","sourceRoot":"","sources":["../../../src/math/geometry/point.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAG/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,mDAAmD,CAAC;AACvF,OAAO,EAEL,eAAe,EAChB,MAAM,kCAAkC,CAAC;AAQ1C,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,EAAE,OAAO,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,eAAe,CAAC;IACnB,CAAC,EAAE,eAAe,CAAC;CACpB,CAAC;AACF,8BAAsB,gBAAgB;IACpC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE;IAGrC,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM;IAKhC,MAAM,CAAC,MAAM,CAAC,IAAI,SAAM;IAGxB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,SAAM,EAAE,GAAG,SAAK,GAAG,KAAK;IAMvD,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,gBAAgB;IAQpD,MAAM,CAAC,SAAS,CACd,CAAC,EAAE,KAAK,EACR,CAAC,EAAE,KAAK,EACR,IAAI,EAAE,MAAM,EACZ,EACE,OAAa,EACb,WAAW,GACZ,GAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAO;IAQpD,MAAM,CAAC,eAAe,CACpB,KAAK,EAAE,MAAM,EACb,EACE,KAAK,EACL,WAAW,EACX,mBAAmB,GACpB,EAAE;QACD,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;KAC9B;IA4BH,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM;CAclC;AAED,qBAAa,KAAK;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,aAAa,CAAC;IACjB,CAAC,EAAE,aAAa,CAAC;gBAEf,IAAI,EAAE,MAAM,EACZ,CAAC,EAAE,aAAa,GAAG,MAAM,EACzB,CAAC,EAAE,aAAa,GAAG,MAAM;IAO3B,KAAK,IAAI,MAAM;IAGf,aAAa,IAAI,gBAAgB;IAQjC,eAAe,IAAI,MAAM;IAGzB,QAAQ,IAAI,MAAM;IAIlB,UAAU,IAAI,MAAM;IAIpB,UAAU,IAAI,MAAM;IAIpB,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,SAAM,GAAG,KAAK;IAiBrC,UAAU,CAAC,CAAC,EAAE,KAAK,GAAG,MAAM;IAM5B,MAAM,CAAC,CAAC,EAAE,KAAK,GAAG,OAAO;IAGzB,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK;IAK5B,YAAY;IAGZ,YAAY,CAAC,EACX,OAAc,EACd,SAAgB,EAChB,KAAK,EACL,IAAI,EACJ,KAAK,GACN,GAAE,kBAAuB;IAiB1B,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK;IAiBnC,eAAe,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,SAAkB;CAItD"}
1
+ {"version":3,"file":"point.d.ts","sourceRoot":"","sources":["../../../src/math/geometry/point.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAG/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,mDAAmD,CAAC;AACvF,OAAO,EAEL,eAAe,EAChB,MAAM,kCAAkC,CAAC;AAO1C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAG9B,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,EAAE,OAAO,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,eAAe,CAAC;IACnB,CAAC,EAAE,eAAe,CAAC;CACpB,CAAC;AACF,8BAAsB,gBAAgB;IACpC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE;IAGrC,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM;IAKhC,MAAM,CAAC,MAAM,CAAC,IAAI,SAAM;IAGxB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,SAAM,EAAE,GAAG,SAAK,GAAG,KAAK;IAMvD,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,gBAAgB;IAQpD,MAAM,CAAC,SAAS,CACd,CAAC,EAAE,KAAK,EACR,CAAC,EAAE,KAAK,EACR,IAAI,EAAE,MAAM,EACZ,EACE,OAAa,EACb,WAAW,GACZ,GAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAO;IAQpD,MAAM,CAAC,eAAe,CACpB,KAAK,EAAE,MAAM,EACb,EACE,KAAK,EACL,WAAW,EACX,mBAAmB,GACpB,EAAE;QACD,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;KAC9B;IA4BH,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM;CAclC;AAED,qBAAa,KAAK;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,aAAa,CAAC;IACjB,CAAC,EAAE,aAAa,CAAC;gBAEf,IAAI,EAAE,MAAM,EACZ,CAAC,EAAE,aAAa,GAAG,MAAM,EACzB,CAAC,EAAE,aAAa,GAAG,MAAM;IAO3B,KAAK,IAAI,MAAM;IAGf,aAAa,IAAI,gBAAgB;IAQjC,eAAe,IAAI,MAAM;IAGzB,QAAQ,IAAI,MAAM;IAIlB,UAAU,IAAI,MAAM;IAIpB,UAAU,IAAI,MAAM;IAIpB,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,SAAM,GAAG,KAAK;IAQrC,UAAU,CAAC,CAAC,EAAE,KAAK,GAAG,MAAM;IAM5B,MAAM,CAAC,CAAC,EAAE,KAAK,GAAG,OAAO;IAGzB,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK;IAK5B,YAAY;IAGZ,YAAY,CAAC,EACX,OAAc,EACd,SAAgB,EAChB,KAAK,EACL,IAAI,EACJ,KAAK,GACN,GAAE,kBAAuB;IAiB1B,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK;IAiBnC,eAAe,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,SAAkB;IAIrD,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,SAAkB;IAI1C,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,SAAkB;CAIjD"}
@@ -1,9 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Point = exports.PointConstructor = void 0;
4
- const node_1 = require("../../tree/nodes/node");
5
4
  const numberNode_1 = require("../../tree/nodes/numbers/numberNode");
6
- const rational_1 = require("../numbers/rationals/rational");
7
5
  const vector_1 = require("./vector");
8
6
  const randint_1 = require("../utils/random/randint");
9
7
  const nodeConstructor_1 = require("../../tree/nodes/nodeConstructor");
@@ -12,6 +10,7 @@ const substractNode_1 = require("../../tree/nodes/operators/substractNode");
12
10
  const multiplyNode_1 = require("../../tree/nodes/operators/multiplyNode");
13
11
  const addNode_1 = require("../../tree/nodes/operators/addNode");
14
12
  const randomLetter_1 = require("../../utils/strings/randomLetter");
13
+ const fractionNode_1 = require("../../tree/nodes/operators/fractionNode");
15
14
  class PointConstructor {
16
15
  static randomName(excludes) {
17
16
  return (0, randomLetter_1.randomLetter)(true, ["O", ...(excludes ?? [])]);
@@ -97,15 +96,7 @@ class Point {
97
96
  return this.y.evaluate();
98
97
  }
99
98
  midpoint(B, name = "I") {
100
- const types = [this.x.type, this.y.type, B.x.type, B.y.type];
101
- if (types.some((type) => type !== node_1.NodeType.number)) {
102
- throw Error("general midpoint not implemented yet");
103
- }
104
- return new Point(name, new rational_1.Rational(this.x.value + B.x.value, 2)
105
- .simplify()
106
- .toTree(), new rational_1.Rational(this.y.value + B.y.value, 2)
107
- .simplify()
108
- .toTree());
99
+ return new Point(name, (0, fractionNode_1.frac)((0, addNode_1.add)(this.x, B.x), 2).simplify(), (0, fractionNode_1.frac)((0, addNode_1.add)(this.y, B.y), 2).simplify());
109
100
  }
110
101
  distanceTo(B) {
111
102
  const dx = this.getXnumber() - B.getXnumber();
@@ -148,8 +139,16 @@ class Point {
148
139
  return new Point(this.name, (0, substractNode_1.substract)((0, multiplyNode_1.multiply)(cos, this.x).simplify(), (0, multiplyNode_1.multiply)(sin, this.y).simplify()).simplify(), (0, addNode_1.add)((0, multiplyNode_1.multiply)(sin, this.x).simplify(), (0, multiplyNode_1.multiply)(cos, this.y).simplify()).simplify());
149
140
  }
150
141
  centralSymetric(center, name = this.name + "'") {
151
- const vec = vector_1.VectorConstructor.fromPoints(this, center).opposite();
142
+ const vec = vector_1.VectorConstructor.fromPoints(this, center);
152
143
  return vec.getEndPoint(center, name);
153
144
  }
145
+ project(line, name = this.name + "'") {
146
+ const perp = line.getPerpendicular(this);
147
+ return perp.intersect(line, name);
148
+ }
149
+ axialSymetric(line, name = this.name + "'") {
150
+ const projOrtho = this.project(line);
151
+ return this.centralSymetric(projOrtho, name);
152
+ }
154
153
  }
155
154
  exports.Point = Point;
@@ -8,7 +8,9 @@ export declare abstract class RationalConstructor {
8
8
  * @param maxGcd max number by which the fraction is simplifiable
9
9
  */
10
10
  static randomSimplifiable(maxGcd?: number): Rational;
11
- static randomIrreductible(max?: number): Rational;
11
+ static randomIrreductible(max?: number, { onlySupOne }?: {
12
+ onlySupOne?: boolean;
13
+ }): Rational;
12
14
  static randomIrreductibleProba(maxDenum?: number): Rational | Integer;
13
15
  static randomIrreductibleWithSign(max?: number): Rational;
14
16
  static randomPureRational(max?: number): Rational;
@@ -1 +1 @@
1
- {"version":3,"file":"rational.d.ts","sourceRoot":"","sources":["../../../../src/math/numbers/rationals/rational.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAQ,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAMvE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAE/C,8BAAsB,mBAAmB;IACvC;;OAEG;IACH,MAAM,CAAC,kBAAkB,CAAC,MAAM,GAAE,MAAW;IAW7C,MAAM,CAAC,kBAAkB,CAAC,GAAG,GAAE,MAAW;IAO1C,MAAM,CAAC,uBAAuB,CAAC,QAAQ,GAAE,MAAW;IAKpD,MAAM,CAAC,0BAA0B,CAAC,GAAG,GAAE,MAAW;IAQlD,MAAM,CAAC,kBAAkB,CAAC,GAAG,GAAE,MAAW;CAO3C;AAED,qBAAa,QAAS,YAAW,MAAM;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,OAAO,CAAC;IACtB,IAAI,EAAE,UAAU,CAAC;gBAEL,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IAYlD,MAAM,CAAC,CAAC,EAAE,MAAM;IAGhB,KAAK;IAML,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAkBvB,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO;IAgBxC,OAAO,CAAC,cAAc,EAAE,OAAO,GAAG,MAAM;IAIxC,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAgB1B,QAAQ,IAAI,QAAQ;IAIpB,MAAM,CAAC,IAAI,CAAC,EAAE,WAAW;IAgBzB,cAAc;IAId,QAAQ,IAAI,OAAO,GAAG,QAAQ;CAqB/B"}
1
+ {"version":3,"file":"rational.d.ts","sourceRoot":"","sources":["../../../../src/math/numbers/rationals/rational.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAQ,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAMvE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAE/C,8BAAsB,mBAAmB;IACvC;;OAEG;IACH,MAAM,CAAC,kBAAkB,CAAC,MAAM,GAAE,MAAW;IAW7C,MAAM,CAAC,kBAAkB,CACvB,GAAG,GAAE,MAAW,EAChB,EAAE,UAAkB,EAAE,GAAE;QAAE,UAAU,CAAC,EAAE,OAAO,CAAA;KAAO;IASvD,MAAM,CAAC,uBAAuB,CAAC,QAAQ,GAAE,MAAW;IAKpD,MAAM,CAAC,0BAA0B,CAAC,GAAG,GAAE,MAAW;IAQlD,MAAM,CAAC,kBAAkB,CAAC,GAAG,GAAE,MAAW;CAO3C;AAED,qBAAa,QAAS,YAAW,MAAM;IACrC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,OAAO,CAAC;IACtB,IAAI,EAAE,UAAU,CAAC;gBAEL,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IAYlD,MAAM,CAAC,CAAC,EAAE,MAAM;IAGhB,KAAK;IAML,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAkBvB,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO;IAgBxC,OAAO,CAAC,cAAc,EAAE,OAAO,GAAG,MAAM;IAIxC,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAgB1B,QAAQ,IAAI,QAAQ;IAIpB,MAAM,CAAC,IAAI,CAAC,EAAE,WAAW;IAgBzB,cAAc;IAId,QAAQ,IAAI,OAAO,GAAG,QAAQ;CAqB/B"}
@@ -31,11 +31,13 @@ class RationalConstructor {
31
31
  }
32
32
  return new Rational(num, denum);
33
33
  }
34
- static randomIrreductible(max = 11) {
34
+ static randomIrreductible(max = 11, { onlySupOne = false } = {}) {
35
35
  const a = (0, randint_1.randint)(2, max);
36
36
  const b = (0, random_1.random)([...(0, coprimesOf_1.coprimesOf)(a), 1]);
37
37
  if (b === 1)
38
38
  return new Rational(b, a);
39
+ if (onlySupOne)
40
+ return new Rational(a, b);
39
41
  const [num, denum] = (0, shuffle_1.shuffle)([a, b]);
40
42
  return new Rational(num, denum);
41
43
  }
@@ -1 +1 @@
1
- {"version":3,"file":"playground.d.ts","sourceRoot":"","sources":["../src/playground.ts"],"names":[],"mappings":"AAqDA,eAAO,MAAM,UAAU,YAAW,CAAC"}
1
+ {"version":3,"file":"playground.d.ts","sourceRoot":"","sources":["../src/playground.ts"],"names":[],"mappings":"AAqDA,eAAO,MAAM,UAAU,YAKtB,CAAC"}
package/lib/playground.js CHANGED
@@ -2,7 +2,12 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.playground = void 0;
4
4
  const nodeConstructor_1 = require("./tree/nodes/nodeConstructor");
5
- const playground = () => { };
5
+ const playground = () => {
6
+ // const a = multiply(-3, power("x", 2));
7
+ // console.log(isMonom(a));
8
+ // const a = "-3x^2";
9
+ // console.log(isMonom(parsed));
10
+ };
6
11
  exports.playground = playground;
7
12
  const logIdentifiers = () => {
8
13
  const ids = '{"xA":-3,"yA":-2,"yPrimeA":{"id":31,"child":{"id":3,"leftChild":{"id":7,"value":3},"rightChild":{"id":7,"value":2}}},"trinomCoeffs":[0.3888888888888889,0.833333333333333,-3]}';
@@ -1 +1 @@
1
- {"version":3,"file":"addNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/addNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EACL,uBAAuB,EACvB,WAAW,EAGZ,MAAM,gBAAgB,CAAC;AAKxB,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAYlE,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,OAAO,CAE/C;AAED,eAAO,MAAM,GAAG,MACX,aAAa,GAAG,MAAM,GAAG,MAAM,KAC/B,aAAa,GAAG,MAAM,GAAG,MAAM,YAOnC,CAAC;AAEF,qBAAa,OAAQ,YAAW,uBAAuB;IACrD,EAAE,EAAE,WAAW,CAAC;IAChB,SAAS,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,aAAa,CAAC;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;gBAEjB,SAAS,EAAE,aAAa,EACxB,UAAU,EAAE,aAAa,EACzB,IAAI,CAAC,EAAE,WAAW;IASpB,OAAO,aAGL;IAEF,YAAY,IAAI,MAAM;IAItB,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,aAAa,EAAE;IAoCtD,SAAS,IAAI,MAAM,EAAE;IAIrB,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAK5C,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,MAAM;IAerC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAMtC,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IAmI/C,aAAa;;;;;;;;;IAOb,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;IAUpC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAMxD,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa;CAMxD"}
1
+ {"version":3,"file":"addNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/addNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EACL,uBAAuB,EACvB,WAAW,EAGZ,MAAM,gBAAgB,CAAC;AAKxB,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAWlE,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,OAAO,CAE/C;AAED,eAAO,MAAM,GAAG,MACX,aAAa,GAAG,MAAM,GAAG,MAAM,KAC/B,aAAa,GAAG,MAAM,GAAG,MAAM,YAOnC,CAAC;AAEF,qBAAa,OAAQ,YAAW,uBAAuB;IACrD,EAAE,EAAE,WAAW,CAAC;IAChB,SAAS,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,aAAa,CAAC;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;gBAEjB,SAAS,EAAE,aAAa,EACxB,UAAU,EAAE,aAAa,EACzB,IAAI,CAAC,EAAE,WAAW;IASpB,OAAO,aAGL;IAEF,YAAY,IAAI,MAAM;IAItB,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,aAAa,EAAE;IAoCtD,SAAS,IAAI,MAAM,EAAE;IAIrB,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAK5C,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,MAAM;IAerC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAMtC,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IAmI/C,aAAa;;;;;;;;;IAOb,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;IAUpC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAMxD,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa;CAMxD"}
@@ -235,7 +235,7 @@ class AddNode {
235
235
  return new numberNode_1.NumberNode(0);
236
236
  if (externals.length === 1)
237
237
  return externals[0];
238
- return (0, operatorComposition_1.operatorComposition)(AddNode, externals);
238
+ return (0, operatorComposition_1.operatorComposition)(AddNode, externals.sort(addSort));
239
239
  }
240
240
  toIdentifiers() {
241
241
  return {
@@ -260,6 +260,20 @@ class AddNode {
260
260
  }
261
261
  }
262
262
  exports.AddNode = AddNode;
263
+ const addSort = (a, b) => {
264
+ //! this is super risky,
265
+ if (a.isNumeric !== b.isNumeric) {
266
+ return Number(a.isNumeric) - Number(b.isNumeric);
267
+ }
268
+ if ((0, monomNode_1.isMonom)(a) && (0, monomNode_1.isMonom)(b)) {
269
+ const parsedA = (0, monomNode_1.parseToMonomNode)(a);
270
+ const parsedB = (0, monomNode_1.parseToMonomNode)(b);
271
+ if (parsedA && parsedB) {
272
+ return Number(parsedB.degree) - Number(parsedA.degree);
273
+ }
274
+ }
275
+ return 0;
276
+ };
263
277
  const addSimplifyFrac = (a, b, opts) => {
264
278
  if (!opts?.towardsDistribute && (0, fractionNode_1.isFractionNode)(a) && (0, fractionNode_1.isFractionNode)(b)) {
265
279
  //c/d + e/f = cf+ed / df
@@ -1 +1 @@
1
- {"version":3,"file":"fractionNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/fractionNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,gBAAgB,CAAC;AAK3E,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAKlE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,eAAO,MAAM,IAAI,MACZ,aAAa,GAAG,MAAM,GAAG,MAAM,KAC/B,aAAa,GAAG,MAAM,GAAG,MAAM,SAC3B,WAAW,iBAOnB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,EAAE,EAAE,OAAO,CAAC,QAAQ,CAAC;IACrB,SAAS,EAAE,eAAe,CAAC;IAC3B,UAAU,EAAE,eAAe,CAAC;CAC7B,CAAC;AACF,qBAAa,YAAa,YAAW,YAAY;IAC/C,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB;;;OAGG;IACH,EAAE,EAAE,WAAW,CAAC;IAChB,SAAS,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,aAAa,CAAC;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;gBAEjB,SAAS,EAAE,aAAa,EACxB,UAAU,EAAE,aAAa,EACzB,IAAI,CAAC,EAAE,WAAW;IAiBpB,YAAY,IAAI,MAAM;IAItB,aAAa,IAAI,uBAAuB;IAQxC,UAAU;IAGV,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW;IA+BpC,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAG5C,SAAS;IAUT,KAAK,IAAI,MAAM;IA2Bf,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAMtC,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IAyJ/C,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;IAOpC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAOxD,sBAAsB;IAQtB,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa;CAGxD"}
1
+ {"version":3,"file":"fractionNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/fractionNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,gBAAgB,CAAC;AAK3E,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAKlE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,eAAO,MAAM,IAAI,MACZ,aAAa,GAAG,MAAM,GAAG,MAAM,KAC/B,aAAa,GAAG,MAAM,GAAG,MAAM,SAC3B,WAAW,iBAOnB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,EAAE,EAAE,OAAO,CAAC,QAAQ,CAAC;IACrB,SAAS,EAAE,eAAe,CAAC;IAC3B,UAAU,EAAE,eAAe,CAAC;CAC7B,CAAC;AACF,qBAAa,YAAa,YAAW,YAAY;IAC/C,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB;;;OAGG;IACH,EAAE,EAAE,WAAW,CAAC;IAChB,SAAS,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,aAAa,CAAC;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;gBAEjB,SAAS,EAAE,aAAa,EACxB,UAAU,EAAE,aAAa,EACzB,IAAI,CAAC,EAAE,WAAW;IAiBpB,YAAY,IAAI,MAAM;IAItB,aAAa,IAAI,uBAAuB;IAQxC,UAAU;IAGV,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW;IA+BpC,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAG5C,SAAS;IAUT,KAAK,IAAI,MAAM;IA2Bf,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAMtC,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IAqK/C,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;IAOpC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAOxD,sBAAsB;IAQtB,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa;CAGxD"}
@@ -11,6 +11,7 @@ const multiplyNode_1 = require("./multiplyNode");
11
11
  const rational_1 = require("../../../math/numbers/rationals/rational");
12
12
  const operatorComposition_1 = require("../../../tree/utilities/operatorComposition");
13
13
  const addNode_1 = require("./addNode");
14
+ const powerNode_1 = require("./powerNode");
14
15
  function isFractionNode(a) {
15
16
  return (0, operatorNode_1.isOperatorNode)(a) && a.id === operatorNode_1.OperatorIds.fraction;
16
17
  }
@@ -208,6 +209,13 @@ class FractionNode {
208
209
  }
209
210
  //!ya mieux à faire pour gérer tous les cas d'un coup
210
211
  //!s'insiprer de multiply
212
+ if ((0, powerNode_1.isPowerNode)(num) &&
213
+ (0, powerNode_1.isPowerNode)(denum) &&
214
+ num.rightChild.isNumeric &&
215
+ denum.rightChild.isNumeric &&
216
+ num.rightChild.evaluate() === denum.rightChild.evaluate()) {
217
+ return new powerNode_1.PowerNode(new FractionNode(num.leftChild, denum.leftChild), num.rightChild).simplify(opts);
218
+ }
211
219
  if (num.equals(denum))
212
220
  return new numberNode_1.NumberNode(1);
213
221
  return null;
@@ -1 +1 @@
1
- {"version":3,"file":"multiplyNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/multiplyNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EACL,uBAAuB,EACvB,WAAW,EAEZ,MAAM,gBAAgB,CAAC;AAYxB,OAAO,EACL,aAAa,EACb,eAAe,EAEhB,MAAM,kBAAkB,CAAC;AAS1B,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,eAAO,MAAM,QAAQ,MAChB,aAAa,GAAG,MAAM,GAAG,MAAM,KAC/B,aAAa,GAAG,MAAM,GAAG,MAAM,SAC3B,WAAW,iBAOnB,CAAC;AACF,eAAO,MAAM,iBAAiB,QAAS,aAAa,EAAE,SAWrD,CAAC;AACF,qBAAa,YAAa,YAAW,uBAAuB;IAC1D,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,EAAE,EAAE,WAAW,CAAC;IAChB,SAAS,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,aAAa,CAAC;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;gBAEjB,SAAS,EAAE,aAAa,EACxB,UAAU,EAAE,aAAa,EACzB,IAAI,CAAC,EAAE,WAAW;IAUpB,OAAO,aAGL;IAEF,YAAY,IAAI,MAAM;IAItB,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,MAAM;IAwErC,SAAS;IAkDT,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,YAAY,EAAE;IAyFrD,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAG5C,aAAa;;;;;;;;;IAYb,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAItC,IAAI;IAGJ,cAAc;IACd,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IAiK/C,MAAM,CAAC,IAAI,EAAE,aAAa;IAU1B,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAQxD,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa;CAMxD"}
1
+ {"version":3,"file":"multiplyNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/multiplyNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EACL,uBAAuB,EACvB,WAAW,EAEZ,MAAM,gBAAgB,CAAC;AAYxB,OAAO,EACL,aAAa,EACb,eAAe,EAEhB,MAAM,kBAAkB,CAAC;AAS1B,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,eAAO,MAAM,QAAQ,MAChB,aAAa,GAAG,MAAM,GAAG,MAAM,KAC/B,aAAa,GAAG,MAAM,GAAG,MAAM,SAC3B,WAAW,iBAOnB,CAAC;AACF,eAAO,MAAM,iBAAiB,QAAS,aAAa,EAAE,SAWrD,CAAC;AACF,qBAAa,YAAa,YAAW,uBAAuB;IAC1D,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,EAAE,EAAE,WAAW,CAAC;IAChB,SAAS,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,aAAa,CAAC;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;gBAEjB,SAAS,EAAE,aAAa,EACxB,UAAU,EAAE,aAAa,EACzB,IAAI,CAAC,EAAE,WAAW;IAUpB,OAAO,aAGL;IAEF,YAAY,IAAI,MAAM;IAItB,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,MAAM;IA4ErC,SAAS;IAkDT,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,YAAY,EAAE;IAyFrD,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAG5C,aAAa;;;;;;;;;IAYb,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAItC,IAAI;IAGJ,cAAc;IACd,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IAiK/C,MAAM,CAAC,IAAI,EAAE,aAAa;IAU1B,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAQxD,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa;CAMxD"}
@@ -94,6 +94,7 @@ class MultiplyNode {
94
94
  let showTimesSign = !opts?.forceDotSign &&
95
95
  (opts?.forceTimesSign ||
96
96
  !isNaN(+rightTex[0]) ||
97
+ (this.rightChild.isNumeric && this.leftChild.isNumeric) ||
97
98
  (0, numberNode_1.isNumberNode)(this.rightChild) ||
98
99
  ((0, variableNode_1.isVariableNode)(this.leftChild) &&
99
100
  (0, variableNode_1.isVariableNode)(this.rightChild) &&
@@ -101,6 +102,9 @@ class MultiplyNode {
101
102
  ((0, sqrtNode_1.isSqrtNode)(this.leftChild) && (0, sqrtNode_1.isSqrtNode)(this.rightChild)));
102
103
  if ((0, operatorNode_1.isOperatorNode)(this.rightChild)) {
103
104
  showTimesSign ||= [operatorNode_1.OperatorIds.fraction].includes(this.rightChild.id);
105
+ if ((0, fractionNode_1.isFractionNode)(this.rightChild.leftChild)) {
106
+ showTimesSign = true;
107
+ }
104
108
  }
105
109
  const cDotSign = opts?.forceDotSign ? ` \\cdot ` : "";
106
110
  const nextIsLetter = rightTex[0].toLowerCase() !== rightTex[0].toUpperCase();
@@ -43,5 +43,11 @@ export declare const parseToMonom: (node: AlgebraicNode, { variable, maxDegree,
43
43
  maxDegree: undefined;
44
44
  minDegree: number;
45
45
  }) => false | MonomNode;
46
+ type Opts = {
47
+ variable?: string;
48
+ maxDegree?: number;
49
+ minDegree?: number;
50
+ };
51
+ export declare const isMonom: (node: AlgebraicNode, { variable, maxDegree, minDegree }?: Opts) => boolean;
46
52
  export {};
47
53
  //# sourceMappingURL=monomNode.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"monomNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/polynomials/monomNode.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,eAAe,EAEhB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAO/D,eAAO,MAAM,KAAK,MACb,aAAa,GAAG,MAAM,GAAG,MAAM,UAC1B,MAAM,SACP,gBAAgB,cAMxB,CAAC;AACF,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,SAAS,CAEnD;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,SAAM,qBAGvD;AACD,KAAK,gBAAgB,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAO7C;;;GAGG;AACH,qBAAa,SAAU,YAAW,aAAa;IAC7C,CAAC,EAAE,aAAa,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,QAAQ,CAAkB;gBAG9B,CAAC,EAAE,aAAa,GAAG,MAAM,EACzB,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,gBAAgB;IAUzB,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS;IAMvC,MAAM,CAAC,IAAI,EAAE,aAAa;IAG1B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAGtC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAGxD,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe;IAG/B,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS;IAG7C,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS;IAGhD,YAAY;IAIZ,MAAM;IAMN,KAAK;IAIL,aAAa;;;;;;;;;;CAQd;AAED,eAAO,MAAM,YAAY,SACjB,aAAa;;;;uBAyIpB,CAAC"}
1
+ {"version":3,"file":"monomNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/polynomials/monomNode.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EACb,eAAe,EAEhB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAO/D,eAAO,MAAM,KAAK,MACb,aAAa,GAAG,MAAM,GAAG,MAAM,UAC1B,MAAM,SACP,gBAAgB,cAMxB,CAAC;AACF,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,SAAS,CAEnD;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,SAAM,qBAGvD;AACD,KAAK,gBAAgB,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAO7C;;;GAGG;AACH,qBAAa,SAAU,YAAW,aAAa;IAC7C,CAAC,EAAE,aAAa,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,QAAQ,CAAkB;gBAG9B,CAAC,EAAE,aAAa,GAAG,MAAM,EACzB,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,gBAAgB;IAUzB,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS;IAMvC,MAAM,CAAC,IAAI,EAAE,aAAa;IAG1B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAGtC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAGxD,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe;IAG/B,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS;IAG7C,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,SAAS;IAGhD,YAAY;IAIZ,MAAM;IAMN,KAAK;IAIL,aAAa;;;;;;;;;;CAQd;AAED,eAAO,MAAM,YAAY,SACjB,aAAa;;;;uBAyIpB,CAAC;AAEF,KAAK,IAAI,GAAG;IACV,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,OAAO,SACZ,aAAa,uCACiB,IAAI,YA8HzC,CAAC"}
@@ -1,10 +1,9 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.parseToMonom = exports.MonomNode = exports.parseToMonomNode = exports.isMonomNode = exports.monom = void 0;
3
+ exports.isMonom = exports.parseToMonom = exports.MonomNode = exports.parseToMonomNode = exports.isMonomNode = exports.monom = void 0;
4
4
  const algebraicNode_1 = require("../algebraicNode");
5
5
  const oppositeNode_1 = require("../functions/oppositeNode");
6
6
  const node_1 = require("../node");
7
- // import { NodeIdentifiers } from "../nodeConstructor";
8
7
  const multiplyNode_1 = require("../operators/multiplyNode");
9
8
  const powerNode_1 = require("../operators/powerNode");
10
9
  const variableNode_1 = require("../variables/variableNode");
@@ -214,3 +213,128 @@ const parseToMonom = (node, { variable, maxDegree, minDegree } = {
214
213
  return false;
215
214
  };
216
215
  exports.parseToMonom = parseToMonom;
216
+ const isMonom = (node, { variable, maxDegree, minDegree } = {
217
+ variable: "x",
218
+ maxDegree: undefined,
219
+ minDegree: 0,
220
+ }) => {
221
+ variable = variable ?? "x";
222
+ maxDegree = maxDegree ?? undefined;
223
+ minDegree = minDegree ?? 0;
224
+ if (isMonomNode(node)) {
225
+ if (node.variable !== variable)
226
+ return false;
227
+ if (maxDegree && node.degree > maxDegree)
228
+ return false;
229
+ if (minDegree && node.degree < minDegree)
230
+ return false;
231
+ return true;
232
+ }
233
+ if (node.isNumeric && minDegree === 0)
234
+ return true;
235
+ //not monom
236
+ if ((0, variableNode_1.isVariableNode)(node) && node.name === variable && minDegree < 2)
237
+ return true;
238
+ //new MonomNode(1, 1, { variable });
239
+ if ((0, oppositeNode_1.isOppositeNode)(node) &&
240
+ (0, variableNode_1.isVariableNode)(node.child) &&
241
+ node.child.name === variable &&
242
+ minDegree < 2)
243
+ return true;
244
+ // new MonomNode(-1, 1, {variable})
245
+ if ((0, powerNode_1.isSquareNode)(node)) {
246
+ if (minDegree > 2)
247
+ return false;
248
+ if (maxDegree && maxDegree < 2)
249
+ return false;
250
+ return (0, variableNode_1.isVariableNode)(node.leftChild) && node.leftChild.name === "x";
251
+ }
252
+ if ((0, oppositeNode_1.isOppositeNode)(node) && (0, powerNode_1.isSquareNode)(node.child)) {
253
+ if (minDegree > 2)
254
+ return false;
255
+ if (maxDegree && maxDegree < 2)
256
+ return false;
257
+ return ((0, variableNode_1.isVariableNode)(node.child.leftChild) && node.child.leftChild.name === "x");
258
+ }
259
+ if ((0, powerNode_1.isPowerNode)(node)) {
260
+ if (!node.rightChild.isNumeric)
261
+ return false;
262
+ const powerEv = node.rightChild.evaluate();
263
+ if (maxDegree && powerEv > maxDegree)
264
+ return false;
265
+ if (minDegree && powerEv < minDegree)
266
+ return false;
267
+ return (0, variableNode_1.isVariableNode)(node.leftChild) && node.leftChild.name === "x";
268
+ }
269
+ if ((0, oppositeNode_1.isOppositeNode)(node) && (0, powerNode_1.isPowerNode)(node.child)) {
270
+ if (!node.child.rightChild.isNumeric)
271
+ return false;
272
+ const powerEv = node.child.rightChild.evaluate();
273
+ if (maxDegree && powerEv > maxDegree)
274
+ return false;
275
+ if (minDegree && powerEv < minDegree)
276
+ return false;
277
+ return ((0, variableNode_1.isVariableNode)(node.child.leftChild) && node.child.leftChild.name === "x");
278
+ }
279
+ if ((0, multiplyNode_1.isMultiplyNode)(node)) {
280
+ const numericChild = node.leftChild.isNumeric
281
+ ? "left"
282
+ : node.rightChild.isNumeric
283
+ ? "right"
284
+ : undefined;
285
+ if (!numericChild)
286
+ return false;
287
+ const varChild = numericChild === "left" ? node.rightChild : node.leftChild;
288
+ if ((0, variableNode_1.isVariableNode)(varChild) && varChild.name === variable && minDegree < 2)
289
+ return true;
290
+ if ((0, powerNode_1.isSquareNode)(varChild) &&
291
+ (0, variableNode_1.isVariableNode)(varChild.leftChild) &&
292
+ varChild.leftChild.name === variable) {
293
+ if (maxDegree && maxDegree < 2)
294
+ return false;
295
+ if (minDegree > 2)
296
+ return false;
297
+ // new MonomNode(numericChild, powerEv, { variable });
298
+ return true;
299
+ }
300
+ if ((0, powerNode_1.isPowerNode)(varChild) &&
301
+ (0, variableNode_1.isVariableNode)(varChild.leftChild) &&
302
+ varChild.leftChild.name === variable &&
303
+ varChild.rightChild.isNumeric) {
304
+ const powerEv = varChild.rightChild.evaluate();
305
+ if (maxDegree && powerEv > maxDegree)
306
+ return false;
307
+ if (powerEv < minDegree)
308
+ return false;
309
+ // new MonomNode(numericChild, powerEv, { variable });
310
+ return true;
311
+ }
312
+ }
313
+ if ((0, oppositeNode_1.isOppositeNode)(node) && (0, multiplyNode_1.isMultiplyNode)(node.child)) {
314
+ const numericChild = node.child.leftChild.isNumeric
315
+ ? "left"
316
+ : node.child.rightChild.isNumeric
317
+ ? "right"
318
+ : undefined;
319
+ if (!numericChild)
320
+ return false;
321
+ const varChild = numericChild === "left" ? node.child.rightChild : node.child.leftChild;
322
+ if ((0, variableNode_1.isVariableNode)(varChild) && varChild.name === variable && minDegree < 2)
323
+ return true;
324
+ //new MonomNode(numericChild, 1, {variable});
325
+ if ((0, powerNode_1.isPowerNode)(varChild) &&
326
+ (0, variableNode_1.isVariableNode)(varChild.leftChild) &&
327
+ varChild.leftChild.name === variable &&
328
+ varChild.rightChild.isNumeric) {
329
+ const powerEv = varChild.rightChild.evaluate();
330
+ if (maxDegree && powerEv > maxDegree)
331
+ return false;
332
+ if (powerEv < minDegree)
333
+ return false;
334
+ // new MonomNode(numericChild, powerEv, { variable });
335
+ return true;
336
+ }
337
+ }
338
+ return false;
339
+ };
340
+ exports.isMonom = isMonom;
@@ -1 +1 @@
1
- {"version":3,"file":"affineParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/affineParser.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,YAAY,QAAS,MAAM,aAAY,MAAM,qKAuBzD,CAAC"}
1
+ {"version":3,"file":"affineParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/affineParser.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,YAAY,QAAS,MAAM,aAAY,MAAM,qKAuBzD,CAAC"}
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.affineParser = void 0;
4
4
  const addNode_1 = require("../nodes/operators/addNode");
5
5
  const substractNode_1 = require("../nodes/operators/substractNode");
6
+ const monomNode_1 = require("../nodes/polynomials/monomNode");
6
7
  const latexParser_1 = require("./latexParser");
7
8
  const monomParser_1 = require("./monomParser");
8
9
  const affineParser = (ans, variable = "x") => {
@@ -21,7 +22,7 @@ const affineParser = (ans, variable = "x") => {
21
22
  if (!numericChild)
22
23
  return false;
23
24
  const varChild = numericChild === "left" ? parsed.rightChild : parsed.leftChild;
24
- return (0, monomParser_1.isMonom)(varChild, { variable, maxDegree: 1 }) ? parsed : false;
25
+ return (0, monomNode_1.isMonom)(varChild, { variable, maxDegree: 1 }) ? parsed : false;
25
26
  }
26
27
  return false;
27
28
  }
@@ -0,0 +1,8 @@
1
+ import { IntervalNode } from "../nodes/sets/intervalNode";
2
+ type Opts = {
3
+ allowCommaInsteadOfSemicolon?: boolean;
4
+ allowNoBrackets?: boolean;
5
+ };
6
+ export declare const intervalParser: (ans: string, opts?: Opts) => false | IntervalNode;
7
+ export {};
8
+ //# sourceMappingURL=intervalParser.d.ts.map
@@ -0,0 +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,yBAuCtD,CAAC"}
@@ -0,0 +1,38 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.intervalParser = void 0;
4
+ const closure_1 = require("../nodes/sets/closure");
5
+ const intervalNode_1 = require("../nodes/sets/intervalNode");
6
+ const latexParser_1 = require("./latexParser");
7
+ const intervalParser = (ans, opts) => {
8
+ const allowCommaInsteadOfSemicolon = opts?.allowCommaInsteadOfSemicolon ?? false;
9
+ const allowNoBrackets = opts?.allowNoBrackets ?? false;
10
+ let formated = ans.replaceAll("\\ ", "");
11
+ if (allowNoBrackets && !["]", "["].includes(formated[0])) {
12
+ formated = "[" + formated;
13
+ }
14
+ if (allowNoBrackets && !["]", "["].includes(formated[formated.length - 1])) {
15
+ formated = formated + "]";
16
+ }
17
+ const leftBracket = formated[0];
18
+ const rightBracket = formated[formated.length - 1];
19
+ if ((!allowNoBrackets && !["]", "["].includes(leftBracket)) ||
20
+ !["]", "["].includes(rightBracket))
21
+ return false;
22
+ let bornes = formated.split(";");
23
+ if (!allowCommaInsteadOfSemicolon && bornes.length !== 2)
24
+ return false;
25
+ if (bornes.length !== 2) {
26
+ bornes = formated.split(",");
27
+ if (bornes.length !== 2)
28
+ return false;
29
+ }
30
+ const aParsed = (0, latexParser_1.parseAlgebraic)(bornes[0]);
31
+ if (!aParsed)
32
+ return false;
33
+ const bParsed = (0, latexParser_1.parseAlgebraic)(bornes[1]);
34
+ if (!bParsed)
35
+ return false;
36
+ return new intervalNode_1.IntervalNode(aParsed, bParsed, closure_1.Closure.fromBrackets(leftBracket, rightBracket));
37
+ };
38
+ exports.intervalParser = intervalParser;
@@ -1,10 +1,8 @@
1
- import { AlgebraicNode } from "../nodes/algebraicNode";
2
1
  type Opts = {
3
2
  variable?: string;
4
3
  maxDegree?: number;
5
4
  minDegree?: number;
6
5
  };
7
- export declare const monomParser: (str: string, { variable, maxDegree, minDegree }?: Opts) => false | AlgebraicNode;
8
- export declare const isMonom: (node: AlgebraicNode, { variable, maxDegree, minDegree }?: Opts) => boolean;
6
+ export declare const monomParser: (str: string, { variable, maxDegree, minDegree }?: Opts) => false | import("../nodes/algebraicNode").AlgebraicNode;
9
7
  export {};
10
8
  //# sourceMappingURL=monomParser.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"monomParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/monomParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAUvD,KAAK,IAAI,GAAG;IACV,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AACF,eAAO,MAAM,WAAW,QACjB,MAAM,uCACyB,IAAI,0BAgBzC,CAAC;AAEF,eAAO,MAAM,OAAO,SACZ,aAAa,uCACiB,IAAI,YAoHzC,CAAC"}
1
+ {"version":3,"file":"monomParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/monomParser.ts"],"names":[],"mappings":"AAGA,KAAK,IAAI,GAAG;IACV,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AACF,eAAO,MAAM,WAAW,QACjB,MAAM,uCACyB,IAAI,2DAiBzC,CAAC"}