math-exercises 2.2.92 → 2.2.94

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

@@ -0,0 +1,8 @@
+import { Exercise } from "../../../../exercises/exercise";
+type Identifiers = {
+    num: number;
+    denum: number;
+};
+export declare const fractionSquare: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=fractionSquare.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"fractionSquare.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/fractionSquare.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAelC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA6FF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAiBhD,CAAC"}

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

@@ -0,0 +1,106 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fractionSquare = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const rational_1 = require("../../../../math/numbers/rationals/rational");
+const fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
+const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
+const latexParser_1 = require("../../../../tree/parsers/latexParser");
+const alignTex_1 = require("../../../../utils/latex/alignTex");
+const getPropositions = (n, { answer, denum, num }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const fraction = (0, fractionNode_1.frac)(num, denum);
+    (0, exercise_1.tryToAddWrongProp)(propositions, (0, fractionNode_1.frac)(2 * num, 2 * denum).toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, (0, fractionNode_1.frac)((0, powerNode_1.square)(num), denum).simplify().toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, (0, fractionNode_1.frac)(num, (0, powerNode_1.square)(denum)).simplify().toTex());
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, rational_1.RationalConstructor.randomIrreductible().toTree().toTex());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const getStatementNode = (identifiers) => {
+    const { num, denum } = identifiers;
+    return (0, powerNode_1.square)((0, fractionNode_1.frac)(num, denum));
+};
+const getAnswer = (identifiers) => {
+    return getStatementNode(identifiers).simplify().toTex();
+};
+const getInstruction = (identifiers) => {
+    const statement = getStatementNode(identifiers);
+    return `Simplifier : 
+  
+$$
+${statement.toTex()}
+$$`;
+};
+const getHint = (identifiers) => {
+    return `Pour passer une fraction au carré, on met le numérateur au carré et le dénominateur au carré : 
+
+$$
+\\left(\\frac ab\\right)^2 = \\frac{a^2}{b^2}
+$$
+
+Ensuite, on simplifie la fraction obtenue si possible.`;
+};
+const getCorrection = (identifiers) => {
+    const statement = getStatementNode(identifiers);
+    const midStep = (0, fractionNode_1.frac)((0, powerNode_1.square)(identifiers.num), (0, powerNode_1.square)(identifiers.denum));
+    return `On met le numérateur et le dénominateur au carré : 
+
+${(0, alignTex_1.alignTex)([
+        [statement.toTex(), "=", midStep.toTex()],
+        ["", "=", getAnswer(identifiers)],
+    ])}`;
+};
+const getKeys = (identifiers) => {
+    return [];
+};
+const isAnswerValid = (ans, { answer }) => {
+    try {
+        const parsed = (0, latexParser_1.parseAlgebraic)(ans);
+        if (!parsed)
+            return false;
+        if (!(0, fractionNode_1.isFractionNode)(parsed))
+            return false;
+        return parsed.simplify().toTex() === answer;
+    }
+    catch (err) {
+        return false;
+    }
+};
+const getFractionSquareQuestion = (ops) => {
+    const rational = rational_1.RationalConstructor.randomIrreductible();
+    const identifiers = {
+        num: rational.num,
+        denum: rational.denum,
+    };
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "tex",
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
+    };
+    return question;
+};
+exports.fractionSquare = {
+    id: "fractionSquare",
+    connector: "=",
+    label: "Passer une fraction au carré",
+    isSingleStep: true,
+    generator: (nb, opts) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getFractionSquareQuestion(opts), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    getInstruction,
+    getHint,
+    getCorrection,
+    getAnswer,
+    hasHintAndCorrection: true,
+};

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

@@ -11,4 +11,5 @@ export * from "./fractionsSumsSameDenominators";
 export * from "./fractionsSumsMultiplesDenominators";
 export * from "./fractionsSumsPrimeDenominators";
 export * from "./fractionsOperations";
+export * from "./fractionSquare";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,iCAAiC,CAAC;AAChD,cAAc,sCAAsC,CAAC;AACrD,cAAc,kCAAkC,CAAC;AACjD,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/fractions/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAC;AAC7C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,iCAAiC,CAAC;AAChD,cAAc,sCAAsC,CAAC;AACrD,cAAc,kCAAkC,CAAC;AACjD,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC"}

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

@@ -27,3 +27,4 @@ __exportStar(require("./fractionsSumsSameDenominators"), exports);
 __exportStar(require("./fractionsSumsMultiplesDenominators"), exports);
 __exportStar(require("./fractionsSumsPrimeDenominators"), exports);
 __exportStar(require("./fractionsOperations"), exports);
+__exportStar(require("./fractionSquare"), exports);

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

@@ -1 +1,10 @@
+import { Exercise } from "../../../../exercises/exercise";
+type Identifiers = {
+    a: number;
+    b: number;
+    c?: number;
+    type: number;
+};
+export declare const choseOperationToSolveEquation: Exercise<Identifiers>;
+export {};
 //# sourceMappingURL=choseOperationToSolveEquation.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"choseOperationToSolveEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/choseOperationToSolveEquation.ts"],"names":[],"mappings":""}
+{"version":3,"file":"choseOperationToSolveEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/choseOperationToSolveEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAqJF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAqB/D,CAAC"}

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

@@ -1,129 +1,163 @@
 "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;
-//   type: number
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.choseOperationToSolveEquation = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const randint_1 = require("../../../../math/utils/random/randint");
+const equalNode_1 = require("../../../../tree/nodes/equations/equalNode");
+const addNode_1 = require("../../../../tree/nodes/operators/addNode");
+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 getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer, "raw");
+    (0, exercise_1.tryToAddWrongProp)(propositions, "une soustraction", "raw");
+    (0, exercise_1.tryToAddWrongProp)(propositions, "une addition", "raw");
+    (0, exercise_1.tryToAddWrongProp)(propositions, "une division", "raw");
+    (0, exercise_1.tryToAddWrongProp)(propositions, "une multiplication", "raw");
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const getAnswer = ({ a, b, type, c }) => {
+    switch (type) {
+        case 1:
+            //ax = b tous entiers
+            return "une division";
+        case 2:
+            // ax + b = c tous entiers
+            return "une soustraction";
+        case 3:
+            //ax-b = c tous entiers
+            return "une addition";
+        case 4:
+            //x/a = b tous entiers
+            return "une multiplication";
+        case 5:
+            //x+a = b
+            return "une soustraction";
+        case 6:
+        default:
+            //x-a = b
+            return "une addition";
+    }
+};
+const getStatementNode = (identifiers) => {
+    const { type } = identifiers;
+    const a = identifiers.a.toTree();
+    const b = identifiers.b.toTree();
+    const c = identifiers.c?.toTree();
+    switch (type) {
+        case 1:
+            //ax = b tous entiers
+            return new equalNode_1.EqualNode((0, multiplyNode_1.multiply)(a, "x"), b);
+        case 2:
+            // ax + b = c tous entiers
+            return new equalNode_1.EqualNode((0, addNode_1.add)((0, multiplyNode_1.multiply)(a, "x"), b), c);
+        case 3:
+            //ax-b = c tous entiers
+            return new equalNode_1.EqualNode((0, substractNode_1.substract)((0, multiplyNode_1.multiply)(a, "x"), b), c);
+        case 4:
+            //x/a = b tous entiers
+            return new equalNode_1.EqualNode((0, fractionNode_1.frac)("x", a), b);
+        case 5:
+            //x+a = b
+            return new equalNode_1.EqualNode((0, addNode_1.add)("x", a), b);
+        case 6:
+        default:
+            //x-a = b
+            return new equalNode_1.EqualNode((0, substractNode_1.substract)("x", a), b);
+    }
+};
+const getInstruction = (identifiers) => {
+    const { type, a, b, c } = identifiers;
+    const equation = getStatementNode(identifiers);
+    return `Pour résoudre l'équation :
+
+$$
+${equation.toTex()}
+$$
+
+il faut d'abord effectuer :
+`;
+};
+// const getHint: GetHint<Identifiers> = (identifiers) => {
 // };
-// 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(2, 10);
-//       b = randint(2, 10)
-//       break;
-//     case 2 :
-//      // ax + b = c tous entiers
-//      break;
-//     case 3:
-//         //ax-b = c tous entiers
-//       break;
-//     case 4:
-//       //x/a = b tous entiers
-//     break;
-//     case 5:
-//         //x+a = b
-//     break;
-//     case 6:
-//         //x-a = b
-//       break;
-//     case 7:
-//       break;
-//   }
-//   const identifiers: Identifiers = {type, };
-//   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",
+// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {
+//     return ``
 // };
+const getKeys = (identifiers) => {
+    return [];
+};
+const isAnswerValid = (ans, { answer }) => {
+    throw Error("VEA not implemented");
+};
+const getChoseOperationToSolveEquationQuestion = (opts) => {
+    //ax=b avec a entier, ax+b = c tout entier, x/a = b tout entier, x+-a = b entiers ,
+    let a;
+    let b;
+    let c;
+    const type = (0, randint_1.randint)(1, 7);
+    switch (type) {
+        case 1:
+            //ax = b tous entiers
+            a = (0, randint_1.randint)(2, 10);
+            b = (0, randint_1.randint)(1, 10);
+            break;
+        case 2:
+            // ax + b = c tous entiers
+            a = (0, randint_1.randint)(2, 10);
+            b = (0, randint_1.randint)(1, 10);
+            c = (0, randint_1.randint)(1, 10);
+            break;
+        case 3:
+            //ax-b = c tous entiers
+            a = (0, randint_1.randint)(2, 10);
+            b = (0, randint_1.randint)(1, 10);
+            c = (0, randint_1.randint)(1, 10);
+            break;
+        case 4:
+            //x/a = b tous entiers
+            a = (0, randint_1.randint)(2, 10);
+            b = (0, randint_1.randint)(1, 10);
+            break;
+        case 5:
+            //x+a = b
+            a = (0, randint_1.randint)(1, 10);
+            b = (0, randint_1.randint)(1, 10);
+            break;
+        case 6:
+        default:
+            //x-a = b
+            a = (0, randint_1.randint)(1, 10);
+            b = (0, randint_1.randint)(1, 10);
+            break;
+    }
+    const identifiers = { type, a, b, c };
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "tex",
+        identifiers,
+        // hint: getHint(identifiers),
+        // correction: getCorrection(identifiers),
+    };
+    return question;
+};
+exports.choseOperationToSolveEquation = {
+    id: "choseOperationToSolveEquation",
+    connector: "=",
+    label: "Choisir la bonne opération pour résoudre une équation du premier degré",
+    isSingleStep: true,
+    generator: (nb, opts) => (0, getDistinctQuestions_1.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/index.d.ts

@@ -12,4 +12,5 @@ export * from "./firstDegreeEquationIntType3";
 export * from "./equationFromSentenceExercise";
 export * from "./binomialsTrinomialsProposedSolutions";
 export * from "./equationWithDistributivity";
+export * from "./choseOperationToSolveEquation";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AACnC,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wCAAwC,CAAC;AACvD,cAAc,8BAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AACnC,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wCAAwC,CAAC;AACvD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iCAAiC,CAAC"}

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

@@ -28,3 +28,4 @@ __exportStar(require("./firstDegreeEquationIntType3"), exports);
 __exportStar(require("./equationFromSentenceExercise"), exports);
 __exportStar(require("./binomialsTrinomialsProposedSolutions"), exports);
 __exportStar(require("./equationWithDistributivity"), exports);
+__exportStar(require("./choseOperationToSolveEquation"), exports);

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

@@ -1 +1 @@
-{"version":3,"file":"factoIdRmq1.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factoIdRmq1.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAalC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAgGF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAc7C,CAAC"}
+{"version":3,"file":"factoIdRmq1.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factoIdRmq1.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,0BAA0B,CAAC;AAsBlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAqIF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAkB7C,CAAC"}

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

@@ -11,47 +11,75 @@ const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
 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: 1,
-        max: 10,
-    });
+const latexParser_1 = require("../../../../tree/parsers/latexParser");
+const getStatementNode = (identifiers) => {
+    const affine = new affine_1.Affine(identifiers.a, identifiers.b);
     const statementTree = affine.multiply(affine).toTree();
-    const aMonom = new affine_1.Affine(affine.a, 0).toTree();
-    const answerTree = new powerNode_1.PowerNode(affine.toTree(), new numberNode_1.NumberNode(2));
-    const answer = answerTree.toTex();
+    return statementTree;
+};
+const getStartStatement = (identifiers) => {
+    const statementTree = getStatementNode(identifiers);
     const statementTex = statementTree.toTex();
-    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 
+    return statementTex;
+};
+const getInstruction = (identifiers) => {
+    return `Factoriser : 
+ 
+$$
+${getStartStatement(identifiers)}
+$$`;
+};
+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 getCorrection = (identifiers) => {
+    const affine = new affine_1.Affine(identifiers.a, identifiers.b);
+    const aMonom = new affine_1.Affine(affine.a, 0).toTree();
+    const statementTex = getStartStatement(identifiers);
+    const answer = getAnswer(identifiers);
+    return `On utilise l'identité remarquable 
+  
 $$
 a^2 + 2ab+b^2 = (a+b)^2
 $$
-
+  
 en prenant $a=${aMonom.toTex()}$ et $b=${affine.b}$ : 
 
 ${(0, alignTex_1.alignTex)([
-            [
-                statementTex,
-                "=",
-                new addNode_1.AddNode(new addNode_1.AddNode(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 addNode_1.AddNode(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 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.simplify().toTex();
+    return answer;
+};
+const getFactoType1Question = () => {
+    const affine = affine_1.AffineConstructor.random({ min: 1, max: 10 }, {
+        min: 1,
+        max: 10,
+    });
+    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;
 };
@@ -65,18 +93,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, 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.factoIdRmq1 = {
     id: "factoIdRmq1",
@@ -92,4 +122,8 @@ exports.factoIdRmq1 = {
     isAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
+    getInstruction,
+    getAnswer,
+    getHint,
+    getCorrection,
 };

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,EAQT,MAAM,0BAA0B,CAAC;AAclC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAgGF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAc7C,CAAC"}
+{"version":3,"file":"factoIdRmq2.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factoIdRmq2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,0BAA0B,CAAC;AAuBlC,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"}