math-exercises 2.2.98 → 3.0.2

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

@@ -1,44 +1,41 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.affineAdjustmentCompleteExercise = void 0;
-const exercise_1 = require("../../../../exercises/exercise");
-const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
-const randfloat_1 = require("../../../../math/utils/random/randfloat");
-const randint_1 = require("../../../../math/utils/random/randint");
-const round_1 = require("../../../../math/utils/round");
-const generateAffineCloud_1 = require("../../../../math/utils/stats/generateAffineCloud");
-const leastSquares_1 = require("../../../../math/utils/stats/leastSquares");
-const rSquared_1 = require("../../../../math/utils/stats/rSquared");
-const equalNode_1 = require("../../../../tree/nodes/equations/equalNode");
-const numberNode_1 = require("../../../../tree/nodes/numbers/numberNode");
-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 variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
-const dollarize_1 = require("../../../../utils/latex/dollarize");
-const mdTable_1 = require("../../../../utils/markdown/mdTable");
+import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { randfloat } from "../../../../math/utils/random/randfloat.js";
+import { randint } from "../../../../math/utils/random/randint.js";
+import { round } from "../../../../math/utils/round.js";
+import { generateAffineCloud } from "../../../../math/utils/stats/generateAffineCloud.js";
+import { leastSquares } from "../../../../math/utils/stats/leastSquares.js";
+import { rSquared } from "../../../../math/utils/stats/rSquared.js";
+import { EqualNode } from "../../../../tree/nodes/equations/equalNode.js";
+import { NumberNode } from "../../../../tree/nodes/numbers/numberNode.js";
+import { AddNode } from "../../../../tree/nodes/operators/addNode.js";
+import { MultiplyNode } from "../../../../tree/nodes/operators/multiplyNode.js";
+import { PowerNode } from "../../../../tree/nodes/operators/powerNode.js";
+import { SubstractNode } from "../../../../tree/nodes/operators/substractNode.js";
+import { VariableNode } from "../../../../tree/nodes/variables/variableNode.js";
+import { dollarize } from "../../../../utils/latex/dollarize.js";
+import { mdTable } from "../../../../utils/markdown/mdTable.js";
 const getAnswer = (identifiers) => {
     const { xValues, yValues } = identifiers;
-    const { a, b } = (0, leastSquares_1.leastSquares)(xValues, yValues);
-    const aFixed = (0, round_1.round)(a, 1);
-    const bFixed = (0, round_1.round)(b, 1);
-    const answerEq = new equalNode_1.EqualNode(new variableNode_1.VariableNode("y"), new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(aFixed), new variableNode_1.VariableNode("x")), new numberNode_1.NumberNode(bFixed)).simplify({ forbidFactorize: true })).toTex();
-    const r2 = (0, round_1.round)((0, rSquared_1.rSquared)(xValues, yValues), 2);
-    const answerR = new equalNode_1.EqualNode(new powerNode_1.PowerNode(new variableNode_1.VariableNode("R"), new numberNode_1.NumberNode(2)), r2.toTree()).toTex();
+    const { a, b } = leastSquares(xValues, yValues);
+    const aFixed = round(a, 1);
+    const bFixed = round(b, 1);
+    const answerEq = new EqualNode(new VariableNode("y"), new AddNode(new MultiplyNode(new NumberNode(aFixed), new VariableNode("x")), new NumberNode(bFixed)).simplify({ forbidFactorize: true })).toTex();
+    const r2 = round(rSquared(xValues, yValues), 2);
+    const answerR = new EqualNode(new PowerNode(new VariableNode("R"), new NumberNode(2)), r2.toTree()).toTex();
     return `${answerEq}\\newline ${answerR}`;
 };
 const getInstruction = (identifiers) => {
     const { xValues, yValues } = identifiers;
-    const dataTable = (0, mdTable_1.mdTable)([
-        ["$x$", ...xValues.map((n) => (0, dollarize_1.dollarize)(n.frenchify()))],
-        ["$y$", ...yValues.map((n) => (0, dollarize_1.dollarize)(n.frenchify()))],
+    const dataTable = mdTable([
+        ["$x$", ...xValues.map((n) => dollarize(n.frenchify()))],
+        ["$y$", ...yValues.map((n) => dollarize(n.frenchify()))],
     ]);
     return `On considère la série statistique ci-dessous. A l'aide de la calculatrice, déterminer l'équation de la droite d'ajustement et la valeur du coefficient de détermination. ${dataTable}
 `;
 };
 const getAffineAdjustmentCompleteQuestion = () => {
-    const data = (0, generateAffineCloud_1.generateAffineCloud)(6);
+    const data = generateAffineCloud(6);
     data.sort((a, b) => a.x - b.x);
     const xValues = data.map((point) => point.x);
     const yValues = data.map((point) => point.y);
@@ -58,46 +55,46 @@ const getAffineAdjustmentCompleteQuestion = () => {
 };
 const getPropositions = (n, { answer, xValues, yValues }) => {
     const propositions = [];
-    (0, exercise_1.addValidProp)(propositions, answer, "tex");
-    const { a, b } = (0, leastSquares_1.leastSquares)(xValues, yValues);
-    const r2 = (0, round_1.round)((0, rSquared_1.rSquared)(xValues, yValues), 2);
-    const aFixed = (0, round_1.round)(a, 1);
-    const bFixed = (0, round_1.round)(b, 1);
-    const answerEq = new equalNode_1.EqualNode(new variableNode_1.VariableNode("y"), new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(aFixed), new variableNode_1.VariableNode("x")), new numberNode_1.NumberNode(bFixed)).simplify({ forbidFactorize: true })).toTex();
-    const answerR = new equalNode_1.EqualNode(new powerNode_1.PowerNode(new variableNode_1.VariableNode("R"), new numberNode_1.NumberNode(2)), r2.toTree()).toTex();
-    const wrongAnswerEq1 = new equalNode_1.EqualNode(new variableNode_1.VariableNode("y"), new substractNode_1.SubstractNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(aFixed), new variableNode_1.VariableNode("x")), new numberNode_1.NumberNode(bFixed)).simplify({ forbidFactorize: true })).toTex();
-    const awrong = (0, randfloat_1.randfloat)(1, 10, 1);
-    const wrongAnswerEq2 = new equalNode_1.EqualNode(new variableNode_1.VariableNode("y"), new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode((0, round_1.round)(awrong, 1)), new variableNode_1.VariableNode("x")), new numberNode_1.NumberNode(bFixed)).simplify({ forbidFactorize: true })).toTex();
-    const wrongAnswerR1 = new equalNode_1.EqualNode(new variableNode_1.VariableNode("R"), r2.toTree()).toTex();
-    const wrongAnswerR2 = new equalNode_1.EqualNode(new powerNode_1.PowerNode(new variableNode_1.VariableNode("R"), new numberNode_1.NumberNode(2)), (r2 + 0.01).toTree()).toTex();
+    addValidProp(propositions, answer, "tex");
+    const { a, b } = leastSquares(xValues, yValues);
+    const r2 = round(rSquared(xValues, yValues), 2);
+    const aFixed = round(a, 1);
+    const bFixed = round(b, 1);
+    const answerEq = new EqualNode(new VariableNode("y"), new AddNode(new MultiplyNode(new NumberNode(aFixed), new VariableNode("x")), new NumberNode(bFixed)).simplify({ forbidFactorize: true })).toTex();
+    const answerR = new EqualNode(new PowerNode(new VariableNode("R"), new NumberNode(2)), r2.toTree()).toTex();
+    const wrongAnswerEq1 = new EqualNode(new VariableNode("y"), new SubstractNode(new MultiplyNode(new NumberNode(aFixed), new VariableNode("x")), new NumberNode(bFixed)).simplify({ forbidFactorize: true })).toTex();
+    const awrong = randfloat(1, 10, 1);
+    const wrongAnswerEq2 = new EqualNode(new VariableNode("y"), new AddNode(new MultiplyNode(new NumberNode(round(awrong, 1)), new VariableNode("x")), new NumberNode(bFixed)).simplify({ forbidFactorize: true })).toTex();
+    const wrongAnswerR1 = new EqualNode(new VariableNode("R"), r2.toTree()).toTex();
+    const wrongAnswerR2 = new EqualNode(new PowerNode(new VariableNode("R"), new NumberNode(2)), (r2 + 0.01).toTree()).toTex();
     const wrongAnswer1 = `${answerEq}\\newline ${wrongAnswerR1}`;
     const wrongAnswer2 = `${answerEq}\\newline ${wrongAnswerR2}`;
     const wrongAnswer3 = `${wrongAnswerEq1}\\newline ${answerR}`;
     const wrongAnswer4 = `${wrongAnswerEq2}\\newline ${answerR}`;
-    (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer1);
-    (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer2);
-    (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer3);
-    (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer4);
+    tryToAddWrongProp(propositions, wrongAnswer1);
+    tryToAddWrongProp(propositions, wrongAnswer2);
+    tryToAddWrongProp(propositions, wrongAnswer3);
+    tryToAddWrongProp(propositions, wrongAnswer4);
     while (propositions.length < n) {
-        const a = (0, randint_1.randint)(-10, 10, [0]);
-        const b = (0, randint_1.randint)(-10, 10);
-        const wrongAnswerEq = new equalNode_1.EqualNode(new variableNode_1.VariableNode("y"), new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode("x")), new numberNode_1.NumberNode(b)).simplify({ forbidFactorize: true })).toTex();
-        const wrongAnswerR = new equalNode_1.EqualNode(new powerNode_1.PowerNode(new variableNode_1.VariableNode("R"), new numberNode_1.NumberNode(2)), (0, round_1.round)(Math.random(), 2).toTree()).toTex();
+        const a = randint(-10, 10, [0]);
+        const b = randint(-10, 10);
+        const wrongAnswerEq = new EqualNode(new VariableNode("y"), new AddNode(new MultiplyNode(new NumberNode(a), new VariableNode("x")), new NumberNode(b)).simplify({ forbidFactorize: true })).toTex();
+        const wrongAnswerR = new EqualNode(new PowerNode(new VariableNode("R"), new NumberNode(2)), round(Math.random(), 2).toTree()).toTex();
         const wrongAnswer = `${wrongAnswerEq}\\newline ${wrongAnswerR}`;
-        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+        tryToAddWrongProp(propositions, wrongAnswer);
     }
-    return (0, exercise_1.shuffleProps)(propositions, n);
+    return shuffleProps(propositions, n);
 };
 const isAnswerValid = (ans, { answer }) => {
     return ans === answer;
 };
-exports.affineAdjustmentCompleteExercise = {
+export const affineAdjustmentCompleteExercise = {
     id: "affineAdjustmentComplete",
     label: "Déterminer l'équation de la droite d'ajustement et le coefficient de détermination",
     levels: ["1rePro"],
     isSingleStep: true,
     sections: ["Statistiques"],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAffineAdjustmentCompleteQuestion, nb),
+    generator: (nb) => getDistinctQuestions(getAffineAdjustmentCompleteQuestion, nb),
     answerType: "QCU",
     qcmTimer: 60,
     freeTimer: 60,

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

@@ -1,4 +1,4 @@
-import { Exercise } from "../../../../exercises/exercise";
+import { Exercise } from "../../../../exercises/exercise.js";
 type Identifiers = {
     xValues: number[];
     yValues: number[];

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

@@ -1 +1 @@
-{"version":3,"file":"affineAdjustmentRsquared.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineAdjustmentRsquared.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,0BAA0B,CAAC;AAmBlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAqGF,eAAO,MAAM,gCAAgC,EAAE,QAAQ,CAAC,WAAW,CAgBlE,CAAC"}
+{"version":3,"file":"affineAdjustmentRsquared.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineAdjustmentRsquared.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAkBrC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAqGF,eAAO,MAAM,gCAAgC,EAAE,QAAQ,CAAC,WAAW,CAgBlE,CAAC"}

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

@@ -1,37 +1,34 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.affineAdjustmentRsquaredExercise = void 0;
-const exercise_1 = require("../../../../exercises/exercise");
-const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
-const round_1 = require("../../../../math/utils/round");
-const generateAffineCloud_1 = require("../../../../math/utils/stats/generateAffineCloud");
-const rSquared_1 = require("../../../../math/utils/stats/rSquared");
-const equalNode_1 = require("../../../../tree/nodes/equations/equalNode");
-const numberNode_1 = require("../../../../tree/nodes/numbers/numberNode");
-const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
-const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
-const dollarize_1 = require("../../../../utils/latex/dollarize");
-const mdTable_1 = require("../../../../utils/markdown/mdTable");
+import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { round } from "../../../../math/utils/round.js";
+import { generateAffineCloud } from "../../../../math/utils/stats/generateAffineCloud.js";
+import { rSquared } from "../../../../math/utils/stats/rSquared.js";
+import { EqualNode } from "../../../../tree/nodes/equations/equalNode.js";
+import { NumberNode } from "../../../../tree/nodes/numbers/numberNode.js";
+import { PowerNode } from "../../../../tree/nodes/operators/powerNode.js";
+import { VariableNode } from "../../../../tree/nodes/variables/variableNode.js";
+import { dollarize } from "../../../../utils/latex/dollarize.js";
+import { mdTable } from "../../../../utils/markdown/mdTable.js";
 const getInstruction = (identifiers) => {
     const { xValues, yValues } = identifiers;
-    let dataTable = (0, mdTable_1.mdTable)([
-        ["$x$", ...xValues.map((n) => (0, dollarize_1.dollarize)(n.frenchify()))],
-        ["$y$", ...yValues.map((n) => (0, dollarize_1.dollarize)(n.frenchify()))],
+    let dataTable = mdTable([
+        ["$x$", ...xValues.map((n) => dollarize(n.frenchify()))],
+        ["$y$", ...yValues.map((n) => dollarize(n.frenchify()))],
     ]);
     return `On considère la série statistique ci-dessous. Déterminez la valeur du coefficient de détermination. ${dataTable}
 `;
 };
 const getAnswer = (identifiers) => {
     const { xValues, yValues } = identifiers;
-    const r2 = (0, round_1.round)((0, rSquared_1.rSquared)(xValues, yValues), 2);
-    const answer = new equalNode_1.EqualNode(new powerNode_1.PowerNode(new variableNode_1.VariableNode("R"), new numberNode_1.NumberNode(2)), r2.toTree()).toTex();
+    const r2 = round(rSquared(xValues, yValues), 2);
+    const answer = new EqualNode(new PowerNode(new VariableNode("R"), new NumberNode(2)), r2.toTree()).toTex();
     return answer;
 };
 const getAffineAdjustmentRsquaredQuestion = () => {
-    const data = (0, generateAffineCloud_1.generateAffineCloud)(6);
+    const data = generateAffineCloud(6);
     data.sort((a, b) => a.x - b.x);
-    const xValues = data.map((point) => (0, round_1.round)(point.x, 1));
-    const yValues = data.map((point) => (0, round_1.round)(point.y, 1));
+    const xValues = data.map((point) => round(point.x, 1));
+    const yValues = data.map((point) => round(point.y, 1));
     const identifiers = { xValues, yValues };
     const question = {
         answer: getAnswer(identifiers),
@@ -45,36 +42,36 @@ const getAffineAdjustmentRsquaredQuestion = () => {
 };
 const getPropositions = (n, { answer, xValues, yValues }) => {
     const propositions = [];
-    const r2 = (0, round_1.round)((0, rSquared_1.rSquared)(xValues, yValues), 2);
-    (0, exercise_1.addValidProp)(propositions, answer, "tex");
-    const wrongAnswer1 = new equalNode_1.EqualNode(new variableNode_1.VariableNode("R"), r2.toTree()).toTex();
-    const wrongAnswer2 = new equalNode_1.EqualNode(new powerNode_1.PowerNode(new variableNode_1.VariableNode("R"), new numberNode_1.NumberNode(2)), (r2 + 0.01).toTree()).toTex();
-    const wrongAnswer3 = new equalNode_1.EqualNode(new variableNode_1.VariableNode("R"), (r2 - 0.01).toTree()).toTex();
-    (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer1);
-    (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer2);
-    (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer3);
+    const r2 = round(rSquared(xValues, yValues), 2);
+    addValidProp(propositions, answer, "tex");
+    const wrongAnswer1 = new EqualNode(new VariableNode("R"), r2.toTree()).toTex();
+    const wrongAnswer2 = new EqualNode(new PowerNode(new VariableNode("R"), new NumberNode(2)), (r2 + 0.01).toTree()).toTex();
+    const wrongAnswer3 = new EqualNode(new VariableNode("R"), (r2 - 0.01).toTree()).toTex();
+    tryToAddWrongProp(propositions, wrongAnswer1);
+    tryToAddWrongProp(propositions, wrongAnswer2);
+    tryToAddWrongProp(propositions, wrongAnswer3);
     while (propositions.length < n) {
-        const wrongAnswer = new equalNode_1.EqualNode(new powerNode_1.PowerNode(new variableNode_1.VariableNode("R"), new numberNode_1.NumberNode(1)), (0, round_1.round)(Math.random(), 2).toTree()).toTex();
-        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+        const wrongAnswer = new EqualNode(new PowerNode(new VariableNode("R"), new NumberNode(1)), round(Math.random(), 2).toTree()).toTex();
+        tryToAddWrongProp(propositions, wrongAnswer);
     }
-    return (0, exercise_1.shuffleProps)(propositions, n);
+    return shuffleProps(propositions, n);
 };
 const isAnswerValid = (ans, { xValues, yValues }) => {
-    const r2 = (0, round_1.round)((0, rSquared_1.rSquared)(xValues, yValues), 2);
-    const validanswer = new equalNode_1.EqualNode(new powerNode_1.PowerNode(new variableNode_1.VariableNode("R"), new numberNode_1.NumberNode(2)), r2.toTree());
+    const r2 = round(rSquared(xValues, yValues), 2);
+    const validanswer = new EqualNode(new PowerNode(new VariableNode("R"), new NumberNode(2)), r2.toTree());
     const latexs = validanswer.toAllValidTexs({
         allowRawRightChildAsSolution: true,
         allowFractionToDecimal: true,
     });
     return latexs.includes(ans);
 };
-exports.affineAdjustmentRsquaredExercise = {
+export const affineAdjustmentRsquaredExercise = {
     id: "affineAdjustmentRsquared",
     label: "Déterminer le coefficient de détermination à partir d'un tableau de données",
     levels: ["1rePro"],
     isSingleStep: true,
     sections: ["Statistiques"],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAffineAdjustmentRsquaredQuestion, nb),
+    generator: (nb) => getDistinctQuestions(getAffineAdjustmentRsquaredQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,

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

@@ -1,4 +1,4 @@
-import { Exercise } from "../../../../exercises/exercise";
+import { Exercise } from "../../../../exercises/exercise.js";
 type Identifiers = {
     xA: number;
     xB: number;

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

@@ -1 +1 @@
-{"version":3,"file":"affineExpressionFromTwoImages.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineExpressionFromTwoImages.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,0BAA0B,CAAC;AAelC,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;AA+IF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAgB/D,CAAC"}
+{"version":3,"file":"affineExpressionFromTwoImages.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineExpressionFromTwoImages.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAerC,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;AA+IF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAgB/D,CAAC"}

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

@@ -1,29 +1,26 @@
-"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 fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
-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 latexParser_1 = require("../../../../tree/parsers/latexParser");
-const shuffle_1 = require("../../../../utils/alea/shuffle");
-const handleVEAError_1 = require("../../../../utils/errors/handleVEAError");
-const alignTex_1 = require("../../../../utils/latex/alignTex");
+import { addValidProp, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { Rational } from "../../../../math/numbers/rationals/rational.js";
+import { AffineConstructor } from "../../../../math/polynomials/affine.js";
+import { randint } from "../../../../math/utils/random/randint.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";
+import { SubstractNode } from "../../../../tree/nodes/operators/substractNode.js";
+import { VariableNode } from "../../../../tree/nodes/variables/variableNode.js";
+import { parseAlgebraic } from "../../../../tree/parsers/latexParser.js";
+import { shuffle } from "../../../../utils/alea/shuffle.js";
+import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
+import { alignTex } from "../../../../utils/latex/alignTex.js";
 const getCorrection = (identifiers) => {
     const { xA, xB, yA, yB } = identifiers;
-    const a = new fractionNode_1.FractionNode(new substractNode_1.SubstractNode(yB.toTree(), yA.toTree()), new substractNode_1.SubstractNode(xB.toTree(), xA.toTree()));
+    const a = new FractionNode(new SubstractNode(yB.toTree(), yA.toTree()), new SubstractNode(xB.toTree(), xA.toTree()));
     const aSimplified = a.simplify();
-    const b = new substractNode_1.SubstractNode(yA.toTree(), new multiplyNode_1.MultiplyNode(a, xA.toTree())).simplify();
+    const b = new SubstractNode(yA.toTree(), new MultiplyNode(a, xA.toTree())).simplify();
     const answer = getAnswer(identifiers);
     return `On calcule d'abord le taux d'accroissement $a$ : 
     
-${(0, alignTex_1.alignTex)([
+${alignTex([
         ["a", "=", `\\frac{y_2-y_1}{x_2-x_1}`],
         ["", "=", `${a.toTex()}`],
         ["", "=", `${aSimplified.toTex()}`],
@@ -34,13 +31,13 @@ Il faut ensuite trouver l'ordonnée à l'origine $b$. On sait que $f(${xA}) = ${
 Donc 
 
 $$
-${yA} = ${new multiplyNode_1.MultiplyNode(aSimplified, xA.toTree()).toTex()}+b
+${yA} = ${new MultiplyNode(aSimplified, xA.toTree()).toTex()}+b
 $$ 
     
 On a donc 
 
 $$
-b = ${new substractNode_1.SubstractNode(yA.toTree(), new multiplyNode_1.MultiplyNode(aSimplified, xA.toTree())).toTex()} = ${b.toTex()}
+b = ${new SubstractNode(yA.toTree(), new MultiplyNode(aSimplified, xA.toTree())).toTex()} = ${b.toTex()}
 $$
 
 Ainsi, $f(x) = ${answer}$.
@@ -57,10 +54,10 @@ const getHint = (identifiers) => {
 };
 const getAnswer = (identifiers) => {
     const { xA, yA, xB, yB } = identifiers;
-    const a = new rational_1.Rational(yB - yA, xB - xA).simplify().toTree();
+    const a = new 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();
-    return new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(a, new variableNode_1.VariableNode("x")), b)
+    const b = new SubstractNode(yA.toTree(), new MultiplyNode(a, xA.toTree())).simplify();
+    return new AddNode(new MultiplyNode(a, new VariableNode("x")), b)
         .simplify({
         forceDistributeFractions: true,
         towardsDistribute: true,
@@ -69,9 +66,9 @@ const getAnswer = (identifiers) => {
         .toTex();
 };
 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 [xA, yA] = [1, 2].map((el) => randint(-9, 10));
+    const xB = randint(-9, 10, [xA]);
+    const yB = randint(-9, 10);
     const identifiers = { xA, xB, yA, yB };
     const question = {
         instruction: getInstruction(identifiers),
@@ -87,16 +84,16 @@ const getAffineExpressionFromTwoImagesQuestion = () => {
 };
 const getPropositions = (n, { answer, xA, xB, yA, yB }) => {
     const propositions = [];
-    (0, exercise_1.addValidProp)(propositions, answer);
+    addValidProp(propositions, answer);
     while (propositions.length < n) {
-        const wrongAnswer = affine_1.AffineConstructor.random().toTex();
-        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+        const wrongAnswer = AffineConstructor.random().toTex();
+        tryToAddWrongProp(propositions, wrongAnswer);
     }
-    return (0, shuffle_1.shuffle)(propositions);
+    return shuffle(propositions);
 };
 const isAnswerValid = (ans, { xA, xB, yA, yB }) => {
     try {
-        const parsed = (0, latexParser_1.parseAlgebraic)(ans);
+        const parsed = parseAlgebraic(ans);
         if (!parsed)
             return false;
         return (parsed
@@ -108,7 +105,7 @@ const isAnswerValid = (ans, { xA, xB, yA, yB }) => {
             .toTex() === ans);
     }
     catch (err) {
-        return (0, handleVEAError_1.handleVEAError)(err);
+        return handleVEAError(err);
     }
     // const a = new Rational(yB - yA, xB - xA).simplify().toTree();
     // //yA = axA+b donc b = yA-axA
@@ -126,14 +123,14 @@ const isAnswerValid = (ans, { xA, xB, yA, yB }) => {
     // const texs = answer.toAllValidTexs();
     // return texs.includes(ans);
 };
-exports.affineExpressionFromTwoImages = {
+export const 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),
+    generator: (nb) => getDistinctQuestions(getAffineExpressionFromTwoImagesQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,

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

@@ -1,4 +1,4 @@
-import { Exercise } from "../../../../exercises/exercise";
+import { Exercise } from "../../../../exercises/exercise.js";
 type Identifiers = {
     b: number;
     secondPoint: number[];

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

@@ -1 +1 @@
-{"version":3,"file":"affineExpressionReading.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineExpressionReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,0BAA0B,CAAC;AAiBlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAkIF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAezD,CAAC"}
+{"version":3,"file":"affineExpressionReading.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineExpressionReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAYT,MAAM,6BAA6B,CAAC;AAiBrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC;AAkIF,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,WAAW,CAezD,CAAC"}

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

@@ -1,20 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.affineExpressionReading = void 0;
-const exercise_1 = require("../../../../exercises/exercise");
-const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
-const colors_1 = require("../../../../geogebra/colors");
-const geogebraConstructor_1 = require("../../../../geogebra/geogebraConstructor");
-const rational_1 = require("../../../../math/numbers/rationals/rational");
-const affine_1 = require("../../../../math/polynomials/affine");
-const randint_1 = require("../../../../math/utils/random/randint");
-const equalNode_1 = require("../../../../tree/nodes/equations/equalNode");
-const numberNode_1 = require("../../../../tree/nodes/numbers/numberNode");
-const addNode_1 = require("../../../../tree/nodes/operators/addNode");
-const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
-const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
-const latexParser_1 = require("../../../../tree/parsers/latexParser");
-const handleVEAError_1 = require("../../../../utils/errors/handleVEAError");
+import { addValidProp, shuffleProps, tryToAddWrongProp, } from "../../../../exercises/exercise.js";
+import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions.js";
+import { randomColor } from "../../../../geogebra/colors.js";
+import { GeogebraConstructor } from "../../../../geogebra/geogebraConstructor.js";
+import { Rational } from "../../../../math/numbers/rationals/rational.js";
+import { AffineConstructor } from "../../../../math/polynomials/affine.js";
+import { randint } from "../../../../math/utils/random/randint.js";
+import { EqualNode } from "../../../../tree/nodes/equations/equalNode.js";
+import { NumberNode } from "../../../../tree/nodes/numbers/numberNode.js";
+import { AddNode } from "../../../../tree/nodes/operators/addNode.js";
+import { MultiplyNode } from "../../../../tree/nodes/operators/multiplyNode.js";
+import { VariableNode } from "../../../../tree/nodes/variables/variableNode.js";
+import { parseAlgebraic } from "../../../../tree/parsers/latexParser.js";
+import { handleVEAError } from "../../../../utils/errors/handleVEAError.js";
 const getInstruction = () => {
     return `Ci-dessous est tracée la courbe représentative d'une fonction affine $f$. Déterminer graphiquement l'expression algébrique de $f(x)$.`;
 };
@@ -26,10 +23,10 @@ const getGGBOptions = (identifiers) => {
     let yMax = Math.max(b, secondPoint[1]);
     const commands = [
         `l = Line[(0, ${b}), (${secondPoint[0]}, ${secondPoint[1]})]`,
-        `SetColor(l, "${(0, colors_1.randomColor)()}")`,
+        `SetColor(l, "${randomColor()}")`,
         "SetFixed(l, true)",
     ];
-    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+    const ggb = new GeogebraConstructor({
         commands,
     });
     return ggb.getOptions({
@@ -38,15 +35,15 @@ const getGGBOptions = (identifiers) => {
 };
 const getAnswer = (identifiers) => {
     const { b, secondPoint } = identifiers;
-    const leadingCoeff = new rational_1.Rational(secondPoint[1] - b, secondPoint[0])
+    const leadingCoeff = new Rational(secondPoint[1] - b, secondPoint[0])
         .simplify()
         .toTree();
-    const answer = new equalNode_1.EqualNode(new variableNode_1.VariableNode("f(x)"), new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(leadingCoeff, new variableNode_1.VariableNode("x")), new numberNode_1.NumberNode(b)).simplify({ forceDistributeFractions: true, forbidFactorize: true })).toTex();
+    const answer = new EqualNode(new VariableNode("f(x)"), new AddNode(new MultiplyNode(leadingCoeff, new VariableNode("x")), new NumberNode(b)).simplify({ forceDistributeFractions: true, forbidFactorize: true })).toTex();
     return answer;
 };
 const getAffineExpressionReadingQuestion = () => {
-    const b = (0, randint_1.randint)(-5, 6);
-    const secondPoint = [(0, randint_1.randint)(-5, 6, [0]), (0, randint_1.randint)(-5, 6)];
+    const b = randint(-5, 6);
+    const secondPoint = [randint(-5, 6, [0]), randint(-5, 6)];
     const identifiers = { b, secondPoint };
     const question = {
         answer: getAnswer(identifiers),
@@ -60,33 +57,33 @@ const getAffineExpressionReadingQuestion = () => {
 };
 const getPropositions = (n, { answer, b, secondPoint }) => {
     const propositions = [];
-    (0, exercise_1.addValidProp)(propositions, answer);
+    addValidProp(propositions, answer);
     const wrongAs = [];
     if (secondPoint[1] - b !== 0)
-        wrongAs.push(new rational_1.Rational(secondPoint[0], secondPoint[1] - b).simplify().toTree());
+        wrongAs.push(new Rational(secondPoint[0], secondPoint[1] - b).simplify().toTree());
     if (secondPoint[0] !== 0)
-        wrongAs.push(new rational_1.Rational(secondPoint[1] + b, secondPoint[0]).simplify().toTree());
+        wrongAs.push(new Rational(secondPoint[1] + b, secondPoint[0]).simplify().toTree());
     if (secondPoint[1] + b !== 0)
-        wrongAs.push(new rational_1.Rational(secondPoint[0], secondPoint[1] + b).simplify().toTree());
+        wrongAs.push(new Rational(secondPoint[0], secondPoint[1] + b).simplify().toTree());
     if (b !== 0)
-        wrongAs.push(new rational_1.Rational(secondPoint[1] - secondPoint[0], b).simplify().toTree());
-    const fx = new variableNode_1.VariableNode("f(x)");
-    const x = new variableNode_1.VariableNode("x");
+        wrongAs.push(new Rational(secondPoint[1] - secondPoint[0], b).simplify().toTree());
+    const fx = new VariableNode("f(x)");
+    const x = new VariableNode("x");
     wrongAs.forEach((coeff) => {
-        (0, exercise_1.tryToAddWrongProp)(propositions, new equalNode_1.EqualNode(fx, new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(coeff, x), new numberNode_1.NumberNode(b)).simplify({
+        tryToAddWrongProp(propositions, new EqualNode(fx, new AddNode(new MultiplyNode(coeff, x), new NumberNode(b)).simplify({
             forceDistributeFractions: true,
             forbidFactorize: true,
         })).toTex());
     });
     while (propositions.length < n) {
-        (0, exercise_1.tryToAddWrongProp)(propositions, new equalNode_1.EqualNode(fx, affine_1.AffineConstructor.random().toTree()).toTex());
+        tryToAddWrongProp(propositions, new EqualNode(fx, AffineConstructor.random().toTree()).toTex());
     }
-    return (0, exercise_1.shuffleProps)(propositions, n);
+    return shuffleProps(propositions, n);
 };
 const isAnswerValid = (ans, { answer, secondPoint, b }) => {
     try {
         const formated = ans.replaceAll("f(x)", "").replaceAll("=", "");
-        const parsed = (0, latexParser_1.parseAlgebraic)(formated);
+        const parsed = parseAlgebraic(formated);
         if (!parsed)
             return false;
         return ("f(x)=" +
@@ -101,17 +98,17 @@ const isAnswerValid = (ans, { answer, secondPoint, b }) => {
             answer);
     }
     catch (err) {
-        return (0, handleVEAError_1.handleVEAError)(err);
+        return handleVEAError(err);
     }
 };
-exports.affineExpressionReading = {
+export const affineExpressionReading = {
     id: "affineExpressionReading",
     connector: "=",
     label: "Lire graphiquement l'expression d'une fonction affine",
     levels: ["2nde", "1reESM", "1rePro", "1reSpé", "1reTech"],
     isSingleStep: true,
     sections: ["Droites", "Fonctions affines"],
-    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAffineExpressionReadingQuestion, nb),
+    generator: (nb) => getDistinctQuestions(getAffineExpressionReadingQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,

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

@@ -1,4 +1,4 @@
-import { Exercise } from "../../../../exercises/exercise";
+import { Exercise } from "../../../../exercises/exercise.js";
 type Identifiers = {
     trinomial: number[];
     leftbound: number;

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

@@ -1 +1 @@
-{"version":3,"file":"affineMeanValue.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineMeanValue.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAqGF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAajD,CAAC"}
+{"version":3,"file":"affineMeanValue.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/affineMeanValue.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAqGF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAajD,CAAC"}