math-exercises 2.2.92 → 2.2.94

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

@@ -12,31 +12,39 @@ const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
 const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
 const alignTex_1 = require("../../../../utils/latex/alignTex");
 const shuffle_1 = require("../../../../utils/alea/shuffle");
-const gcd_1 = require("../../../../math/utils/arithmetic/gcd");
-const getFactoType1Question = () => {
-    const affine = affine_1.AffineConstructor.random({
-        min: 1,
-        max: 10,
-    }, { min: -9, max: 0 });
-    const statementTree = affine.multiply(affine).toTree();
-    const statementTex = statementTree.toTex();
+const latexParser_1 = require("../../../../tree/parsers/latexParser");
+const getInstruction = (identifiers) => {
+    return `Factoriser : 
+  
+$$
+${getStartStatement(identifiers)}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const affine = new affine_1.Affine(identifiers.a, identifiers.b);
     const answerTree = new powerNode_1.PowerNode(affine.toTree(), new numberNode_1.NumberNode(2));
-    const answer = answerTree.toTex();
-    const aMonom = new affine_1.Affine(affine.a, 0).toTree();
-    const question = {
-        instruction: `Factoriser : $${statementTex}$`,
-        startStatement: statementTex,
-        answer,
-        keys: ["x"],
-        answerFormat: "tex",
-        identifiers: { a: affine.a, b: affine.b },
-        hint: `Essaie de réécrire cette expression sous la forme 
+    const answer = answerTree.simplify().toTex();
+    return answer;
+};
+const getHint = (identifiers) => {
+    return `Essaie de réécrire cette expression sous la forme 
     
 $$
 a^2 - 2ab+b^2
-$$`,
-        correction: `
-On utilise l'identité remarquable 
+$$`;
+};
+const getStartStatement = (identifiers) => {
+    const affine = new affine_1.Affine(identifiers.a, identifiers.b);
+    const statementTree = affine.multiply(affine).toTree();
+    const statementTex = statementTree.toTex();
+    return statementTex;
+};
+const getCorrection = (identifiers) => {
+    const affine = new affine_1.Affine(identifiers.a, identifiers.b);
+    const answer = getAnswer(identifiers);
+    const statementTex = getStartStatement(identifiers);
+    const aMonom = new affine_1.Affine(affine.a, 0).toTree();
+    return `On utilise l'identité remarquable 
 
 $$
 a^2 - 2ab+b^2 = (a-b)^2
@@ -45,14 +53,30 @@ $$
 en prenant $a=${aMonom.toTex()}$ et $b=${-affine.b}$ : 
 
 ${(0, alignTex_1.alignTex)([
-            [
-                statementTex,
-                "=",
-                new addNode_1.AddNode(new substractNode_1.SubstractNode(new powerNode_1.SquareNode(aMonom), new multiplyNode_1.MultiplyNode((2).toTree(), new multiplyNode_1.MultiplyNode(aMonom, (-affine.b).toTree()))), new powerNode_1.SquareNode((-affine.b).toTree())).toTex(),
-            ],
-            ["", "=", answer],
-        ])}
-`,
+        [
+            statementTex,
+            "=",
+            new addNode_1.AddNode(new substractNode_1.SubstractNode(new powerNode_1.SquareNode(aMonom), new multiplyNode_1.MultiplyNode((2).toTree(), new multiplyNode_1.MultiplyNode(aMonom, (-affine.b).toTree()))), new powerNode_1.SquareNode((-affine.b).toTree())).toTex(),
+        ],
+        ["", "=", answer],
+    ])}
+`;
+};
+const getFactoType1Question = () => {
+    const affine = affine_1.AffineConstructor.random({
+        min: 1,
+        max: 10,
+    }, { min: -9, max: 0 });
+    const identifiers = { a: affine.a, b: affine.b };
+    const question = {
+        instruction: getInstruction(identifiers),
+        startStatement: getStartStatement(identifiers),
+        answer: getAnswer(identifiers),
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -67,18 +91,20 @@ const getPropositions = (n, { answer, a, b }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
-const isAnswerValid = (ans, { a, b }) => {
-    const affine = new affine_1.Affine(a, b);
-    const answerTree = new powerNode_1.SquareNode(affine.toTree());
-    const validLatexs = answerTree.toAllValidTexs();
-    const pgcd = (0, gcd_1.gcd)(a, Math.abs(b));
-    if (pgcd !== 1) {
-        const affine2 = new affine_1.Affine(a / pgcd, b / pgcd);
-        const coeff = pgcd ** 2;
-        const answerTree2 = new multiplyNode_1.MultiplyNode(coeff.toTree(), affine2.toTree());
-        validLatexs.push(...answerTree2.toAllValidTexs());
+const isAnswerValid = (ans, { answer, a, b }) => {
+    try {
+        const parsed = (0, latexParser_1.parseAlgebraic)(ans);
+        if (!parsed)
+            return false;
+        if (!(0, multiplyNode_1.isMultiplyNode)(parsed) &&
+            !(0, powerNode_1.isSquareNode)(parsed) &&
+            !(0, powerNode_1.isPowerNode)(parsed))
+            return false;
+        return parsed.simplify().toTex() === answer;
+    }
+    catch (err) {
+        return false;
     }
-    return validLatexs.includes(ans);
 };
 exports.factoIdRmq2 = {
     id: "factoIdRmq2",
@@ -94,4 +120,8 @@ exports.factoIdRmq2 = {
     isAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
+    getAnswer,
+    getCorrection,
+    getHint,
+    getInstruction,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"factoIdRmq3.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factoIdRmq3.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AA4HF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAc7C,CAAC"}
+{"version":3,"file":"factoIdRmq3.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factoIdRmq3.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAkBlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAmKF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAkB7C,CAAC"}

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

@@ -4,41 +4,41 @@ exports.factoIdRmq3 = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
 const affine_1 = require("../../../../math/polynomials/affine");
-const gcd_1 = require("../../../../math/utils/arithmetic/gcd");
 const randint_1 = require("../../../../math/utils/random/randint");
 const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
 const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
+const latexParser_1 = require("../../../../tree/parsers/latexParser");
 const alignTex_1 = require("../../../../utils/latex/alignTex");
-const getFactoType1Question = () => {
-    const affine = affine_1.AffineConstructor.random({
-        min: 1,
-        max: 11,
-    }, { excludes: [0] });
-    const affine2 = new affine_1.Affine(affine.a, -affine.b);
-    const statementTree = affine.multiply(affine2).toTree();
-    const statementTex = statementTree.toTex();
-    const bPositive = Math.abs(affine.b);
-    const aMonom = new multiplyNode_1.MultiplyNode(affine.a.toTree(), "x".toTree());
+const getAnswer = (identifiers) => {
+    const affine = new affine_1.Affine(identifiers.affine1Coeffs[1], identifiers.affine1Coeffs[0]);
+    const affine2 = new affine_1.Affine(identifiers.affine2Coeffs[1], identifiers.affine2Coeffs[0]);
     const answerTree = new multiplyNode_1.MultiplyNode(affine.toTree(), affine2.toTree());
-    const answer = answerTree.toTex();
-    const question = {
-        instruction: `Factoriser : $${statementTree.toTex()}$`,
-        startStatement: statementTree.toTex(),
-        answer,
-        keys: ["x"],
-        answerFormat: "tex",
-        identifiers: {
-            affine1Coeffs: affine.coefficients,
-            affine2Coeffs: affine2.coefficients,
-        },
-        hint: `Utilise l'identité remarquable 
+    const answer = answerTree.simplify().toTex();
+    return answer;
+};
+const getInstruction = (identifiers) => {
+    return `Factoriser : 
+  
+$$
+${getStartStatement(identifiers)}
+$$`;
+};
+const getHint = (identifiers) => {
+    return `Utilise l'identité remarquable 
     
 $$
 a^2 - b^2 = (a-b)(a+b)
-$$`,
-        correction: `
-On utilise l'identité remarquable 
+$$`;
+};
+const getCorrection = (identifiers) => {
+    const affine = new affine_1.Affine(identifiers.affine1Coeffs[1], identifiers.affine1Coeffs[0]);
+    const affine2 = new affine_1.Affine(identifiers.affine2Coeffs[1], identifiers.affine2Coeffs[0]);
+    const statementTex = getStartStatement(identifiers);
+    const answer = getAnswer(identifiers);
+    const bPositive = Math.abs(affine.b);
+    const aMonom = new multiplyNode_1.MultiplyNode(affine.a.toTree(), "x".toTree());
+    return `On utilise l'identité remarquable 
 
 $$
 a^2 - b^2=(a-b)(a+b)
@@ -47,13 +47,39 @@ $$
 en prenant $a=${aMonom.toTex()}$ et $b=${bPositive}$ : 
 
 ${(0, alignTex_1.alignTex)([
-            [
-                statementTex,
-                "=",
-                new substractNode_1.SubstractNode(new powerNode_1.SquareNode(aMonom), new powerNode_1.SquareNode(bPositive.toTree())).toTex(),
-            ],
-            ["", "=", answer],
-        ])}`,
+        [
+            statementTex,
+            "=",
+            new substractNode_1.SubstractNode(new powerNode_1.SquareNode(aMonom), new powerNode_1.SquareNode(bPositive.toTree())).toTex(),
+        ],
+        ["", "=", answer],
+    ])}`;
+};
+const getStartStatement = (identifiers) => {
+    const affine = new affine_1.Affine(identifiers.affine1Coeffs[1], identifiers.affine1Coeffs[0]);
+    const affine2 = new affine_1.Affine(identifiers.affine2Coeffs[1], identifiers.affine2Coeffs[0]);
+    const statementTree = affine.multiply(affine2).toTree();
+    return statementTree.toTex();
+};
+const getFactoType1Question = () => {
+    const affine = affine_1.AffineConstructor.random({
+        min: 1,
+        max: 11,
+    }, { excludes: [0] });
+    const affine2 = new affine_1.Affine(affine.a, -affine.b);
+    const identifiers = {
+        affine1Coeffs: affine.coefficients,
+        affine2Coeffs: affine2.coefficients,
+    };
+    const question = {
+        instruction: getInstruction(identifiers),
+        startStatement: getStartStatement(identifiers),
+        answer: getAnswer(identifiers),
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -72,21 +98,22 @@ const getPropositions = (n, { answer, affine1Coeffs, affine2Coeffs }) => {
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
-const isAnswerValid = (ans, { affine1Coeffs, affine2Coeffs }) => {
-    const affine = new affine_1.Affine(affine1Coeffs[1], affine1Coeffs[0]);
-    const affine2 = new affine_1.Affine(affine2Coeffs[1], affine2Coeffs[0]);
-    const answerTree = new multiplyNode_1.MultiplyNode(affine.toTree(), affine2.toTree());
-    const validLatexs = answerTree.toAllValidTexs();
-    const pgcd = (0, gcd_1.gcd)(Math.abs(affine1Coeffs[1]), Math.abs(affine1Coeffs[0]));
-    if (pgcd !== 1) {
-        const affineA = new affine_1.Affine(affine1Coeffs[1] / pgcd, affine1Coeffs[0] / pgcd);
-        const affineB = new affine_1.Affine(affine2Coeffs[1] / pgcd, affine2Coeffs[0] / pgcd);
-        const answer2 = new multiplyNode_1.MultiplyNode(affineA.toTree(), affineB.toTree());
-        const coeff = pgcd ** 2;
-        const answerTree2 = new multiplyNode_1.MultiplyNode(coeff.toTree(), answer2);
-        validLatexs.push(...answerTree2.toAllValidTexs());
+const isAnswerValid = (ans, { answer, ...identifiers }) => {
+    try {
+        const parsed = (0, latexParser_1.parseAlgebraic)(ans);
+        if (!parsed)
+            return false;
+        if (!(0, multiplyNode_1.isMultiplyNode)(parsed) &&
+            !(0, powerNode_1.isSquareNode)(parsed) &&
+            !(0, powerNode_1.isPowerNode)(parsed))
+            return false;
+        return (parsed
+            .simplify({ towardsDistribute: true, forbidFactorize: true })
+            .toTex() === getStartStatement(identifiers));
+    }
+    catch (err) {
+        return false;
     }
-    return validLatexs.includes(ans);
 };
 exports.factoIdRmq3 = {
     id: "factoIdRmq3",
@@ -102,4 +129,8 @@ exports.factoIdRmq3 = {
     isAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
+    getInstruction,
+    getHint,
+    getAnswer,
+    getCorrection,
 };

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,0BAA0B,CAAC;AAkBlC;;;GAGG;AACH,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAiKF,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,0BAA0B,CAAC;AAkBlC;;;GAGG;AACH,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAgKF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAepD,CAAC"}

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

@@ -102,7 +102,6 @@ const getPropositions = (n, { answer, affinesCoeffs, operation }) => {
 };
 const isAnswerValid = (ans, { answer, ...identifiers }) => {
     try {
-        console.log(ans, answer, identifiers);
         const parsed = (0, latexParser_1.parseAlgebraic)(ans);
         if (!parsed)
             return false;

package/lib/exercises/math/functions/affines/affineExpressionReading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"affineExpressionReading.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineExpressionReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAelC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AA+GF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAezD,CAAC"}
+{"version":3,"file":"affineExpressionReading.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineExpressionReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,0BAA0B,CAAC;AAiBlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAkIF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAezD,CAAC"}

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

@@ -13,13 +13,12 @@ const numberNode_1 = require("../../../../tree/nodes/numbers/numberNode");
 const addNode_1 = require("../../../../tree/nodes/operators/addNode");
 const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
-const getAffineExpressionReadingQuestion = () => {
-    const b = (0, randint_1.randint)(-5, 6);
-    const secondPoint = [(0, randint_1.randint)(-5, 6, [0]), (0, randint_1.randint)(-5, 6)];
-    const leadingCoeff = new rational_1.Rational(secondPoint[1] - b, secondPoint[0])
-        .simplify()
-        .toTree();
-    const answer = new equalNode_1.EqualNode(new variableNode_1.VariableNode("f(x)"), new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(leadingCoeff, new variableNode_1.VariableNode("x")), new numberNode_1.NumberNode(b)).simplify({ forceDistributeFractions: true, forbidFactorize: true })).toTex();
+const latexParser_1 = require("../../../../tree/parsers/latexParser");
+const getInstruction = () => {
+    return `Ci-dessous est tracée la courbe représentative d'une fonction affine $f$. Déterminer graphiquement l'expression algébrique de $f(x)$.`;
+};
+const getGGBOptions = (identifiers) => {
+    const { b, secondPoint } = identifiers;
     let xMin = Math.min(0, secondPoint[0]);
     let xMax = Math.max(0, secondPoint[0]);
     let yMin = Math.min(b, secondPoint[1]);
@@ -32,15 +31,29 @@ const getAffineExpressionReadingQuestion = () => {
     const ggb = new geogebraConstructor_1.GeogebraConstructor({
         commands,
     });
+    return ggb.getOptions({
+        coords: ggb.getAdaptedCoords({ xMin, xMax, yMin, yMax }),
+    });
+};
+const getAnswer = (identifiers) => {
+    const { b, secondPoint } = identifiers;
+    const leadingCoeff = new rational_1.Rational(secondPoint[1] - b, secondPoint[0])
+        .simplify()
+        .toTree();
+    const answer = new equalNode_1.EqualNode(new variableNode_1.VariableNode("f(x)"), new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(leadingCoeff, new variableNode_1.VariableNode("x")), new numberNode_1.NumberNode(b)).simplify({ forceDistributeFractions: true, forbidFactorize: true })).toTex();
+    return answer;
+};
+const getAffineExpressionReadingQuestion = () => {
+    const b = (0, randint_1.randint)(-5, 6);
+    const secondPoint = [(0, randint_1.randint)(-5, 6, [0]), (0, randint_1.randint)(-5, 6)];
+    const identifiers = { b, secondPoint };
     const question = {
-        answer,
-        instruction: `Ci-dessous est tracée la courbe représentative d'une fonction affine $f$. Déterminer graphiquement l'expression algébrique de $f(x)$.`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: ["fx", "equal", "x"],
-        ggbOptions: ggb.getOptions({
-            coords: ggb.getAdaptedCoords({ xMin, xMax, yMin, yMax }),
-        }),
+        ggbOptions: getGGBOptions(identifiers),
         answerFormat: "tex",
-        identifiers: { b, secondPoint },
+        identifiers,
     };
     return question;
 };
@@ -70,16 +83,25 @@ const getPropositions = (n, { answer, b, secondPoint }) => {
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
 const isAnswerValid = (ans, { answer, secondPoint, b }) => {
-    const leadingCoeff = new rational_1.Rational(secondPoint[1] - b, secondPoint[0])
-        .simplify()
-        .toTree();
-    const tree = new equalNode_1.EqualNode(new variableNode_1.VariableNode("f(x)"), new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(leadingCoeff, new variableNode_1.VariableNode("x")), new numberNode_1.NumberNode(b)).simplify({ forceDistributeFractions: true, forbidFactorize: true }), {
-        allowFractionToDecimal: true,
-        allowMinusAnywhereInFraction: true,
-        allowRawRightChildAsSolution: true,
-    });
-    const texs = tree.toAllValidTexs();
-    return texs.includes(ans);
+    try {
+        const formated = ans.replaceAll("f(x)", "").replaceAll("=", "");
+        const parsed = (0, latexParser_1.parseAlgebraic)(formated);
+        if (!parsed)
+            return false;
+        return ("f(x)=" +
+            parsed
+                .simplify({
+                forbidFactorize: true,
+                forceIsolateMonomCoeffs: true,
+                decimalToFractions: true,
+                forceDistributeFractions: true,
+            })
+                .toTex() ===
+            answer);
+    }
+    catch (err) {
+        return false;
+    }
 };
 exports.affineExpressionReading = {
     id: "affineExpressionReading",

package/lib/exercises/math/percent/findRightCalcul.d.ts

@@ -0,0 +1,10 @@
+import { Exercise } from "../../../exercises/exercise";
+type Identifiers = {
+    type: number;
+    price: number;
+    evolution: number;
+    askingFinalPrice: boolean;
+};
+export declare const findRightCalculForPriceEvolution: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=findRightCalcul.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"findRightCalcul.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/findRightCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AAoIF,eAAO,MAAM,gCAAgC,EAAE,QAAQ,CAAC,WAAW,CAiBlE,CAAC"}

package/lib/exercises/math/percent/findRightCalcul.js

@@ -0,0 +1,116 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findRightCalculForPriceEvolution = void 0;
+const exercise_1 = require("../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const randint_1 = require("../../../math/utils/random/randint");
+const addNode_1 = require("../../../tree/nodes/operators/addNode");
+const divideNode_1 = require("../../../tree/nodes/operators/divideNode");
+const fractionNode_1 = require("../../../tree/nodes/operators/fractionNode");
+const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
+const substractNode_1 = require("../../../tree/nodes/operators/substractNode");
+const coinFlip_1 = require("../../../utils/alea/coinFlip");
+const random_1 = require("../../../utils/alea/random");
+const getPropositions = (n, { answer, evolution, price, type }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    if (evolution > 0) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, multiplyNode_1.multiply)(price, (0, addNode_1.add)(1, (0, fractionNode_1.frac)(Math.abs(evolution), 100))).toTex());
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, multiplyNode_1.multiply)(price, Math.abs(evolution) / 100).toTex());
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, divideNode_1.divide)(price, Math.abs(evolution)).toTex());
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, divideNode_1.divide)(price, (0, addNode_1.add)(1, (0, fractionNode_1.frac)(Math.abs(evolution), 100))).toTex());
+    }
+    else {
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, multiplyNode_1.multiply)(price, (0, substractNode_1.substract)(1, (0, fractionNode_1.frac)(Math.abs(evolution), 100))).toTex());
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, multiplyNode_1.multiply)(price, Math.abs(evolution) / 100).toTex());
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, divideNode_1.divide)(price, Math.abs(evolution)).toTex());
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, divideNode_1.divide)(price, (0, substractNode_1.substract)(1, (0, fractionNode_1.frac)(Math.abs(evolution), 100))).toTex());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const getAnswer = (identifiers) => {
+    const { type, price, evolution, askingFinalPrice } = identifiers;
+    if (askingFinalPrice)
+        return (0, multiplyNode_1.multiply)(price, (evolution > 0 ? addNode_1.add : substractNode_1.substract)(1, (0, fractionNode_1.frac)(Math.abs(evolution), 100))).toTex();
+    else
+        return (0, multiplyNode_1.multiply)(price, Math.abs(evolution) / 100).toTex();
+};
+const getInstruction = (identifiers) => {
+    const { type, price, evolution, askingFinalPrice } = identifiers;
+    switch (type) {
+        case 1:
+            return `Un manteau coûte $${price}€$. Le magasin propose une réduction de $${Math.abs(evolution)}\\%$ sur cet article. Quel calcul peut-on faire pour trouver le ${askingFinalPrice
+                ? "nouveau prix de l'article"
+                : "montant de la réduction"} ?`;
+        case 2:
+            return `Le budget d'un club de sport est de $${price}€$. Suite à des pertes d'abonnés, ce budget diminuera de $${Math.abs(evolution)}\\%$ l'année prochaine. Quel calcul peut-on faire pour trouver le ${askingFinalPrice
+                ? "budget du club l'an prochain"
+                : "montant de la diminution"} ?`;
+        case 3:
+            return `L'abonnement à une plateforme de streaming coûte $${price}€$. Le mois prochain, ce prix augmentera de $${evolution}\\%$. Quel calcul peut-on faire pour trouver le ${askingFinalPrice
+                ? "nouveau prix de l'abonnement"
+                : "montant de l'augmentation"} ?`;
+        case 4:
+            return `Le salaire de M. Moulin est de $${price}€$. Le mois prochain, il recevra une augmentation de $${evolution}\\%$. Quel calcul peut-on faire pour trouver le ${askingFinalPrice
+                ? "nouveau salaire de M. Moulin"
+                : "montant de l'augmentation"} ?`;
+    }
+    return "";
+};
+// const getHint: GetHint<Identifiers> = (identifiers) => {
+//   return "";
+// };
+// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {
+//   return "";
+// };
+const getKeys = (identifiers) => {
+    return [];
+};
+const isAnswerValid = (ans, { answer }) => {
+    throw Error("VEA not implemented");
+};
+const getFindRightCalculQuestion = (ops) => {
+    const evolution = (0, randint_1.randint)(-6, 7, [0]) * 10;
+    const type = evolution < 0 ? (0, random_1.random)([1, 2]) : (0, random_1.random)([3, 4]);
+    const price = type === 1
+        ? (0, randint_1.randint)(30, 400)
+        : type === 2
+            ? 10000 * (0, randint_1.randint)(5, 20)
+            : type === 3
+                ? (0, randint_1.randint)(10, 50)
+                : (0, randint_1.randint)(1300, 2000);
+    const askingFinalPrice = (0, coinFlip_1.coinFlip)();
+    const identifiers = {
+        type,
+        price,
+        evolution,
+        askingFinalPrice,
+    };
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "tex",
+        identifiers,
+        // hint: getHint(identifiers),
+        // correction: getCorrection(identifiers),
+    };
+    return question;
+};
+exports.findRightCalculForPriceEvolution = {
+    id: "findRightCalculForPriceEvolution",
+    connector: "=",
+    label: "Choisir le bon calcul pour appliquer une évolution en pourcentage",
+    isSingleStep: true,
+    generator: (nb, opts) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getFindRightCalculQuestion(opts), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getInstruction,
+    // getHint,
+    // getCorrection,
+    getAnswer,
+    answerType: "QCU",
+};

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

@@ -1 +1 @@
-{"version":3,"file":"htToTTC.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/htToTTC.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AA6CF,eAAO,MAAM,OAAO,EAAE,QAAQ,CAAC,WAAW,CAczC,CAAC"}
+{"version":3,"file":"htToTTC.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/htToTTC.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAmEF,eAAO,MAAM,OAAO,EAAE,QAAQ,CAAC,WAAW,CAkBzC,CAAC"}

package/lib/exercises/math/percent/htToTTC.js

@@ -9,18 +9,23 @@ const round_1 = require("../../../math/utils/round");
 const numberParser_1 = require("../../../tree/parsers/numberParser");
 const coinFlip_1 = require("../../../utils/alea/coinFlip");
 const random_1 = require("../../../utils/alea/random");
-const getHtToTtcQuestion = () => {
-    const TVA = (0, random_1.random)([20, 5.5]);
-    const ht = (0, coinFlip_1.coinFlip)() ? (0, randint_1.randint)(50, 1000) : (0, randfloat_1.randfloat)(20, 200, 2);
+const getAnswer = (identifiers) => {
+    const { TVA, ht } = identifiers;
     const answer = (0, round_1.round)(ht * (1 + TVA / 100), 2).frenchify();
-    const question = {
-        answer,
-        instruction: `Un objet coûte $${ht.frenchify()}€$ en HT. Quel est son prix TTC, sachant que la TVA est de $${TVA.frenchify()}\\%$ ? (arrondir au centième)`,
-        keys: [],
-        answerFormat: "tex",
-        identifiers: { TVA, ht },
-        hint: `Pour augmenter un prix de $t\\%$, on le multiplie par $1 + \\frac{t}{100}$.`,
-        correction: `Pour augmenter $${ht.frenchify()}$ de $${TVA.frenchify()}\\%$, on le multiplie par :
+    return answer;
+};
+const getInstruction = (identifiers) => {
+    const { TVA, ht } = identifiers;
+    return `Un objet coûte $${ht.frenchify()}€$ en HT. Quel est son prix TTC, sachant que la TVA est de $${TVA.frenchify()}\\%$ ? (arrondir au centième)`;
+};
+const getHint = (identifiers) => {
+    const { TVA, ht } = identifiers;
+    return `Pour augmenter un prix de $t\\%$, on le multiplie par $1 + \\frac{t}{100}$.`;
+};
+const getCorrection = (identifiers) => {
+    const { TVA, ht } = identifiers;
+    const answer = getAnswer(identifiers);
+    return `Pour augmenter $${ht.frenchify()}$ de $${TVA.frenchify()}\\%$, on le multiplie par :
     
 $$
 1 + \\frac{${TVA.frenchify()}}{100} = ${(0, round_1.round)(1 + TVA / 100, 3).frenchify()}
@@ -31,7 +36,20 @@ Le prix TTC est donc :
 $$
 ${ht.frenchify()} \\times ${(0, round_1.round)(1 + TVA / 100, 3).frenchify()} = ${answer}
 $$
-`,
+`;
+};
+const getHtToTtcQuestion = () => {
+    const TVA = (0, random_1.random)([20, 5.5]);
+    const ht = (0, coinFlip_1.coinFlip)() ? (0, randint_1.randint)(50, 1000) : (0, randfloat_1.randfloat)(20, 200, 2);
+    const identifiers = { TVA, ht };
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: [],
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -62,4 +80,8 @@ exports.htToTTC = {
     isAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
+    getAnswer,
+    getInstruction,
+    getHint,
+    getCorrection,
 };

package/lib/exercises/math/percent/index.d.ts

@@ -15,4 +15,5 @@ export * from "./findStartValueAfterEvolution";
 export * from "./subPopulationEffectifFromPercent";
 export * from "./populationEffectifFromSubPopulation";
 export * from "./findEndValueAfterEvolution";
+export * from "./findRightCalcul";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,oCAAoC,CAAC;AACnD,cAAc,uCAAuC,CAAC;AACtD,cAAc,8BAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,oCAAoC,CAAC;AACnD,cAAc,uCAAuC,CAAC;AACtD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mBAAmB,CAAC"}

package/lib/exercises/math/percent/index.js

@@ -31,3 +31,5 @@ __exportStar(require("./findStartValueAfterEvolution"), exports);
 __exportStar(require("./subPopulationEffectifFromPercent"), exports);
 __exportStar(require("./populationEffectifFromSubPopulation"), exports);
 __exportStar(require("./findEndValueAfterEvolution"), exports);
+__exportStar(require("./findRightCalcul"), exports);
+// export * from "./percentWritings";