math-exercises 2.0.0 → 2.0.2

package/lib/exercises/complex/index.js

@@ -0,0 +1,27 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./addComplex"), exports);
+// export * from "./argumentFromAlgebraicComplex";
+__exportStar(require("./conjugateComplex.ts"), exports);
+__exportStar(require("./conjugateDivideComplex"), exports);
+__exportStar(require("./conjugateMultiplyComplex"), exports);
+__exportStar(require("./divideComplex"), exports);
+__exportStar(require("./inverseComplex"), exports);
+__exportStar(require("./linearCombinaisonComplex"), exports);
+__exportStar(require("./moduloFromAlgebraicComplex"), exports);
+__exportStar(require("./mutiplyComplex"), exports);
+__exportStar(require("./reAndIm"), exports);

package/lib/exercises/complex/inverseComplex.d.ts

@@ -1,10 +1,8 @@
-import { MathExercise } from '../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../exercises/exercise";
+type Identifiers = {
     re: number;
     im: number;
 };
-type VEAProps = {};
-export declare const inverseComplex: MathExercise<QCMProps, VEAProps>;
+export declare const inverseComplex: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=inverseComplex.d.ts.map

package/lib/exercises/complex/inverseComplex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inverseComplex.d.ts","sourceRoot":"","sources":["../../../src/exercises/complex/inverseComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAkCnB,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW3D,CAAC"}
+{"version":3,"file":"inverseComplex.d.ts","sourceRoot":"","sources":["../../../src/exercises/complex/inverseComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AA0CF,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,WAAW,CAapD,CAAC"}

package/lib/exercises/complex/inverseComplex.js

@@ -11,10 +11,10 @@ const getInverseComplexQuestion = () => {
     const question = {
         answer,
         instruction: `Déterminer l'inverse de $z=${complex.toTree().toTex()}$.`,
-        keys: ['i'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, re: complex.re, im: complex.im },
-        startStatement: '\\frac{1}{z}',
+        keys: ["i"],
+        answerFormat: "tex",
+        identifiers: { re: complex.re, im: complex.im },
+        startStatement: "\\frac{1}{z}",
     };
     return question;
 };
@@ -32,15 +32,23 @@ const getPropositions = (n, { answer, re, im }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { re, im }) => {
+    const z = new complex_1.Complex(re, im);
+    const inv = z.inverseNode();
+    const texs = inv.toAllValidTexs({ allowFractionToDecimal: true });
+    console.log(texs);
+    return texs.includes(ans);
+};
 exports.inverseComplex = {
-    id: 'inverseComplex',
-    connector: '=',
+    id: "inverseComplex",
+    connector: "=",
     label: "Inverse d'un nombre complexe",
-    levels: ['MathExp'],
+    levels: ["MathExp"],
     isSingleStep: true,
-    sections: ['Nombres complexes'],
+    sections: ["Nombres complexes"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getInverseComplexQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/complex/linearCombinaisonComplex.d.ts

@@ -1,8 +1,10 @@
-import { MathExercise } from '../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../exercises/exercise";
+type Identifiers = {
+    a: number;
+    b: number;
+    z1: number[];
+    z2: number[];
 };
-type VEAProps = {};
-export declare const linearCombinaisonComplex: MathExercise<QCMProps, VEAProps>;
+export declare const linearCombinaisonComplex: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=linearCombinaisonComplex.d.ts.map

package/lib/exercises/complex/linearCombinaisonComplex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"linearCombinaisonComplex.d.ts","sourceRoot":"","sources":["../../../src/exercises/complex/linearCombinaisonComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAYlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAwCnB,eAAO,MAAM,wBAAwB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWrE,CAAC"}
+{"version":3,"file":"linearCombinaisonComplex.d.ts","sourceRoot":"","sources":["../../../src/exercises/complex/linearCombinaisonComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,EAAE,EAAE,MAAM,EAAE,CAAC;IACb,EAAE,EAAE,MAAM,EAAE,CAAC;CACd,CAAC;AAgDF,eAAO,MAAM,wBAAwB,EAAE,YAAY,CAAC,WAAW,CAa9D,CAAC"}

package/lib/exercises/complex/linearCombinaisonComplex.js

@@ -9,22 +9,22 @@ 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 simplify_1 = require("../../tree/parsers/simplify");
 const shuffle_1 = require("../../utils/shuffle");
 const getLinearCombinaisonComplexQuestion = () => {
     const z1 = complex_1.ComplexConstructor.random();
     const z2 = complex_1.ComplexConstructor.random();
     const a = (0, randint_1.randint)(-10, 11, [0]);
     const b = (0, randint_1.randint)(-10, 11, [0]);
-    const statement = (0, simplify_1.simplifyNode)(new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode('z_1')), new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(b), new variableNode_1.VariableNode('z_2'))));
-    //   const statement = simplify(`${a}z+${b}z'`);
-    const answer = (0, simplify_1.simplifyComplex)(new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), z1.toTree()), new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(b), z2.toTree()))).toTex();
+    const statement = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode("z_1")), new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(b), new variableNode_1.VariableNode("z_2")));
+    const answer = z1.times(a).add(z2.times(b)).toTree().toTex();
     const question = {
         answer,
-        instruction: `Soit $z_1=${z1.toTree().toTex()}$ et $z_2=${z2.toTree().toTex()}$. Calculer $${statement.toTex()}$.`,
-        keys: ['i', 'z', 'quote'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer },
+        instruction: `Soit $z_1=${z1.toTree().toTex()}$ et $z_2=${z2
+            .toTree()
+            .toTex()}$. Calculer $${statement.toTex()}$.`,
+        keys: ["i", "z", "quote"],
+        answerFormat: "tex",
+        identifiers: { a, b, z1: [z1.re, z1.im], z2: [z2.re, z2.im] },
     };
     return question;
 };
@@ -37,15 +37,23 @@ const getPropositions = (n, { answer }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { answer, a, b, z1, z2 }) => {
+    const complex1 = new complex_1.Complex(z1[0], z1[1]);
+    const complex2 = new complex_1.Complex(z2[0], z2[1]);
+    const answerTree = complex1.times(a).add(complex2.times(b)).toTree();
+    const texs = answerTree.toAllValidTexs();
+    return texs.includes(ans);
+};
 exports.linearCombinaisonComplex = {
-    id: 'linearCombinaisonComplex',
-    connector: '=',
-    label: 'Combinaison linéaire de deux nombres complexes',
-    levels: ['MathExp'],
+    id: "linearCombinaisonComplex",
+    connector: "=",
+    label: "Combinaison linéaire de deux nombres complexes",
+    levels: ["MathExp"],
     isSingleStep: true,
-    sections: ['Nombres complexes'],
+    sections: ["Nombres complexes"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getLinearCombinaisonComplexQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/complex/moduloFromAlgebraicComplex.d.ts

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

package/lib/exercises/complex/moduloFromAlgebraicComplex.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"moduloFromAlgebraicComplex.d.ts","sourceRoot":"","sources":["../../../src/exercises/complex/moduloFromAlgebraicComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AA4CF,eAAO,MAAM,0BAA0B,EAAE,YAAY,CAAC,WAAW,CAahE,CAAC"}

package/lib/exercises/complex/moduloFromAlgebraicComplex.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.moduloFromAlgebraicComplex = void 0;
+const exercise_1 = require("../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
+const complex_1 = require("../../math/complex/complex");
+const real_1 = require("../../math/numbers/reals/real");
+const randint_1 = require("../../math/utils/random/randint");
+const sqrtNode_1 = require("../../tree/nodes/functions/sqrtNode");
+const numberNode_1 = require("../../tree/nodes/numbers/numberNode");
+const getModuloFromAlgebraicComplexQuestion = () => {
+    const z = complex_1.ComplexConstructor.random();
+    const zTex = z.toTree().toTex();
+    const answer = z.toModuleTree().toTex();
+    const question = {
+        answer: answer,
+        instruction: `Soit $z=${zTex}$. Déterminer le module $|z|$ de $z$.`,
+        keys: [],
+        answerFormat: "tex",
+        identifiers: { re: z.re, im: z.im },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, re, im }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, new real_1.SquareRoot(re + im).simplify().toTree().toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, re ** 2 + im ** 2 + "");
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, `\\sqrt{${(0, randint_1.randint)(0, 100)}}`);
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { re, im }) => {
+    const z = new complex_1.Complex(re, im);
+    const answer = new sqrtNode_1.SqrtNode(new numberNode_1.NumberNode(z.moduleSquared()), {
+        allowSimplifySqrt: true,
+    });
+    const texs = answer.toAllValidTexs();
+    console.log(texs);
+    return texs.includes(ans);
+};
+exports.moduloFromAlgebraicComplex = {
+    id: "moduloFromAlgebraicComplex",
+    connector: "=",
+    label: "Déterminer le module d'un nombre complexe via sa forme algébrique",
+    levels: ["MathExp"],
+    isSingleStep: true,
+    sections: ["Nombres complexes"],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getModuloFromAlgebraicComplexQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+};

package/lib/exercises/complex/mutiplyComplex.d.ts

@@ -1,10 +1,8 @@
-import { MathExercise } from '../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../exercises/exercise";
+type Identifiers = {
     z1: number[];
     z2: number[];
 };
-type VEAProps = {};
-export declare const mutiplyComplex: MathExercise<QCMProps, VEAProps>;
+export declare const mutiplyComplex: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=mutiplyComplex.d.ts.map

package/lib/exercises/complex/mutiplyComplex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mutiplyComplex.d.ts","sourceRoot":"","sources":["../../../src/exercises/complex/mutiplyComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,EAAE,CAAC;IACb,EAAE,EAAE,MAAM,EAAE,CAAC;CACd,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAoCnB,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW3D,CAAC"}
+{"version":3,"file":"mutiplyComplex.d.ts","sourceRoot":"","sources":["../../../src/exercises/complex/mutiplyComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAKlC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,EAAE,CAAC;IACb,EAAE,EAAE,MAAM,EAAE,CAAC;CACd,CAAC;AAgDF,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,WAAW,CAapD,CAAC"}

package/lib/exercises/complex/mutiplyComplex.js

@@ -14,11 +14,13 @@ const getMutiplyComplexQuestion = () => {
     const answer = z1.multiply(z2).toTree().toTex();
     const question = {
         answer,
-        instruction: `Soit $z=${z1.toTree().toTex()}$ et $z'=${z2.toTree().toTex()}$. Calculer $z\\times z'$.`,
-        keys: ['i', 'z', 'quote'],
-        answerFormat: 'tex',
+        instruction: `Soit $z=${z1.toTree().toTex()}$ et $z'=${z2
+            .toTree()
+            .toTex()}$. Calculer $z\\times z'$.`,
+        keys: ["i", "z", "quote"],
+        answerFormat: "tex",
         startStatement: "z\\times z'",
-        qcmGeneratorProps: { answer, z1: [z1.re, z1.im], z2: [z2.re, z2.im] },
+        identifiers: { z1: [z1.re, z1.im], z2: [z2.re, z2.im] },
     };
     return question;
 };
@@ -33,15 +35,24 @@ const getPropositions = (n, { answer, z1, z2 }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { z1, z2 }) => {
+    const complex1 = new complex_1.Complex(z1[0], z1[1]);
+    const complex2 = new complex_1.Complex(z2[0], z2[1]);
+    const answer = complex1.multiply(complex2).toTree();
+    const texs = answer.toAllValidTexs();
+    console.log(ans, texs);
+    return texs.includes(ans);
+};
 exports.mutiplyComplex = {
-    id: 'mutiplyComplex',
-    connector: '=',
-    label: 'Multiplier deux nombres complexes',
-    levels: ['MathExp'],
+    id: "mutiplyComplex",
+    connector: "=",
+    label: "Multiplier deux nombres complexes",
+    levels: ["MathExp"],
     isSingleStep: true,
-    sections: ['Nombres complexes'],
+    sections: ["Nombres complexes"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getMutiplyComplexQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/complex/reAndIm.d.ts

@@ -1,11 +1,9 @@
-import { MathExercise } from '../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../exercises/exercise";
+type Identifiers = {
     re: number;
     im: number;
     isRe: boolean;
 };
-type VEAProps = {};
-export declare const reAndIm: MathExercise<QCMProps, VEAProps>;
+export declare const reAndIm: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=reAndIm.d.ts.map

package/lib/exercises/complex/reAndIm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reAndIm.d.ts","sourceRoot":"","sources":["../../../src/exercises/complex/reAndIm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAOlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAmCnB,eAAO,MAAM,OAAO,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAYpD,CAAC"}
+{"version":3,"file":"reAndIm.d.ts","sourceRoot":"","sources":["../../../src/exercises/complex/reAndIm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AA4CF,eAAO,MAAM,OAAO,EAAE,YAAY,CAAC,WAAW,CAa7C,CAAC"}

package/lib/exercises/complex/reAndIm.js

@@ -10,37 +10,41 @@ const shuffle_1 = require("../../utils/shuffle");
 const getReAndImQuestion = () => {
     const z1 = complex_1.ComplexConstructor.random();
     const isRe = (0, coinFlip_1.coinFlip)();
-    const answer = (isRe ? z1.re : z1.im) + '';
+    const answer = (isRe ? z1.re : z1.im) + "";
     const question = {
         answer,
-        instruction: `Soit $z=${z1.toTree().toTex()}$. Quelle est la partie ${isRe ? 'réelle' : 'imaginaire'} de $z$ ?`,
-        keys: ['i', 'z'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, re: z1.re, im: z1.im, isRe },
+        instruction: `Soit $z=${z1.toTree().toTex()}$. Quelle est la partie ${isRe ? "réelle" : "imaginaire"} de $z$ ?`,
+        keys: ["i", "z"],
+        answerFormat: "tex",
+        identifiers: { re: z1.re, im: z1.im, isRe },
     };
     return question;
 };
 const getPropositions = (n, { answer, re, im, isRe }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    (0, exercise_1.tryToAddWrongProp)(propositions, im + 'i');
+    (0, exercise_1.tryToAddWrongProp)(propositions, im + "i");
     (0, exercise_1.tryToAddWrongProp)(propositions, isRe ? im.toString() : re.toString());
     (0, exercise_1.tryToAddWrongProp)(propositions, (-im).toString());
     while (propositions.length < n) {
-        const wrongAnswer = (0, randint_1.randint)(-10, 11) + '';
+        const wrongAnswer = (0, randint_1.randint)(-10, 11) + "";
         (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
 exports.reAndIm = {
-    id: 'getReAndImQuestion',
-    connector: '=',
+    id: "getReAndImQuestion",
+    connector: "=",
     getPropositions,
-    label: 'Identifier partie réelle et partie imaginaire',
-    levels: ['MathExp'],
+    label: "Identifier partie réelle et partie imaginaire",
+    levels: ["MathExp"],
     isSingleStep: true,
-    sections: ['Nombres complexes'],
+    sections: ["Nombres complexes"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getReAndImQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
+    isAnswerValid,
 };

package/lib/exercises/conversion/aeraConversion.d.ts

@@ -1,11 +1,9 @@
-import { MathExercise } from '../exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../exercise";
+type Identifiers = {
     randomUnitIndex: number;
     randomUnitInstructionIndex: number;
     randomAera: number;
 };
-type VEAProps = {};
-export declare const aeraConversion: MathExercise<QCMProps, VEAProps>;
+export declare const aeraConversion: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=aeraConversion.d.ts.map

package/lib/exercises/conversion/aeraConversion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aeraConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/aeraConversion.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,YAAY,EAOb,MAAM,aAAa,CAAC;AAGrB,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,0BAA0B,EAAE,MAAM,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA0CnB,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAY3D,CAAC"}
+{"version":3,"file":"aeraConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/aeraConversion.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,YAAY,EAQb,MAAM,aAAa,CAAC;AAErB,KAAK,WAAW,GAAG;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,0BAA0B,EAAE,MAAM,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AA4DF,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,WAAW,CAYpD,CAAC"}

package/lib/exercises/conversion/aeraConversion.js

@@ -6,20 +6,26 @@ const randint_1 = require("../../math/utils/random/randint");
 const shuffle_1 = require("../../utils/shuffle");
 const exercise_1 = require("../exercise");
 const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
+const units = ["mm", "cm", "dm", "m", "dam", "hm", "km"];
 const getAeraConversion = () => {
-    const units = ['mm^2', 'cm^2', 'dm^2', 'm^2', 'dam^2', 'hm^2', 'km^2'];
     const randomUnitIndex = (0, randint_1.randint)(0, 7);
     const randomUnitInstructionIndex = (0, randint_1.randint)(
     // cette manip a pour but d'éviter des conversion de type km² --> cm² ou le contraire (chiffre trop grand/petit)
     randomUnitIndex - 2 < 0 ? 0 : randomUnitIndex - 2, randomUnitIndex + 2 > 7 ? 7 : randomUnitIndex + 3, [randomUnitIndex]);
     const randomAera = decimal_1.DecimalConstructor.random(0, 1000, (0, randint_1.randint)(0, 4));
-    const answer = (randomAera.multiplyByPowerOfTen(2 * (randomUnitIndex - randomUnitInstructionIndex)).value + '').replace('.', ',');
+    const answer = (randomAera.multiplyByPowerOfTen(2 * (randomUnitIndex - randomUnitInstructionIndex)).value + "").replace(".", ",");
     const question = {
-        instruction: `$${randomAera.value}$ $${units[randomUnitIndex]}$ = ... $${units[randomUnitInstructionIndex]}$`,
+        instruction: `Compléter : $${randomAera.value
+            .toString()
+            .replace(".", ",")} \\textrm{${units[randomUnitIndex]}}^2 = \\ldots \\textrm{${units[randomUnitInstructionIndex]}}^2$`,
         answer,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, randomAera: randomAera.value, randomUnitIndex, randomUnitInstructionIndex },
+        answerFormat: "tex",
+        identifiers: {
+            randomAera: randomAera.value,
+            randomUnitIndex,
+            randomUnitInstructionIndex,
+        },
     };
     return question;
 };
@@ -28,18 +34,25 @@ const getPropositions = (n, { answer, randomAera, randomUnitIndex, randomUnitIns
     (0, exercise_1.addValidProp)(propositions, answer);
     const aeraDecimal = new decimal_1.Decimal(randomAera);
     while (propositions.length < n) {
-        const wrongAnswer = aeraDecimal.multiplyByPowerOfTen(2 * (0, randint_1.randint)(-2, 4, [randomUnitIndex - randomUnitInstructionIndex])).value + '';
+        const wrongAnswer = aeraDecimal
+            .multiplyByPowerOfTen(2 * (0, randint_1.randint)(-2, 4, [randomUnitIndex - randomUnitInstructionIndex]))
+            .value.toString()
+            .replace(".", ",");
         (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
 exports.aeraConversion = {
-    id: 'aeraConversion',
-    connector: '=',
+    id: "aeraConversion",
+    connector: "=",
     getPropositions,
-    label: 'Conversion des aires',
-    levels: ['6ème', '5ème', 'CAP', '2ndPro'],
-    sections: ['Conversions'],
+    isAnswerValid,
+    label: "Conversion des aires",
+    levels: ["6ème", "5ème", "CAP", "2ndPro"],
+    sections: ["Conversions"],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAeraConversion, nb),
     qcmTimer: 60,

package/lib/exercises/conversion/capacityConversion.d.ts

@@ -1,11 +1,9 @@
-import { MathExercise } from '../exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../exercise";
+type Identifiers = {
     randomUnitIndex: number;
     randomUnitInstructionIndex: number;
     randomCapacity: number;
 };
-type VEAProps = {};
-export declare const capacityConversion: MathExercise<QCMProps, VEAProps>;
+export declare const capacityConversion: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=capacityConversion.d.ts.map

package/lib/exercises/conversion/capacityConversion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"capacityConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/capacityConversion.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,YAAY,EAOb,MAAM,aAAa,CAAC;AAIrB,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,0BAA0B,EAAE,MAAM,CAAC;IACnC,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAuCnB,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAY/D,CAAC"}
+{"version":3,"file":"capacityConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/capacityConversion.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,YAAY,EAQb,MAAM,aAAa,CAAC;AAGrB,KAAK,WAAW,GAAG;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,0BAA0B,EAAE,MAAM,CAAC;IACnC,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAuDF,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,WAAW,CAaxD,CAAC"}

package/lib/exercises/conversion/capacityConversion.js

@@ -6,18 +6,24 @@ const randint_1 = require("../../math/utils/random/randint");
 const shuffle_1 = require("../../utils/shuffle");
 const exercise_1 = require("../exercise");
 const getDistinctQuestions_1 = require("../utils/getDistinctQuestions");
+const units = ["mL", "cL", "dL", "L", "daL", "hL", "kL"];
 const getCapacityConversion = () => {
-    const units = ['mL', 'cL', 'dL', 'L', 'daL', 'hL', 'kL'];
     const randomUnitIndex = (0, randint_1.randint)(0, 7);
     const randomUnitInstructionIndex = (0, randint_1.randint)(0, 7, [randomUnitIndex]);
     const randomCapacity = decimal_1.DecimalConstructor.random(0, 1000, (0, randint_1.randint)(0, 4));
-    const answer = (randomCapacity.multiplyByPowerOfTen(randomUnitIndex - randomUnitInstructionIndex).value + '').replace('.', ',');
+    const answer = (randomCapacity.multiplyByPowerOfTen(randomUnitIndex - randomUnitInstructionIndex).value + "").replace(".", ",");
     const question = {
-        instruction: `$${randomCapacity.value}$ $${units[randomUnitIndex]}$ = ... $${units[randomUnitInstructionIndex]}$`,
+        instruction: `Compléter : $${randomCapacity.value
+            .toString()
+            .replace(".", ",")} \\textrm{${units[randomUnitIndex]}} = \\ldots \\textrm{${units[randomUnitInstructionIndex]}}$`,
         answer,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, randomCapacity: randomCapacity.value, randomUnitIndex, randomUnitInstructionIndex },
+        answerFormat: "tex",
+        identifiers: {
+            randomCapacity: randomCapacity.value,
+            randomUnitIndex,
+            randomUnitInstructionIndex,
+        },
     };
     return question;
 };
@@ -26,20 +32,27 @@ const getPropositions = (n, { answer, randomCapacity, randomUnitIndex, randomUni
     (0, exercise_1.addValidProp)(propositions, answer);
     const capacityDecimal = new decimal_1.Decimal(randomCapacity);
     while (propositions.length < n) {
-        const wrongAnswer = capacityDecimal.multiplyByPowerOfTen((0, randint_1.randint)(-3, 4, [randomUnitIndex - randomUnitInstructionIndex])).value + '';
+        const wrongAnswer = capacityDecimal
+            .multiplyByPowerOfTen((0, randint_1.randint)(-3, 4, [randomUnitIndex - randomUnitInstructionIndex]))
+            .value.toString()
+            .replace(".", ",");
         (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
 exports.capacityConversion = {
-    id: 'capacityConversion',
-    connector: '=',
+    id: "capacityConversion",
+    connector: "=",
     getPropositions,
-    label: 'Conversion de capacités',
-    levels: ['6ème', '5ème', 'CAP', '2ndPro'],
-    sections: ['Conversions'],
+    label: "Conversion de capacités",
+    levels: ["6ème", "5ème", "CAP", "2ndPro"],
+    sections: ["Conversions"],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getCapacityConversion, nb),
     qcmTimer: 60,
     freeTimer: 60,
+    isAnswerValid,
 };

package/lib/exercises/conversion/index.d.ts

@@ -0,0 +1,7 @@
+export * from "./aeraConversion";
+export * from "./capacityConversion";
+export * from "./lengthConversion";
+export * from "./massConversion";
+export * from "./volumeCapacityConversion";
+export * from "./volumeConversion";
+//# sourceMappingURL=index.d.ts.map

package/lib/exercises/conversion/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,oBAAoB,CAAC"}

package/lib/exercises/conversion/index.js

@@ -0,0 +1,22 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./aeraConversion"), exports);
+__exportStar(require("./capacityConversion"), exports);
+__exportStar(require("./lengthConversion"), exports);
+__exportStar(require("./massConversion"), exports);
+__exportStar(require("./volumeCapacityConversion"), exports);
+__exportStar(require("./volumeConversion"), exports);

package/lib/exercises/conversion/lengthConversion.d.ts

@@ -1,11 +1,9 @@
-import { MathExercise } from '../exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../exercise";
+type Identifiers = {
     randomUnitIndex: number;
     randomUnitInstructionIndex: number;
     randomLength: number;
 };
-type VEAProps = {};
-export declare const lengthConversion: MathExercise<QCMProps, VEAProps>;
+export declare const lengthConversion: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=lengthConversion.d.ts.map

package/lib/exercises/conversion/lengthConversion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lengthConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/lengthConversion.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,YAAY,EAOb,MAAM,aAAa,CAAC;AAIrB,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,0BAA0B,EAAE,MAAM,CAAC;IACnC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAuCnB,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW7D,CAAC"}
+{"version":3,"file":"lengthConversion.d.ts","sourceRoot":"","sources":["../../../src/exercises/conversion/lengthConversion.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,YAAY,EAQb,MAAM,aAAa,CAAC;AAIrB,KAAK,WAAW,GAAG;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,0BAA0B,EAAE,MAAM,CAAC;IACnC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAuDF,eAAO,MAAM,gBAAgB,EAAE,YAAY,CAAC,WAAW,CAYtD,CAAC"}