math-exercises 2.2.65 → 2.2.67

package/lib/exercises/math/calcul/fractions/fractionAndIntegerSum.d.ts

@@ -1,5 +1,6 @@
 import { Exercise } from "../../../../exercises/exercise";
 type Identifiers = {
+    isIntegerFirst: boolean;
     integer: number;
     rational: [number, number];
 };

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

@@ -1 +1 @@
-{"version":3,"file":"fractionAndIntegerSum.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionAndIntegerSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AA4ClC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AAgCF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAwBF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAehE,CAAC"}
+{"version":3,"file":"fractionAndIntegerSum.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionAndIntegerSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,cAAc,EAAE,OAAO,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC5B,CAAC;AA+FF,KAAK,OAAO,GAAG;IACb,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAcF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAgBhE,CAAC"}

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

@@ -4,35 +4,60 @@ exports.fractionAndIntegerSum = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const allowNonIrreductibleFractions_1 = require("../../../../exercises/options/allowNonIrreductibleFractions");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const rationalVEA_1 = require("../../../../exercises/vea/rationalVEA");
 const integer_1 = require("../../../../math/numbers/integer/integer");
 const rational_1 = require("../../../../math/numbers/rationals/rational");
 const randint_1 = require("../../../../math/utils/random/randint");
 const addNode_1 = require("../../../../tree/nodes/operators/addNode");
-const rationalParser_1 = require("../../../../tree/parsers/rationalParser");
+const fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
+const coinFlip_1 = require("../../../../utils/alea/coinFlip");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
+const rebuildIdentifiers = (oldIdentifiers) => {
+    if (oldIdentifiers.isIntegerFirst !== undefined)
+        return oldIdentifiers;
+    return {
+        integer: oldIdentifiers.integer,
+        isIntegerFirst: (0, coinFlip_1.coinFlip)(),
+        rational: oldIdentifiers.rational,
+    };
+};
+const getStatementNode = (identifiers) => {
+    const ratio = (0, fractionNode_1.frac)(identifiers.rational[0], identifiers.rational[1]);
+    const statement = identifiers.isIntegerFirst
+        ? (0, addNode_1.add)(identifiers.integer, ratio)
+        : (0, addNode_1.add)(ratio, identifiers.integer);
+    return statement;
+};
+const getInstruction = (identifiers, opts) => {
+    const statement = getStatementNode(identifiers);
+    return `Calculer ${opts?.allowNonIrreductible
+        ? ""
+        : "et donner le résultat sous la forme la plus simplifiée possible"} : 
+  
+$$
+${statement.toTex()}
+$$`;
+};
+const getAnswer = (identifiers, opts) => {
+    const answerTree = getStatementNode(identifiers);
+    return answerTree.simplify().toTex();
+};
 const getFractionAndIntegerSum = (opts) => {
     const rational = rational_1.RationalConstructor.randomIrreductible();
-    const integer = new integer_1.Integer((0, randint_1.randint)(-10, 11, [0]));
-    const statementTree = new addNode_1.AddNode(rational.toTree(), integer.toTree());
-    statementTree.shuffle();
-    const answerTree = rational.add(integer).toTree();
-    const answer = answerTree.toTex();
+    const integer = (0, randint_1.randint)(-10, 11, [0]);
+    const isIntegerFirst = (0, coinFlip_1.coinFlip)();
+    const identifiers = {
+        integer: integer,
+        rational: [rational.num, rational.denum],
+        isIntegerFirst,
+    };
     const question = {
-        instruction: `Calculer ${opts?.allowNonIrreductible
-            ? ""
-            : "et donner le résultat sous la forme la plus simplifiée possible"} : 
-  
-$$
-${statementTree.toTex()}
-$`,
-        startStatement: statementTree.toTex(),
-        answer,
+        instruction: getInstruction(identifiers, opts),
+        startStatement: getStatementNode(identifiers).toTex(),
+        answer: getAnswer(identifiers, opts),
         keys: [],
         answerFormat: "tex",
-        identifiers: {
-            integer: integer.value,
-            rational: [rational.num, rational.denum],
-        },
+        identifiers,
     };
     return question;
 };
@@ -52,30 +77,16 @@ const getPropositions = (n, { answer, integer, rational }) => {
     return (0, shuffle_1.shuffle)(propositions);
 };
 const options = [allowNonIrreductibleFractions_1.allowNonIrreductibleOption];
-const isAnswerValid = (ans, { integer, rational }, opts) => {
-    const integerObj = new integer_1.Integer(integer);
-    const rationalObj = new rational_1.Rational(rational[0], rational[1]);
-    const answerTree = rationalObj
-        .add(integerObj)
-        .toTree({ allowFractionToDecimal: true });
-    const texs = answerTree.toAllValidTexs();
-    if (opts?.allowNonIrreductible) {
-        const parsed = (0, rationalParser_1.rationalParser)(ans);
-        if (!parsed)
-            return false;
-        return texs.includes(parsed.simplify().toTex());
-    }
-    else {
-        return texs.includes(ans);
-    }
+const isAnswerValid = (ans, { answer, integer, rational }, opts) => {
+    return (0, rationalVEA_1.rationalVEA)(ans, answer, {
+        allowNonIrreductible: !!opts?.allowNonIrreductible,
+    });
 };
 exports.fractionAndIntegerSum = {
     id: "fractionAndIntegerSum",
     connector: "=",
     label: "Somme d'un entier et d'une fraction",
-    levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro", "1rePro"],
     isSingleStep: false,
-    sections: ["Fractions"],
     generator: (nb, opts) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getFractionAndIntegerSum(opts), nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -83,4 +94,7 @@ exports.fractionAndIntegerSum = {
     isAnswerValid,
     subject: "Mathématiques",
     options,
+    getAnswer,
+    getInstruction,
+    rebuildIdentifiers,
 };

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,0BAA0B,CAAC;AAWlC,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,0BAA0B,CAAC;AAUlC,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"}

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

@@ -1 +1 @@
-{"version":3,"file":"fractionsSumsMultiplesDenominators.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSumsMultiplesDenominators.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA2FF,eAAO,MAAM,kCAAkC,EAAE,QAAQ,CAAC,WAAW,CAkBpE,CAAC"}
+{"version":3,"file":"fractionsSumsMultiplesDenominators.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSumsMultiplesDenominators.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA2FF,eAAO,MAAM,kCAAkC,EAAE,QAAQ,CAAC,WAAW,CAkBpE,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"fractionsSumsPrimeDenominators.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSumsPrimeDenominators.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA6FF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,CAkBhE,CAAC"}
+{"version":3,"file":"fractionsSumsPrimeDenominators.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionsSumsPrimeDenominators.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA6FF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,CAkBhE,CAAC"}

package/lib/exercises/math/calcul/proportionality/findCoeffInProportionalTableNonIntegers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findCoeffInProportionalTableNonIntegers.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/findCoeffInProportionalTableNonIntegers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,0BAA0B,CAAC;AAiBlC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,GAAG,CAAC;IACd,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAqHF,KAAK,OAAO,GAAG;IACb,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAC;AAoBF,eAAO,MAAM,uCAAuC,EAAE,QAAQ,CAC5D,WAAW,EACX,OAAO,CAsBR,CAAC"}
+{"version":3,"file":"findCoeffInProportionalTableNonIntegers.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/findCoeffInProportionalTableNonIntegers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAiBT,MAAM,0BAA0B,CAAC;AAiBlC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,GAAG,CAAC;IACd,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAyHF,KAAK,OAAO,GAAG;IACb,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B,CAAC;AAoBF,eAAO,MAAM,uCAAuC,EAAE,QAAQ,CAC5D,WAAW,EACX,OAAO,CAsBR,CAAC"}

package/lib/exercises/math/calcul/proportionality/findCoeffInProportionalTableNonIntegers.js

@@ -51,10 +51,15 @@ const getKeys = (identifiers) => {
     return [];
 };
 const isAnswerValid = (ans, { answer }) => {
-    const parsed = (0, latexParser_1.parseAlgebraic)(ans);
-    if (!parsed)
+    try {
+        const parsed = (0, latexParser_1.parseAlgebraic)(ans);
+        if (!parsed)
+            return false;
+        return parsed.simplify().toTex() === answer;
+    }
+    catch (err) {
         return false;
-    return parsed.simplify().toTex() === answer;
+    }
 };
 const getFindCoeffInProportionalTableNonIntegersQuestion = (opts) => {
     let coeff;

package/lib/exercises/math/calculLitteral/distributivity/firstIdentity.js

@@ -30,7 +30,7 @@ const getFirstIdentityQuestion = () => {
         keys: ["x"],
         answerFormat: "tex",
         identifiers: { a: affine.a, b: affine.b },
-        hint: `Utilise l'identité remarquable 
+        hint: `Utilise l'identité remarquable :
     
 $$
 (a+b)^2 = a^2 + 2ab+b^2

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

@@ -0,0 +1 @@
+//# sourceMappingURL=choseOperationToSolveEquation.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"choseOperationToSolveEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/choseOperationToSolveEquation.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,122 @@
+"use strict";
+// import {
+//   Exercise,
+//   Proposition,
+//   QCMGenerator,
+//   Question,
+//   QuestionGenerator,
+//   VEA,
+//   addValidProp,
+//   shuffleProps,
+//   GetAnswer,
+//   GetHint,
+//   GetCorrection,
+//   GetInstruction,
+//   GetKeys,
+//   tryToAddWrongProp,
+// } from "../../../../exercises/exercise";
+// import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions";
+// import { randint } from "../../../../math/utils/random/randint";
+// import {
+//   EqualNode,
+//   EqualNodeConstructor,
+//   EqualNodeIdentifiers,
+// } from "../../../../tree/nodes/equations/equalNode";
+// import {
+//   NodeConstructor,
+//   NodeIdentifiers,
+// } from "../../../../tree/nodes/nodeConstructor";
+// type Identifiers = {
+//   equaIdentifiers: EqualNodeIdentifiers;
+// };
+// const getPropositions: QCMGenerator<Identifiers> = (n, { answer }) => {
+//   const propositions: Proposition[] = [];
+//   addValidProp(propositions, answer);
+//   tryToAddWrongProp(propositions, "une soustraction", "raw");
+//   tryToAddWrongProp(propositions, "une addition", "raw");
+//   tryToAddWrongProp(propositions, "une division", "raw");
+//   tryToAddWrongProp(propositions, "une multiplication", "raw");
+//   return shuffleProps(propositions, n);
+// };
+// const getAnswer: GetAnswer<Identifiers> = (identifiers) => {
+//   return;
+// };
+// const getInstruction: GetInstruction<Identifiers> = (identifiers) => {
+//   const equation = EqualNodeConstructor.fromIdentifiers(
+//     identifiers.equaIdentifiers,
+//   );
+//   return `Pour résoudre l'équation :
+// $$
+// ${equation.toTex()}
+// $$
+// il faut d'abord effectuer :
+// `;
+// };
+// // const getHint: GetHint<Identifiers> = (identifiers) => {};
+// // const getCorrection: GetCorrection<Identifiers> = (identifiers) => {};
+// const getKeys: GetKeys<Identifiers> = (identifiers) => {
+//   return [];
+// };
+// const isAnswerValid: VEA<Identifiers> = (ans, { answer }) => {
+//   throw Error("VEA not implemented");
+// };
+// const getChoseOperationToSolveEquationQuestion: QuestionGenerator<
+//   Identifiers
+// > = (ops) => {
+//   //ax=b avec a entier, ax+b = c tout entier, x/a = b tout entier, x+-a = b entiers ,
+//   let a: number;
+//   let b: number;
+//   let c: number | undefined;
+//   const type = randint(1, 7);
+//   switch (type) {
+//     case 1:
+//       //ax = b tous entiers
+//       a = randint(-10);
+//       break;
+//     case 2:
+//       break;
+//     case 3:
+//       break;
+//     case 4:
+//       break;
+//     case 5:
+//       break;
+//     case 6:
+//       break;
+//     case 7:
+//       break;
+//   }
+//   const identifiers: Identifiers = {};
+//   const question: Question<Identifiers> = {
+//     answer: getAnswer(identifiers),
+//     instruction: getInstruction(identifiers),
+//     keys: getKeys(identifiers),
+//     answerFormat: "tex",
+//     identifiers,
+//     // hint: getHint(identifiers),
+//     // correction: getCorrection(identifiers),
+//   };
+//   return question;
+// };
+// export const choseOperationToSolveEquation: Exercise<Identifiers> = {
+//   id: "choseOperationToSolveEquation",
+//   connector: "=",
+//   label:
+//     "Choisir la bonne opération pour résoudre une équation du premier degré",
+//   isSingleStep: true,
+//   generator: (nb, opts) =>
+//     getDistinctQuestions(
+//       () => getChoseOperationToSolveEquationQuestion(opts),
+//       nb,
+//     ),
+//   qcmTimer: 60,
+//   freeTimer: 60,
+//   getPropositions,
+//   isAnswerValid,
+//   subject: "Mathématiques",
+//   getInstruction,
+//   // getHint,
+//   // getCorrection,
+//   getAnswer,
+//   answerType: "QCU",
+// };

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

@@ -1,11 +1,17 @@
 import { Exercise } from "../../../../exercises/exercise";
+import { NodeIdentifiers } from "../../../../tree/nodes/nodeConstructor";
 /**
  *  type ax=b
  */
 type Identifiers = {
-    a: number;
-    b: number;
+    a: NodeIdentifiers;
+    b: NodeIdentifiers;
+    isXRight: boolean;
+    aNumberType: string;
 };
-export declare const equationType2Exercise: Exercise<Identifiers>;
+type Options = {
+    aNumberType: string[];
+};
+export declare const equationType2Exercise: Exercise<Identifiers, Options>;
 export {};
 //# sourceMappingURL=equationType2Exercise.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"equationType2Exercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationType2Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAiBlC;;GAEG;AACH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAoEF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAevD,CAAC"}
+{"version":3,"file":"equationType2Exercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationType2Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,0BAA0B,CAAC;AAsBlC,OAAO,EAEL,eAAe,EAChB,MAAM,kCAAkC,CAAC;AAK1C;;GAEG;AAGH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,eAAe,CAAC;IACnB,CAAC,EAAE,eAAe,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AA+GF,KAAK,OAAO,GAAG;IACb,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAaF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAiBhE,CAAC"}

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

@@ -5,7 +5,6 @@ const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
 const equationKeys_1 = require("../../../../exercises/utils/keys/equationKeys");
 const rational_1 = require("../../../../math/numbers/rationals/rational");
-const affine_1 = require("../../../../math/polynomials/affine");
 const randint_1 = require("../../../../math/utils/random/randint");
 const equationSolutionNode_1 = require("../../../../tree/nodes/equations/equationSolutionNode");
 const equalNode_1 = require("../../../../tree/nodes/equations/equalNode");
@@ -14,30 +13,59 @@ const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
 const alignTex_1 = require("../../../../utils/latex/alignTex");
 const fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
-const numberNode_1 = require("../../../../tree/nodes/numbers/numberNode");
-const getEquationType2ExerciseQuestion = () => {
-    const b = (0, randint_1.randint)(-10, 11);
-    const a = (0, randint_1.randint)(-9, 10, [0, 1]);
-    const solution = new rational_1.Rational(b, a).simplify();
-    const affine = new affine_1.Affine(a, 0).toTree();
-    const tree = new equalNode_1.EqualNode(affine, b.toTree());
-    const answer = new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), solution.toTree()).toTex();
+const coinFlip_1 = require("../../../../utils/alea/coinFlip");
+const random_1 = require("../../../../utils/alea/random");
+const generalAffine_1 = require("../../../../math/polynomials/generalAffine");
+const nodeConstructor_1 = require("../../../../tree/nodes/nodeConstructor");
+const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
+const addNode_1 = require("../../../../tree/nodes/operators/addNode");
+const rebuildIdentifiers = (oldIdentifiers) => {
+    if (!!oldIdentifiers.numberType)
+        return oldIdentifiers;
+    return {
+        a: oldIdentifiers.a.toTree().toIdentifiers(),
+        b: oldIdentifiers.b.toTree().toIdentifiers(),
+        isXRight: false,
+        aNumberType: "Entier",
+    };
+};
+const getEquationType2ExerciseQuestion = (opts) => {
+    const types = opts?.aNumberType ?? ["Entier"];
+    const b = (0, randint_1.randint)(-10, 11).toTree();
+    const type = (0, random_1.random)(types);
+    const a = type === "Entier"
+        ? (0, randint_1.randint)(-9, 10, [0, 1]).toTree()
+        : rational_1.RationalConstructor.randomIrreductibleWithSign().toTree();
+    const solution = (0, fractionNode_1.frac)(b, a).simplify();
+    const affine = new generalAffine_1.GeneralAffine(a, 0).toTree();
+    const isXRight = (0, coinFlip_1.coinFlip)();
+    const equalTree = new equalNode_1.EqualNode(affine, b);
+    const tree = isXRight ? equalTree.reverse() : equalTree;
+    const answer = new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), solution).toTex();
     const statementTex = tree.toTex();
+    const identifiers = {
+        a: a.toIdentifiers(),
+        b: b.toIdentifiers(),
+        isXRight,
+        aNumberType: type,
+    };
     const question = {
         instruction: `Résoudre : $${statementTex}$`,
         startStatement: statementTex,
         answer,
         keys: equationKeys_1.equationKeys,
         answerFormat: "tex",
-        identifiers: { a, b: b },
-        hint: `Il faut isoler $x$ à gauche. Pour cela, effectue l'opération des deux côtés de l'équation qui permet de supprimer la multiplication par $${a}$.`,
-        correction: `Pour isoler $x$ à gauche, on divise les deux côtés de l'équation par $${a}$: 
+        identifiers: identifiers,
+        hint: `Il faut isoler $x$ à ${isXRight ? "droite" : "gauche"}. Pour cela, effectue l'opération des deux côtés de l'équation qui permet de supprimer la multiplication par $${a.toTex()}$.`,
+        correction: `Pour isoler $x$ à ${isXRight ? "droite" : "gauche"}, on divise les deux côtés de l'équation par $${a.toTex()}$ : 
     
 ${(0, alignTex_1.alignTex)([
             [
                 `${statementTex}`,
                 "\\iff",
-                new equalNode_1.EqualNode(new fractionNode_1.FractionNode(affine, new numberNode_1.NumberNode(a)), new fractionNode_1.FractionNode(b.toTree(), new numberNode_1.NumberNode(a))).toTex(),
+                isXRight
+                    ? (0, equalNode_1.equal)((0, fractionNode_1.frac)(b, a), (0, fractionNode_1.frac)(affine, a)).toTex()
+                    : (0, equalNode_1.equal)((0, fractionNode_1.frac)(affine, a), (0, fractionNode_1.frac)(b, a)).toTex(),
             ],
             ["", "\\iff", answer],
         ])}
@@ -46,22 +74,39 @@ ${(0, alignTex_1.alignTex)([
     return question;
 };
 const getPropositions = (n, { answer, a, b }) => {
+    const aNode = nodeConstructor_1.NodeConstructor.fromIdentifiers(a);
+    const bNode = nodeConstructor_1.NodeConstructor.fromIdentifiers(b);
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, (0, substractNode_1.substract)(bNode, aNode).simplify().toTex());
     while (propositions.length < n) {
-        const wrongAnswer = new rational_1.Rational(b + (0, randint_1.randint)(-7, 8, [0, -b]), a + (0, randint_1.randint)(-7, 8, [-a, 0])).simplify();
-        (0, exercise_1.tryToAddWrongProp)(propositions, new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), wrongAnswer.toTree()).toTex());
+        const bEv = (0, randint_1.randint)(-7, 8, [0, -bNode.evaluate()]);
+        const a = (0, addNode_1.add)(aNode, (0, randint_1.randint)(-7, 8, [-aNode.evaluate(), 0]));
+        const wrongAnswer = (0, fractionNode_1.frac)(bEv, a).simplify();
+        (0, exercise_1.tryToAddWrongProp)(propositions, new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), wrongAnswer).toTex());
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
 const isAnswerValid = (ans, { a, b }) => {
-    const solution = new rational_1.Rational(b, a).simplify().toTree();
+    const aNode = nodeConstructor_1.NodeConstructor.fromIdentifiers(a);
+    const bNode = nodeConstructor_1.NodeConstructor.fromIdentifiers(b);
+    const solution = (0, fractionNode_1.frac)(bNode, aNode).simplify();
     const answerTree = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([solution]), {
         opts: { allowFractionToDecimal: true, allowRawRightChildAsSolution: true },
     });
     const validLatexs = answerTree.toAllValidTexs();
     return validLatexs.includes(ans);
 };
+const options = [
+    {
+        id: "aNumberType",
+        label: "Autoriser des fractions pour $a$",
+        target: exercise_1.GeneratorOptionTarget.generation,
+        type: exercise_1.GeneratorOptionType.multiselect,
+        defaultValue: ["Entier"],
+        values: ["Entier", "Rationnel"],
+    },
+];
 exports.equationType2Exercise = {
     id: "equa2",
     connector: "\\iff",
@@ -69,11 +114,13 @@ exports.equationType2Exercise = {
     levels: ["4ème", "3ème", "2nde", "CAP", "2ndPro", "1rePro", "1reTech"],
     sections: ["Équations"],
     isSingleStep: true,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getEquationType2ExerciseQuestion, nb),
+    generator: (nb, opts) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getEquationType2ExerciseQuestion(opts), nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
+    options,
+    rebuildIdentifiers,
 };

package/lib/exercises/math/functions/affines/algebricExpressionOfAffine.js

@@ -12,7 +12,7 @@ const getAlgebricExpressionOfAffineQuestion = () => {
     const question = {
         answer: f.toTex(),
         instruction: `Soit une fonction affine $f$ dont le coefficient directeur vaut $${a}$ et l'ordonnée à l'origine vaut $${b}$. Écrire l'expression algébrique de $f(x)$.`,
-        keys: ["x", "equal"],
+        keys: ["x"],
         answerFormat: "tex",
         identifiers: { a, b },
     };

package/lib/exercises/math/functions/trinoms/coefficientsIdentification.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"coefficientsIdentification.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/trinoms/coefficientsIdentification.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAMlC,OAAO,EAEL,eAAe,EAChB,MAAM,kCAAkC,CAAC;AAO1C,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,eAAe,CAAC;IAC9B,YAAY,EAAE,eAAe,CAAC;IAC9B,YAAY,EAAE,eAAe,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAmIF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAgB5D,CAAC"}
+{"version":3,"file":"coefficientsIdentification.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/trinoms/coefficientsIdentification.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAMlC,OAAO,EAEL,eAAe,EAChB,MAAM,kCAAkC,CAAC;AAO1C,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,eAAe,CAAC;IAC9B,YAAY,EAAE,eAAe,CAAC;IAC9B,YAAY,EAAE,eAAe,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAuIF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAgB5D,CAAC"}

package/lib/exercises/math/functions/trinoms/coefficientsIdentification.js

@@ -72,10 +72,15 @@ const getKeys = (identifiers) => {
     return [];
 };
 const isAnswerValid = (ans, { answer }) => {
-    const parsed = (0, latexParser_1.parseAlgebraic)(ans);
-    if (!parsed)
+    try {
+        const parsed = (0, latexParser_1.parseAlgebraic)(ans);
+        if (!parsed)
+            return false;
+        return parsed.simplify().toTex() === answer;
+    }
+    catch (err) {
         return false;
-    return parsed.simplify().toTex() === answer;
+    }
 };
 const getCoefficientsIdentificationQuestion = () => {
     const a = (0, random_1.random)([

package/lib/exercises/math/geometry/cartesian/distanceBetweenTwoPoints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"distanceBetweenTwoPoints.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/distanceBetweenTwoPoints.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAgHF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAc1D,CAAC"}
+{"version":3,"file":"distanceBetweenTwoPoints.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/distanceBetweenTwoPoints.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAkHF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAc1D,CAAC"}

package/lib/exercises/math/geometry/cartesian/distanceBetweenTwoPoints.js

@@ -18,7 +18,9 @@ const getDistanceBetweenTwoPoints = () => {
         .toTree()
         .toTex();
     const question = {
-        instruction: `Soit $${A.toTexWithCoords()}$ et $${B.toTexWithCoords()}$. Calculer la distance $AB$.`,
+        instruction: `Dans un repère orthonormé, soit deux points $${A.toTexWithCoords()}$ et $${B.toTexWithCoords()}$. 
+    
+Calculer la distance $AB$.`,
         startStatement: "AB",
         answer,
         keys: [],

package/lib/exercises/math/geometry/cartesian/drawAlineInGGB.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"drawAlineInGGB.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/drawAlineInGGB.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAIT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AA2DF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAahD,CAAC"}
+{"version":3,"file":"drawAlineInGGB.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/drawAlineInGGB.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAIT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AA2DF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAYhD,CAAC"}

package/lib/exercises/math/geometry/cartesian/drawAlineInGGB.js

@@ -64,8 +64,7 @@ exports.drawAlineInGGB = {
     answerType: "GGB",
     sections: ["Géométrie cartésienne"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getDrawAlineInGgbQuestion, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
+    ggbTimer: 60,
     isGGBAnswerValid,
     subject: "Mathématiques",
 };

package/lib/exercises/math/geometry/cartesian/placeAPoint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"placeAPoint.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/placeAPoint.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAIT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AA+B5C,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAY/C,CAAC"}
+{"version":3,"file":"placeAPoint.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/placeAPoint.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAIT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AA+B5C,eAAO,MAAM,aAAa,EAAE,QAAQ,CAAC,WAAW,CAW/C,CAAC"}

package/lib/exercises/math/geometry/cartesian/placeAPoint.js

@@ -40,8 +40,7 @@ exports.testGGBAnswer = {
     sections: ["Géométrie euclidienne"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getPlaceAPointQuestion, nb),
     answerType: "GGB",
-    qcmTimer: 60,
-    freeTimer: 60,
+    ggbTimer: 60,
     isGGBAnswerValid,
     subject: "Mathématiques",
 };

package/lib/exercises/math/geometry/euclidianConstructions/buildMediatriceWithCompass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildMediatriceWithCompass.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/euclidianConstructions/buildMediatriceWithCompass.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAalC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,EAAE,CAAC;IACZ,CAAC,EAAE,MAAM,EAAE,CAAC;CACb,CAAC;AAsGF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAe5D,CAAC"}
+{"version":3,"file":"buildMediatriceWithCompass.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/euclidianConstructions/buildMediatriceWithCompass.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAalC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,EAAE,CAAC;IACZ,CAAC,EAAE,MAAM,EAAE,CAAC;CACb,CAAC;AAsGF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAc5D,CAAC"}

package/lib/exercises/math/geometry/euclidianConstructions/buildMediatriceWithCompass.js

@@ -108,8 +108,7 @@ exports.buildMediatriceWithCompass = {
     isSingleStep: true,
     sections: [],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getBuildMediatriceWithCompassQuestion, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
+    ggbTimer: 60,
     getPropositions,
     isGGBAnswerValid,
     subject: "Mathématiques",

package/lib/exercises/math/geometry/vectors/drawAVectorInGGB.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"drawAVectorInGGB.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/vectors/drawAVectorInGGB.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAIT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAkCF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAalD,CAAC"}
+{"version":3,"file":"drawAVectorInGGB.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/vectors/drawAVectorInGGB.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAIT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAkCF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAYlD,CAAC"}

package/lib/exercises/math/geometry/vectors/drawAVectorInGGB.js

@@ -45,8 +45,7 @@ exports.drawAVectorInGGB = {
     isSingleStep: true,
     sections: ["Géométrie cartésienne"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getDrawAVectorInGgbQuestion, nb),
-    qcmTimer: 60,
-    freeTimer: 60,
+    ggbTimer: 60,
     answerType: "GGB",
     isGGBAnswerValid,
     subject: "Mathématiques",

package/lib/exercises/math/percent/applyPercent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"applyPercent.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/applyPercent.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,QAAQ,EAQT,MAAM,gBAAgB,CAAC;AAGxB,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAqFF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAwB9C,CAAC"}
+{"version":3,"file":"applyPercent.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/applyPercent.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,QAAQ,EAQT,MAAM,gBAAgB,CAAC;AAGxB,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAmFF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAwB9C,CAAC"}