math-exercises 2.0.1 → 2.0.2

package/lib/exercises/calculLitteral/distributivity/firstIdentity.d.ts

@@ -1,12 +1,11 @@
-import { MathExercise, QCMGenerator, QuestionGenerator } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise, QCMGenerator, QuestionGenerator, VEA } from "../../../exercises/exercise";
+type Identifiers = {
     a: number;
     b: number;
 };
-type VEAProps = {};
-export declare const getFirstIdentityQuestion: QuestionGenerator<QCMProps, VEAProps>;
-export declare const getFirstIdentityPropositions: QCMGenerator<QCMProps>;
-export declare const firstIdentity: MathExercise<QCMProps, VEAProps>;
+export declare const getFirstIdentityQuestion: QuestionGenerator<Identifiers>;
+export declare const getFirstIdentityPropositions: QCMGenerator<Identifiers>;
+export declare const isFirstIdentityAnswerValid: VEA<Identifiers>;
+export declare const firstIdentity: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=firstIdentity.d.ts.map

package/lib/exercises/calculLitteral/distributivity/firstIdentity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"firstIdentity.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/firstIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,YAAY,EAEZ,iBAAiB,EAGlB,MAAM,0BAA0B,CAAC;AAYlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAGnB,eAAO,MAAM,wBAAwB,EAAE,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,CAe1E,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,QAAQ,CAe/D,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW1D,CAAC"}
+{"version":3,"file":"firstIdentity.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/firstIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAMF,eAAO,MAAM,wBAAwB,EAAE,iBAAiB,CAAC,WAAW,CAenE,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CA2BlE,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,GAAG,CAAC,WAAW,CAKvD,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,WAAW,CAYnD,CAAC"}

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.firstIdentity = exports.getFirstIdentityPropositions = exports.getFirstIdentityQuestion = void 0;
+exports.firstIdentity = exports.isFirstIdentityAnswerValid = exports.getFirstIdentityPropositions = exports.getFirstIdentityQuestion = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const integer_1 = require("../../../math/numbers/integer/integer");
@@ -11,7 +11,7 @@ const intervals_1 = require("../../../math/sets/intervals/intervals");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
 const shuffle_1 = require("../../../utils/shuffle");
-const interval = new intervals_1.Interval('[[1; 10]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
+const interval = new intervals_1.Interval("[[1; 10]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
 const getFirstIdentityQuestion = () => {
     const affine = affine_1.AffineConstructor.random(interval, interval);
     const statementTree = new powerNode_1.PowerNode(affine.toTree(), new numberNode_1.NumberNode(2));
@@ -20,9 +20,9 @@ const getFirstIdentityQuestion = () => {
         instruction: `Développer et réduire : $${statementTree.toTex()}$`,
         startStatement: statementTree.toTex(),
         answer,
-        keys: ['x'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a: affine.a, b: affine.b },
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers: { a: affine.a, b: affine.b },
     };
     return question;
 };
@@ -42,15 +42,23 @@ const getFirstIdentityPropositions = (n, { answer, a, b }) => {
     return (0, shuffle_1.shuffle)(propositions);
 };
 exports.getFirstIdentityPropositions = getFirstIdentityPropositions;
+const isFirstIdentityAnswerValid = (ans, { a, b }) => {
+    const affine = new affine_1.Affine(a, b);
+    const answer = affine.multiply(affine).toTree();
+    const texs = answer.toAllValidTexs();
+    return texs.includes(ans);
+};
+exports.isFirstIdentityAnswerValid = isFirstIdentityAnswerValid;
 exports.firstIdentity = {
-    id: 'idRmq1',
-    connector: '=',
-    label: 'Identité remarquable $(a+b)^2$',
-    levels: ['3ème', '2nde'],
-    sections: ['Calcul littéral'],
+    id: "idRmq1",
+    connector: "=",
+    label: "Identité remarquable $(a+b)^2$",
+    levels: ["3ème", "2nde"],
+    sections: ["Calcul littéral"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(exports.getFirstIdentityQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions: exports.getFirstIdentityPropositions,
+    isAnswerValid: exports.isFirstIdentityAnswerValid,
 };

package/lib/exercises/calculLitteral/distributivity/index.d.ts

@@ -0,0 +1,7 @@
+export * from "./allIdentities";
+export * from "./doubleDistributivity";
+export { firstIdentity } from "./firstIdentity";
+export { secondIdentity } from "./secondIdentity";
+export * from "./simpleDistributivity";
+export { thirdIdentity } from "./thirdIdentity";
+//# sourceMappingURL=index.d.ts.map

package/lib/exercises/calculLitteral/distributivity/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,cAAc,wBAAwB,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC"}

package/lib/exercises/calculLitteral/distributivity/index.js

@@ -0,0 +1,26 @@
+"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 });
+exports.thirdIdentity = exports.secondIdentity = exports.firstIdentity = void 0;
+__exportStar(require("./allIdentities"), exports);
+__exportStar(require("./doubleDistributivity"), exports);
+var firstIdentity_1 = require("./firstIdentity");
+Object.defineProperty(exports, "firstIdentity", { enumerable: true, get: function () { return firstIdentity_1.firstIdentity; } });
+var secondIdentity_1 = require("./secondIdentity");
+Object.defineProperty(exports, "secondIdentity", { enumerable: true, get: function () { return secondIdentity_1.secondIdentity; } });
+__exportStar(require("./simpleDistributivity"), exports);
+var thirdIdentity_1 = require("./thirdIdentity");
+Object.defineProperty(exports, "thirdIdentity", { enumerable: true, get: function () { return thirdIdentity_1.thirdIdentity; } });

package/lib/exercises/calculLitteral/distributivity/secondIdentity.d.ts

@@ -1,12 +1,11 @@
-import { MathExercise, QCMGenerator, QuestionGenerator } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise, QCMGenerator, QuestionGenerator, VEA } from "../../../exercises/exercise";
+type Identifiers = {
     a: number;
     b: number;
 };
-type VEAProps = {};
-export declare const getSecondIdentityQuestion: QuestionGenerator<QCMProps, VEAProps>;
-export declare const getSecondIdentityPropositions: QCMGenerator<QCMProps>;
-export declare const secondIdentity: MathExercise<QCMProps, VEAProps>;
+export declare const getSecondIdentityQuestion: QuestionGenerator<Identifiers>;
+export declare const getSecondIdentityPropositions: QCMGenerator<Identifiers>;
+export declare const isSecondIdentityAnswerValid: VEA<Identifiers>;
+export declare const secondIdentity: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=secondIdentity.d.ts.map

package/lib/exercises/calculLitteral/distributivity/secondIdentity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"secondIdentity.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/secondIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,YAAY,EAEZ,iBAAiB,EAGlB,MAAM,0BAA0B,CAAC;AAYlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAKnB,eAAO,MAAM,yBAAyB,EAAE,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,CAe3E,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,YAAY,CAAC,QAAQ,CAgBhE,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAY3D,CAAC"}
+{"version":3,"file":"secondIdentity.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/secondIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AASF,eAAO,MAAM,yBAAyB,EAAE,iBAAiB,CAAC,WAAW,CAepE,CAAC;AAEF,eAAO,MAAM,6BAA6B,EAAE,YAAY,CAAC,WAAW,CA4BnE,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,GAAG,CAAC,WAAW,CAQxD,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,YAAY,CAAC,WAAW,CAapD,CAAC"}

package/lib/exercises/calculLitteral/distributivity/secondIdentity.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.secondIdentity = exports.getSecondIdentityPropositions = exports.getSecondIdentityQuestion = void 0;
+exports.secondIdentity = exports.isSecondIdentityAnswerValid = exports.getSecondIdentityPropositions = exports.getSecondIdentityQuestion = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const integer_1 = require("../../../math/numbers/integer/integer");
@@ -11,8 +11,8 @@ const intervals_1 = require("../../../math/sets/intervals/intervals");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
 const shuffle_1 = require("../../../utils/shuffle");
-const intervalA = new intervals_1.Interval('[[0; 10]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
-const intervalB = new intervals_1.Interval('[[-10; 0]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
+const intervalA = new intervals_1.Interval("[[0; 10]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
+const intervalB = new intervals_1.Interval("[[-10; 0]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
 const getSecondIdentityQuestion = () => {
     const affine = affine_1.AffineConstructor.random(intervalA, intervalB);
     const statementTree = new powerNode_1.PowerNode(affine.toTree(), new numberNode_1.NumberNode(2));
@@ -21,9 +21,9 @@ const getSecondIdentityQuestion = () => {
         instruction: `Développer et réduire : $${statementTree.toTex()}$`,
         startStatement: statementTree.toTex(),
         answer,
-        keys: ['x'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a: affine.a, b: affine.b },
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers: { a: affine.a, b: affine.b },
     };
     return question;
 };
@@ -43,15 +43,23 @@ const getSecondIdentityPropositions = (n, { answer, a, b }) => {
     return (0, shuffle_1.shuffle)(propositions);
 };
 exports.getSecondIdentityPropositions = getSecondIdentityPropositions;
+const isSecondIdentityAnswerValid = (ans, { a, b }) => {
+    const affine = new affine_1.Affine(a, b);
+    const answer = affine.multiply(affine).toTree();
+    const texs = answer.toAllValidTexs();
+    return texs.includes(ans);
+};
+exports.isSecondIdentityAnswerValid = isSecondIdentityAnswerValid;
 exports.secondIdentity = {
-    id: 'idRmq2',
-    connector: '=',
-    label: 'Identité remarquable $(a-b)^2$',
-    levels: ['3ème', '2nde'],
-    sections: ['Calcul littéral'],
+    id: "idRmq2",
+    connector: "=",
+    label: "Identité remarquable $(a-b)^2$",
+    levels: ["3ème", "2nde"],
+    sections: ["Calcul littéral"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(exports.getSecondIdentityQuestion, nb),
     getPropositions: exports.getSecondIdentityPropositions,
+    isAnswerValid: exports.isSecondIdentityAnswerValid,
     qcmTimer: 60,
     freeTimer: 60,
 };

package/lib/exercises/calculLitteral/distributivity/simpleDistributivity.d.ts

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

package/lib/exercises/calculLitteral/distributivity/simpleDistributivity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"simpleDistributivity.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/simpleDistributivity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAWlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAsCnB,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWjE,CAAC"}
+{"version":3,"file":"simpleDistributivity.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/simpleDistributivity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAoDF,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,WAAW,CAa1D,CAAC"}

package/lib/exercises/calculLitteral/distributivity/simpleDistributivity.js

@@ -11,7 +11,7 @@ const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
 const shuffle_1 = require("../../../utils/shuffle");
 const excludeNbrs = [new integer_1.Integer(-1), new integer_1.Integer(0), new integer_1.Integer(1)];
-const interval = new intervals_1.Interval('[[-10; 10]]').difference(new discreteSet_1.DiscreteSet(excludeNbrs));
+const interval = new intervals_1.Interval("[[-10; 10]]").difference(new discreteSet_1.DiscreteSet(excludeNbrs));
 const getSimpleDistributivityQuestion = () => {
     const affine = affine_1.AffineConstructor.random(interval, interval);
     const coeff = interval.getRandomElement();
@@ -21,9 +21,9 @@ const getSimpleDistributivityQuestion = () => {
         instruction: `Développer et réduire : $${statementTree.toTex()}$`,
         startStatement: statementTree.toTex(),
         answer,
-        keys: ['x'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a: affine.a, b: affine.b, coeff: coeff.value },
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers: { a: affine.a, b: affine.b, coeff: coeff.value },
     };
     return question;
 };
@@ -40,15 +40,22 @@ const getPropositions = (n, { answer, a, b, coeff }) => {
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { a, b, coeff }) => {
+    const affine = new affine_1.Affine(a, b);
+    const answerTree = affine.times(coeff).toTree();
+    const validLatexs = answerTree.toAllValidTexs();
+    return validLatexs.includes(ans);
+};
 exports.simpleDistributivity = {
-    id: 'simpleDistri',
-    connector: '=',
-    label: 'Distributivité simple',
-    levels: ['3ème', '2nde', 'CAP', '2ndPro', '1reTech'],
-    sections: ['Calcul littéral'],
+    id: "simpleDistri",
+    connector: "=",
+    label: "Distributivité simple",
+    levels: ["3ème", "2nde", "CAP", "2ndPro", "1reTech"],
+    sections: ["Calcul littéral"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getSimpleDistributivityQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/calculLitteral/distributivity/thirdIdentity.d.ts

@@ -1,12 +1,11 @@
-import { MathExercise, QCMGenerator, QuestionGenerator } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise, QCMGenerator, QuestionGenerator, VEA } from "../../../exercises/exercise";
+type Identifiers = {
     affine1Coeffs: number[];
     affine2Coeffs: number[];
 };
-type VEAProps = {};
-export declare const getThirdIdentityQuestion: QuestionGenerator<QCMProps, VEAProps>;
-export declare const getThirdIdentityPropositions: QCMGenerator<QCMProps>;
-export declare const thirdIdentity: MathExercise<QCMProps, VEAProps>;
+export declare const getThirdIdentityQuestion: QuestionGenerator<Identifiers>;
+export declare const getThirdIdentityPropositions: QCMGenerator<Identifiers>;
+export declare const isThirdIdentityAnswerValid: VEA<Identifiers>;
+export declare const thirdIdentity: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=thirdIdentity.d.ts.map

package/lib/exercises/calculLitteral/distributivity/thirdIdentity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"thirdIdentity.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/thirdIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,YAAY,EAEZ,iBAAiB,EAGlB,MAAM,0BAA0B,CAAC;AAUlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAInB,eAAO,MAAM,wBAAwB,EAAE,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,CAe1E,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,QAAQ,CAgB/D,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAY1D,CAAC"}
+{"version":3,"file":"thirdIdentity.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/thirdIdentity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAEZ,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAGJ,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAMF,eAAO,MAAM,wBAAwB,EAAE,iBAAiB,CAAC,WAAW,CAkBnE,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CAyBlE,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,GAAG,CAAC,WAAW,CAUvD,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,WAAW,CAYnD,CAAC"}

package/lib/exercises/calculLitteral/distributivity/thirdIdentity.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.thirdIdentity = exports.getThirdIdentityPropositions = exports.getThirdIdentityQuestion = void 0;
+exports.thirdIdentity = exports.isThirdIdentityAnswerValid = exports.getThirdIdentityPropositions = exports.getThirdIdentityQuestion = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const integer_1 = require("../../../math/numbers/integer/integer");
@@ -9,7 +9,7 @@ const discreteSet_1 = require("../../../math/sets/discreteSet");
 const intervals_1 = require("../../../math/sets/intervals/intervals");
 const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
 const shuffle_1 = require("../../../utils/shuffle");
-const interval = new intervals_1.Interval('[[-10; 10]]').difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
+const interval = new intervals_1.Interval("[[-10; 10]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
 const getThirdIdentityQuestion = () => {
     const affine = affine_1.AffineConstructor.random(interval, interval);
     const affine2 = new affine_1.Affine(affine.a, -affine.b);
@@ -19,9 +19,12 @@ const getThirdIdentityQuestion = () => {
         instruction: `Développer et réduire : $${statementTree.toTex()}$`,
         startStatement: statementTree.toTex(),
         answer,
-        keys: ['x'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, affine1Coeffs: affine.coefficients, affine2Coeffs: affine2.coefficients },
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers: {
+            affine1Coeffs: affine.coefficients,
+            affine2Coeffs: affine2.coefficients,
+        },
     };
     return question;
 };
@@ -43,15 +46,24 @@ const getThirdIdentityPropositions = (n, { answer, affine1Coeffs, affine2Coeffs
     return (0, shuffle_1.shuffle)(propositions);
 };
 exports.getThirdIdentityPropositions = getThirdIdentityPropositions;
+const isThirdIdentityAnswerValid = (ans, { affine1Coeffs, affine2Coeffs }) => {
+    const affine = new affine_1.Affine(affine1Coeffs[1], affine1Coeffs[0]);
+    const affine2 = new affine_1.Affine(affine2Coeffs[1], affine2Coeffs[0]);
+    const answer = affine.multiply(affine2).toTree();
+    const texs = answer.toAllValidTexs();
+    return texs.includes(ans);
+};
+exports.isThirdIdentityAnswerValid = isThirdIdentityAnswerValid;
 exports.thirdIdentity = {
-    id: 'idRmq3',
-    connector: '=',
-    label: 'Identité remarquable $(a+b)(a-b)$',
-    levels: ['3ème', '2nde'],
-    sections: ['Calcul littéral'],
+    id: "idRmq3",
+    connector: "=",
+    label: "Identité remarquable $(a+b)(a-b)$",
+    levels: ["3ème", "2nde"],
+    sections: ["Calcul littéral"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(exports.getThirdIdentityQuestion, nb),
     getPropositions: exports.getThirdIdentityPropositions,
+    isAnswerValid: exports.isThirdIdentityAnswerValid,
     qcmTimer: 60,
     freeTimer: 60,
 };

package/lib/exercises/calculLitteral/equation/equationSimpleSquare.d.ts

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

package/lib/exercises/calculLitteral/equation/equationSimpleSquare.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"equationSimpleSquare.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/equationSimpleSquare.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAelC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA8EnB,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWjE,CAAC"}
+{"version":3,"file":"equationSimpleSquare.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/equationSimpleSquare.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AA0BlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AA4IF,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,WAAW,CAY1D,CAAC"}

package/lib/exercises/calculLitteral/equation/equationSimpleSquare.js

@@ -3,11 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.equationSimpleSquare = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
+const equationKeys_1 = require("../../../exercises/utils/keys/equationKeys");
+const rational_1 = require("../../../math/numbers/rationals/rational");
+const real_1 = require("../../../math/numbers/reals/real");
 const randint_1 = require("../../../math/utils/random/randint");
+const equationSolutionNode_1 = require("../../../tree/nodes/equations/equationSolutionNode");
+const oppositeNode_1 = require("../../../tree/nodes/functions/oppositeNode");
+const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
+const discreteSetNode_1 = require("../../../tree/nodes/sets/discreteSetNode");
 const coinFlip_1 = require("../../../utils/coinFlip");
 const diceFlip_1 = require("../../../utils/diceFlip");
+const isInt_1 = require("../../../utils/isInt");
 const random_1 = require("../../../utils/random");
-const shuffle_1 = require("../../../utils/shuffle");
 const squares = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12].map((el) => el ** 2);
 const higherFactor = (n) => {
     for (let i = Math.floor(Math.sqrt(n)); i > 0; i--)
@@ -17,7 +24,6 @@ const higherFactor = (n) => {
 };
 const getEquationSimpleSquare = () => {
     let randNbr = (0, randint_1.randint)(-20, 101);
-    let answer;
     const rand = (0, diceFlip_1.diceFlip)(3);
     if (rand === 0)
         randNbr = (0, randint_1.randint)(-20, 0);
@@ -27,58 +33,97 @@ const getEquationSimpleSquare = () => {
         randNbr = (0, randint_1.randint)(2, 100);
     const instruction = `Résoudre l'équation : $x^2 = ${randNbr}$`;
     const sqrt = Math.sqrt(randNbr);
-    if (randNbr < 0)
-        answer = `S=\\emptyset`;
-    else if (sqrt === Math.floor(sqrt))
-        answer = `S=\\left\\{-${sqrt};${sqrt}\\right\\}`;
+    let solutionsSet;
+    if (randNbr < 0) {
+        solutionsSet = new discreteSetNode_1.DiscreteSetNode([]);
+    }
+    else if (sqrt === Math.floor(sqrt)) {
+        if (sqrt === 0)
+            solutionsSet = new discreteSetNode_1.DiscreteSetNode([new numberNode_1.NumberNode(0)]);
+        else
+            solutionsSet = new discreteSetNode_1.DiscreteSetNode([
+                new numberNode_1.NumberNode(-sqrt),
+                new numberNode_1.NumberNode(+sqrt),
+            ]);
+    }
     else {
-        const factor = higherFactor(randNbr);
-        const radicand = randNbr / factor ** 2;
-        answer = `S=\\left\\{-${factor === 1 ? "" : factor}\\sqrt{${radicand}};${factor === 1 ? "" : factor}\\sqrt{${radicand}}\\right\\}`;
+        const tree = new real_1.SquareRoot(randNbr).simplify().toTree();
+        solutionsSet = new discreteSetNode_1.DiscreteSetNode([new oppositeNode_1.OppositeNode(tree), tree]);
     }
+    const answer = new equationSolutionNode_1.EquationSolutionNode(solutionsSet).toTex();
     const question = {
         instruction,
         answer,
-        keys: ["x", "S", "equal", "lbrace", "rbrace", "semicolon", "emptyset"],
+        keys: equationKeys_1.equationKeys,
         answerFormat: "tex",
-        qcmGeneratorProps: { answer, sqrt, randNbr },
+        identifiers: { randNbr },
     };
     return question;
 };
-const getPropositions = (n, { answer, sqrt, randNbr }) => {
+const getPropositions = (n, { answer, randNbr }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    if (sqrt === Math.floor(sqrt)) {
+    const half = new rational_1.Rational(randNbr, 2).simplify().toTree();
+    if (randNbr < 0) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{-\\sqrt{${-randNbr}}\\right\\}`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{\\sqrt{-${-randNbr}}\\right\\}`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([half])).toTex());
+    }
+    else if ((0, isInt_1.isInt)(Math.sqrt(randNbr))) {
+        const sqrt = Math.sqrt(randNbr);
         (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{${sqrt}\\right\\}`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([half])).toTex());
         while (propositions.length < n) {
             const tempAns = sqrt + (0, randint_1.randint)(-sqrt + 1, 7, [0]);
-            (0, exercise_1.tryToAddWrongProp)(propositions, (0, coinFlip_1.coinFlip)() ? `S=\\left\\{${tempAns}\\ ; -${tempAns}\\right\\}` : `S=\\emptyset`);
+            (0, exercise_1.tryToAddWrongProp)(propositions, (0, coinFlip_1.coinFlip)()
+                ? `S=\\left\\{-${tempAns};${tempAns}\\right\\}`
+                : `S=\\emptyset`);
         }
     }
-    else if (randNbr >= 0 && sqrt !== Math.floor(sqrt)) {
+    else {
+        const sqrtTree = new real_1.SquareRoot(randNbr).simplify().toTree();
+        const sqrt = Math.sqrt(randNbr);
         const factor = higherFactor(randNbr);
         const radicand = randNbr / factor ** 2;
-        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{${factor}\\sqrt{${radicand}}\\right\\}`);
-        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{${radicand}\\sqrt{${factor}}\\right\\}`);
-        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{${Math.floor(sqrt)}\\right\\}`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([sqrtTree])).toTex());
+        (0, exercise_1.tryToAddWrongProp)(propositions, new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([half])).toTex());
         while (propositions.length < n) {
             const tempFactor = factor + (0, randint_1.randint)(-factor + 1, 7, [0]);
             const tempRadicand = radicand + (0, randint_1.randint)(-radicand + 1, 7, [0]);
             (0, exercise_1.tryToAddWrongProp)(propositions, (0, coinFlip_1.coinFlip)()
-                ? `S=\\left\\{${tempFactor}\\sqrt{${tempRadicand}}\\ ; -${tempFactor}\\sqrt{${tempRadicand}} \\right}`
+                ? `S=\\left\\{-${tempFactor}\\sqrt{${tempRadicand}};${tempFactor}\\sqrt{${tempRadicand}}\\right\\}`
                 : `S=\\emptyset`);
         }
     }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { randNbr }) => {
+    let answerTrees = [];
+    if (randNbr < 0) {
+        answerTrees = [new equationSolutionNode_1.EquationSolutionNode(discreteSetNode_1.EmptySet)];
+    }
+    else if (randNbr === 0) {
+        answerTrees = [
+            new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([new numberNode_1.NumberNode(0)])),
+        ];
+    }
+    // else if (randNbr === 1) {
+    //   answerTrees = [
+    //     new EquationSolutionNode(new DiscreteSetNode([new NumberNode(1)])),
+    //   ];
+    // }
     else {
-        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{-\\sqrt{${-randNbr}}\\right\\}`);
-        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{${Math.floor(Math.sqrt(-randNbr))}\\right\\}`);
-        while (propositions.length < n) {
-            const factor = (0, randint_1.randint)(2, 5);
-            const radicand = (0, randint_1.randint)(2, -randNbr);
-            (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\left\\{${factor}\\sqrt{${radicand}};-${factor}\\sqrt{${radicand}}\\right\\}`);
+        const sqrt = new real_1.SquareRoot(randNbr);
+        const sqrtTree = sqrt.toTree();
+        answerTrees.push(new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([new oppositeNode_1.OppositeNode(sqrtTree), sqrtTree])));
+        if (sqrt.isSimplifiable()) {
+            const simplified = sqrt.simplify().toTree();
+            answerTrees.push(new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode([new oppositeNode_1.OppositeNode(simplified), simplified])));
         }
     }
-    return (0, shuffle_1.shuffle)(propositions);
+    const texs = answerTrees.flatMap((tree) => tree.toAllValidTexs());
+    console.log(ans, texs);
+    return texs.includes(ans);
 };
 exports.equationSimpleSquare = {
     id: "equationSimpleSquare",
@@ -91,4 +136,5 @@ exports.equationSimpleSquare = {
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/calculLitteral/equation/equationType1Exercise.d.ts

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

package/lib/exercises/calculLitteral/equation/equationType1Exercise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"equationType1Exercise.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/equationType1Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAYlC;;GAEG;AACH,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAkCnB,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWlE,CAAC"}
+{"version":3,"file":"equationType1Exercise.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/equationType1Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAWlC;;GAEG;AACH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA4CF,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,WAAW,CAa3D,CAAC"}