math-exercises 2.2.78 → 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.
Files changed (152) hide show
  1. package/lib/exercises/math/calculLitteral/inequations/firstDegreeInequationsType0.d.ts +5 -1
  2. package/lib/exercises/math/calculLitteral/inequations/firstDegreeInequationsType0.d.ts.map +1 -1
  3. package/lib/exercises/math/calculLitteral/inequations/firstDegreeInequationsType0.js +95 -20
  4. package/lib/exercises/math/calculLitteral/inequations/firstDegreeInequationsType1.d.ts +4 -1
  5. package/lib/exercises/math/calculLitteral/inequations/firstDegreeInequationsType1.d.ts.map +1 -1
  6. package/lib/exercises/math/calculLitteral/inequations/firstDegreeInequationsType1.js +104 -26
  7. package/lib/exercises/math/derivation/derivative/firstDegreeDerivative.d.ts.map +1 -1
  8. package/lib/exercises/math/derivation/derivative/firstDegreeDerivative.js +44 -5
  9. package/lib/exercises/math/derivation/derivative/lnDerivativeOne.d.ts.map +1 -1
  10. package/lib/exercises/math/derivation/derivative/lnDerivativeOne.js +17 -7
  11. package/lib/exercises/math/derivation/derivative/lnDerivativeThree.d.ts.map +1 -1
  12. package/lib/exercises/math/derivation/derivative/lnDerivativeThree.js +46 -27
  13. package/lib/exercises/math/derivation/derivative/lnDerivativeTwo.js +1 -1
  14. package/lib/exercises/math/derivation/derivative/rootFunctionDerivative.d.ts.map +1 -1
  15. package/lib/exercises/math/derivation/derivative/rootFunctionDerivative.js +57 -26
  16. package/lib/exercises/math/derivation/derivative/secondDegreeDerivative.d.ts.map +1 -1
  17. package/lib/exercises/math/derivation/derivative/secondDegreeDerivative.js +50 -8
  18. package/lib/exercises/math/derivation/derivative/secondDerivativeOfExpoFunction.js +1 -1
  19. package/lib/exercises/math/derivation/derivative/thirdDegreeDerivative.d.ts.map +1 -1
  20. package/lib/exercises/math/derivation/derivative/thirdDegreeDerivative.js +67 -13
  21. package/lib/exercises/math/derivation/derivative/usualderivative.d.ts.map +1 -1
  22. package/lib/exercises/math/derivation/derivative/usualderivative.js +1 -2
  23. package/lib/exercises/math/functions/affines/signFunction.d.ts.map +1 -1
  24. package/lib/exercises/math/functions/affines/signFunction.js +66 -27
  25. package/lib/exercises/math/functions/basics/graphicInequation.d.ts.map +1 -1
  26. package/lib/exercises/math/functions/basics/graphicInequation.js +57 -36
  27. package/lib/exercises/math/functions/exponential/expEquation.js +1 -1
  28. package/lib/exercises/math/functions/exponentials/exponentialsVariations.d.ts +9 -0
  29. package/lib/exercises/math/functions/exponentials/exponentialsVariations.d.ts.map +1 -0
  30. package/lib/exercises/math/functions/exponentials/exponentialsVariations.js +124 -0
  31. package/lib/exercises/math/functions/exponentials/index.d.ts +2 -0
  32. package/lib/exercises/math/functions/exponentials/index.d.ts.map +1 -0
  33. package/lib/exercises/math/functions/exponentials/index.js +17 -0
  34. package/lib/exercises/math/functions/index.d.ts +1 -0
  35. package/lib/exercises/math/functions/index.d.ts.map +1 -1
  36. package/lib/exercises/math/functions/index.js +1 -0
  37. package/lib/exercises/math/functions/integral/integralFractions.js +1 -1
  38. package/lib/exercises/math/functions/logarithm/log10Simplifying.d.ts.map +1 -1
  39. package/lib/exercises/math/functions/logarithm/log10Simplifying.js +6 -2
  40. package/lib/exercises/math/functions/logarithm/logEquation.d.ts.map +1 -1
  41. package/lib/exercises/math/functions/logarithm/logEquation.js +22 -14
  42. package/lib/exercises/math/functions/logarithm/logPowerEquation.d.ts.map +1 -1
  43. package/lib/exercises/math/functions/logarithm/logPowerEquation.js +14 -12
  44. package/lib/exercises/math/functions/logarithm/logSimplifiying.d.ts.map +1 -1
  45. package/lib/exercises/math/functions/logarithm/logSimplifiying.js +36 -16
  46. package/lib/exercises/math/geometry/areas/rectangleArea.d.ts.map +1 -1
  47. package/lib/exercises/math/geometry/areas/rectangleArea.js +5 -2
  48. package/lib/exercises/math/geometry/vectors/vectorLinearCombination.js +4 -4
  49. package/lib/exercises/math/index.d.ts +1 -0
  50. package/lib/exercises/math/index.d.ts.map +1 -1
  51. package/lib/exercises/math/index.js +1 -0
  52. package/lib/exercises/math/matrices/matrixInversibilityDomain.js +1 -0
  53. package/lib/exercises/math/percent/applyPercent.d.ts.map +1 -1
  54. package/lib/exercises/math/percent/applyPercent.js +2 -0
  55. package/lib/exercises/math/percent/findEndValueAfterEvolution.d.ts +8 -0
  56. package/lib/exercises/math/percent/findEndValueAfterEvolution.d.ts.map +1 -0
  57. package/lib/exercises/math/percent/findEndValueAfterEvolution.js +104 -0
  58. package/lib/exercises/math/percent/index.d.ts +1 -0
  59. package/lib/exercises/math/percent/index.d.ts.map +1 -1
  60. package/lib/exercises/math/percent/index.js +1 -0
  61. package/lib/exercises/math/powers/index.d.ts +1 -0
  62. package/lib/exercises/math/powers/index.d.ts.map +1 -1
  63. package/lib/exercises/math/powers/index.js +1 -0
  64. package/lib/exercises/math/powers/powersMixOperations.d.ts +11 -0
  65. package/lib/exercises/math/powers/powersMixOperations.d.ts.map +1 -0
  66. package/lib/exercises/math/powers/powersMixOperations.js +99 -0
  67. package/lib/exercises/math/primitive/logarithmePrimitive.d.ts.map +1 -1
  68. package/lib/exercises/math/primitive/logarithmePrimitive.js +11 -3
  69. package/lib/exercises/math/sampling/confidenceInterval.d.ts +9 -0
  70. package/lib/exercises/math/sampling/confidenceInterval.d.ts.map +1 -0
  71. package/lib/exercises/math/sampling/confidenceInterval.js +134 -0
  72. package/lib/exercises/math/sampling/fluctuationInterval.d.ts +9 -0
  73. package/lib/exercises/math/sampling/fluctuationInterval.d.ts.map +1 -0
  74. package/lib/exercises/math/sampling/fluctuationInterval.js +131 -0
  75. package/lib/exercises/math/sampling/index.d.ts +4 -0
  76. package/lib/exercises/math/sampling/index.d.ts.map +1 -0
  77. package/lib/exercises/math/sampling/index.js +19 -0
  78. package/lib/exercises/math/sampling/isSamplingRepresentative.d.ts +11 -0
  79. package/lib/exercises/math/sampling/isSamplingRepresentative.d.ts.map +1 -0
  80. package/lib/exercises/math/sampling/isSamplingRepresentative.js +116 -0
  81. package/lib/exercises/math/sequences/geometric/geometricVariations.d.ts +9 -0
  82. package/lib/exercises/math/sequences/geometric/geometricVariations.d.ts.map +1 -0
  83. package/lib/exercises/math/sequences/geometric/geometricVariations.js +124 -0
  84. package/lib/exercises/math/sequences/geometric/index.d.ts +1 -0
  85. package/lib/exercises/math/sequences/geometric/index.d.ts.map +1 -1
  86. package/lib/exercises/math/sequences/geometric/index.js +1 -0
  87. package/lib/exercises/math/sets/intervals/inequalityToInterval.d.ts.map +1 -1
  88. package/lib/exercises/math/sets/intervals/inequalityToInterval.js +11 -11
  89. package/lib/exercises/options/inequationSolutionFormat.d.ts +3 -0
  90. package/lib/exercises/options/inequationSolutionFormat.d.ts.map +1 -0
  91. package/lib/exercises/options/inequationSolutionFormat.js +12 -0
  92. package/lib/exercises/pc/pH.js +1 -1
  93. package/lib/index.d.ts +35 -2
  94. package/lib/index.d.ts.map +1 -1
  95. package/lib/math/numbers/integer/integer.d.ts +1 -1
  96. package/lib/math/numbers/rationals/rational.d.ts +3 -1
  97. package/lib/math/numbers/rationals/rational.d.ts.map +1 -1
  98. package/lib/math/numbers/rationals/rational.js +3 -1
  99. package/lib/math/numbers/reals/real.d.ts +1 -1
  100. package/lib/playground.d.ts.map +1 -1
  101. package/lib/playground.js +6 -1
  102. package/lib/tree/nodes/algebraicNode.d.ts +1 -0
  103. package/lib/tree/nodes/algebraicNode.d.ts.map +1 -1
  104. package/lib/tree/nodes/inequations/inequationNode.d.ts +5 -2
  105. package/lib/tree/nodes/inequations/inequationNode.d.ts.map +1 -1
  106. package/lib/tree/nodes/inequations/inequationNode.js +40 -3
  107. package/lib/tree/nodes/numbers/numberNode.d.ts +2 -2
  108. package/lib/tree/nodes/numbers/numberNode.d.ts.map +1 -1
  109. package/lib/tree/nodes/numbers/numberNode.js +7 -1
  110. package/lib/tree/nodes/operators/addNode.d.ts.map +1 -1
  111. package/lib/tree/nodes/operators/addNode.js +15 -1
  112. package/lib/tree/nodes/operators/fractionNode.d.ts.map +1 -1
  113. package/lib/tree/nodes/operators/fractionNode.js +8 -0
  114. package/lib/tree/nodes/operators/multiplyNode.d.ts.map +1 -1
  115. package/lib/tree/nodes/operators/multiplyNode.js +4 -0
  116. package/lib/tree/nodes/polynomials/monomNode.d.ts +6 -0
  117. package/lib/tree/nodes/polynomials/monomNode.d.ts.map +1 -1
  118. package/lib/tree/nodes/polynomials/monomNode.js +126 -2
  119. package/lib/tree/nodes/sets/intervalNode.d.ts +2 -2
  120. package/lib/tree/nodes/sets/intervalNode.d.ts.map +1 -1
  121. package/lib/tree/nodes/sets/intervalNode.js +2 -2
  122. package/lib/tree/nodes/sets/setNode.d.ts +1 -0
  123. package/lib/tree/nodes/sets/setNode.d.ts.map +1 -1
  124. package/lib/tree/nodes/sets/unionIntervalNode.d.ts +1 -1
  125. package/lib/tree/nodes/sets/unionIntervalNode.d.ts.map +1 -1
  126. package/lib/tree/nodes/sets/unionIntervalNode.js +1 -1
  127. package/lib/tree/parsers/affineParser.d.ts.map +1 -1
  128. package/lib/tree/parsers/affineParser.js +2 -1
  129. package/lib/tree/parsers/inequationParser.d.ts +7 -0
  130. package/lib/tree/parsers/inequationParser.d.ts.map +1 -0
  131. package/lib/tree/parsers/inequationParser.js +30 -0
  132. package/lib/tree/parsers/intervalParser.d.ts +8 -0
  133. package/lib/tree/parsers/intervalParser.d.ts.map +1 -0
  134. package/lib/tree/parsers/intervalParser.js +44 -0
  135. package/lib/tree/parsers/latexParser.d.ts.map +1 -1
  136. package/lib/tree/parsers/latexParser.js +29 -6
  137. package/lib/tree/parsers/monomParser.d.ts +1 -3
  138. package/lib/tree/parsers/monomParser.d.ts.map +1 -1
  139. package/lib/tree/parsers/monomParser.js +7 -129
  140. package/lib/tree/parsers/polynomialParser.d.ts.map +1 -1
  141. package/lib/tree/parsers/polynomialParser.js +2 -1
  142. package/lib/tree/parsers/powerParser.d.ts +1 -1
  143. package/lib/tree/parsers/powerParser.d.ts.map +1 -1
  144. package/lib/tree/parsers/powerParser.js +2 -1
  145. package/lib/tree/parsers/rationalParser.d.ts +1 -1
  146. package/lib/tree/parsers/trinomParser.js +2 -2
  147. package/lib/tree/parsers/unionIntervalParser.d.ts +9 -0
  148. package/lib/tree/parsers/unionIntervalParser.d.ts.map +1 -0
  149. package/lib/tree/parsers/unionIntervalParser.js +26 -0
  150. package/lib/types/keyIds.d.ts +1 -1
  151. package/lib/types/keyIds.d.ts.map +1 -1
  152. package/package.json +1 -1
@@ -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,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(): this;
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;AACjD,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;CAGT"}
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;
@@ -8,6 +8,7 @@ export interface SetNode extends Node {
8
8
  id: SetIds;
9
9
  isEmpty: boolean;
10
10
  toEquivalentNodes: (opts?: NodeOptions) => SetNode[];
11
+ simplify: () => SetNode;
11
12
  }
12
13
  export declare function isSetNode(a: Node): a is SetNode;
13
14
  //# sourceMappingURL=setNode.d.ts.map
@@ -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;CACtD;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,OAAO,CAE/C"}
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"}
@@ -22,6 +22,6 @@ export declare class UnionIntervalNode implements Node {
22
22
  id: NodeIds;
23
23
  } & Record<string, any>)[];
24
24
  };
25
- simplify(): this;
25
+ simplify(): UnionIntervalNode;
26
26
  }
27
27
  //# sourceMappingURL=unionIntervalNode.d.ts.map
@@ -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;CAGT"}
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"}
@@ -58,7 +58,7 @@ class UnionIntervalNode {
58
58
  };
59
59
  }
60
60
  simplify() {
61
- return this;
61
+ return new UnionIntervalNode(this.sets.map((set) => set.simplify()), this.opts);
62
62
  }
63
63
  }
64
64
  exports.UnionIntervalNode = UnionIntervalNode;
@@ -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,7 @@
1
+ import { InequationNode } from "../nodes/inequations/inequationNode";
2
+ type Opts = {
3
+ variable: string;
4
+ };
5
+ export declare const inequationParser: (ans: string, opts?: Opts) => false | InequationNode;
6
+ export {};
7
+ //# sourceMappingURL=inequationParser.d.ts.map
@@ -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;
@@ -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,yBA8CtD,CAAC"}
@@ -0,0 +1,44 @@
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
+ 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)
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));
39
+ }
40
+ catch (e) {
41
+ return false;
42
+ }
43
+ };
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;AAGzD,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AAkDrE,eAAO,MAAM,QAAQ,UAAW,MAAM,aA4BrC,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"}
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
- const symbols = [{ tex: "\\pi", node: piNode_1.PiNode }];
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 match = char.match(/[\+\-\(\)\^a-zA-Z_=<>\{\}]/);
61
- if (match) {
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 n'est dans une profondeur unique
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,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"}