math-exercises 3.0.201 → 3.0.202

package/lib/math/utils/polynomial/polynomialUtils.js

@@ -106,7 +106,7 @@ export function createNodeFPolynomialFromCoeffs(arrNodeCoeff, isFilterOutTopZero
  * @param arrPoint
  * @returns coeffN x^N + ... + coeff2 x^2 + coeff1 x^1 + coeff0
  */
-export function createNodeFTrinomFromPoints(nodeA, arrPoint) {
+export function createNodeFTrinomFromPoints(nodeA, arrPoint, isShouldSimplify = false, simplifyOptionsPass1 = {}, simplifyOptionsPass2 = {}) {
     const [[nodeX1, nodeY1], [nodeX2, nodeY2]] = arrPoint.map((point) => [
         point.x,
         point.y,
@@ -118,7 +118,10 @@ export function createNodeFTrinomFromPoints(nodeA, arrPoint) {
     //{c=y1-(ax1^2+bx1)
     const nodeB = frac(substract(substract(nodeY1, nodeY2), multiply(nodeA, substract(square(nodeX1), square(nodeX2)))), substract(nodeX1, nodeX2));
     const nodeC = substract(nodeY1, add(multiply(nodeA, square(nodeX1)), multiply(nodeB, nodeX1)));
-    const nodePolynomial = createNodeFPolynomialFromCoeffs([nodeC, nodeB, nodeA], true);
+    const [nodeARefined, nodeBRefined, nodeCRefined] = isShouldSimplify
+        ? [nodeA, nodeB, nodeC].map((node) => node.simplify(simplifyOptionsPass1).simplify(simplifyOptionsPass2))
+        : [nodeA, nodeB, nodeC];
+    const nodePolynomial = createNodeFPolynomialFromCoeffs([nodeCRefined, nodeBRefined, nodeARefined], true);
     return nodePolynomial;
 }
 /**

package/lib/tests/exoTest.js

@@ -7,7 +7,7 @@ export const exoTest = (exo) => {
     //hint
     //answer
     //propositions
-    console.log(exo.id);
+    console.log(`begin test ${exo.id}`);
     let qcmTime = -1;
     let veaTime = -1;
     let generatorTime = -1;

package/lib/tests/questionTest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"questionTest.d.ts","sourceRoot":"","sources":["../../src/tests/questionTest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AA0BjE,eAAO,MAAM,YAAY,GACvB,KAAK,QAAQ,CAAC,MAAM,CAAC,EACrB,UAAU,QAAQ,CAAC,MAAM,CAAC;;;CA6U3B,CAAC"}
+{"version":3,"file":"questionTest.d.ts","sourceRoot":"","sources":["../../src/tests/questionTest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AA0BjE,eAAO,MAAM,YAAY,GACvB,KAAK,QAAQ,CAAC,MAAM,CAAC,EACrB,UAAU,QAAQ,CAAC,MAAM,CAAC;;;CAuV3B,CAAC"}

package/lib/tests/questionTest.js

@@ -203,8 +203,11 @@ export const questionTest = (exo, question) => {
             throw new Error(`exo ${exo.id} has no keys`);
         const answer = question.answer;
         const before = Date.now();
+        if (!exo.isAnswerValid)
+            throw new Error(`exo ${exo.id} has no isAnswerValid`);
         console.log("will test vea : ", exo.id);
-        if (!exo.isAnswerValid(answer, { answer, ...question.identifiers }, question.options)) {
+        if (!exo.isAnswerValid(answer, { answer, ...question.identifiers }, question.options) ||
+            exo.isAnswerValid("N.S.P", { answer, ...question.identifiers }, question.options)) {
             throw new Error(`exo ${exo.id} has invalid VEA, ids ${jsonIds}, answer ${question.answer}`);
         }
         const after = Date.now();
@@ -235,8 +238,9 @@ export const questionTest = (exo, question) => {
                 throw new Error(`exo ${exo.id} has invalid props, ${props.map((p) => p.statement)}`);
         }
         else {
-            if (rightAnswers !== 1)
-                throw new Error(`exo ${exo.id} has invalid props`);
+            if (rightAnswers !== 1) {
+                throw new Error(`exo ${exo.id} has invalid props, rightAnswers: ${rightAnswers}`);
+            }
         }
         props.forEach((prop) => {
             if (prop.statement.includes("undefined"))

package/lib/tests/singleExo.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"singleExo.test.d.ts","sourceRoot":"","sources":["../../src/tests/singleExo.test.ts"],"names":[],"mappings":"AAEA,OAAO,6BAA6B,CAAC"}
+{"version":3,"file":"singleExo.test.d.ts","sourceRoot":"","sources":["../../src/tests/singleExo.test.ts"],"names":[],"mappings":"AAGA,OAAO,6BAA6B,CAAC"}

package/lib/tests/singleExo.test.js

@@ -1,9 +1,9 @@
 import "../prototypesEnhancement.js";
 import { exoTest } from "./exoTest.js";
-import { productOfSinAXPlusBCosCXPlusDDerivative, } from "../exercises/math/index.js";
+import { problemMaximizeProfitFindProduction, } from "../exercises/math/index.js";
 try {
     for (let i = 0; i < 1000; i++)
-        exoTest(productOfSinAXPlusBCosCXPlusDDerivative);
+        exoTest(problemMaximizeProfitFindProduction);
 }
 catch (err) {
     throw err;

package/lib/tree/utilities/nodeComparator.d.ts

@@ -5,7 +5,7 @@ export declare abstract class NodeComparator {
     static compareViaSub: <T extends AlgebraicNode>(node1: T, node2: T) => -1 | 0 | 1;
     static isEqualViaSub: (node1: AlgebraicNode, node2: AlgebraicNode) => boolean;
     static isEqualViaFrac: (node1: AlgebraicNode, node2: AlgebraicNode) => boolean;
-    static isEqualViaRandomEvaluations(node1: AlgebraicNode, node2: AlgebraicNode, nbRandomEvaluations: number): boolean;
+    static isEqualViaRandomEvaluations(node1: AlgebraicNode, node2: AlgebraicNode, nbRandomEvaluations: number, precision?: number): boolean;
     static isNodeInDiscreteSet: (node: AlgebraicNode, nodeDiscreteSet: DiscreteSetNode) => boolean;
     static isTupleInCartesianProductOfDiscreteSets: (tuple: Tuple, arrDiscreteSet: DiscreteSetNode[]) => boolean;
     static isEqualTuple: (tuple1: Tuple, tuple2: Tuple) => boolean;

package/lib/tree/utilities/nodeComparator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nodeComparator.d.ts","sourceRoot":"","sources":["../../../src/tree/utilities/nodeComparator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAGjD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAI1D,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAInE,8BAAsB,cAAc;IAGlC,MAAM,CAAC,aAAa,GAAI,CAAC,SAAS,aAAa,EAC7C,OAAO,CAAC,EACR,OAAO,CAAC,KACP,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CA4DX;IAEF,MAAM,CAAC,aAAa,GAClB,OAAO,aAAa,EACpB,OAAO,aAAa,KACnB,OAAO,CAER;IAIF,MAAM,CAAC,cAAc,GACnB,OAAO,aAAa,EACpB,OAAO,aAAa,KACnB,OAAO,CAgBR;IAIF,MAAM,CAAC,2BAA2B,CAChC,KAAK,EAAE,aAAa,EACpB,KAAK,EAAE,aAAa,EACpB,mBAAmB,EAAE,MAAM;IA+D7B,MAAM,CAAC,mBAAmB,GACxB,MAAM,aAAa,EACnB,iBAAiB,eAAe,aAI9B;IAEJ,MAAM,CAAC,uCAAuC,GAC5C,OAAO,KAAK,EACZ,gBAAgB,eAAe,EAAE,aAQjC;IAIF,MAAM,CAAC,YAAY,GAAI,QAAQ,KAAK,EAAE,QAAQ,KAAK,aAIjD;IAEF,MAAM,CAAC,iBAAiB,GAAI,OAAO,KAAK,EAAE,UAAU,KAAK,EAAE,aAMzD;CACH"}
+{"version":3,"file":"nodeComparator.d.ts","sourceRoot":"","sources":["../../../src/tree/utilities/nodeComparator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAGjD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAI1D,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAKnE,8BAAsB,cAAc;IAGlC,MAAM,CAAC,aAAa,GAAI,CAAC,SAAS,aAAa,EAC7C,OAAO,CAAC,EACR,OAAO,CAAC,KACP,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CA4DX;IAEF,MAAM,CAAC,aAAa,GAClB,OAAO,aAAa,EACpB,OAAO,aAAa,KACnB,OAAO,CAER;IAIF,MAAM,CAAC,cAAc,GACnB,OAAO,aAAa,EACpB,OAAO,aAAa,KACnB,OAAO,CAgBR;IAIF,MAAM,CAAC,2BAA2B,CAChC,KAAK,EAAE,aAAa,EACpB,KAAK,EAAE,aAAa,EACpB,mBAAmB,EAAE,MAAM,EAC3B,SAAS,GAAE,MAAU;IAiEvB,MAAM,CAAC,mBAAmB,GACxB,MAAM,aAAa,EACnB,iBAAiB,eAAe,aAI9B;IAEJ,MAAM,CAAC,uCAAuC,GAC5C,OAAO,KAAK,EACZ,gBAAgB,eAAe,EAAE,aAQjC;IAIF,MAAM,CAAC,YAAY,GAAI,QAAQ,KAAK,EAAE,QAAQ,KAAK,aAIjD;IAEF,MAAM,CAAC,iBAAiB,GAAI,OAAO,KAAK,EAAE,UAAU,KAAK,EAAE,aAMzD;CACH"}

package/lib/tree/utilities/nodeComparator.js

@@ -5,6 +5,7 @@ import { frac } from "../nodes/operators/fractionNode.js";
 import { substract } from "../nodes/operators/substractNode.js";
 import { NodeRewriter } from "./nodeRewriter.js";
 import { NodeSimplifier } from "./nodeSimplifier.js";
+import { round } from "../../math/utils/round.js";
 export class NodeComparator {
     //via sub
     static compareViaSub = (node1, node2) => {
@@ -89,7 +90,7 @@ export class NodeComparator {
         });
     };
     //via random evaluations
-    static isEqualViaRandomEvaluations(node1, node2, nbRandomEvaluations) {
+    static isEqualViaRandomEvaluations(node1, node2, nbRandomEvaluations, precision = 8) {
         const getSafeEvaluationDictForEqualityCheck = (node1, node2, nbSafeX = 4) => {
             const dict = {};
             let counter = -1;
@@ -125,9 +126,10 @@ export class NodeComparator {
             return dict;
         };
         return Object.values(getSafeEvaluationDictForEqualityCheck(node1, node2, nbRandomEvaluations)).every((arrSafeEval) => {
-            return arrSafeEval
-                .slice(1)
-                .every((safeEval) => substract(arrSafeEval[0].value, safeEval.value).evaluate() === 0);
+            return arrSafeEval.slice(1).every((safeEval) => {
+                const valueSubRounded = round(substract(arrSafeEval[0].value, safeEval.value).evaluate(), precision);
+                return valueSubRounded === 0;
+            });
         });
     }
     //discreteSets, etc.

package/lib/tree/utilities/nodeSimplifier.d.ts

@@ -11,5 +11,6 @@ export declare abstract class NodeSimplifier {
         isMultiTopLevel: boolean;
     }, toTexOpts?: ToTexOptions) => string[];
     static simplifyByVibrating(algebraicNode: AlgebraicNode, nbVibrations?: number, isTowardsDistribute?: boolean): AlgebraicNode;
+    static simplifyByInfiltrating(algebraicNode: AlgebraicNode, simplifyOpts: SimplifyOptions): AlgebraicNode;
 }
 //# sourceMappingURL=nodeSimplifier.d.ts.map

package/lib/tree/utilities/nodeSimplifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nodeSimplifier.d.ts","sourceRoot":"","sources":["../../../src/tree/utilities/nodeSimplifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAiB3E,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAKhD,8BAAsB,cAAc;IAClC,MAAM,CAAC,QAAQ,GAAI,CAAC,SAAS,aAAa,EACxC,eAAe,CAAC,EAChB,cAAc,eAAe,EAC7B,eAAc,YAIb,KACA,MAAM,CAsBP;IAEF,MAAM,CAAC,iBAAiB,GAAI,eAAe,aAAa,sCAmCtD;IAEF,MAAM,CAAC,8BAA8B,GAAI,OAAO,aAAa,EAAE,qBAK7D;IAEF,MAAM,CAAC,eAAe,GAAI,CAAC,SAAS,aAAa,EAC/C,eAAe,CAAC,EAChB,cAAc,eAAe,EAC7B,iBAAgB;QACd,eAAe,EAAE,OAAO,CAAC;KAG1B,EACD,YAAW,YAIV,KACA,aAAa,EAAE,CA4JhB;IAEF,MAAM,CAAC,gBAAgB,GACrB,MAAM,aAAa,EACnB,eAAc,eAAoB,EAClC,iBAAgB;QACd,eAAe,EAAE,OAAO,CAAC;KAG1B,EACD,YAAW,YAIV,cAQD;IAEF,MAAM,CAAC,mBAAmB,CACxB,aAAa,EAAE,aAAa,EAC5B,YAAY,GAAE,MAAU,EACxB,mBAAmB,GAAE,OAAc,GAClC,aAAa;CAcjB"}
+{"version":3,"file":"nodeSimplifier.d.ts","sourceRoot":"","sources":["../../../src/tree/utilities/nodeSimplifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAiB3E,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAKhD,8BAAsB,cAAc;IAClC,MAAM,CAAC,QAAQ,GAAI,CAAC,SAAS,aAAa,EACxC,eAAe,CAAC,EAChB,cAAc,eAAe,EAC7B,eAAc,YAIb,KACA,MAAM,CAsBP;IAEF,MAAM,CAAC,iBAAiB,GAAI,eAAe,aAAa,sCAmCtD;IAEF,MAAM,CAAC,8BAA8B,GAAI,OAAO,aAAa,EAAE,qBAK7D;IAEF,MAAM,CAAC,eAAe,GAAI,CAAC,SAAS,aAAa,EAC/C,eAAe,CAAC,EAChB,cAAc,eAAe,EAC7B,iBAAgB;QACd,eAAe,EAAE,OAAO,CAAC;KAG1B,EACD,YAAW,YAIV,KACA,aAAa,EAAE,CA4JhB;IAEF,MAAM,CAAC,gBAAgB,GACrB,MAAM,aAAa,EACnB,eAAc,eAAoB,EAClC,iBAAgB;QACd,eAAe,EAAE,OAAO,CAAC;KAG1B,EACD,YAAW,YAIV,cAQD;IAEF,MAAM,CAAC,mBAAmB,CACxB,aAAa,EAAE,aAAa,EAC5B,YAAY,GAAE,MAAU,EACxB,mBAAmB,GAAE,OAAc,GAClC,aAAa;IAehB,MAAM,CAAC,sBAAsB,CAC3B,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,eAAe,GAC5B,aAAa;CAyDjB"}

package/lib/tree/utilities/nodeSimplifier.js

@@ -209,4 +209,44 @@ export class NodeSimplifier {
             return this.simplifyByVibrating(nodeSimplified, nbVibrations - 1, !isTowardsDistribute);
         }
     }
+    static simplifyByInfiltrating(algebraicNode, simplifyOpts) {
+        const outNode = (() => {
+            if (isOperatorNode(algebraicNode)) {
+                const [nodeLeft, nodeRight] = [
+                    algebraicNode.leftChild,
+                    algebraicNode.rightChild,
+                ];
+                const isCanDiveDeeper = [nodeLeft, nodeRight].every((nodeChild) => isOperatorNode(nodeChild) || isFunctionNode(nodeChild));
+                if (isCanDiveDeeper) {
+                    const [nodeLeftSimplified, nodeRightSimplified] = [
+                        nodeLeft,
+                        nodeRight,
+                    ].map((nodeChild) => this.simplifyByInfiltrating(nodeChild, simplifyOpts));
+                    const funcMother = NodeRewriter.getArrCreateNodeFromChildrenFunction(algebraicNode).find(() => true);
+                    return funcMother([nodeLeftSimplified, nodeRightSimplified]).simplify(simplifyOpts);
+                }
+                else {
+                    return algebraicNode.simplify(simplifyOpts);
+                }
+            }
+            else if (isFunctionNode(algebraicNode)) {
+                const nodeChild = algebraicNode.child;
+                const isCanDiveDeeper = [nodeChild].every((nodeChild) => isOperatorNode(nodeChild) || isFunctionNode(nodeChild));
+                if (isCanDiveDeeper) {
+                    const [nodeChildSimplified] = [nodeChild].map((nodeChild) => this.simplifyByInfiltrating(nodeChild, simplifyOpts));
+                    const funcMother = NodeRewriter.getArrCreateNodeFromChildrenFunction(algebraicNode).find(() => true);
+                    return funcMother([nodeChildSimplified]).simplify(simplifyOpts);
+                }
+                else {
+                    return algebraicNode.simplify(simplifyOpts);
+                }
+            }
+            else {
+                return algebraicNode.simplify(simplifyOpts);
+            }
+        })();
+        // console.log("simplifyByInfiltrating", "nodeIn:", algebraicNode.toTex());
+        // console.log("simplifyByInfiltrating", "nodeOut:", outNode.toTex());
+        return outNode;
+    }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "math-exercises",
   "type": "module",
-  "version": "3.0.201",
+  "version": "3.0.202",
   "description": "Math exercises generator for middle school and high school",
   "main": "lib/index.js",
   "files": [