math-exercises 3.0.56 → 3.0.58

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

@@ -8,7 +8,7 @@ import { firstDegreeInequationResolutionTex } from "../../../../tree/nodes/inequ
 import { MinusInfinityNode, PlusInfinityNode, } from "../../../../tree/nodes/numbers/infiniteNode.js";
 import { ClosureType } from "../../../../tree/nodes/sets/closure.js";
 import { IntervalNode } from "../../../../tree/nodes/sets/intervalNode.js";
-import { intervalParser } from "../../../../tree/parsers/intervalParser.js";
+import { parseAlgebraic } from "../../../../tree/parsers/latexParser.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
 import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
@@ -51,10 +51,11 @@ $$
 
 Sur quel intervalle $f$ est-elle ${identifiers.askingPositive ? "positive" : "négative"} ?`;
 };
-const getAnswer = ({ a, b, askingPositive }) => {
+const getAnswerNode = (identifiers) => {
+    const { a, b, askingPositive } = identifiers;
     const root = new Rational(-b, a).simplify().toTree();
-    const toRightInfInterval = new IntervalNode(root, PlusInfinityNode, ClosureType.FO).toTex();
-    const toLeftInfInteral = new IntervalNode(MinusInfinityNode, root, ClosureType.OF).toTex();
+    const toRightInfInterval = new IntervalNode(root, PlusInfinityNode, ClosureType.FO);
+    const toLeftInfInteral = new IntervalNode(MinusInfinityNode, root, ClosureType.OF);
     if (askingPositive) {
         return a > 0 ? toRightInfInterval : toLeftInfInteral;
     }
@@ -62,6 +63,9 @@ const getAnswer = ({ a, b, askingPositive }) => {
         return a > 0 ? toLeftInfInteral : toRightInfInterval;
     }
 };
+const getAnswer = (identifiers) => {
+    return getAnswerNode(identifiers).toTex();
+};
 const getSignFunction = () => {
     const a = randint(-9, 10, [0]);
     const b = randint(-9, 10);
@@ -92,15 +96,23 @@ const getPropositions = (n, { answer }) => {
     }
     return shuffle(propositions);
 };
-const isAnswerValid = (ans, { answer, a, b, askingPositive }) => {
+const isAnswerValid = (ans, { answer, ...identifiers }) => {
     try {
-        const parsed = intervalParser(ans, {
-            allowCommaInsteadOfSemicolon: true,
-            allowNoBrackets: true,
-        });
-        if (!parsed)
+        //? on accepte les réponses peu importe le sens des crochets, meme pour l'infini
+        const formated = ans
+            .replaceAll("]", "")
+            .replaceAll("[", "")
+            .replaceAll("\\ ", "");
+        const splitted = formated.includes(";")
+            ? formated.split(";")
+            : formated.split(",");
+        if (splitted.length !== 2)
             return false;
-        return parsed.simplify().toTex() === answer;
+        const a = parseAlgebraic(splitted[0]);
+        const b = parseAlgebraic(splitted[1]);
+        const intAnswer = getAnswerNode(identifiers);
+        return (a.simplify().toTex() === intAnswer.a.toTex() &&
+            b.simplify().toTex() === intAnswer.b.toTex());
     }
     catch (err) {
         return handleVEAError(err);

package/lib/exercises/math/functions/exponential/expEquation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/exponential/expEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAkBrC,cAAc;AACd,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA2FF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAgB7C,CAAC"}
+{"version":3,"file":"expEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/exponential/expEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAkBrC,cAAc;AACd,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAiGF,eAAO,MAAM,WAAW,EAAE,QAAQ,CAAC,WAAW,CAgB7C,CAAC"}

package/lib/exercises/math/functions/exponential/expEquation.js

@@ -45,6 +45,9 @@ const getExpEquation = () => {
     const a = randint(-9, 20, [0]);
     const k = a > 0 ? randint(1, 20) : randint(-20, 0);
     const identifiers = { a, k };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         instruction: getInstruction(identifiers),
         answer: getAnswer(identifiers),

package/lib/exercises/math/functions/exponential/expFactorization.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expFactorization.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/exponential/expFactorization.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IAEV,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AA6JF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAiBlD,CAAC"}
+{"version":3,"file":"expFactorization.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/exponential/expFactorization.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IAEV,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAkKF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAiBlD,CAAC"}

package/lib/exercises/math/functions/exponential/expFactorization.js

@@ -120,6 +120,9 @@ const getExpFactorizationQuestion = () => {
         f,
         uA,
     };
+    return getQuestionFromIdentifiers(identifiers);
+};
+const getQuestionFromIdentifiers = (identifiers) => {
     const question = {
         answer: getAnswer(identifiers),
         instruction: getInstruction(identifiers),

package/lib/exercises/math/functions/exponential/expSimplifiying.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expSimplifiying.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/exponential/expSimplifiying.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAarC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAkIF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAajD,CAAC"}
+{"version":3,"file":"expSimplifiying.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/exponential/expSimplifiying.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAmBrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAmKF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAYjD,CAAC"}

package/lib/exercises/math/functions/exponential/expSimplifiying.js

@@ -2,56 +2,92 @@ import { addValidProp, tryToAddWrongProp, } from "../../../../exercises/exercise
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { Polynomial, PolynomialConstructor, } from "../../../../math/polynomials/polynomial.js";
 import { randint } from "../../../../math/utils/random/randint.js";
-import { ExpNode } from "../../../../tree/nodes/functions/expNode.js";
-import { NumberNode } from "../../../../tree/nodes/numbers/numberNode.js";
+import { ExpNode, isExpNode } from "../../../../tree/nodes/functions/expNode.js";
+import { isNumberNode, } from "../../../../tree/nodes/numbers/numberNode.js";
 import { FractionNode } from "../../../../tree/nodes/operators/fractionNode.js";
 import { MultiplyNode } from "../../../../tree/nodes/operators/multiplyNode.js";
+import { parseAlgebraic } from "../../../../tree/parsers/latexParser.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
+import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
+const getStatementNode = (identifiers) => {
+    const { random, a, uCoeffs, vCoeffs } = identifiers;
+    const u = new Polynomial(uCoeffs);
+    const v = new Polynomial(vCoeffs);
+    let expression;
+    switch (random) {
+        case 1:
+            //e^u*e^a / e^v
+            expression = new FractionNode(new MultiplyNode(new ExpNode(u.toTree()), new ExpNode(a.toTree())), new ExpNode(v.toTree()));
+            break;
+        case 2:
+            //e^u * e^v
+            expression = new MultiplyNode(new ExpNode(u.toTree()), new ExpNode(v.toTree())).shuffle();
+            break;
+        case 3:
+        default:
+            //e^u / e^v
+            expression = new FractionNode(new ExpNode(u.toTree()), new ExpNode(v.toTree()));
+            break;
+    }
+    return expression;
+};
+const getInstruction = (identifiers) => {
+    return `Écrire sous la forme d'une seule exponentielle : 
+  
+$$
+${getStatementNode(identifiers).toTex()}
+$$`;
+};
+const getAnswer = (identifiers) => {
+    const statement = getStatementNode(identifiers);
+    return statement
+        .simplify({
+        towardsDistribute: true,
+        forbidFactorize: true,
+    })
+        .toTex();
+};
+// const getHint: GetHint<Identifiers> = (identifiers) => {};
+// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {};
+const getQuestionFromIdentifiers = (identifiers) => {
+    const question = {
+        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers),
+        keys: ["x", "epower", "exp"],
+        answerFormat: "tex",
+        identifiers,
+    };
+    return question;
+};
 const getExpSimplifiying = () => {
     const random = randint(1, 4);
     let a;
     let u, v;
-    let expression;
-    let answer;
     switch (random) {
         case 1:
             //e^u*e^a / e^v
             a = randint(-9, 10, [0]);
             u = new Polynomial([0, randint(-9, 10, [0])]);
             v = new Polynomial([randint(-9, 10), randint(-9, 10, [0])]);
-            expression = new FractionNode(new MultiplyNode(new ExpNode(u.toTree()), new ExpNode(new NumberNode(a))), new ExpNode(v.toTree()));
-            answer = new ExpNode(u.add(a).add(v.opposite()).toTree()).toTex();
             break;
         case 2:
             //e^u * e^v
             u = new Polynomial([randint(-9, 10), randint(-9, 10, [0])]);
             v = new Polynomial([randint(-9, 10), randint(-9, 10, [0])]);
-            expression = new MultiplyNode(new ExpNode(u.toTree()), new ExpNode(v.toTree())).shuffle();
-            answer = new ExpNode(u.add(v).toTree()).toTex();
             break;
         case 3:
+        default:
             //e^u / e^v
             u = new Polynomial([randint(-9, 10), randint(-9, 10, [0])]);
             v = new Polynomial([randint(-9, 10), randint(-9, 10, [0])]);
-            expression = new FractionNode(new ExpNode(u.toTree()), new ExpNode(v.toTree()));
-            answer = new ExpNode(u.add(v.opposite()).toTree()).toTex();
-            break;
-        default:
-            throw Error("something wrong happened");
     }
-    const question = {
-        instruction: `Simplifier l'expression $${expression.toTex()}$.`,
-        answer,
-        keys: ["x", "epower", "exp"],
-        answerFormat: "tex",
-        identifiers: {
-            random,
-            a,
-            uCoeffs: u.coefficients,
-            vCoeffs: v.coefficients,
-        },
+    const identifiers = {
+        random,
+        a,
+        uCoeffs: u.coefficients,
+        vCoeffs: v.coefficients,
     };
-    return question;
+    return getQuestionFromIdentifiers(identifiers);
 };
 const getPropositions = (n, { answer, random, a, uCoeffs, vCoeffs }) => {
     const propositions = [];
@@ -77,32 +113,33 @@ const getPropositions = (n, { answer, random, a, uCoeffs, vCoeffs }) => {
     }
     return shuffle(propositions);
 };
-const isAnswerValid = (ans, { a, random, uCoeffs, vCoeffs }) => {
-    const u = new Polynomial(uCoeffs);
-    const v = new Polynomial(vCoeffs);
-    let answer;
-    switch (random) {
-        case 1:
-            answer = new ExpNode(u.add(a).add(v.opposite()).toTree());
-            break;
-        case 2:
-            answer = new ExpNode(u.add(v).toTree());
-            break;
-        case 3:
-            answer = new ExpNode(u.add(v.opposite()).toTree());
-            break;
-        default:
-            throw Error("wrong random in exp simplifying");
+const isAnswerValid = (ans, { answer, ...identifiers }) => {
+    try {
+        const parsed = parseAlgebraic(ans);
+        const statement = getStatementNode(identifiers);
+        if (!isExpNode(parsed) && !isNumberNode(parsed))
+            return false;
+        return (parsed
+            .simplify({
+            towardsDistribute: true,
+            forbidFactorize: true,
+        })
+            .toTex() ===
+            statement
+                .simplify({
+                towardsDistribute: true,
+                forbidFactorize: true,
+            })
+                .toTex());
+    }
+    catch (err) {
+        return handleVEAError(err);
     }
-    const texs = answer.toAllValidTexs();
-    return texs.includes(ans);
 };
 export const expSimplifiying = {
     id: "expSimplifiying",
     connector: "\\iff",
     label: "Simplifier des expressions avec l'exponentielle",
-    levels: ["1reSpé", "TermSpé", "MathComp"],
-    sections: ["Exponentielle"],
     isSingleStep: false,
     generator: (nb) => getDistinctQuestions(getExpSimplifiying, nb),
     qcmTimer: 60,
@@ -110,4 +147,5 @@ export const expSimplifiying = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
+    getQuestionFromIdentifiers,
 };

package/lib/exercises/math/geometry/cartesian/cartesianEquationOfLine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cartesianEquationOfLine.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/cartesianEquationOfLine.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAqBrC,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;AAyNF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAczD,CAAC"}
+{"version":3,"file":"cartesianEquationOfLine.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/cartesian/cartesianEquationOfLine.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAqBrC,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;AAiOF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAczD,CAAC"}

package/lib/exercises/math/geometry/cartesian/cartesianEquationOfLine.js

@@ -9,6 +9,7 @@ import { EqualNode } from "../../../../tree/nodes/equations/equalNode.js";
 import { opposite } from "../../../../tree/nodes/functions/oppositeNode.js";
 import { NumberNode } from "../../../../tree/nodes/numbers/numberNode.js";
 import { add, AddNode } from "../../../../tree/nodes/operators/addNode.js";
+import { frac } from "../../../../tree/nodes/operators/fractionNode.js";
 import { multiply, MultiplyNode, } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { VariableNode } from "../../../../tree/nodes/variables/variableNode.js";
 import { parseAlgebraic } from "../../../../tree/parsers/latexParser.js";
@@ -33,14 +34,20 @@ const getCorrection = (identifiers) => {
     const A = new Point("A", aX, aY);
     const B = new Point("B", bX, bY);
     const vec = VectorConstructor.fromPoints(A, B);
-    const partial = add(multiply(opposite(vec.y), "x"), multiply(vec.x, "y")).simplify({
+    const simpVec = vec.toPrimeColinear("u");
+    const coeff = frac(vec.x, simpVec.x).simplify();
+    const partial = add(multiply(simpVec.y, "x"), multiply(opposite(simpVec.x), "y")).simplify({
         forbidFactorize: true,
     });
     const partialEv = partial.toDetailedEvaluation({ x: A.x, y: A.y });
     const partialEvSimp = partialEv.simplify();
     const c = opposite(partialEvSimp).simplify();
     return `On lit graphiquement que la droite passe par les points $${A.toTexWithCoords()}$ et $${B.toTexWithCoords()}$. On en déduit qu'un vecteur directeur de $d$ est $${vec.toTexWithCoords()}$.
-  
+
+${coeff.toTex() !== "1"
+        ? `Puisque tout vecteur colinéaire à $${vec.toTex()}$ est alors aussi un vecteur directeur de $d$, on peut diviser les coordonnées de $${vec.toTex()}$ par $${coeff.toTex()}$ pour obtenir un vecteur directeur plus simple : $${simpVec.toTexWithCoords()}$.`
+        : ""}
+
 Une équation cartésienne de $d$ est donc de la forme : 
 
 $$
@@ -97,8 +104,8 @@ const getQuestionFromIdentifiers = (identifiers) => {
         keys: ["x", "y", "equal"],
         answerFormat: "tex",
         identifiers,
-        // hint: getHint(identifiers),
-        // correction: getCorrection(identifiers),
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -179,6 +186,6 @@ export const cartesianEquationOfLine = {
     isAnswerValid,
     hasGeogebra: true,
     subject: "Mathématiques",
-    // hasHintAndCorrection: true,
+    hasHintAndCorrection: true,
     getQuestionFromIdentifiers,
 };

package/lib/exercises/math/geometry/euclidianConstructions/buildRhombus.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=buildRhombus.d.ts.map

package/lib/exercises/math/geometry/euclidianConstructions/buildRhombus.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildRhombus.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/euclidianConstructions/buildRhombus.ts"],"names":[],"mappings":""}

package/lib/exercises/math/geometry/euclidianConstructions/buildRhombus.js

@@ -0,0 +1,63 @@
+// import {
+//     Exercise,
+//     Question,
+//     QuestionGenerator,
+//     GGBVEA,
+//     GetHint,
+//     GetCorrection,
+//     GetInstruction,
+//     GetStudentGGBOptions,
+//     GetGGBAnswer,
+//     GetQuestionFromIdentifiers
+//   } from '../../../../exercises/exercise.js';
+//   import { getDistinctQuestions } from '../../../../exercises/utils/getDistinctQuestions.js';
+export {};
+//   type Identifiers = {
+//     side: number;
+//     diagonalSide: number;
+//   };
+//   const getInstruction : GetInstruction<Identifiers> = (identifiers)=>{
+//     const {side, diagonalSide} = identifiers
+//       return `Construire un losange $ABCD$ de $${side}$ de côté et tel que $AC = ${diagonalSide}$. `
+//   }
+//   const getHint : GetHint<Identifiers> = (identifiers)=>{
+//   }
+//   const getCorrection : GetCorrection<Identifiers> = (identifiers)=>{
+//   }
+//   const getGGBAnswer: GetGGBAnswer<Identifiers> = (identifiers)=>{
+//   }
+//   const getStudentGGBOptions: GetStudentGGBOptions<Identifiers> = (identifiers)=>{
+//   }
+//   const isGGBAnswerValid: GGBVEA<Identifiers> = (ans, {ggbAnswer}) => {
+//     throw Error("GGBVea not implemented")
+//   }
+//   const getBuildRhombusQuestion: QuestionGenerator<Identifiers>  = ()=>{
+//     const identifiers: Identifiers = {}
+//     return getQuestionFromIdentifiers(identifiers);
+//   }
+//     const getQuestionFromIdentifiers: GetQuestionFromIdentifiers<Identifiers> = (identifiers)=>{
+//       return {
+//         ggbAnswer: getGGBAnswer(identifiers),
+//         instruction: getInstruction(identifiers),
+//         studentGgbOptions: getStudentGGBOptions(identifiers),
+//         identifiers,
+//         hint: getHint(identifiers),
+//         correction: getCorrection(identifiers)
+//       }
+//     }
+//   export const buildRhombus: Exercise<Identifiers> = {
+//     id: 'buildRhombus',
+//     label: undefined,
+//     isSingleStep: true,
+//     generator: (nb, opts) => getDistinctQuestions(()=>getBuildRhombusQuestion(opts), nb),
+//     ggbTimer: 60,
+//     isGGBAnswerValid,
+//     subject: "Mathématiques",
+//     getHint,
+//     getInstruction,
+//     getCorrection,
+//     getGGBAnswer,
+//     getStudentGGBOptions,
+//     answerType: "GGB",
+//     getQuestionFromIdentifiers
+//   };

package/lib/exercises/math/geometry/lines/cartesianEquationToReduced.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cartesianEquationToReduced.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/lines/cartesianEquationToReduced.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AA0MF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAkB5D,CAAC"}
+{"version":3,"file":"cartesianEquationToReduced.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/lines/cartesianEquationToReduced.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAkBrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AA+OF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAkB5D,CAAC"}

package/lib/exercises/math/geometry/lines/cartesianEquationToReduced.js

@@ -3,6 +3,7 @@ import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQue
 import { RationalConstructor } from "../../../../math/numbers/rationals/rational.js";
 import { gcd } from "../../../../math/utils/arithmetic/gcd.js";
 import { randint } from "../../../../math/utils/random/randint.js";
+import { EqualNode } from "../../../../tree/nodes/equations/equalNode.js";
 import { add } from "../../../../tree/nodes/operators/addNode.js";
 import { frac } from "../../../../tree/nodes/operators/fractionNode.js";
 import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
@@ -11,6 +12,8 @@ import { monom } from "../../../../tree/nodes/polynomials/monomNode.js";
 import { parseAlgebraic } from "../../../../tree/parsers/latexParser.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
 import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
+import { isInt } from "../../../../utils/isInt.js";
+import { alignTex } from "../../../../utils/latex/alignTex.js";
 //ax+by+c = 0 into y = ... (et inversement)
 const getCartesianEquation = (identifiers) => {
     const { a, b, c, toReduced } = identifiers;
@@ -69,30 +72,66 @@ ${toReduced
         ? `Quelle est l'équation réduite de $d$ ?`
         : `Donner une équation cartésienne de $d$.`}`;
 };
-// const getHint: GetHint<Identifiers> = (identifiers) => {
-//   if (identifiers.toReduced)
-//     return `Pour déterminer l'équation réduite de $d$, il faut isoler la variable $y$ à gauche de l'équation, afin d'obtenir une équation de la forme :
-// $$
-// y = ax+b
-// $$`;
-//   return `Pour déterminer une équation cartésienne de $d$, il faut transformer son équation réduite en une équation de la forme :
-// $$
-// ax+by+c = 0
-// $$`;
-// };
-// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {
-//   const { a, b, c, toReduced } = identifiers;
-//   const cartesian = new EqualNode(
-//     getCartesianEquation(identifiers),
-//     (0).toTree(),
-//   );
-//   if (toReduced)
-//     return `On isole $y$ à gauche de l'équation :
-// $$
-// ${cartesian.isolate("y").toTex()}
-// $$`;
-//   return "";
-// };
+const getHint = (identifiers) => {
+    if (identifiers.toReduced)
+        return `Pour déterminer l'équation réduite de $d$, il faut isoler la variable $y$ à gauche de l'équation, afin d'obtenir une équation de la forme :
+
+$$
+y = ax+b
+$$`;
+    return `Pour déterminer une équation cartésienne de $d$, il faut transformer son équation réduite en une équation de la forme :
+
+$$
+ax+by+c = 0
+$$`;
+};
+const getCorrection = (identifiers) => {
+    const { a, b, c, toReduced } = identifiers;
+    const cartesian = new EqualNode(getCartesianEquation(identifiers), (0).toTree());
+    if (toReduced) {
+        const steps = [];
+        const res = cartesian.isolate("y", { steps });
+        const resSimp = res.rightChild.simplify({
+            towardsDistribute: true,
+            forceDistributeFractions: true,
+            forbidFactorize: true,
+        });
+        if (res.rightChild.toTex() !== resSimp.toTex())
+            steps.push(new EqualNode("y".toTree(), resSimp).toTex());
+        return `On isole $y$ à gauche de l'équation :
+
+${alignTex(steps.map((e) => [e]))}`;
+    }
+    const m = -a / b;
+    const p = -c / b;
+    const hasFracs = !isInt(m) || !isInt(p);
+    const coeff = hasFracs ? b : undefined;
+    const reduced = getReducedEquation(identifiers);
+    const equa = new EqualNode(substract("y", reduced), (0).toTree());
+    const equaSimp = equa.simplify({
+        towardsDistribute: true,
+        forbidFactorize: true,
+        forceDistributeFractions: true,
+    });
+    const equaTex = equa.toTex();
+    const equaSimpTex = equaSimp.toTex();
+    const equaSteps = [[equaTex]];
+    if (equaTex !== equaSimpTex)
+        equaSteps.push([equaSimpTex]);
+    return `On regroupe tous les termes à gauche :
+  
+${alignTex(equaSteps)}
+
+${hasFracs
+        ? `On multiple les deux côtés par $${coeff}$ pour supprimer les fractions : 
+  
+$$
+${cartesian.toTex()}
+$$`
+        : ""}
+
+`;
+};
 const getKeys = (identifiers) => {
     return ["x", "y", "equal"];
 };
@@ -167,8 +206,8 @@ const getQuestionFromIdentifiers = (identifiers) => {
         keys: getKeys(identifiers),
         answerFormat: "tex",
         identifiers,
-        // hint: getHint(identifiers),
-        // correction: getCorrection(identifiers),
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
 };
 export const cartesianEquationToReduced = {
@@ -182,9 +221,9 @@ export const cartesianEquationToReduced = {
     isAnswerValid,
     subject: "Mathématiques",
     getInstruction,
-    // getHint,
-    // getCorrection,
+    getHint,
+    getCorrection,
     getAnswer,
     getQuestionFromIdentifiers,
-    // hasHintAndCorrection: true,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/geometry/lines/cartesianEquationsIntersection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cartesianEquationsIntersection.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/lines/cartesianEquationsIntersection.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAUrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAO7C,KAAK,WAAW,GAAG;IACjB,gBAAgB,EAAE,eAAe,EAAE,CAAC;IACpC,gBAAgB,EAAE,eAAe,EAAE,CAAC;CACrC,CAAC;AAkHF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,CAoBhE,CAAC"}
+{"version":3,"file":"cartesianEquationsIntersection.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/lines/cartesianEquationsIntersection.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAeT,MAAM,6BAA6B,CAAC;AAWrC,OAAO,EACL,eAAe,EAEhB,MAAM,qCAAqC,CAAC;AAQ7C,KAAK,WAAW,GAAG;IACjB,gBAAgB,EAAE,eAAe,EAAE,CAAC;IACpC,gBAAgB,EAAE,eAAe,EAAE,CAAC;CACrC,CAAC;AA0KF,eAAO,MAAM,8BAA8B,EAAE,QAAQ,CAAC,WAAW,CAqBhE,CAAC"}

package/lib/exercises/math/geometry/lines/cartesianEquationsIntersection.js

@@ -56,8 +56,59 @@ $$
 
 Déterminer les coordonnées du point d'intersection de $d_1$ et $d_2$.`;
 };
-// const getHint: GetHint<Identifiers> = (identifiers) => {};
-// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {};
+const getHint = (identifiers) => {
+    const { cartesianCoeffs1, cartesianCoeffs2 } = identifiers;
+    const coeffs1 = cartesianCoeffs1.map((c) => reifyAlgebraic(c));
+    const coeffs2 = cartesianCoeffs2.map((c) => reifyAlgebraic(c));
+    const equa1 = getEquation(coeffs1).toTex();
+    const equa2 = getEquation(coeffs2).toTex();
+    return `Le point d'intersection de $d_1$ et $d_2$, s'il existe, est le point dont les coordonnées $(x;y)$ est une solution du système :
+  
+$$
+\\left\\{\\begin{matrix}
+${equa1} \\\\
+${equa2}
+\\end{matrix}\\right.
+$$`;
+};
+const getCorrection = (identifiers) => {
+    const { cartesianCoeffs1, cartesianCoeffs2 } = identifiers;
+    const coeffs1 = cartesianCoeffs1.map((c) => reifyAlgebraic(c));
+    const coeffs2 = cartesianCoeffs2.map((c) => reifyAlgebraic(c));
+    let equa1 = getEquation(coeffs1);
+    let equa2 = getEquation(coeffs2);
+    let corr = `On doit résoudre le système : 
+  
+$$
+\\left\\{\\begin{matrix}
+${equa1.toTex()} \\\\
+${equa2.toTex()}
+\\end{matrix}\\right.
+$$`;
+    coeffs1[2] = opposite(coeffs1[2].simplify());
+    coeffs2[2] = opposite(coeffs2[2].simplify());
+    const sys = new GeneralSystem([coeffs1, coeffs2]);
+    [equa1, equa2] = sys.getEqualNodes();
+    corr += `
+  
+c'est à dire : 
+
+$$
+${sys.toTex()}
+$$
+
+`;
+    corr += sys.toCorrectionTex();
+    corr += `
+
+Le point d'intersection de $d_1$ et $d_2$ a donc pour coordonnées : 
+
+$$
+${getAnswer(identifiers)}
+$$
+`;
+    return corr;
+};
 const getKeys = (identifiers) => {
     return ["semicolon"];
 };
@@ -93,8 +144,8 @@ const getQuestionFromIdentifiers = (identifiers) => {
         keys: getKeys(identifiers),
         answerFormat: "tex",
         identifiers,
-        // hint: getHint(identifiers),
-        // correction: getCorrection(identifiers),
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
 };
 export const cartesianEquationsIntersection = {
@@ -112,4 +163,5 @@ export const cartesianEquationsIntersection = {
     // getCorrection,
     getAnswer,
     getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/geometry/lines/drawLineFromCartesianEquation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"drawLineFromCartesianEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/lines/drawLineFromCartesianEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAQrC,OAAO,EAGL,gBAAgB,EACjB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAGL,iBAAiB,EAClB,MAAM,+BAA+B,CAAC;AAQvC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,SAAS,EAAE,iBAAiB,CAAC;CAC9B,CAAC;AA+HF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAmB/D,CAAC"}
+{"version":3,"file":"drawLineFromCartesianEquation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/lines/drawLineFromCartesianEquation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAMrC,OAAO,EAGL,gBAAgB,EACjB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAGL,iBAAiB,EAClB,MAAM,+BAA+B,CAAC;AAMvC,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,SAAS,EAAE,iBAAiB,CAAC;CAC9B,CAAC;AA4KF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAoB/D,CAAC"}