math-exercises 3.0.11 → 3.0.12

package/lib/exercises/math/calculLitteral/equation/equationType4Exercise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"equationType4Exercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationType4Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAerC;;GAEG;AAEH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAsGF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAiBvD,CAAC"}
+{"version":3,"file":"equationType4Exercise.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/equationType4Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAkBrC;;GAEG;AAEH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAkGF,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,WAAW,CAoBvD,CAAC"}

package/lib/exercises/math/calculLitteral/equation/equationType4Exercise.js

@@ -4,7 +4,7 @@ import { equationKeys } from "../../../../exercises/utils/keys/equationKeys.js";
 import { Rational } from "../../../../math/numbers/rationals/rational.js";
 import { Affine } from "../../../../math/polynomials/affine.js";
 import { randint } from "../../../../math/utils/random/randint.js";
-import { EqualNode } from "../../../../tree/nodes/equations/equalNode.js";
+import { EqualNode, equationResolutionTex, } from "../../../../tree/nodes/equations/equalNode.js";
 import { VariableNode } from "../../../../tree/nodes/variables/variableNode.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
 import { equationVEA } from "../../../../exercises/vea/equationVEA.js";
@@ -53,23 +53,22 @@ const getQuestionFromIdentifiers = (identifiers) => {
         keys: equationKeys,
         answerFormat: "tex",
         identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
-//     hint: `Commence par regrouper les termes en $x$ d'un même côté de l'équation. Puis, isole $x$ en effectuant les bonnes opérations.`,
-//     correction: `On isole $x$ à gauche en soustrayant par $${b}$ puis en divisant par $${a}$ :
-// ${alignTex([
-//   [
-//     statementTex,
-//     "\\iff",
-//     new EqualNode(
-//       new Affine(a, 0).toTree(),
-//       affines[1].add(-b).toTree(),
-//     ).toTex(),
-//   ],
-//   ["", "\\iff", answer],
-// ])}
-//     `,
+const getHint = (identifiers) => {
+    return `Commence par regrouper les termes en $x$ d'un même côté de l'équation. Puis, isole $x$ en effectuant les bonnes opérations.`;
+};
+const getCorrection = (identifiers) => {
+    const { a, b, c, d } = identifiers;
+    return `On regroupe les nombres d'un côté, et les termes en $x$ de l'autre :
+  
+$$
+${equationResolutionTex(a.toTree(), b.toTree(), c.toTree(), d.toTree())}
+$$`;
+};
 const getPropositions = (n, { answer, a, b, c, d }) => {
     const propositions = [];
     addValidProp(propositions, answer);
@@ -101,4 +100,7 @@ export const equationType4Exercise = {
     getInstruction,
     getAnswer,
     getQuestionFromIdentifiers,
+    getHint,
+    getCorrection,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/calculLitteral/equation/firstDegreeEquationIntType3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"firstDegreeEquationIntType3.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/firstDegreeEquationIntType3.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAWT,MAAM,6BAA6B,CAAC;AAUrC,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;CACX,CAAC;AAmGF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAe7D,CAAC"}
+{"version":3,"file":"firstDegreeEquationIntType3.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/equation/firstDegreeEquationIntType3.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAarC,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;CACX,CAAC;AAkHF,eAAO,MAAM,2BAA2B,EAAE,QAAQ,CAAC,WAAW,CAgB7D,CAAC"}

package/lib/exercises/math/calculLitteral/equation/firstDegreeEquationIntType3.js

@@ -2,7 +2,7 @@ import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exer
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
 import { equationVEA } from "../../../../exercises/vea/equationVEA.js";
 import { randint } from "../../../../math/utils/random/randint.js";
-import { EqualNode } from "../../../../tree/nodes/equations/equalNode.js";
+import { EqualNode, equationResolutionTex, } from "../../../../tree/nodes/equations/equalNode.js";
 import { AddNode } from "../../../../tree/nodes/operators/addNode.js";
 import { FractionNode } from "../../../../tree/nodes/operators/fractionNode.js";
 import { MultiplyNode } from "../../../../tree/nodes/operators/multiplyNode.js";
@@ -21,6 +21,17 @@ const getAnswer = (identifiers) => {
     const answer = new EqualNode(new VariableNode("x"), x.toTree()).toTex();
     return answer;
 };
+const getHint = (identifiers) => {
+    return `Commence par regrouper les termes en $x$ d'un même côté de l'équation. Puis, isole $x$ en effectuant les bonnes opérations.`;
+};
+const getCorrection = (identifiers) => {
+    const { a, b, c, d } = identifiers;
+    return `On regroupe les nombres d'un côté, et les termes en $x$ de l'autre :
+  
+$$
+${equationResolutionTex(a.toTree(), b.toTree(), c.toTree(), d.toTree())}
+$$`;
+};
 const getFirstDegreeEquationIntQuestion = () => {
     const a = randint(-15, 15, [0]);
     const x = randint(-15, 15, [0]);
@@ -34,6 +45,8 @@ const getFirstDegreeEquationIntQuestion = () => {
         keys: ["x", "equal"],
         answerFormat: "tex",
         identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -75,9 +88,7 @@ const isAnswerValid = (ans, { answer, x }) => {
 export const firstDegreeEquationIntType3 = {
     id: "firstDegreeEquationIntType3",
     label: "Résoudre une équation du type $ax + b = cx + d$ (solution entière)",
-    levels: ["2nde"],
     isSingleStep: true,
-    sections: ["Équations"],
     generator: (nb) => getDistinctQuestions(getFirstDegreeEquationIntQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -86,4 +97,7 @@ export const firstDegreeEquationIntType3 = {
     subject: "Mathématiques",
     getInstruction,
     getAnswer,
+    getHint,
+    getCorrection,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/functions/basics/inverseImageFunction.d.ts

@@ -1,7 +1,7 @@
 import { Exercise } from "../../../../exercises/exercise.js";
 type Identifiers = {
-    poly1: number[];
-    xValue: number;
+    coeffs: number[];
+    yValue: number;
 };
 export declare const inverseImageFunction: Exercise<Identifiers>;
 export {};

package/lib/exercises/math/functions/basics/inverseImageFunction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inverseImageFunction.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/inverseImageFunction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,6BAA6B,CAAC;AAKrC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAyCF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAatD,CAAC"}
+{"version":3,"file":"inverseImageFunction.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/basics/inverseImageFunction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IAIjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA4GF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAoBtD,CAAC"}

package/lib/exercises/math/functions/basics/inverseImageFunction.js

@@ -1,34 +1,94 @@
 import { addValidProp, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { AffineConstructor } from "../../../../math/polynomials/affine.js";
 import { Polynomial } from "../../../../math/polynomials/polynomial.js";
 import { randint } from "../../../../math/utils/random/randint.js";
+import { equationResolutionTex } from "../../../../tree/nodes/equations/equalNode.js";
+import { add } from "../../../../tree/nodes/operators/addNode.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
+const rebuildIdentifiers = (oldIds) => {
+    if (oldIds.coeffs?.length)
+        return oldIds;
+    const polynome = new Polynomial(oldIds.poly1);
+    const yValue = polynome.calculate(oldIds.xValue);
+    return {
+        coeffs: oldIds.poly1,
+        yValue,
+    };
+};
+const getStartStatement = (identifiers) => {
+    const { yValue } = identifiers;
+    return `f(x) = ${yValue}`;
+};
+const getInstruction = (identifiers) => {
+    const { yValue, coeffs } = identifiers;
+    const polynome = new Polynomial(coeffs);
+    const statement = `Soit $f$ la fonction définie sur $\\mathbb{R}$ par : 
+  
+$$
+f(x) = ${polynome.toTree().toTex()}
+$$ 
+    
+Déterminer le ou les antécédents de $${yValue}$ par $f$.`;
+    return statement;
+};
+const getAnswer = (identifiers) => {
+    const { yValue, coeffs } = identifiers;
+    const polynome = AffineConstructor.fromCoeffs(coeffs);
+    const xValue = polynome.solve(yValue);
+    const answer = "x=" + xValue.toTex();
+    return answer;
+};
 const getInverseImageFunction = () => {
     const polynome1 = new Polynomial([randint(-9, 10), randint(-5, 6, [0])]);
     const xValue = randint(-9, 10);
-    let image = polynome1.calculate(xValue) + "";
-    const statement = `Soit $f(x) = ${polynome1
-        .toTree()
-        .toTex()}$. Déterminer le ou les antécédents de $${image}$ par $f$.`;
-    const answer = "x=" + xValue;
+    const y = polynome1.calculate(xValue);
+    const identifiers = { coeffs: polynome1.coefficients, yValue: y };
     const question = {
-        instruction: statement,
-        startStatement: `f(x) = ${image}`,
-        answer,
+        instruction: getInstruction(identifiers),
+        startStatement: getStartStatement(identifiers),
+        answer: getAnswer(identifiers),
         keys: ["x", "equal"],
         answerFormat: "tex",
-        identifiers: { poly1: polynome1.coefficients, xValue },
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
-const getPropositions = (n, { answer, poly1, xValue }) => {
+const getHint = (identifiers) => {
+    const { yValue, coeffs } = identifiers;
+    return `On doit résoudre l'équation : 
+  
+$$
+f(x) = ${yValue}
+$$`;
+};
+const getCorrection = (identifiers) => {
+    const { yValue, coeffs } = identifiers;
+    const polynome = AffineConstructor.fromCoeffs(coeffs);
+    const xValue = polynome.solve(yValue);
+    const answer = "x=" + xValue.toTex();
+    return `On résout l'équation : 
+  
+$$
+f(x) = ${yValue}
+$$
+
+On obtient : 
+
+$$
+${equationResolutionTex(coeffs[1].toTree(), coeffs[0].toTree(), (0).toTree(), yValue.toTree())}
+$$`;
+};
+const getPropositions = (n, { answer, coeffs, yValue }) => {
     const propositions = [];
     addValidProp(propositions, answer);
-    const poly = new Polynomial(poly1);
-    const image = poly.calculate(xValue);
-    tryToAddWrongProp(propositions, "x=" + image);
+    const poly = AffineConstructor.fromCoeffs(coeffs);
+    const x = poly.solve(yValue);
+    tryToAddWrongProp(propositions, "x=" + yValue);
     while (propositions.length < n) {
-        const wrongAnswer = xValue + randint(-10, 11, [0]);
+        const wrongAnswer = add(x, randint(-10, 11, [0])).simplify();
         tryToAddWrongProp(propositions, "x=" + wrongAnswer);
     }
     return shuffle(propositions);
@@ -49,4 +109,11 @@ export const inverseImageFunction = {
     freeTimer: 60,
     isAnswerValid,
     subject: "Mathématiques",
+    getInstruction,
+    getAnswer,
+    getStartStatement,
+    rebuildIdentifiers,
+    getCorrection,
+    getHint,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/trigonometry/equationCosOnRandomInterval.js

@@ -64,12 +64,12 @@ $$
 ${new CosNode("x".toTree()).toTex()}=${value.cos.toTex()}
 $$`;
 };
-const getHint = (identifiers) => {
-    return "";
-};
-const getCorrection = (identifiers) => {
-    return "";
-};
+// const getHint: GetHint<Identifiers> = (identifiers) => {
+//   return "";
+// };
+// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {
+//   return "";
+// };
 const getKeys = (identifiers) => {
     return ["x", "S", "equal", "lbrace", "semicolon", "rbrace", "pi"];
 };
@@ -88,8 +88,8 @@ const getEquationCosOnRandomIntervalQuestion = () => {
         keys: getKeys(identifiers),
         answerFormat: "tex",
         identifiers,
-        hint: getHint(identifiers),
-        correction: getCorrection(identifiers),
+        // hint: getHint(identifiers),
+        // correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -104,7 +104,7 @@ export const equationCosOnRandomInterval = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
-    getHint,
-    getCorrection,
+    // getHint,
+    // getCorrection,
     getAnswer,
 };

package/lib/exercises/math/trigonometry/equationSinOnRandomInterval.js

@@ -56,12 +56,12 @@ const getInstruction = ({ degree, leftBoundPiMultiple, }) => {
   ${new SinNode("x".toTree()).toTex()}=${value.sin.toTex()}
   $$`;
 };
-const getHint = (identifiers) => {
-    return "";
-};
-const getCorrection = (identifiers) => {
-    return "";
-};
+// const getHint: GetHint<Identifiers> = (identifiers) => {
+//   return "";
+// };
+// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {
+//   return "";
+// };
 const getKeys = (identifiers) => {
     return ["pi"];
 };
@@ -79,8 +79,8 @@ const getEquationSinOnRandomIntervalQuestion = () => {
         keys: getKeys(identifiers),
         answerFormat: "tex",
         identifiers,
-        hint: getHint(identifiers),
-        correction: getCorrection(identifiers),
+        // hint: getHint(identifiers),
+        // correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -95,7 +95,7 @@ export const equationSinOnRandomInterval = {
     getPropositions,
     isAnswerValid,
     subject: "Mathématiques",
-    getHint,
-    getCorrection,
+    // getHint,
+    // getCorrection,
     getAnswer,
 };

package/lib/exercises/math/trigonometry/mainAngleMeasure.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mainAngleMeasure.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/trigonometry/mainAngleMeasure.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,kBAAkB,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,GAAG,CAAC;CACd,CAAC;AA4FF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAiBlD,CAAC"}
+{"version":3,"file":"mainAngleMeasure.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/trigonometry/mainAngleMeasure.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,6BAA6B,CAAC;AAgBrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,kBAAkB,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,GAAG,CAAC;CACd,CAAC;AA4FF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAkBlD,CAAC"}

package/lib/exercises/math/trigonometry/mainAngleMeasure.js

@@ -98,5 +98,6 @@ export const mainAngleMeasure = {
     // getHint,
     // getCorrection,
     getAnswer,
+    getInstruction,
     // hasHintAndCorrection: false,
 };

package/lib/exercises/math/trigonometry/trigonometrySideCalcul.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trigonometrySideCalcul.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/trigonometry/trigonometrySideCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,6BAA6B,CAAC;AAQrC,OAAO,EAEL,mBAAmB,EACpB,MAAM,iCAAiC,CAAC;AAMzC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C,CAAC;AA4KF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAexD,CAAC"}
+{"version":3,"file":"trigonometrySideCalcul.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/trigonometry/trigonometrySideCalcul.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AASrC,OAAO,EAEL,mBAAmB,EACpB,MAAM,iCAAiC,CAAC;AAMzC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C,CAAC;AA8OF,eAAO,MAAM,sBAAsB,EAAE,QAAQ,CAAC,WAAW,CAmBxD,CAAC"}

package/lib/exercises/math/trigonometry/trigonometrySideCalcul.js

@@ -1,12 +1,42 @@
 import { addValidProp, tryToAddWrongProp, } from "../../../exercises/exercise.js";
 import { getDistinctQuestions } from "../../../exercises/utils/getDistinctQuestions.js";
+import { numberVEA } from "../../../exercises/vea/numberVEA.js";
 import { greenDark } from "../../../geogebra/colors.js";
 import { GeogebraConstructor } from "../../../geogebra/geogebraConstructor.js";
 import { RightTriangleConstructor, } from "../../../math/geometry/rightTriangle.js";
+import { TriangleConstructor, } from "../../../math/geometry/triangle.js";
 import { randint } from "../../../math/utils/random/randint.js";
 import { round } from "../../../math/utils/round.js";
-import { NumberNode } from "../../../tree/nodes/numbers/numberNode.js";
 import { shuffle } from "../../../utils/alea/shuffle.js";
+const getInstruction = (identifiers) => {
+    const { givenAngle, givenSide, sideAsked, triangleIdentifiers } = identifiers;
+    const triangle = TriangleConstructor.fromIdentifiers(triangleIdentifiers);
+    const angleValue = triangle.angles[givenAngle].evaluate().frenchify();
+    return `Le triangle $${triangle.name}$ rectangle en $${triangle.points[0].name}$ est tel que $${triangle.sides[givenSide].toLengthTex()}$ cm et $\\widehat{${triangle.points[givenAngle].name}} = ${angleValue}^\\circ$. 
+    
+Calculer $${triangle.sides[sideAsked].toInsideName()}$ à $0,1$ cm près.`;
+};
+const getAnswer = (identifiers) => {
+    const { givenAngle, givenSide, sideAsked, triangleIdentifiers } = identifiers;
+    const triangle = TriangleConstructor.fromIdentifiers(triangleIdentifiers);
+    const answer = round(triangle.sides[sideAsked].getLength(), 1).frenchify();
+    return answer;
+};
+const getGGBOptions = (identifiers) => {
+    const { givenAngle, givenSide, sideAsked, triangleIdentifiers } = identifiers;
+    const triangle = RightTriangleConstructor.fromIdentifiers(triangleIdentifiers);
+    // triangle.showSidesLength([0, 1, 2].filter((i) => i !== givenSide));
+    triangle.highlightAngle(givenAngle, { color: greenDark, showValue: false });
+    // triangle.highlightSide(sideAsked, { color: "red", caption: "?" });
+    const ggb = new GeogebraConstructor({
+        commands: triangle.commands,
+        hideAxes: true,
+        hideGrid: true,
+    });
+    return ggb.getOptions({
+        coords: triangle.generateCoords(),
+    });
+};
 const getTrigonometrySideCalcul = () => {
     const givenAngle = randint(1, 3);
     const givenSide = randint(0, 3);
@@ -15,16 +45,6 @@ const getTrigonometrySideCalcul = () => {
         randomName: true,
         niceSideIndex: givenSide,
     });
-    triangle.showSidesLength([0, 1, 2].filter((i) => i !== givenSide));
-    triangle.highlightAngle(givenAngle, { color: greenDark, showValue: true });
-    triangle.highlightSide(sideAsked, { color: "red", caption: "?" });
-    const angleValue = triangle.angles[givenAngle].evaluate().frenchify();
-    const ggb = new GeogebraConstructor({
-        commands: triangle.commands,
-        hideAxes: true,
-        hideGrid: true,
-    });
-    const answer = round(triangle.sides[sideAsked].getLength(), 1).frenchify();
     const identifiers = {
         givenAngle,
         givenSide,
@@ -32,16 +52,12 @@ const getTrigonometrySideCalcul = () => {
         triangleIdentifiers: triangle.toIdentifiers(),
     };
     const question = {
-        instruction: `Le triangle $${triangle.name}$ rectangle en $${triangle.points[0].name}$ est tel que $${triangle.sides[givenSide].toLengthTex()}$ cm et $\\widehat{${triangle.points[givenAngle].name}} = ${angleValue}^\\circ$. 
-    
-Calculer $${triangle.sides[sideAsked].toInsideName()}$ à $0,1$ cm près.`,
-        answer,
-        // hint: getHint(identifiers),
-        // correction: getCorrection(identifiers),
+        instruction: getInstruction(identifiers),
+        answer: getAnswer(identifiers),
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
         keys: [],
-        ggbOptions: ggb.getOptions({
-            coords: triangle.generateCoords(),
-        }),
+        ggbOptions: getGGBOptions(identifiers),
         answerFormat: "tex",
         identifiers,
     };
@@ -56,102 +72,144 @@ const getPropositions = (n, { answer }) => {
     return shuffle(propositions);
 };
 const getHint = (identifiers) => {
-    return `Identifier le côté opposé, le côté adjacent et l'hypoténuse, puis utiliser la bonne formule de trigonométrie.`;
+    return `Identifie le côté opposé, le côté adjacent et l'hypoténuse du triangle. Puis, utilise la bonne formule de trigonométrie, en te rappelant de : 
+  
+$$
+\\text{SOH-CAH-TOA}
+$$`;
 };
-// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {
-//   const hypothenus = { name: sides[2], length: sideLengths[2] };
-//   const sidesWithLentgh = sides.map((value, index) => {
-//     return { name: value, length: sideLengths[index] };
-//   });
-//   const adjacent = sidesWithLentgh.filter(
-//     (value) =>
-//       value.name !== hypothenus.name &&
-//       [value.name.charAt(0), value.name.charAt(1)].includes(angle),
-//   )[0];
-//   const opposite = sidesWithLentgh.filter(
-//     (value) => value.name !== hypothenus.name && value.name !== adjacent.name,
-//   )[0];
-//   const correctEquations = getCorrectEquations(
-//     { name: sides[randSideQuestion], length: sideLengths[randSideQuestion] },
-//     { name: sides[randSide], length: sideLengths[randSide] },
-//     hypothenus,
-//     { name: angle, value: angleValue },
-//     adjacent,
-//     opposite,
-//     answer,
-//   );
-//   return `On utilise la relation :
-// $$
-// ${correctEquations[0]}
-// $$
-// On a donc :
-// $$
-// ${correctEquations[1]}
-// $$
-// donc
-// $$${correctEquations[2]}$$. Ainsi $${correctEquations[3]}$ `;
-// };
-const getCorrectEquations = (randSideQuestion, randSide, hypothenus, angle, adjacent, opposite, answer) => {
-    let result;
-    switch (randSideQuestion.name) {
-        case adjacent.name:
-            result =
-                randSide.name === opposite.name
-                    ? [
-                        `\\tan(\\widehat{${angle.name}})=\\frac{${opposite.name}}{${adjacent.name}}`,
-                        `\\tan(\\widehat{${angle.value}})=\\frac{${opposite.length}}{${adjacent.name}}`,
-                        `${adjacent.name}=\\frac{${opposite.length}}{\\tan(\\widehat{${angle.value}})}`,
-                    ]
-                    : [
-                        `\\cos(\\widehat{${angle.name}})=\\frac{${adjacent.name}}{${hypothenus.name}}`,
-                        `\\cos(\\widehat{${angle.value}})=\\frac{${adjacent.name}}{${hypothenus.length}}`,
-                        `${adjacent.name}=\\cos(\\widehat{${angle.value}})\\times${hypothenus.length}`,
-                    ];
-            return result.concat(`${answer}=${adjacent.name}`);
-        case opposite.name:
-            result =
-                randSide.name === adjacent.name
-                    ? [
-                        `\\tan(\\widehat{${angle.name}})=\\frac{${opposite.name}}{${adjacent.name}}`,
-                        `\\tan(\\widehat{${angle.value}})=\\frac{${opposite.name}}{${adjacent.length}}`,
-                        `${opposite.name}=\\tan(\\widehat{${angle.value}})*${adjacent.length}`,
-                    ]
-                    : [
-                        `\\sin(\\widehat{${angle.name}})=\\frac{${opposite.name}}{${hypothenus.name}}`,
-                        `\\sin(\\widehat{${angle.value}})=\\frac{${opposite.name}}{${hypothenus.length}}`,
-                        `${opposite.name}=\\sin(\\widehat{${angle.value}})\\times${hypothenus.length}`,
-                    ];
-            return result.concat(`${answer}=${opposite.name}`);
-        case hypothenus.name:
-            result =
-                randSide.name === adjacent.name
-                    ? [
-                        `\\cos(\\widehat{${angle.name}})=\\frac{${adjacent.name}}{${hypothenus.name}}`,
-                        `\\cos(\\widehat{${angle.value}})=\\frac{${adjacent.length}}{${hypothenus.name}}`,
-                        `${hypothenus.name}=\\frac{${adjacent.length}}{\\cos(${angle.value})}`,
-                    ]
-                    : [
-                        `\\sin(\\widehat{${angle.name}})=\\frac{${opposite.name}}{${hypothenus.name}}`,
-                        `\\sin(\\widehat{${angle.value}})=\\frac{${opposite.length}}{${hypothenus.name}}`,
-                        `${hypothenus.name}=\\frac{${opposite.length}}{\\sin(${angle.value})}`,
-                    ];
-            return result.concat(`${hypothenus.name}=${answer}`);
-        default:
-            return [];
+const getCorrection = (identifiers) => {
+    const { givenAngle, givenSide, sideAsked, triangleIdentifiers } = identifiers;
+    //sohcahtoa
+    //
+    const triangle = RightTriangleConstructor.fromIdentifiers(triangleIdentifiers);
+    const angle = triangle.angles[givenAngle];
+    const hypoSegment = triangle.sides[0];
+    const adjacentSegment = triangle.sides[3 - givenAngle];
+    const oppositeSegment = triangle.sides[givenAngle];
+    const angleValue = angle.evaluate().frenchify();
+    const sideAskedType = sideAsked === 0
+        ? "hypoténuse"
+        : sideAsked === givenAngle
+            ? "opposé"
+            : "adjacent";
+    const sideGivenType = givenSide === 0
+        ? "hypoténuse"
+        : givenSide === givenAngle
+            ? "opposé"
+            : "adjacent";
+    const fcts = [
+        {
+            id: "cos",
+            name: "le cosinus",
+            frac: "\\frac{\\text{adjacent}}{\\text{hypoténuse}}",
+        },
+        {
+            id: "sin",
+            name: "le sinus",
+            frac: "\\frac{\\text{opposé}}{\\text{hypoténuse}}",
+        },
+        {
+            id: "tan",
+            name: "la tangente",
+            frac: "\\frac{\\text{opposé}}{\\text{adjacent}}",
+        },
+    ];
+    const sidesProps = [
+        {
+            id: "adjacent",
+            name: "le côté adjacent",
+            tex: adjacentSegment.toTex(),
+            insideTex: adjacentSegment.toInsideName(),
+            value: sideGivenType === "adjacent"
+                ? adjacentSegment.getLength().frenchify()
+                : adjacentSegment.toInsideName(),
+        },
+        {
+            id: "opposé",
+            name: "le côté opposé",
+            tex: oppositeSegment.toTex(),
+            insideTex: oppositeSegment.toInsideName(),
+            value: sideGivenType === "opposé"
+                ? oppositeSegment.getLength().frenchify()
+                : oppositeSegment.toInsideName(),
+        },
+        {
+            id: "hypoténuse",
+            name: "l'hypoténuse",
+            tex: hypoSegment.toTex(),
+            insideTex: hypoSegment.toInsideName(),
+            value: sideGivenType === "hypoténuse"
+                ? hypoSegment.getLength().frenchify()
+                : hypoSegment.toInsideName(),
+        },
+    ];
+    let fct;
+    let sides;
+    switch (sideAskedType) {
+        case "hypoténuse":
+            if (sideGivenType === "adjacent") {
+                fct = fcts[0];
+                sides = [sidesProps[2], sidesProps[0]];
+            }
+            else {
+                fct = fcts[1];
+                sides = [sidesProps[2], sidesProps[1]];
+            }
+            break;
+        case "adjacent":
+            if (sideGivenType === "opposé") {
+                fct = fcts[2];
+                sides = [sidesProps[0], sidesProps[1]];
+            }
+            else {
+                fct = fcts[0];
+                sides = [sidesProps[0], sidesProps[2]];
+            }
+            break;
+        case "opposé":
+            if (sideGivenType === "adjacent") {
+                fct = fcts[2];
+                sides = [sidesProps[1], sidesProps[0]];
+            }
+            else {
+                fct = fcts[1];
+                sides = [sidesProps[1], sidesProps[2]];
+            }
+            break;
     }
+    let isDenumeratorAsked = sideAskedType === "hypoténuse" ||
+        (sideAskedType === "adjacent" && sideGivenType === "opposé");
+    return `Dans le triangle $${triangle.name}$ rectangle en $${triangle.points[0].name}$, par rapport à l'angle $${angle.toTex()}$, $${sides[0].tex}$ est ${sides[0].name} et $${sides[1].tex}$ est ${sides[1].name}.
+        
+Pour trouver $${sides[0].insideTex}$, on peut donc utiliser ${fct.name} de l'angle $${angle.toTex()}$. En effet, on a : 
+
+$$
+\\${fct.id}(${angle.toTex()}) = ${fct.frac}
+$$
+
+donc
+
+$$
+\\${fct.id}(${angleValue}) = \\frac{${sides[isDenumeratorAsked ? 1 : 0].insideTex}}{${sides[isDenumeratorAsked ? 0 : 1].insideTex}} = \\frac{${sides[isDenumeratorAsked ? 1 : 0].value}}{${sides[isDenumeratorAsked ? 0 : 1].value}}
+$$
+
+Ainsi,
+
+$$
+${isDenumeratorAsked
+        ? `${sides[0].insideTex} = \\frac{${sides[1].value}}{\\${fct.id}(${angleValue})}`
+        : `${sides[0].insideTex} = \\${fct.id}(${angleValue}) \\times ${sides[1].value}`} \\approx ${getAnswer(identifiers)}\\text{ cm}
+$$`;
 };
 const isAnswerValid = (ans, { answer }) => {
-    const answerTree = new NumberNode(Number(answer.replace(",", ".")));
-    const texs = answerTree.toAllValidTexs();
-    return texs.includes(ans);
+    return numberVEA(ans, answer, 1);
 };
 export const trigonometrySideCalcul = {
     id: "trigonometrySideCalcul",
     connector: "=",
     label: "Utiliser la trigonométrie pour calculer un côté",
-    levels: ["4ème", "3ème", "2nde"],
     isSingleStep: false,
-    sections: ["Trigonométrie", "Géométrie euclidienne"],
     generator: (nb) => getDistinctQuestions(getTrigonometrySideCalcul, nb),
     qcmTimer: 60,
     freeTimer: 60,
@@ -159,4 +217,10 @@ export const trigonometrySideCalcul = {
     isAnswerValid,
     hasGeogebra: true,
     subject: "Mathématiques",
+    getInstruction,
+    getAnswer,
+    getHint,
+    getGGBOptions,
+    getCorrection,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/vea/numberVEA.d.ts

@@ -1,2 +1,2 @@
-export declare const numberVEA: (studentAns: string, answer: string) => boolean;
+export declare const numberVEA: (studentAns: string, answer: string, roundTo?: number) => boolean;
 //# sourceMappingURL=numberVEA.d.ts.map

package/lib/exercises/vea/numberVEA.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"numberVEA.d.ts","sourceRoot":"","sources":["../../../src/exercises/vea/numberVEA.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,SAAS,eAAgB,MAAM,UAAU,MAAM,YAI3D,CAAC"}
+{"version":3,"file":"numberVEA.d.ts","sourceRoot":"","sources":["../../../src/exercises/vea/numberVEA.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,SAAS,eACR,MAAM,UACV,MAAM,YACJ,MAAM,YAKjB,CAAC"}

package/lib/exercises/vea/numberVEA.js

@@ -1,6 +1,6 @@
 import { numberParser } from "../../tree/parsers/numberParser.js";
-export const numberVEA = (studentAns, answer) => {
-    const parsed = numberParser(studentAns);
+export const numberVEA = (studentAns, answer, roundTo) => {
+    const parsed = numberParser(studentAns, roundTo);
     if (!parsed)
         return false;
     return parsed === answer;

package/lib/index.d.ts

@@ -691,8 +691,8 @@ declare const mathExercises: (Exercise<{
 }, {
     curveTypes: string[];
 }> | Exercise<{
-    poly1: number[];
-    xValue: number;
+    coeffs: number[];
+    yValue: number;
 }, {}> | Exercise<{
     yValue: number;
     points: number[][];

package/lib/math/polynomials/affine.d.ts

@@ -1,3 +1,4 @@
+import { AlgebraicNode } from "../../tree/nodes/algebraicNode.js";
 import { Nombre } from "../numbers/nombre.js";
 import { Polynomial } from "./polynomial.js";
 import { Trinom } from "./trinom.js";
@@ -28,6 +29,7 @@ export declare class Affine extends Polynomial {
     variable: string;
     constructor(a: number, b: number, variable?: string);
     getRoot(): Nombre;
+    solve(y: AlgebraicNode | number): AlgebraicNode;
     square(): Trinom;
     times(n: number): Affine;
     toString(): string;

package/lib/math/polynomials/affine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"affine.d.ts","sourceRoot":"","sources":["../../../src/math/polynomials/affine.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAG9C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,8BAAsB,iBAAiB;IACrC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM;IAG3C,MAAM,CAAC,MAAM,CACX,KAAK,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,EAC3D,KAAK,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAC1D,MAAM;IAcT,MAAM,CAAC,gBAAgB,CACrB,EAAE,EAAE,MAAM,EACV,KAAK,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,EAC3D,KAAK,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAC1D,MAAM,EAAE;CAWZ;AAED,qBAAa,MAAO,SAAQ,UAAU;IACpC,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,MAAM,CAAC;gBAEL,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAY;IAOxD,OAAO,IAAI,MAAM;IAIjB,MAAM,IAAI,MAAM;IAMhB,KAAK,CAAC,CAAC,EAAE,MAAM;IAIf,QAAQ,IAAI,MAAM;IAIlB,iBAAiB,IAAI,MAAM;IAI3B,aAAa;CAGd"}
+{"version":3,"file":"affine.d.ts","sourceRoot":"","sources":["../../../src/math/polynomials/affine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAKlE,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAG9C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,8BAAsB,iBAAiB;IACrC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM;IAG3C,MAAM,CAAC,MAAM,CACX,KAAK,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,EAC3D,KAAK,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAC1D,MAAM;IAcT,MAAM,CAAC,gBAAgB,CACrB,EAAE,EAAE,MAAM,EACV,KAAK,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,EAC3D,KAAK,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,GAC1D,MAAM,EAAE;CAWZ;AAED,qBAAa,MAAO,SAAQ,UAAU;IACpC,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,MAAM,CAAC;gBAEL,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAY;IAOxD,OAAO,IAAI,MAAM;IAGjB,KAAK,CAAC,CAAC,EAAE,aAAa,GAAG,MAAM;IAG/B,MAAM,IAAI,MAAM;IAMhB,KAAK,CAAC,CAAC,EAAE,MAAM;IAIf,QAAQ,IAAI,MAAM;IAIlB,iBAAiB,IAAI,MAAM;IAI3B,aAAa;CAGd"}

package/lib/math/polynomials/affine.js

@@ -1,4 +1,6 @@
 import { randomColor } from "../../geogebra/colors.js";
+import { frac } from "../../tree/nodes/operators/fractionNode.js";
+import { substract } from "../../tree/nodes/operators/substractNode.js";
 import { Rational } from "../numbers/rationals/rational.js";
 import { randint } from "../utils/random/randint.js";
 import { Polynomial } from "./polynomial.js";
@@ -37,6 +39,9 @@ export class Affine extends Polynomial {
     getRoot() {
         return new Rational(-this.b, this.a).simplify();
     }
+    solve(y) {
+        return frac(substract(y, this.b), this.a).simplify();
+    }
     square() {
         return new Trinom(this.a ** 2, 2 * this.a * this.b, this.b ** 2, {
             variable: this.variable,

package/lib/tree/nodes/equations/equalNode.d.ts

@@ -1,4 +1,3 @@
-import { Affine } from "../../../math/polynomials/affine.js";
 import { AlgebraicNode } from "../algebraicNode.js";
 import { Node, NodeIds, NodeOptions, NodeType } from "../node.js";
 import { NodeIdentifiers } from "../nodeConstructor.js";
@@ -28,5 +27,5 @@ export declare class EqualNode implements Node {
     shuffle(): EqualNode;
     reverse(): EqualNode;
 }
-export declare const firstDegreeEquationResolutionTex: (affineLeft: Affine, affineRight: Affine) => void;
+export declare const equationResolutionTex: (a: AlgebraicNode, b: AlgebraicNode, c: AlgebraicNode, d: AlgebraicNode) => string | string[];
 //# sourceMappingURL=equalNode.d.ts.map

package/lib/tree/nodes/equations/equalNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"equalNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/equations/equalNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAE1D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAClE,OAAO,EAAmB,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAEzE,eAAO,MAAM,KAAK,MACb,aAAa,GAAG,MAAM,GAAG,MAAM,KAC/B,aAAa,GAAG,MAAM,GAAG,MAAM,cAOnC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC;IAClB,SAAS,EAAE,eAAe,CAAC;IAC3B,UAAU,EAAE,eAAe,CAAC;IAC5B,IAAI,CAAC,EAAE,WAAW,CAAC;CACpB,CAAC;AAEF,8BAAsB,oBAAoB;IACxC,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,oBAAoB,GAAG,SAAS;CAOrE;AAED,eAAO,MAAM,WAAW,SAAU,IAAI,KAAG,IAAI,IAAI,SAChB,CAAC;AAElC,qBAAa,SAAU,YAAW,IAAI;IACpC,SAAS,EAAE,IAAI,CAAC;IAChB,UAAU,EAAE,IAAI,CAAC;IACjB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,IAAI,EAAE,QAAQ,CAAC;gBACH,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,WAAW;IAOjE,aAAa,IAAI,oBAAoB;IAQrC,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW;IAmBpC,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAM5C,YAAY,IAAI,MAAM;IAGtB,KAAK,IAAI,MAAM;IAIf,QAAQ;IAIR,OAAO;IAIP,OAAO;CAUR;AAED,eAAO,MAAM,gCAAgC,eAC/B,MAAM,eACL,MAAM,SAuBpB,CAAC"}
+{"version":3,"file":"equalNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/equations/equalNode.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAClE,OAAO,EAAmB,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAOzE,eAAO,MAAM,KAAK,MACb,aAAa,GAAG,MAAM,GAAG,MAAM,KAC/B,aAAa,GAAG,MAAM,GAAG,MAAM,cAOnC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC;IAClB,SAAS,EAAE,eAAe,CAAC;IAC3B,UAAU,EAAE,eAAe,CAAC;IAC5B,IAAI,CAAC,EAAE,WAAW,CAAC;CACpB,CAAC;AAEF,8BAAsB,oBAAoB;IACxC,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,oBAAoB,GAAG,SAAS;CAOrE;AAED,eAAO,MAAM,WAAW,SAAU,IAAI,KAAG,IAAI,IAAI,SAChB,CAAC;AAElC,qBAAa,SAAU,YAAW,IAAI;IACpC,SAAS,EAAE,IAAI,CAAC;IAChB,UAAU,EAAE,IAAI,CAAC;IACjB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,IAAI,EAAE,QAAQ,CAAC;gBACH,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,WAAW;IAOjE,aAAa,IAAI,oBAAoB;IAQrC,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW;IAmBpC,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAM5C,YAAY,IAAI,MAAM;IAGtB,KAAK,IAAI,MAAM;IAIf,QAAQ;IAIR,OAAO;IAIP,OAAO;CAUR;AAED,eAAO,MAAM,qBAAqB,MAC7B,aAAa,KACb,aAAa,KACb,aAAa,KACb,aAAa,sBA2DjB,CAAC"}

package/lib/tree/nodes/equations/equalNode.js

@@ -1,6 +1,12 @@
 import { coinFlip } from "../../../utils/alea/coinFlip.js";
+import { alignTex } from "../../../utils/latex/alignTex.js";
 import { NodeIds, NodeType } from "../node.js";
 import { NodeConstructor } from "../nodeConstructor.js";
+import { add } from "../operators/addNode.js";
+import { frac } from "../operators/fractionNode.js";
+import { multiply } from "../operators/multiplyNode.js";
+import { substract } from "../operators/substractNode.js";
+import { monom } from "../polynomials/monomNode.js";
 export const equal = (a, b) => {
     const nodeA = typeof a === "number" ? a.toTree() : typeof a === "string" ? a.toTree() : a;
     const nodeB = typeof b === "number" ? b.toTree() : typeof b === "string" ? b.toTree() : b;
@@ -67,26 +73,45 @@ export class EqualNode {
         return new EqualNode(this.rightChild, this.leftChild, this.opts);
     }
 }
-export const firstDegreeEquationResolutionTex = (affineLeft, affineRight) => {
-    //ax(+-b) = (+-c)(x)(+-d)
-    // const b = affine.b;
-    // const a = affine.a;
-    // if (a === 1 && b === 0)
-    //   return new InequationNode([affine.toTree(), right], [order]).toTex();
-    // const steps: string[][] = [[affine.toTex(), order, right.toTex()]];
-    // if (b !== 0)
-    //   steps.push([
-    //     affine.add(-b).toTex(),
-    //     order,
-    //     substract(right, b).simplify().toTex(),
-    //   ]);
-    // if (a !== 1) {
-    //   if (a < 0) order = new InequationSymbol(order).reversed();
-    //   steps.push([
-    //     affine.variable,
-    //     order,
-    //     frac(substract(right, b), a).simplify().toTex(),
-    //   ]);
-    // }
-    // return alignTex(steps, true);
+export const equationResolutionTex = (a, b, c, d) => {
+    //(+-a)x(+-b) = (+-c)x(+-d)
+    const steps = [];
+    const iteration = (a, b, c, d) => {
+        const aEv = a.evaluate();
+        const bEv = b.evaluate();
+        const cEv = c.evaluate();
+        if (bEv === 0) {
+            if (cEv === 0) {
+                //ax = d
+                if (aEv === 1) {
+                    //x = d
+                    steps.push(`x=${d.toTex()}`);
+                    return;
+                }
+                else {
+                    //ax = d
+                    steps.push(`${multiply(a, "x").toTex()}=${d.toTex()}`);
+                    iteration((1).toTree(), (0).toTree(), (0).toTree(), frac(d, a).simplify());
+                }
+            }
+            else {
+                steps.push(`${monom(a, 1).toTex()}=${add(monom(c, 1), d).toTex()}`);
+                //ax = c!x + d
+                iteration(substract(a, c).simplify(), (0).toTree(), (0).toTree(), d);
+            }
+        }
+        else {
+            //ax + b! = cx + d
+            steps.push(`${add(multiply(a, "x"), b).simplify().toTex()}=${add(multiply(c, "x"), d)
+                .simplify()
+                .toTex()}`);
+            iteration(a, (0).toTree(), c, substract(d, b).simplify());
+        }
+    };
+    iteration(a, b, c, d);
+    if (steps.length === 1) {
+        return steps[0];
+    }
+    return alignTex(steps.map((e) => [e.split("=")[0], "=", e.split("=")[1]]), true);
+    return steps;
 };

package/lib/tree/parsers/numberParser.d.ts

@@ -1,2 +1,2 @@
-export declare const numberParser: (ans: string) => string | false;
+export declare const numberParser: (ans: string, roundTo?: number) => string | false;
 //# sourceMappingURL=numberParser.d.ts.map

package/lib/tree/parsers/numberParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"numberParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/numberParser.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,YAAY,QAAS,MAAM,mBAIvC,CAAC"}
+{"version":3,"file":"numberParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/numberParser.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,YAAY,QAAS,MAAM,YAAY,MAAM,mBAKzD,CAAC"}

package/lib/tree/parsers/numberParser.js

@@ -1,7 +1,10 @@
+import { round } from "../../math/utils/round.js";
 //returns false if ans is NaN (even in french form) and returns the frenchified form otherwise
-export const numberParser = (ans) => {
+export const numberParser = (ans, roundTo) => {
     const nb = ans.unfrenchify();
     if (isNaN(nb))
         return false;
+    if (roundTo !== undefined)
+        return round(nb, roundTo).frenchify();
     return nb.frenchify();
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "math-exercises",
   "type": "module",
-  "version": "3.0.11",
+  "version": "3.0.12",
   "description": "Math exercises generator for middle school and high school",
   "main": "lib/index.js",
   "files": [