math-exercises 2.0.0 → 2.0.2

package/lib/exercises/powers/calculateNegativePower.d.ts

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

package/lib/exercises/powers/calculateNegativePower.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calculateNegativePower.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/calculateNegativePower.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAOlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA0CnB,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWnE,CAAC"}
+{"version":3,"file":"calculateNegativePower.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/calculateNegativePower.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAmEF,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAAC,WAAW,CAa5D,CAAC"}

package/lib/exercises/powers/calculateNegativePower.js

@@ -3,55 +3,71 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateNegativePower = void 0;
 const exercise_1 = require("../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
+const power_1 = require("../../math/numbers/integer/power");
 const rational_1 = require("../../math/numbers/rationals/rational");
 const randint_1 = require("../../math/utils/random/randint");
 const numberNode_1 = require("../../tree/nodes/numbers/numberNode");
+const fractionNode_1 = require("../../tree/nodes/operators/fractionNode");
 const powerNode_1 = require("../../tree/nodes/operators/powerNode");
 const getCalculatePowerQuestion = () => {
-    const int = (0, randint_1.randint)(0, 11);
+    const int = (0, randint_1.randint)(1, 11);
     const power = (0, randint_1.randint)(-5, 0);
     const statement = new powerNode_1.PowerNode(new numberNode_1.NumberNode(int), new numberNode_1.NumberNode(power)).toTex();
-    const answer = int === 0 ? '0' : new rational_1.Rational(1, int ** Math.abs(power)).simplify().toTree().toTex();
+    const answer = new rational_1.Rational(1, int ** Math.abs(power))
+        .simplify()
+        .toTree()
+        .toTex();
     const question = {
         answer,
         instruction: `Calculer : $${statement}$`,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, int, power },
+        answerFormat: "tex",
+        identifiers: { int, power },
     };
     return question;
 };
 const getPropositions = (n, { answer, int, power }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    (0, exercise_1.tryToAddWrongProp)(propositions, int * power + '');
-    (0, exercise_1.tryToAddWrongProp)(propositions, -(int ** Math.abs(power)) + '');
-    (0, exercise_1.tryToAddWrongProp)(propositions, int * power + '');
-    if (int < 0)
-        (0, exercise_1.tryToAddWrongProp)(propositions, -(int ** power) + '');
-    if (int === 0 || int === 1) {
-        (0, exercise_1.tryToAddWrongProp)(propositions, power + '');
-        (0, exercise_1.tryToAddWrongProp)(propositions, '0');
-        (0, exercise_1.tryToAddWrongProp)(propositions, '1');
-        (0, exercise_1.tryToAddWrongProp)(propositions, '-1');
-        (0, exercise_1.tryToAddWrongProp)(propositions, '2');
-        (0, exercise_1.tryToAddWrongProp)(propositions, -power + '');
+    (0, exercise_1.tryToAddWrongProp)(propositions, int * power + "");
+    (0, exercise_1.tryToAddWrongProp)(propositions, -(int ** Math.abs(power)) + "");
+    (0, exercise_1.tryToAddWrongProp)(propositions, int * power + "");
+    if (int === 1) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, power + "");
+        (0, exercise_1.tryToAddWrongProp)(propositions, "0");
+        (0, exercise_1.tryToAddWrongProp)(propositions, "1");
+        (0, exercise_1.tryToAddWrongProp)(propositions, "-1");
+        (0, exercise_1.tryToAddWrongProp)(propositions, "2");
+        (0, exercise_1.tryToAddWrongProp)(propositions, -power + "");
     }
     while (propositions.length < n) {
-        const wrongAnswer = new rational_1.Rational(1, int ** (0, randint_1.randint)(0, 6, [power])).simplify().toTree().toTex();
+        const wrongAnswer = new rational_1.Rational(1, int ** (0, randint_1.randint)(0, 6, [power]))
+            .simplify()
+            .toTree()
+            .toTex();
         (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
+const isAnswerValid = (ans, { int, power }) => {
+    const answerTree = new rational_1.Rational(1, int ** Math.abs(power))
+        .simplify()
+        .toTree({ allowFractionToDecimal: true });
+    const secondTree = new fractionNode_1.FractionNode(new numberNode_1.NumberNode(1), new power_1.Power(int, -power).simplify());
+    const texs = [...answerTree.toAllValidTexs(), ...secondTree.toAllValidTexs()];
+    console.log(texs);
+    return texs.includes(ans);
+};
 exports.calculateNegativePower = {
-    id: 'calculateNegativePower',
-    connector: '=',
-    label: 'Calculer une puissance négative',
-    levels: ['4ème', '3ème', '2ndPro', '2nde', 'CAP'],
+    id: "calculateNegativePower",
+    connector: "=",
+    label: "Calculer une puissance négative",
+    levels: ["4ème", "3ème", "2ndPro", "2nde", "CAP"],
     isSingleStep: true,
-    sections: ['Puissances'],
+    sections: ["Puissances"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getCalculatePowerQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/powers/calculatePower.d.ts

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

package/lib/exercises/powers/calculatePower.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"calculatePower.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/calculatePower.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA8CnB,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW3D,CAAC"}
+{"version":3,"file":"calculatePower.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/calculatePower.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAuDF,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,WAAW,CAapD,CAAC"}

package/lib/exercises/powers/calculatePower.js

@@ -10,52 +10,56 @@ const getCalculatePowerQuestion = () => {
     const int = (0, randint_1.randint)(-10, 11);
     const power = (0, randint_1.randint)(0, 6);
     const statement = new powerNode_1.PowerNode(new numberNode_1.NumberNode(int), new numberNode_1.NumberNode(power)).toTex();
-    const answer = int ** power + '';
+    const answer = int ** power + "";
     const question = {
         answer,
         instruction: `Calculer : $${statement}$`,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, int, power },
+        answerFormat: "tex",
+        identifiers: { int, power },
     };
     return question;
 };
 const getPropositions = (n, { answer, int, power }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    (0, exercise_1.tryToAddWrongProp)(propositions, int * power + '');
+    (0, exercise_1.tryToAddWrongProp)(propositions, int * power + "");
     if (int < 0)
-        (0, exercise_1.tryToAddWrongProp)(propositions, -(int ** power) + '');
+        (0, exercise_1.tryToAddWrongProp)(propositions, -(int ** power) + "");
     if (int === 0) {
-        (0, exercise_1.tryToAddWrongProp)(propositions, power + '');
-        (0, exercise_1.tryToAddWrongProp)(propositions, '1');
-        (0, exercise_1.tryToAddWrongProp)(propositions, -power + '');
-        (0, exercise_1.tryToAddWrongProp)(propositions, '-1');
-        (0, exercise_1.tryToAddWrongProp)(propositions, '2');
+        (0, exercise_1.tryToAddWrongProp)(propositions, power + "");
+        (0, exercise_1.tryToAddWrongProp)(propositions, "1");
+        (0, exercise_1.tryToAddWrongProp)(propositions, -power + "");
+        (0, exercise_1.tryToAddWrongProp)(propositions, "-1");
+        (0, exercise_1.tryToAddWrongProp)(propositions, "2");
     }
     if (int === 1 || int === -1) {
-        (0, exercise_1.tryToAddWrongProp)(propositions, power + '');
-        (0, exercise_1.tryToAddWrongProp)(propositions, '0');
-        (0, exercise_1.tryToAddWrongProp)(propositions, '1');
-        (0, exercise_1.tryToAddWrongProp)(propositions, '-1');
-        (0, exercise_1.tryToAddWrongProp)(propositions, '2');
-        (0, exercise_1.tryToAddWrongProp)(propositions, -power + '');
+        (0, exercise_1.tryToAddWrongProp)(propositions, power + "");
+        (0, exercise_1.tryToAddWrongProp)(propositions, "0");
+        (0, exercise_1.tryToAddWrongProp)(propositions, "1");
+        (0, exercise_1.tryToAddWrongProp)(propositions, "-1");
+        (0, exercise_1.tryToAddWrongProp)(propositions, "2");
+        (0, exercise_1.tryToAddWrongProp)(propositions, -power + "");
     }
     while (propositions.length < n) {
-        const wrongAnswer = int ** (0, randint_1.randint)(0, 6, [power]) + '';
+        const wrongAnswer = int ** (0, randint_1.randint)(0, 6, [power]) + "";
         (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
 exports.calculatePower = {
-    id: 'calculatePower',
-    connector: '=',
-    label: 'Calculer une puissance',
-    levels: ['4ème', '3ème', '2ndPro', '2nde', 'CAP'],
+    id: "calculatePower",
+    connector: "=",
+    label: "Calculer une puissance",
+    levels: ["4ème", "3ème", "2ndPro", "2nde", "CAP"],
     isSingleStep: true,
-    sections: ['Puissances'],
+    sections: ["Puissances"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getCalculatePowerQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/powers/decimalToScientific.d.ts

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

package/lib/exercises/powers/decimalToScientific.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decimalToScientific.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/decimalToScientific.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,YAAY,EAQb,MAAM,aAAa,CAAC;AAGrB,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAwCnB,eAAO,MAAM,mBAAmB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAwBhE,CAAC"}
+{"version":3,"file":"decimalToScientific.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/decimalToScientific.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,YAAY,EASb,MAAM,aAAa,CAAC;AAGrB,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAqDF,eAAO,MAAM,mBAAmB,EAAE,YAAY,CAAC,WAAW,CA0BzD,CAAC"}

package/lib/exercises/powers/decimalToScientific.js

@@ -14,7 +14,7 @@ const getDecimalToScientificQuestion = () => {
     const isZero = (0, probaFlip_1.probaFlip)(0.2);
     let intPart, dec;
     if (isZero) {
-        dec = decimal_1.DecimalConstructor.fromParts('0', decimal_1.DecimalConstructor.randomFracPart((0, randint_1.randint)(2, 5), (0, randint_1.randint)(1, 4)));
+        dec = decimal_1.DecimalConstructor.fromParts("0", decimal_1.DecimalConstructor.randomFracPart((0, randint_1.randint)(2, 5), (0, randint_1.randint)(1, 4)));
     }
     else {
         intPart = integer_1.IntegerConstructor.random((0, randint_1.randint)(2, 5));
@@ -27,8 +27,8 @@ const getDecimalToScientificQuestion = () => {
         startStatement: decTex,
         answer: answer,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, decimal: dec.value },
+        answerFormat: "tex",
+        identifiers: { decimal: dec.value },
     };
     return question;
 };
@@ -42,28 +42,35 @@ const getPropositions = (n, { answer, decimal }) => {
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
+const isAnswerValid = (ans, { decimal }) => {
+    const answerTree = new decimal_1.Decimal(decimal).toScientificNotation();
+    const texs = answerTree.toAllValidTexs({ forbidPowerToProduct: true });
+    console.log(ans, texs);
+    return texs.includes(ans);
+};
 exports.decimalToScientific = {
-    id: 'decimalToScientific',
-    connector: '=',
+    id: "decimalToScientific",
+    connector: "=",
     label: "Passer d'écriture décimale à écriture scientifique",
     levels: [
-        '5ème',
-        '4ème',
-        '3ème',
-        '2nde',
-        'CAP',
-        '2ndPro',
-        '1reESM',
-        '1rePro',
-        '1reSpé',
-        '1reTech',
-        'TermPro',
-        'TermTech',
+        "5ème",
+        "4ème",
+        "3ème",
+        "2nde",
+        "CAP",
+        "2ndPro",
+        "1reESM",
+        "1rePro",
+        "1reSpé",
+        "1reTech",
+        "TermPro",
+        "TermTech",
     ],
-    sections: ['Puissances'],
+    sections: ["Puissances"],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getDecimalToScientificQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

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

@@ -0,0 +1,10 @@
+export * from "./calculateNegativePower";
+export * from "./calculatePower";
+export * from "./decimalToScientific";
+export * from "./powerDefinition";
+export * from "./powersDivision";
+export * from "./powersOfTenToDecimal";
+export * from "./powersPower";
+export * from "./powersProduct";
+export * from "./scientificToDecimal";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC"}

package/lib/exercises/powers/index.js

@@ -0,0 +1,25 @@
+"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("./calculateNegativePower"), exports);
+__exportStar(require("./calculatePower"), exports);
+__exportStar(require("./decimalToScientific"), exports);
+__exportStar(require("./powerDefinition"), exports);
+__exportStar(require("./powersDivision"), exports);
+__exportStar(require("./powersOfTenToDecimal"), exports);
+__exportStar(require("./powersPower"), exports);
+__exportStar(require("./powersProduct"), exports);
+__exportStar(require("./scientificToDecimal"), exports);

package/lib/exercises/powers/powerDefinition.d.ts

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

package/lib/exercises/powers/powerDefinition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"powerDefinition.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/powerDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAsCnB,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW5D,CAAC"}
+{"version":3,"file":"powerDefinition.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/powerDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAqDF,eAAO,MAAM,eAAe,EAAE,YAAY,CAAC,WAAW,CAarD,CAAC"}

package/lib/exercises/powers/powerDefinition.js

@@ -9,22 +9,26 @@ const powerNode_1 = require("../../tree/nodes/operators/powerNode");
 const getPowerDefinitionQuestion = () => {
     const int = (0, randint_1.randint)(2, 11);
     const power = (0, randint_1.randint)(2, 6);
-    let statement = '';
+    let statement = "";
     for (let i = 0; i < power; i++) {
-        statement += int + '';
+        statement += int + "";
         if (i < power - 1)
-            statement += '\\times';
+            statement += "\\times";
     }
     const answer = new powerNode_1.PowerNode(new numberNode_1.NumberNode(int), new numberNode_1.NumberNode(power)).toTex();
     const question = {
         answer,
         instruction: `Écrire sous forme de puissance : $${statement}$`,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, int, power },
+        answerFormat: "tex",
+        identifiers: { int, power },
     };
     return question;
 };
+const isAnswerValid = (ans, { int, power }) => {
+    const answer = new powerNode_1.PowerNode(new numberNode_1.NumberNode(int), new numberNode_1.NumberNode(power)).toTex();
+    return ans === answer;
+};
 const getPropositions = (n, { answer, int, power }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
@@ -37,14 +41,15 @@ const getPropositions = (n, { answer, int, power }) => {
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
 exports.powerDefinition = {
-    id: 'powerDefinition',
-    connector: '=',
-    label: 'Écrire un produit sous forme de puissance',
-    levels: ['4ème', '3ème', '2ndPro', 'CAP'],
+    id: "powerDefinition",
+    connector: "=",
+    label: "Écrire un produit sous forme de puissance",
+    levels: ["4ème", "3ème", "2ndPro", "CAP"],
     isSingleStep: true,
-    sections: ['Puissances'],
+    sections: ["Puissances"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getPowerDefinitionQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/powers/powersDivision.d.ts

@@ -1,15 +1,13 @@
 /**
  * a^b/a^c
  */
-import { MathExercise } from '../exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../exercise";
+type Identifiers = {
     a: number;
     b: number;
     c: number;
 };
-type VEAProps = {};
-export declare const powersDivision: MathExercise<QCMProps, VEAProps>;
-export declare const powersOfTenDivision: MathExercise<QCMProps, VEAProps>;
+export declare const powersDivision: MathExercise<Identifiers>;
+export declare const powersOfTenDivision: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=powersDivision.d.ts.map

package/lib/exercises/powers/powersDivision.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"powersDivision.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/powersDivision.ts"],"names":[],"mappings":"AAAA;;GAEG;AAQH,OAAO,EACL,YAAY,EAOb,MAAM,aAAa,CAAC;AAGrB,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAqCnB,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW3D,CAAC;AACF,eAAO,MAAM,mBAAmB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWhE,CAAC"}
+{"version":3,"file":"powersDivision.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/powersDivision.ts"],"names":[],"mappings":"AAAA;;GAEG;AAQH,OAAO,EACL,YAAY,EAQb,MAAM,aAAa,CAAC;AAGrB,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAmDF,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,WAAW,CA2BpD,CAAC;AACF,eAAO,MAAM,mBAAmB,EAAE,YAAY,CAAC,WAAW,CAgBzD,CAAC"}

package/lib/exercises/powers/powersDivision.js

@@ -19,12 +19,12 @@ const getPowersDivisionQuestion = (opts) => {
     const answerTree = new power_1.Power(a, b - c).simplify();
     const answer = answerTree.toTex();
     const question = {
-        instruction: `Calculer : $${statement.toTex()}$`,
+        instruction: `Simplifier : $${statement.toTex()}$`,
         startStatement: statement.toTex(),
         answer,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a, b, c },
+        answerFormat: "tex",
+        identifiers: { a, b, c },
     };
     return question;
 };
@@ -39,27 +39,49 @@ const getPropositions = (n, { answer, a, b, c }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { a, b, c }) => {
+    const power = new power_1.Power(a, b - c);
+    const answerTree = power.simplify();
+    const texs = answerTree.toAllValidTexs();
+    const rawTex = power.toTree().toTex();
+    if (!texs.includes(rawTex))
+        texs.push(rawTex);
+    return texs.includes(ans);
+};
 exports.powersDivision = {
-    id: 'powersDivision',
-    connector: '=',
-    label: 'Division de puissances',
-    levels: ['4ème', '3ème', '2nde', '2ndPro', '1reESM', '1rePro', '1reSpé', '1reTech', 'TermPro', 'TermTech'],
-    sections: ['Puissances'],
+    id: "powersDivision",
+    connector: "=",
+    label: "Division de puissances",
+    levels: [
+        "4ème",
+        "3ème",
+        "2nde",
+        "2ndPro",
+        "1reESM",
+        "1rePro",
+        "1reSpé",
+        "1reTech",
+        "TermPro",
+        "TermTech",
+    ],
+    sections: ["Puissances"],
     isSingleStep: true,
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getPowersDivisionQuestion({ useOnlyPowersOfTen: true }), nb),
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getPowersDivisionQuestion({ useOnlyPowersOfTen: false }), nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };
 exports.powersOfTenDivision = {
-    id: 'powersOfTenDivision',
-    connector: '=',
-    label: 'Division de puissances de 10',
-    levels: ['4ème', '3ème', '2nde'],
-    sections: ['Puissances'],
+    id: "powersOfTenDivision",
+    connector: "=",
+    label: "Division de puissances de 10",
+    levels: ["4ème", "3ème", "2nde"],
+    sections: ["Puissances"],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getPowersDivisionQuestion({ useOnlyPowersOfTen: true }), nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/powers/powersOfTenToDecimal.d.ts

@@ -1,12 +1,10 @@
 /**
  * 10^(-x) into 0,0...1
  */
-import { MathExercise } from '../exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../exercise";
+type Identifiers = {
     randPower: number;
 };
-type VEAProps = {};
-export declare const powersOfTenToDecimal: MathExercise<QCMProps, VEAProps>;
+export declare const powersOfTenToDecimal: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=powersOfTenToDecimal.d.ts.map

package/lib/exercises/powers/powersOfTenToDecimal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"powersOfTenToDecimal.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/powersOfTenToDecimal.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH,OAAO,EACL,YAAY,EAOb,MAAM,aAAa,CAAC;AAGrB,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAkCnB,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAyBjE,CAAC"}
+{"version":3,"file":"powersOfTenToDecimal.d.ts","sourceRoot":"","sources":["../../../src/exercises/powers/powersOfTenToDecimal.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH,OAAO,EACL,YAAY,EAQb,MAAM,aAAa,CAAC;AAGrB,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA4CF,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,WAAW,CA2B1D,CAAC"}

package/lib/exercises/powers/powersOfTenToDecimal.js

@@ -15,15 +15,15 @@ const getPowersOfTenToDecimalQuestion = () => {
     const randPower = (0, randint_1.randint)(-9, 10);
     const statement = new powerNode_1.PowerNode(new numberNode_1.NumberNode(10), new numberNode_1.NumberNode(randPower));
     const answerTree = new power_1.Power(10, randPower).toDecimalWriting().toTree();
-    const answer = answerTree.toTex().replace('.', ',');
+    const answer = answerTree.toTex().replace(".", ",");
     const statementTex = statement.toTex();
     const question = {
         instruction: `Donner l'écriture décimale de : $${statementTex}$`,
         startStatement: statementTex,
         answer,
         keys: [],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, randPower },
+        answerFormat: "tex",
+        identifiers: { randPower },
     };
     return question;
 };
@@ -32,35 +32,41 @@ const getPropositions = (n, { answer, randPower }) => {
     (0, exercise_1.addValidProp)(propositions, answer);
     while (propositions.length < n) {
         const wrongPower = randPower + (0, randint_1.randint)(-3, 4, [0]);
-        const wrongAnswerTree = new power_1.Power(10, wrongPower).toDecimalWriting().toTree();
+        const wrongAnswerTree = new power_1.Power(10, wrongPower)
+            .toDecimalWriting()
+            .toTree();
         const wrongAnswer = wrongAnswerTree.toTex();
-        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer.replace(".", ","));
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
 exports.powersOfTenToDecimal = {
-    id: 'powersOfTenToDecimal',
-    connector: '=',
+    id: "powersOfTenToDecimal",
+    connector: "=",
     label: "Ecriture décimale d'une puissance de 10",
     levels: [
-        '5ème',
-        '4ème',
-        '3ème',
-        '2nde',
-        'CAP',
-        '2ndPro',
-        '1reESM',
-        '1rePro',
-        '1reSpé',
-        '1reTech',
-        'TermPro',
-        'TermTech',
+        "5ème",
+        "4ème",
+        "3ème",
+        "2nde",
+        "CAP",
+        "2ndPro",
+        "1reESM",
+        "1rePro",
+        "1reSpé",
+        "1reTech",
+        "TermPro",
+        "TermTech",
     ],
-    sections: ['Puissances'],
+    sections: ["Puissances"],
     isSingleStep: true,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getPowersOfTenToDecimalQuestion, nb, 19),
     qcmTimer: 60,
     freeTimer: 60,
     maxAllowedQuestions: 19,
     getPropositions,
+    isAnswerValid,
 };