math-exercises 2.2.3 → 2.2.5

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

@@ -6,6 +6,9 @@ const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQ
 const affine_1 = require("../../../../math/polynomials/affine");
 const randint_1 = require("../../../../math/utils/random/randint");
 const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
+const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
+const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
+const alignTex_1 = require("../../../../utils/alignTex");
 const getFactoType1Question = () => {
     const affine = affine_1.AffineConstructor.random({
         min: 1,
@@ -13,6 +16,9 @@ const getFactoType1Question = () => {
     }, { excludes: [0] });
     const affine2 = new affine_1.Affine(affine.a, -affine.b);
     const statementTree = affine.multiply(affine2).toTree();
+    const statementTex = statementTree.toTex();
+    const bPositive = Math.abs(affine.b);
+    const aMonom = new multiplyNode_1.MultiplyNode(affine.a.toTree(), "x".toTree());
     const answerTree = new multiplyNode_1.MultiplyNode(affine.toTree(), affine2.toTree());
     const answer = answerTree.toTex();
     const question = {
@@ -25,6 +31,18 @@ const getFactoType1Question = () => {
             affine1Coeffs: affine.coefficients,
             affine2Coeffs: affine2.coefficients,
         },
+        hint: `Utilise l'identité remarquable $a^2 - b^2 = (a-b)(a+b)$`,
+        correction: `
+On utilise l'identité remarquable $ a^2 - b^2=(a-b)(a+b)$ en prenant $a=${aMonom.toTex()}$ et $b=${bPositive}$ : 
+
+${(0, alignTex_1.alignTex)([
+            [
+                statementTex,
+                "=",
+                new substractNode_1.SubstractNode(new powerNode_1.SquareNode(aMonom), new powerNode_1.SquareNode(bPositive.toTree())).toTex(),
+            ],
+            ["", "=", answer],
+        ])}`,
     };
     return question;
 };
@@ -63,4 +81,5 @@ exports.factoIdRmq3 = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

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

@@ -1 +1 @@
-{"version":3,"file":"factoType1Exercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factoType1Exercise.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAyHF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAapD,CAAC"}
+{"version":3,"file":"factoType1Exercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factoType1Exercise.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA0HF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAapD,CAAC"}

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

@@ -12,6 +12,7 @@ const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
 const random_1 = require("../../../../utils/random");
 const shuffle_1 = require("../../../../utils/shuffle");
+//TODO fix { "affinesCoeffs": [ [ -2, 8 ], [ -5, 4 ], [ 0, -8 ] ], "operation": "substract" } donne trop de moins
 const getFactoType1Question = () => {
     const affines = affine_1.AffineConstructor.differentRandoms(3);
     const permut = [

package/lib/exercises/math/calculLitteral/factorisation/factorizeCanonicalForm.d.ts

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"factorizeCanonicalForm.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factorizeCanonicalForm.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAuFF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAexD,CAAC"}

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

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.factorizeCanonicalForm = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const affine_1 = require("../../../../math/polynomials/affine");
+const randint_1 = require("../../../../math/utils/random/randint");
+const addNode_1 = require("../../../../tree/nodes/operators/addNode");
+const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
+const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
+const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
+const alignTex_1 = require("../../../../utils/alignTex");
+//(x-a)^2-b^2 avec b entier
+const getFactorizeCanonicalFormQuestion = () => {
+    const affine = new affine_1.Affine(1, (0, randint_1.randint)(-10, 10, [0]));
+    const b = (0, randint_1.randint)(-10, 10, [0]);
+    const statement = new substractNode_1.SubstractNode(new powerNode_1.SquareNode(affine.toTree()), (b ** 2).toTree());
+    const bPositive = Math.abs(b);
+    const answer = new multiplyNode_1.MultiplyNode(affine.add(-bPositive).toTree(), affine.add(bPositive).toTree()).toTex();
+    const statementTex = statement.toTex();
+    const question = {
+        answer,
+        instruction: `Factoriser : $${statementTex}$`,
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers: { a: affine.b, b },
+        hint: `Utilise l'identité remarquable $a^2 - b^2 = (a-b)(a+b)$`,
+        correction: `
+On utilise l'identité remarquable $ a^2 - b^2=(a-b)(a+b)$ en prenant $a=${affine.toTex()}$ et $b=${bPositive}$ : 
+
+${(0, alignTex_1.alignTex)([
+            [
+                statementTex,
+                "=",
+                new substractNode_1.SubstractNode(new powerNode_1.SquareNode(affine.toTree()), new powerNode_1.SquareNode(bPositive.toTree())).toTex(),
+            ],
+            [
+                "",
+                "=",
+                new multiplyNode_1.MultiplyNode(new addNode_1.AddNode(affine.toTree(), (-bPositive).toTree()), new addNode_1.AddNode(affine.toTree(), bPositive.toTree())).toTex(),
+            ],
+            ["", "=", answer],
+        ])}`,
+    };
+    return question;
+};
+const getPropositions = (n, { answer, a, b }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const affine = new affine_1.Affine(a, b);
+    (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(affine.add(-(b ** 2)).toTree(), affine.add(b ** 2).toTree()).toTex());
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(new affine_1.Affine(1, (0, randint_1.randint)(-10, 10)).toTree(), new affine_1.Affine(1, (0, randint_1.randint)(-10, 10)).toTree()).toTex());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer, a, b }) => {
+    const affine = new affine_1.Affine(1, a);
+    const bPositive = Math.abs(b);
+    const answerTree = new multiplyNode_1.MultiplyNode(affine.add(-bPositive).toTree(), affine.add(bPositive).toTree());
+    return answerTree.toAllValidTexs().includes(ans);
+};
+exports.factorizeCanonicalForm = {
+    id: "factorizeCanonicalForm",
+    connector: "=",
+    label: "Factoriser une expression du type $(x-a)^2-b^2$ avec $b$ entier",
+    levels: [],
+    isSingleStep: true,
+    sections: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFactorizeCanonicalFormQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    hasHintAndCorrection: true,
+};

package/lib/exercises/math/calculLitteral/factorisation/factorizeCanonicalFormWithSqrt.d.ts

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"factorizeCanonicalFormWithSqrt.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/factorizeCanonicalFormWithSqrt.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAelC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AA2FF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,CAehE,CAAC"}

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

@@ -0,0 +1,80 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.factorizeCanonicalFormWithSqrt = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const real_1 = require("../../../../math/numbers/reals/real");
+const affine_1 = require("../../../../math/polynomials/affine");
+const randint_1 = require("../../../../math/utils/random/randint");
+const addNode_1 = require("../../../../tree/nodes/operators/addNode");
+const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
+const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
+const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
+const alignTex_1 = require("../../../../utils/alignTex");
+//(x-a)^2-b^2 avec b irrational
+const getFactorizeCanonicalFormWithSqrtQuestion = () => {
+    const affine = new affine_1.Affine(1, (0, randint_1.randint)(-10, 10, [0]));
+    const b = real_1.SquareRootConstructor.randomIrreductible(10);
+    const statement = new substractNode_1.SubstractNode(new powerNode_1.SquareNode(affine.toTree()), b.operand.toTree());
+    const answer = new multiplyNode_1.MultiplyNode(new substractNode_1.SubstractNode(affine.toTree(), b.toTree()), new addNode_1.AddNode(affine.toTree(), b.toTree()))
+        .simplify({ forbidFactorize: true })
+        .toTex();
+    const statementTex = statement.toTex();
+    const question = {
+        answer,
+        instruction: `Factoriser : $${statementTex}$`,
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers: { a: affine.b, bOperand: b.operand },
+        hint: `Utilise l'identité remarquable $a^2 - b^2 = (a-b)(a+b)$`,
+        correction: `
+On utilise l'identité remarquable $ a^2 - b^2=(a-b)(a+b)$ en prenant $a=${affine.toTex()}$ et $b=${b
+            .toTree()
+            .toTex()}$ : 
+
+
+${(0, alignTex_1.alignTex)([
+            [
+                statementTex,
+                "=",
+                new substractNode_1.SubstractNode(new powerNode_1.SquareNode(affine.toTree()), new powerNode_1.SquareNode(b.toTree())).toTex(),
+            ],
+            ["", "=", answer],
+        ])}
+
+`,
+    };
+    return question;
+};
+const getPropositions = (n, { answer, a, bOperand }) => {
+    const propositions = [];
+    const affine = new affine_1.Affine(1, a);
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(affine.add(bOperand).toTree(), affine.add(-bOperand).toTree()).toTex());
+    while (propositions.length < n) {
+        const randomSqrt = real_1.SquareRootConstructor.randomIrreductible(10);
+        (0, exercise_1.tryToAddWrongProp)(propositions, new multiplyNode_1.MultiplyNode(new substractNode_1.SubstractNode(affine.toTree(), randomSqrt.toTree()), new addNode_1.AddNode(affine.toTree(), randomSqrt.toTree())).toTex());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer, a, bOperand }) => {
+    const affine = new affine_1.Affine(1, a);
+    const b = new real_1.SquareRoot(bOperand);
+    const answerTree = new multiplyNode_1.MultiplyNode(new substractNode_1.SubstractNode(affine.toTree(), b.toTree()), new addNode_1.AddNode(affine.toTree(), b.toTree())).simplify({ forbidFactorize: true });
+    return answerTree.toAllValidTexs().includes(ans);
+};
+exports.factorizeCanonicalFormWithSqrt = {
+    id: "factorizeCanonicalFormWithSqrt",
+    connector: "=",
+    label: "Factoriser une expression du type $(x-a)^2-b^2$ avec $b$ irrationnel",
+    levels: [],
+    isSingleStep: true,
+    sections: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFactorizeCanonicalFormWithSqrtQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    hasHintAndCorrection: true,
+};

package/lib/exercises/math/calculLitteral/factorisation/index.d.ts

@@ -2,4 +2,6 @@ export * from "./factoIdRmq1";
 export * from "./factoIdRmq2";
 export * from "./factoIdRmq3";
 export * from "./factoType1Exercise";
+export * from "./factorizeCanonicalForm";
+export * from "./factorizeCanonicalFormWithSqrt";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/factorisation/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,0BAA0B,CAAC;AACzC,cAAc,kCAAkC,CAAC"}

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

@@ -18,3 +18,5 @@ __exportStar(require("./factoIdRmq1"), exports);
 __exportStar(require("./factoIdRmq2"), exports);
 __exportStar(require("./factoIdRmq3"), exports);
 __exportStar(require("./factoType1Exercise"), exports);
+__exportStar(require("./factorizeCanonicalForm"), exports);
+__exportStar(require("./factorizeCanonicalFormWithSqrt"), exports);

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

@@ -1 +1 @@
-{"version":3,"file":"lengthConversion.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/conversion/lengthConversion.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,QAAQ,EAQT,MAAM,gBAAgB,CAAC;AAIxB,KAAK,WAAW,GAAG;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,0BAA0B,EAAE,MAAM,CAAC;IACnC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAyDF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAalD,CAAC"}
+{"version":3,"file":"lengthConversion.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/conversion/lengthConversion.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,QAAQ,EAQT,MAAM,gBAAgB,CAAC;AAIxB,KAAK,WAAW,GAAG;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,0BAA0B,EAAE,MAAM,CAAC;IACnC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AA+DF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAalD,CAAC"}

package/lib/exercises/math/conversion/lengthConversion.js

@@ -3,20 +3,34 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.lengthConversion = void 0;
 const decimal_1 = require("../../../math/numbers/decimals/decimal");
 const randint_1 = require("../../../math/utils/random/randint");
+const measure_1 = require("../../../pc/measure/measure");
+const distanceUnits_1 = require("../../../pc/units/distanceUnits");
 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 unitsObj = [
+    distanceUnits_1.DistanceUnit.mm,
+    distanceUnits_1.DistanceUnit.cm,
+    distanceUnits_1.DistanceUnit.dm,
+    distanceUnits_1.DistanceUnit.m,
+    distanceUnits_1.DistanceUnit.dam,
+    distanceUnits_1.DistanceUnit.hm,
+    distanceUnits_1.DistanceUnit.km,
+];
 const getLengthConversion = () => {
     const randomUnitIndex = (0, randint_1.randint)(0, 7);
     const randomUnitInstructionIndex = (0, randint_1.randint)(0, 7, [randomUnitIndex]);
     const randomLength = decimal_1.DecimalConstructor.random(0, 1000, (0, randint_1.randint)(0, 4));
+    const measure = new measure_1.Measure(randomLength.value, 0, unitsObj[randomUnitIndex]);
     console.log("length conv q");
-    const answer = (randomLength.multiplyByPowerOfTen(randomUnitIndex - randomUnitInstructionIndex).value + "").replace(".", ",");
+    const answer = measure
+        .convert(units[randomUnitInstructionIndex])
+        .toTex({ notScientific: true });
     const question = {
-        instruction: `Compléter : $${randomLength.value
-            .toString()
-            .replace(".", ",")} \\textrm{${units[randomUnitIndex]}} = \\ldots  \\textrm{${units[randomUnitInstructionIndex]}}$`,
+        instruction: `Compléter : $${measure.toTex({
+            notScientific: true,
+        })} = \\ldots  ${unitsObj[randomUnitInstructionIndex].toTex()}$`,
         answer,
         keys: [],
         answerFormat: "tex",

package/lib/exercises/math/equaDiff/equaDiffGeneralForme.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"equaDiffGeneralForme.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/equaDiff/equaDiffGeneralForme.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA6EF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAajE,CAAC"}
+{"version":3,"file":"equaDiffGeneralForme.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/equaDiff/equaDiffGeneralForme.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA6EF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAcjE,CAAC"}

package/lib/exercises/math/equaDiff/equaDiffGeneralForme.js

@@ -63,4 +63,5 @@ exports.exponentialDifferentialEquation = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/functions/affines/affineExpressionFromTwoImages.d.ts

@@ -0,0 +1,10 @@
+import { Exercise } from "../../../../exercises/exercise";
+type Identifiers = {
+    xA: number;
+    xB: number;
+    yA: number;
+    yB: number;
+};
+export declare const affineExpressionFromTwoImages: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=affineExpressionFromTwoImages.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"affineExpressionFromTwoImages.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineExpressionFromTwoImages.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AA8EF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAe/D,CAAC"}

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

@@ -0,0 +1,81 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.affineExpressionFromTwoImages = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const rational_1 = require("../../../../math/numbers/rationals/rational");
+const affine_1 = require("../../../../math/polynomials/affine");
+const randint_1 = require("../../../../math/utils/random/randint");
+const addNode_1 = require("../../../../tree/nodes/operators/addNode");
+const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
+const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
+const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
+const shuffle_1 = require("../../../../utils/shuffle");
+const getAffineExpressionFromTwoImagesQuestion = () => {
+    const [xA, yA] = [1, 2].map((el) => (0, randint_1.randint)(-9, 10));
+    const xB = (0, randint_1.randint)(-9, 10, [xA]);
+    const yB = (0, randint_1.randint)(-9, 10);
+    const a = new rational_1.Rational(yB - yA, xB - xA).simplify().toTree();
+    //yA = axA+b donc b = yA-axA
+    const b = new substractNode_1.SubstractNode(yA.toTree(), new multiplyNode_1.MultiplyNode(a, xA.toTree())).simplify();
+    const answer = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(a, new variableNode_1.VariableNode("x")), b)
+        .simplify({ forceDistributeFractions: true })
+        .toTex();
+    console.log(a.toTex(), b.toTex());
+    const question = {
+        instruction: `Soit $f$ une fonction affine telle que $f(${xA}) = ${yA}$ et $f(${xB}) = ${yB}$.
+    
+Quelle est l'expression algébrique de $f$ ?`,
+        startStatement: "a",
+        answer,
+        hint: "Calcule d'abord le taux d'accroissement de $f$ en utilisant la formule $a = \\frac{y_2-y_1}{x_2-x_1}$. Ensuite, utilise les coordonnées d'un des deux points pour déterminer l'ordonnée à l'origine.",
+        correction: `On calcule d'abord le taux d'accroissement $a$ : 
+    
+$a = \\frac{y_2-y_1}{x_2-x_1} = \\frac{${yB}-${yA}}{${xB}-${xA}} = ${a.toTex()}$
+
+Il faut ensuite trouver l'ordonnée à l'origine $b$. On sait que $f(${xA}) = ${yA}$. Or pour tout $x$ réel, on a $f(x) = ax+b$. 
+
+Donc $${yA} = ${new multiplyNode_1.MultiplyNode(a, xA.toTree()).toTex()}+b$. On a donc $b = ${new substractNode_1.SubstractNode(yA.toTree(), new multiplyNode_1.MultiplyNode(a, xA.toTree())).toTex()} = ${b.toTex()}$.
+
+Ainsi, $f(x) = ${answer}$.
+    `,
+        answerFormat: "tex",
+        keys: ["x"],
+        identifiers: { xA, xB, yA, yB },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, xA, xB, yA, yB }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        const wrongAnswer = affine_1.AffineConstructor.random().toTex();
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+const isAnswerValid = (ans, { xA, xB, yA, yB }) => {
+    const a = new rational_1.Rational(yB - yA, xB - xA).simplify().toTree();
+    //yA = axA+b donc b = yA-axA
+    const b = new substractNode_1.SubstractNode(yA.toTree(), new multiplyNode_1.MultiplyNode(a, xA.toTree())).simplify();
+    const answer = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(a, new variableNode_1.VariableNode("x")), b, {
+        allowFractionToDecimal: true,
+    }).simplify({ forceDistributeFractions: true });
+    const texs = answer.toAllValidTexs();
+    return texs.includes(ans);
+};
+exports.affineExpressionFromTwoImages = {
+    id: "affineExpressionFromTwoImages",
+    connector: "=",
+    label: "Expression algébrique d'une fonction affine via deux images",
+    levels: ["3ème", "2nde", "2ndPro", "1rePro", "1reTech"],
+    isSingleStep: true,
+    sections: ["Fonctions affines", "Droites"],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAffineExpressionFromTwoImagesQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    hasHintAndCorrection: true,
+};

package/lib/exercises/math/functions/affines/index.d.ts

@@ -10,4 +10,5 @@ export * from "./affineAdjustment";
 export * from "./affineAdjustmentRsquared";
 export * from "./affineAdjustmentComplete";
 export * from "./affineMeanValue";
+export * from "./affineExpressionFromTwoImages";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iCAAiC,CAAC;AAChD,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iCAAiC,CAAC;AAChD,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC;AAClC,cAAc,iCAAiC,CAAC"}

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

@@ -26,3 +26,4 @@ __exportStar(require("./affineAdjustment"), exports);
 __exportStar(require("./affineAdjustmentRsquared"), exports);
 __exportStar(require("./affineAdjustmentComplete"), exports);
 __exportStar(require("./affineMeanValue"), exports);
+__exportStar(require("./affineExpressionFromTwoImages"), exports);

package/lib/exercises/math/functions/logarithm/log10PowerSimplifying.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log10PowerSimplifying.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/logarithm/log10PowerSimplifying.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA+CF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAevD,CAAC"}
+{"version":3,"file":"log10PowerSimplifying.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/logarithm/log10PowerSimplifying.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAuDF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAgBvD,CAAC"}

package/lib/exercises/math/functions/logarithm/log10PowerSimplifying.js

@@ -7,6 +7,7 @@ const decimal_1 = require("../../../../math/numbers/decimals/decimal");
 const randint_1 = require("../../../../math/utils/random/randint");
 const log10Node_1 = require("../../../../tree/nodes/functions/log10Node");
 const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
+const alignTex_1 = require("../../../../utils/alignTex");
 const getLog10PowerSimplifyingQuestion = () => {
     const tenthPower = (0, randint_1.randint)(-6, 8, [1]);
     console.log("log10 power simp q");
@@ -38,8 +39,16 @@ const getHint = (nb) => {
 };
 const getCorrection = (tenthPower, nb) => {
     const powerTen = new powerNode_1.PowerNode((10).toTree(), tenthPower.toTree());
-    return `1 . On exprime $${nb.toTex()}$ en puissance de $10$ : $${nb.toTex()} = ${powerTen.toTex()}$ \n 
-  2 . On utilise la propriété $\\log(a^{b}) = b\\times \\log(a)$. On a alors $\\log(${nb.toTex()}) = \\log(${powerTen.toTex()}) = ${tenthPower}\\times \\log(10)  = ${tenthPower}$.
+    return `On exprime $${nb.toTex()}$ en puissance de $10$ :
+  ${(0, alignTex_1.alignTex)(`${nb.toTex()} = ${powerTen.toTex()}`)}
+  On utilise la propriété $\\log(a^{b}) = b\\times \\log(a)$.
+
+  On a alors
+  ${(0, alignTex_1.alignTex)([
+        [`\\log(${nb.toTex()})`, `= \\log(${powerTen.toTex()})`],
+        ["", `= ${tenthPower}\\times \\log(10)`],
+        ["", `= ${tenthPower}`],
+    ])}
   `;
 };
 const isAnswerValid = (ans, { answer, tenthPower }) => {
@@ -59,4 +68,5 @@ exports.log10PowerSimplifying = {
     isAnswerValid,
     maxAllowedQuestions: 10,
     subject: "Mathématiques",
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/functions/trinoms/index.d.ts

@@ -15,4 +15,6 @@ export * from "./summitReading";
 export * from "./summitAbscissFromRoots";
 export * from "./summitAbscissFromDevForm";
 export * from "./trinomialMeanValue";
+export * from "./solveSecondDegreeEquationByFactorisation";
+export * from "./solveSecondDegreeEquationFromCano";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/functions/trinoms/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/trinoms/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,eAAe,CAAC;AAC9B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,0BAA0B,CAAC;AACzC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/trinoms/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,eAAe,CAAC;AAC9B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,0BAA0B,CAAC;AACzC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,sBAAsB,CAAC;AACrC,cAAc,4CAA4C,CAAC;AAC3D,cAAc,qCAAqC,CAAC"}

package/lib/exercises/math/functions/trinoms/index.js

@@ -31,3 +31,5 @@ __exportStar(require("./summitReading"), exports);
 __exportStar(require("./summitAbscissFromRoots"), exports);
 __exportStar(require("./summitAbscissFromDevForm"), exports);
 __exportStar(require("./trinomialMeanValue"), exports);
+__exportStar(require("./solveSecondDegreeEquationByFactorisation"), exports);
+__exportStar(require("./solveSecondDegreeEquationFromCano"), exports);

package/lib/exercises/math/functions/trinoms/solveEquationByFactorisation.d.ts

@@ -0,0 +1,5 @@
+import { Exercise } from '../../../../exercises/exercise';
+type Identifiers = {};
+export declare const solveEquationByFactorisation: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=solveEquationByFactorisation.d.ts.map

package/lib/exercises/math/functions/trinoms/solveEquationByFactorisation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"solveEquationByFactorisation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/trinoms/solveEquationByFactorisation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAGlC,KAAK,WAAW,GAAG,EAClB,CAAC;AA+BF,eAAO,MAAM,4BAA4B,EAAE,QAAQ,CAAC,WAAW,CAc9D,CAAC"}

package/lib/exercises/math/functions/trinoms/solveEquationByFactorisation.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.solveEquationByFactorisation = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const getSolveEquationByFactorisationQuestion = () => {
+    const question = {
+        answer,
+        instruction: ``,
+        keys: [],
+        answerFormat: 'tex',
+        identifiers: {}
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        throw Error("QCM not implemented");
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer }) => {
+    throw Error("VEA not implemented");
+};
+const isGGBAnswerValid = (ans, { ggbAnswer }) => {
+    throw Error("GGBVea not implemented");
+};
+exports.solveEquationByFactorisation = {
+    id: 'solveEquationByFactorisation',
+    connector: "",
+    label: "",
+    levels: [],
+    isSingleStep: true,
+    sections: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getSolveEquationByFactorisationQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    isGGBAnswerValid,
+    subject: "Mathématiques"
+};

package/lib/exercises/math/functions/trinoms/solveSecondDegreeEquationByFactorisation.d.ts

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

package/lib/exercises/math/functions/trinoms/solveSecondDegreeEquationByFactorisation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"solveSecondDegreeEquationByFactorisation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/trinoms/solveSecondDegreeEquationByFactorisation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAgIF,eAAO,MAAM,wCAAwC,EAAE,QAAQ,CAAC,WAAW,CAiB1E,CAAC"}