math-exercises 3.0.52 → 3.0.54

package/lib/exercises/math/calcul/fractions/fractionAndIntegerDivision.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionAndIntegerDivision.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionAndIntegerDivision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAiKF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAmB5D,CAAC"}
+{"version":3,"file":"fractionAndIntegerDivision.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionAndIntegerDivision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAiKF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAiB5D,CAAC"}

package/lib/exercises/math/calcul/fractions/fractionAndIntegerDivision.js

@@ -133,9 +133,7 @@ export const fractionAndIntegerDivision = {
     id: "fractionAndIntegerDivision",
     connector: "=",
     label: "Division d'un entier par une fraction et vice-versa",
-    levels: ["4ème", "3ème", "2nde", "2ndPro", "1rePro", "CAP"],
     isSingleStep: false,
-    sections: ["Fractions"],
     generator: (nb) => getDistinctQuestions(getFractionAndIntegerDivision, nb),
     qcmTimer: 60,
     freeTimer: 60,

package/lib/exercises/math/calcul/fractions/fractionAndIntegerProduct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionAndIntegerProduct.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionAndIntegerProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAkBrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AA2IF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAqBpE,CAAC"}
+{"version":3,"file":"fractionAndIntegerProduct.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionAndIntegerProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAkBrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AA2IF,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAmBpE,CAAC"}

package/lib/exercises/math/calcul/fractions/fractionAndIntegerProduct.js

@@ -115,9 +115,7 @@ export const fractionAndIntegerProduct = {
     id: "fractionAndIntegerProduct",
     connector: "=",
     label: "Produit d'un entier par une fraction",
-    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro", "1rePro"],
     isSingleStep: false,
-    sections: ["Fractions"],
     generator: (nb, opts) => getDistinctQuestions(() => getFractionAndIntegerProduct(opts), nb),
     qcmTimer: 60,
     freeTimer: 60,

package/lib/exercises/math/calcul/fractions/fractionsDivision.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionsDivision.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsDivision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAkFrC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC,CAAC;AAgDF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAgBnD,CAAC"}
+{"version":3,"file":"fractionsDivision.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsDivision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAkFrC,KAAK,WAAW,GAAG;IACjB,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC,CAAC;AAgDF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAcnD,CAAC"}

package/lib/exercises/math/calcul/fractions/fractionsDivision.js

@@ -93,8 +93,6 @@ export const fractionsDivision = {
     id: "fractionsDivision",
     connector: "=",
     label: "Divisions de fractions",
-    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro", "1rePro"],
-    sections: ["Fractions"],
     isSingleStep: false,
     generator: (nb, opts) => getDistinctQuestions(() => getFractionsDivision(opts), nb),
     qcmTimer: 60,

package/lib/exercises/math/calcul/fractions/fractionsSum.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractionsSum.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAyGF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAgBvD,CAAC"}
+{"version":3,"file":"fractionsSum.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAyGF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAcvD,CAAC"}

package/lib/exercises/math/calcul/fractions/fractionsSum.js

@@ -82,8 +82,6 @@ export const fractionsSum = {
     id: "fractionsSum",
     connector: "=",
     label: "Sommes de fractions",
-    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro", "1rePro"],
-    sections: ["Fractions"],
     isSingleStep: false,
     generator: (nb, opts) => getDistinctQuestions(() => getFractionsSum(opts), nb),
     qcmTimer: 60,

package/lib/exercises/math/calcul/mentalCaluls/mentalAddAndSub.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mentalAddAndSub.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalAddAndSub.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AASrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAkEF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAuBjD,CAAC"}
+{"version":3,"file":"mentalAddAndSub.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalAddAndSub.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AA8DF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAWjD,CAAC"}

package/lib/exercises/math/calcul/mentalCaluls/mentalAddAndSub.js

@@ -1,5 +1,6 @@
 import { addValidProp, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { numberVEA } from "../../../../exercises/vea/numberVEA.js";
 import { randint } from "../../../../math/utils/random/randint.js";
 import { round } from "../../../../math/utils/round.js";
 import { NumberNode } from "../../../../tree/nodes/numbers/numberNode.js";
@@ -50,28 +51,13 @@ const getPropositions = (n, { answer, numbers }) => {
     }
     return shuffle(propositions);
 };
-const isAnswerValid = (studentAns, { numbers }) => {
-    const sum = numbers.reduce((acc, curr) => acc + curr);
-    const answerTree = new NumberNode(round(sum, 2));
-    const texs = answerTree.toAllValidTexs();
-    return texs.includes(studentAns);
+const isAnswerValid = (ans, { answer, numbers }) => {
+    return numberVEA(ans, answer);
 };
 export const mentalAddAndSub = {
     id: "mentalAddAndSub",
     connector: "=",
     label: "Additions et soustractions avec des décimaux",
-    levels: [
-        "6ème",
-        "5ème",
-        "4ème",
-        "3ème",
-        "2nde",
-        "1reESM",
-        "CAP",
-        "2ndPro",
-        "1rePro",
-    ],
-    sections: ["Calculs"],
     isSingleStep: true,
     generator: (nb) => getDistinctQuestions(getMentalAddAndSub, nb),
     qcmTimer: 60,

package/lib/exercises/math/calcul/mentalCaluls/mentalMultiplications.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mentalMultiplications.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalMultiplications.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AA6EF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAuBvD,CAAC"}
+{"version":3,"file":"mentalMultiplications.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalMultiplications.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AA6EF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAWvD,CAAC"}

package/lib/exercises/math/calcul/mentalCaluls/mentalMultiplications.js

@@ -68,18 +68,6 @@ export const mentalMultiplications = {
     id: "mentalMultiplications",
     connector: "=",
     label: "Multiplications avec des décimaux",
-    levels: [
-        "6ème",
-        "5ème",
-        "4ème",
-        "3ème",
-        "2nde",
-        "1reESM",
-        "CAP",
-        "2ndPro",
-        "1rePro",
-    ],
-    sections: ["Calculs"],
     isSingleStep: true,
     generator: (nb) => getDistinctQuestions(getMentalMultiplications, nb),
     qcmTimer: 60,

package/lib/exercises/math/calcul/mentalCaluls/mentalPercentage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mentalPercentage.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalPercentage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AA0ErC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAoEF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAwBlD,CAAC"}
+{"version":3,"file":"mentalPercentage.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/mentalCaluls/mentalPercentage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AA0ErC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAoEF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAWlD,CAAC"}

package/lib/exercises/math/calcul/mentalCaluls/mentalPercentage.js

@@ -113,19 +113,6 @@ export const mentalPercentage = {
     id: "mentalPercentage",
     connector: "=",
     label: "Effectuer mentalement des calculs de pourcentages simples",
-    levels: [
-        "6ème",
-        "5ème",
-        "4ème",
-        "3ème",
-        "2nde",
-        "1reESM",
-        "CAP",
-        "2ndPro",
-        "1rePro",
-        "TermPro",
-    ],
-    sections: ["Pourcentages"],
     isSingleStep: true,
     generator: (nb) => getDistinctQuestions(getMentalPercentage, nb),
     qcmTimer: 60,

package/lib/exercises/math/calcul/operations/operationsPrioritiesParenthesis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operationsPrioritiesParenthesis.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/operations/operationsPrioritiesParenthesis.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,GAAG,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAsHF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAcjE,CAAC"}
+{"version":3,"file":"operationsPrioritiesParenthesis.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/operations/operationsPrioritiesParenthesis.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,GAAG,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAsHF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAYjE,CAAC"}

package/lib/exercises/math/calcul/operations/operationsPrioritiesParenthesis.js

@@ -97,9 +97,7 @@ export const operationsPrioritiesParenthesis = {
     id: "operationsPrioritiesParenthesis",
     connector: "=",
     label: "Priorités opératoires avec parenthèses",
-    levels: [],
     isSingleStep: true,
-    sections: [],
     generator: (nb) => getDistinctQuestions(getOperationsPrioritiesParenthesisQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,

package/lib/exercises/math/calculLitteral/equation/binomialsTrinomialsProposedSolutions.d.ts

@@ -1,8 +1,13 @@
 import { Exercise } from "../../../../exercises/exercise.js";
+import { EqualNodeIdentifiers } from "../../../../tree/nodes/equations/equalNode.js";
+import { NodeIdentifiers } from "../../../../tree/nodes/nodeConstructor.js";
 type Identifiers = {
-    solutionNodeIds: any;
-    equationNodeIds: any;
+    solutionNodeIds: NodeIdentifiers;
+    equationNodeIds: EqualNodeIdentifiers;
 };
-export declare const binomialsTrinomialsProposedSolutions: Exercise<Identifiers>;
+type Options = {
+    degree: string;
+};
+export declare const binomialsTrinomialsProposedSolutions: Exercise<Identifiers, Options>;
 export {};
 //# sourceMappingURL=binomialsTrinomialsProposedSolutions.d.ts.map

package/lib/exercises/math/calculLitteral/equation/binomialsTrinomialsProposedSolutions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"binomialsTrinomialsProposedSolutions.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/binomialsTrinomialsProposedSolutions.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,eAAe,EAAE,GAAG,CAAC;IACrB,eAAe,EAAE,GAAG,CAAC;CACtB,CAAC;AA0EF,eAAO,MAAM,oCAAoC,EAAE,QAAQ,CAAC,WAAW,CActE,CAAC"}
+{"version":3,"file":"binomialsTrinomialsProposedSolutions.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/binomialsTrinomialsProposedSolutions.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAMrC,OAAO,EAGL,oBAAoB,EACrB,MAAM,yCAAyC,CAAC;AACjD,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAW7C,KAAK,WAAW,GAAG;IACjB,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,EAAE,oBAAoB,CAAC;CACvC,CAAC;AA2FF,KAAK,OAAO,GAAG;IACb,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAYF,eAAO,MAAM,oCAAoC,EAAE,QAAQ,CACzD,WAAW,EACX,OAAO,CAiBR,CAAC"}

package/lib/exercises/math/calculLitteral/equation/binomialsTrinomialsProposedSolutions.js

@@ -1,12 +1,21 @@
-import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { GeneratorOptionTarget, GeneratorOptionType, addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { Affine } from "../../../../math/polynomials/affine.js";
 import { Trinom } from "../../../../math/polynomials/trinom.js";
 import { randint } from "../../../../math/utils/random/randint.js";
-import { EqualNode } from "../../../../tree/nodes/equations/equalNode.js";
+import { EqualNode, } from "../../../../tree/nodes/equations/equalNode.js";
+import { reifyAlgebraic, } from "../../../../tree/nodes/nodeConstructor.js";
+import { add } from "../../../../tree/nodes/operators/addNode.js";
 import { FractionNode } from "../../../../tree/nodes/operators/fractionNode.js";
-import { SubstractNode } from "../../../../tree/nodes/operators/substractNode.js";
+import { substract, SubstractNode, } from "../../../../tree/nodes/operators/substractNode.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
+import { random } from "../../../../utils/alea/random.js";
+const getInstruction = (identifiers) => {
+    const { solutionNodeIds, equationNodeIds } = identifiers;
+    const solution = reifyAlgebraic(solutionNodeIds, true);
+    const equation = reifyAlgebraic(equationNodeIds, true);
+    return `Le nombre $${solution.toTex()}$ est-il une solution de l'équation $${equation.toTex()}$ ?`;
+};
 function generateTrinomialFromRoot(root, constante) {
     const a = randint(1, 5);
     const r2 = randint(-10, 10, [0]);
@@ -14,63 +23,77 @@ function generateTrinomialFromRoot(root, constante) {
     const c = root * r2;
     return new Trinom(a, a * b, a * c + constante);
 }
-const getBinomialsTrinomialsProposedSolutionsQuestion = () => {
-    const degree = coinFlip();
+const getBinomialsTrinomialsProposedSolutionsQuestion = (opts) => {
+    const degree = opts?.degree === "Second degré"
+        ? 2
+        : opts?.degree === "Premier degré"
+            ? 1
+            : random([1, 2]);
     const constante = randint(-10, 10);
     const root = randint(-10, 10, [0]);
     const trinomial = generateTrinomialFromRoot(root, constante);
     const a1 = randint(-10, 10, [0]);
     const b1 = randint(-10, 10);
-    let a2;
-    do {
-        a2 = randint(-10, 10, [0]);
-    } while (a2 === a1);
+    const a2 = randint(-10, 10, [0, a1]);
     const b2 = randint(-10, 10);
     const binomial1 = new Affine(a1, b1);
     const binomial2 = new Affine(a2, b2);
-    const equation = degree
+    const equation = degree === 2
         ? new EqualNode(trinomial.toTree(), constante.toTree())
         : new EqualNode(binomial1.toTree(), binomial2.toTree());
-    const ans = degree
+    const ans = degree === 2
         ? root.toTree()
         : new FractionNode(new SubstractNode(binomial2.b.toTree(), binomial1.b.toTree()), new SubstractNode(binomial1.a.toTree(), binomial2.a.toTree())).simplify();
-    const answertype = coinFlip();
-    const solution = answertype ? ans : randint(-10, 10).toTree();
-    const answer = answertype ? "Oui" : "Non";
+    const isSol = coinFlip();
+    const solution = isSol ? ans : add(ans, randint(-2, 3, [0])).simplify();
+    const identifiers = {
+        equationNodeIds: equation.toIdentifiers(),
+        solutionNodeIds: solution.toIdentifiers(),
+    };
+    return getQuestionFromIdentifiers(identifiers, opts);
+};
+const getQuestionFromIdentifiers = (identifiers, opts) => {
     const question = {
-        answer: answer,
-        instruction: `Le nombre $${solution.toTex()}$ est-il une solution de l'équation $${equation.toTex()}$ ?`,
-        keys: [],
+        instruction: getInstruction(identifiers, opts),
         answerFormat: "raw",
-        identifiers: {
-            equationNodeIds: equation.toIdentifiers(),
-            solutionNodeIds: solution.toIdentifiers(),
-        },
+        identifiers,
     };
     return question;
 };
-const getPropositions = (n, { answer }) => {
+const getPropositions = (n, { answer, ...identifiers }, opts) => {
     const propositions = [];
-    addValidProp(propositions, answer, "raw");
+    const { solutionNodeIds, equationNodeIds } = identifiers;
+    const solution = reifyAlgebraic(solutionNodeIds, true);
+    const equation = reifyAlgebraic(equationNodeIds, true);
+    const allLeft = substract(equation.leftChild, equation.rightChild);
+    const ev = allLeft.toDetailedEvaluation({ x: solution }).simplify();
+    const isSol = ev.evaluate() === 0;
+    addValidProp(propositions, isSol ? "Oui" : "Non", "raw");
     tryToAddWrongProp(propositions, "Oui", "raw");
     tryToAddWrongProp(propositions, "Non", "raw");
     tryToAddWrongProp(propositions, "On ne peut pas savoir", "raw");
     return shuffleProps(propositions, n);
 };
-const isAnswerValid = (ans, { answer }) => {
-    return ans === answer;
-};
+const options = [
+    {
+        id: "degree",
+        label: "Degré de l'équation",
+        target: GeneratorOptionTarget.generation,
+        type: GeneratorOptionType.select,
+        defaultValue: "Les deux",
+        values: ["Premier degré", "Second degré", "Les deux"],
+    },
+];
 export const binomialsTrinomialsProposedSolutions = {
     id: "binomialsTrinomialsProposedSolutions",
     label: "Vérifier si un nombre est solution d'une équation",
-    levels: ["1rePro"],
     isSingleStep: true,
-    sections: ["Équations"],
-    generator: (nb) => getDistinctQuestions(getBinomialsTrinomialsProposedSolutionsQuestion, nb),
+    generator: (nb, opts) => getDistinctQuestions(() => getBinomialsTrinomialsProposedSolutionsQuestion(opts), nb),
     answerType: "QCU",
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
-    isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
+    options,
 };

package/lib/exercises/math/calculLitteral/equation/equa4.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"equa4.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equa4.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAkBrC;;GAEG;AAEH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAkGF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAoBvD,CAAC"}
+{"version":3,"file":"equa4.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equa4.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAkBrC;;GAEG;AAEH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAkGF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAkBvD,CAAC"}

package/lib/exercises/math/calculLitteral/equation/equa4.js

@@ -88,8 +88,6 @@ export const equationType4Exercise = {
     id: "equa4",
     connector: "\\iff",
     label: "Résoudre une équation du type  $ax+b=cx+d$",
-    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro", "1rePro", "1reTech"],
-    sections: ["Équations"],
     isSingleStep: false,
     generator: (nb) => getDistinctQuestions(getEquationType4ExerciseQuestion, nb),
     qcmTimer: 60,

package/lib/exercises/math/calculLitteral/equation/multiplicationEquation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"multiplicationEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/multiplicationEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAarC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAwHF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAiBxD,CAAC"}
+{"version":3,"file":"multiplicationEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/multiplicationEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAarC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA8HF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAiBxD,CAAC"}

package/lib/exercises/math/calculLitteral/equation/multiplicationEquation.js

@@ -67,6 +67,9 @@ const getMultiplicationEquation = () => {
         d = randint(-9, 10, [0]);
     } while (a / c === b / d);
     const identifiers = { a, b, c, d };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         instruction: getInstruction(identifiers),
         startStatement: getStartStatement(identifiers),

package/lib/exercises/math/calculLitteral/factorisation/factoIdRmq2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factoIdRmq2.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factoIdRmq2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAsBrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA+HF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAkB7C,CAAC"}
+{"version":3,"file":"factoIdRmq2.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factoIdRmq2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAsBrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAiIF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAkB7C,CAAC"}

package/lib/exercises/math/calculLitteral/factorisation/factoIdRmq2.js

@@ -89,16 +89,16 @@ const getPropositions = (n, { answer, a, b }) => {
     }
     return shuffle(propositions);
 };
-const isAnswerValid = (ans, { answer, a, b }) => {
+const isAnswerValid = (ans, { answer, ...identifiers }) => {
     try {
         const parsed = parseAlgebraic(ans);
-        if (!parsed)
-            return false;
         if (!isMultiplyNode(parsed) &&
             !isSquareNode(parsed) &&
             !isPowerNode(parsed))
             return false;
-        return parsed.simplify().toTex() === answer;
+        return (parsed
+            .simplify({ towardsDistribute: true, forbidFactorize: true })
+            .toTex() === getStartStatement(identifiers));
     }
     catch (err) {
         return handleVEAError(err);

package/lib/exercises/math/calculLitteral/factorisation/factoType1Exercise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factoType1Exercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factoType1Exercise.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAuBrC;;;GAGG;AACH,KAAK,WAAW,GAAG;IAEjB,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAIlB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAoKF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAepD,CAAC"}
+{"version":3,"file":"factoType1Exercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factoType1Exercise.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAuBrC;;;GAGG;AACH,KAAK,WAAW,GAAG;IAEjB,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAIlB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAoKF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAapD,CAAC"}

package/lib/exercises/math/calculLitteral/factorisation/factoType1Exercise.js

@@ -130,8 +130,6 @@ export const factoType1Exercise = {
     connector: "=",
     isSingleStep: false,
     label: "Factorisation du type $(ax+b)(cx+d) \\pm (ax+b)(ex+f)$",
-    levels: ["3ème", "2nde"],
-    sections: ["Calcul littéral"],
     generator: (nb) => getDistinctQuestions(getFactoType1Question, nb),
     qcmTimer: 60,
     freeTimer: 60,

package/lib/exercises/math/calculLitteral/simplifying/evaluateExpression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"evaluateExpression.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/simplifying/evaluateExpression.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAoFF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAkBpD,CAAC"}
+{"version":3,"file":"evaluateExpression.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/simplifying/evaluateExpression.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAUrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAoFF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAgBpD,CAAC"}

package/lib/exercises/math/calculLitteral/simplifying/evaluateExpression.js

@@ -84,8 +84,6 @@ export const evaluateExpression = {
     id: "evaluateExpression",
     connector: "=",
     label: "Évaluer une expression",
-    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro"],
-    sections: ["Calcul littéral"],
     isSingleStep: true,
     generator: (nb) => getDistinctQuestions(getEvaluateExpression, nb),
     qcmTimer: 60,

package/lib/exercises/math/calculLitteral/systems/basicNiceValuesSystemResolution.d.ts

@@ -1,7 +1,7 @@
 import { Exercise } from "../../../../exercises/exercise.js";
+import { NodeIdentifiers } from "../../../../tree/nodes/nodeConstructor.js";
 type Identifiers = {
-    coeffs: number[][];
-    isXAsked: boolean;
+    coeffsIds: NodeIdentifiers[][];
 };
 export declare const basicNiceValuesSystemResolution: Exercise<Identifiers>;
 export {};

package/lib/exercises/math/calculLitteral/systems/basicNiceValuesSystemResolution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"basicNiceValuesSystemResolution.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/systems/basicNiceValuesSystemResolution.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAOrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAgDF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAcjE,CAAC"}
+{"version":3,"file":"basicNiceValuesSystemResolution.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/systems/basicNiceValuesSystemResolution.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AASrC,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAKtE,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,eAAe,EAAE,EAAE,CAAC;CAIhC,CAAC;AA2EF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAgBjE,CAAC"}

package/lib/exercises/math/calculLitteral/systems/basicNiceValuesSystemResolution.js

@@ -1,44 +1,69 @@
 import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
-import { System, SystemConstructor } from "../../../../math/systems/system.js";
-import { randint } from "../../../../math/utils/random/randint.js";
-import { coinFlip } from "../../../../utils/alea/coinFlip.js";
+import { Point, PointConstructor } from "../../../../math/geometry/point.js";
+import { GeneralSystemConstructor, } from "../../../../math/systems/generalSystem.js";
+import { pointParser } from "../../../../tree/parsers/pointParser.js";
+import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
 //{ a1x + b1y = c1 , a2x + b2y = c2}
-const getBasicNiceValuesSystemResolutionQuestion = () => {
-    //need a1/b1 != a2/b2
-    const sys = SystemConstructor.niceValues();
-    const { x, y } = sys.solve();
-    const isXAsked = coinFlip();
-    const variable = isXAsked ? "x" : "y";
-    const answer = isXAsked ? x.toTex() : y.toTex();
-    const question = {
-        answer,
-        instruction: `Soit le système d'équations suivant :
-  
+const rebuildIdentifiers = (oldIds) => {
+    if (oldIds?.coeffsIds?.length)
+        return oldIds;
+    return {
+        coeffsIds: oldIds.coeffs.map((row) => row.map((e) => e.toTree())),
+    };
+};
+const getInstruction = (identifiers) => {
+    const sys = GeneralSystemConstructor.fromIdentifiers(identifiers);
+    return `Résoudre le système d'équations suivant :
+
 $$
 ${sys.toTex()}
 $$
-  
-  Que vaut $${variable}$ ?`,
+
+*Donner le couple solution sous la forme $\\left(x;y\\right)$ : par exemple, si la solution est $x=2$ et $y=3$, alors on écrira $\\left(2;3\\right)$.*`;
+};
+const getAnswer = (identifiers) => {
+    const sys = GeneralSystemConstructor.fromIdentifiers(identifiers);
+    const { x, y } = sys.solve();
+    return new Point("A", x, y).toCoords();
+};
+const getBasicSystemResolutionQuestion = () => {
+    const sys = GeneralSystemConstructor.niceValues();
+    const identifiers = {
+        coeffsIds: sys.toIdentifiers().coeffsIds,
+    };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: { coeffs: sys.coeffs, isXAsked },
+        identifiers,
     };
     return question;
 };
-const getPropositions = (n, { answer, coeffs, isXAsked }) => {
+const getPropositions = (n, { answer, ...identifiers }) => {
     const propositions = [];
-    const sys = new System(coeffs);
-    const { x, y } = sys.solve();
     addValidProp(propositions, answer);
-    tryToAddWrongProp(propositions, isXAsked ? y.toTex() : x.toTex());
+    // tryToAddWrongProp(propositions, isXAsked ? y.toTex() : x.toTex());
     while (propositions.length < n) {
-        tryToAddWrongProp(propositions, randint(-10, 11) + "");
+        const point = PointConstructor.random("A");
+        tryToAddWrongProp(propositions, point.toCoords());
     }
     return shuffleProps(propositions, n);
 };
-const isAnswerValid = (ans, { answer, coeffs, isXAsked }) => {
-    return ans === answer;
+const isAnswerValid = (ans, { answer, ...identifiers }) => {
+    try {
+        const parsed = pointParser(ans);
+        if (!parsed)
+            return false;
+        return parsed.simplify().toCoords() === answer;
+    }
+    catch (err) {
+        return handleVEAError(err);
+    }
 };
 export const basicNiceValuesSystemResolution = {
     id: "basicNiceValuesSystemResolution",
@@ -47,10 +72,12 @@ export const basicNiceValuesSystemResolution = {
     levels: ["2nde", "1reSpé"],
     isSingleStep: true,
     sections: ["Systèmes"],
-    generator: (nb) => getDistinctQuestions(getBasicNiceValuesSystemResolutionQuestion, nb),
+    generator: (nb) => getDistinctQuestions(getBasicSystemResolutionQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
+    rebuildIdentifiers,
 };

package/lib/exercises/math/calculLitteral/systems/basicSystemResolution.d.ts

@@ -1,7 +1,7 @@
 import { Exercise } from "../../../../exercises/exercise.js";
+import { NodeIdentifiers } from "../../../../tree/nodes/nodeConstructor.js";
 type Identifiers = {
-    coeffs: number[][];
-    isXAsked: boolean;
+    coeffsIds: NodeIdentifiers[][];
 };
 export declare const basicSystemResolution: Exercise<Identifiers>;
 export {};

package/lib/exercises/math/calculLitteral/systems/basicSystemResolution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"basicSystemResolution.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/systems/basicSystemResolution.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAMrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AA8DF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAcvD,CAAC"}
+{"version":3,"file":"basicSystemResolution.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/systems/basicSystemResolution.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AASrC,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAKtE,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,eAAe,EAAE,EAAE,CAAC;CAIhC,CAAC;AA6EF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAgBvD,CAAC"}