math-exercises 2.0.27 → 2.0.30

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

@@ -1 +1 @@
-{"version":3,"file":"doubleDistributivity.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/doubleDistributivity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAiFF,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,WAAW,CAa1D,CAAC"}
+{"version":3,"file":"doubleDistributivity.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/distributivity/doubleDistributivity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AA6EF,eAAO,MAAM,oBAAoB,EAAE,YAAY,CAAC,WAAW,CAa1D,CAAC"}

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

@@ -3,16 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.doubleDistributivity = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
-const integer_1 = require("../../../math/numbers/integer/integer");
 const affine_1 = require("../../../math/polynomials/affine");
-const discreteSet_1 = require("../../../math/sets/discreteSet");
-const intervals_1 = require("../../../math/sets/intervals/intervals");
 const randint_1 = require("../../../math/utils/random/randint");
 const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
 const shuffle_1 = require("../../../utils/shuffle");
-const interval = new intervals_1.Interval("[[-10; 10]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
 const getDoubleDistributivityQuestion = () => {
-    const affines = affine_1.AffineConstructor.differentRandoms(2, interval, interval);
+    const affines = affine_1.AffineConstructor.differentRandoms(2, undefined, {
+        excludes: [0],
+    });
     const statementTree = new multiplyNode_1.MultiplyNode(affines[0].toTree(), affines[1].toTree());
     const answer = affines[0].multiply(affines[1]).toTree().toTex();
     const question = {
@@ -44,7 +42,9 @@ const getPropositions = (n, { answer, affine1Coeffs, affine2Coeffs }) => {
         .toTree()
         .toTex());
     while (propositions.length < n) {
-        const affinesTemps = affine_1.AffineConstructor.differentRandoms(2, interval, interval);
+        const affinesTemps = affine_1.AffineConstructor.differentRandoms(2, undefined, {
+            excludes: [0],
+        });
         const wrongAnswer = affinesTemps[0].multiply(affinesTemps[1]).toTree();
         (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer.toTex());
     }

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

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

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

@@ -3,17 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.firstIdentity = exports.isFirstIdentityAnswerValid = exports.getFirstIdentityPropositions = exports.getFirstIdentityQuestion = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
-const integer_1 = require("../../../math/numbers/integer/integer");
 const affine_1 = require("../../../math/polynomials/affine");
 const polynomial_1 = require("../../../math/polynomials/polynomial");
-const discreteSet_1 = require("../../../math/sets/discreteSet");
-const intervals_1 = require("../../../math/sets/intervals/intervals");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
 const shuffle_1 = require("../../../utils/shuffle");
-const interval = new intervals_1.Interval("[[1; 10]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
 const getFirstIdentityQuestion = () => {
-    const affine = affine_1.AffineConstructor.random(interval, interval);
+    const affine = affine_1.AffineConstructor.random({
+        excludes: [0],
+    }, {
+        excludes: [0],
+    });
     const statementTree = new powerNode_1.PowerNode(affine.toTree(), new numberNode_1.NumberNode(2));
     const answer = affine.multiply(affine).toTree().toTex();
     const question = {
@@ -35,7 +35,11 @@ const getFirstIdentityPropositions = (n, { answer, a, b }) => {
     (0, exercise_1.tryToAddWrongProp)(propositions, new polynomial_1.Polynomial([b ** 2, a ** 2 + b ** 2, a ** 2]).toTree().toTex());
     const affine = new affine_1.Affine(a, b);
     while (propositions.length < n) {
-        const affineTemp = affine_1.AffineConstructor.random(interval, interval);
+        const affineTemp = affine_1.AffineConstructor.random({
+            excludes: [0],
+        }, {
+            excludes: [0],
+        });
         const wrongAnswer = affine.multiply(affineTemp).toTree();
         (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer.toTex());
     }

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

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

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

@@ -3,18 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.secondIdentity = exports.isSecondIdentityAnswerValid = exports.getSecondIdentityPropositions = exports.getSecondIdentityQuestion = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
-const integer_1 = require("../../../math/numbers/integer/integer");
 const affine_1 = require("../../../math/polynomials/affine");
 const polynomial_1 = require("../../../math/polynomials/polynomial");
-const discreteSet_1 = require("../../../math/sets/discreteSet");
-const intervals_1 = require("../../../math/sets/intervals/intervals");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
 const shuffle_1 = require("../../../utils/shuffle");
-const intervalA = new intervals_1.Interval("[[0; 10]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
-const intervalB = new intervals_1.Interval("[[-10; 0]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
 const getSecondIdentityQuestion = () => {
-    const affine = affine_1.AffineConstructor.random(intervalA, intervalB);
+    const affine = affine_1.AffineConstructor.random({
+        min: 1,
+        max: 11,
+    }, {
+        min: -10,
+        max: 0,
+    });
     const statementTree = new powerNode_1.PowerNode(affine.toTree(), new numberNode_1.NumberNode(2));
     const answer = affine.multiply(affine).toTree().toTex();
     const question = {
@@ -36,7 +37,13 @@ const getSecondIdentityPropositions = (n, { answer, a, b }) => {
     (0, exercise_1.tryToAddWrongProp)(propositions, new polynomial_1.Polynomial([-(b ** 2), -(a ** 2 + b ** 2), a ** 2]).toTree().toTex());
     const affine = new affine_1.Affine(a, b);
     while (propositions.length < n) {
-        const affineTemp = affine_1.AffineConstructor.random(intervalA, intervalB);
+        const affineTemp = affine_1.AffineConstructor.random({
+            min: 1,
+            max: 11,
+        }, {
+            min: -10,
+            max: 0,
+        });
         const wrongAnswer = affine.multiply(affineTemp).toTree();
         (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer.toTex());
     }

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

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

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

@@ -3,27 +3,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.simpleDistributivity = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
-const integer_1 = require("../../../math/numbers/integer/integer");
 const affine_1 = require("../../../math/polynomials/affine");
-const discreteSet_1 = require("../../../math/sets/discreteSet");
-const intervals_1 = require("../../../math/sets/intervals/intervals");
+const randint_1 = require("../../../math/utils/random/randint");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
 const shuffle_1 = require("../../../utils/shuffle");
-const excludeNbrs = [new integer_1.Integer(-1), new integer_1.Integer(0), new integer_1.Integer(1)];
-const interval = new intervals_1.Interval("[[-10; 10]]").difference(new discreteSet_1.DiscreteSet(excludeNbrs));
 const getSimpleDistributivityQuestion = () => {
-    const affine = affine_1.AffineConstructor.random(interval, interval);
-    const coeff = interval.getRandomElement();
-    const statementTree = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(coeff.value), affine.toTree());
-    const answer = affine.times(coeff.value).toTree().toTex();
+    const affine = affine_1.AffineConstructor.random(undefined, {
+        excludes: [0],
+    });
+    const coeff = (0, randint_1.randint)(-10, 11, [-1, 0, 1]);
+    const statementTree = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(coeff), affine.toTree());
+    const answer = affine.times(coeff).toTree().toTex();
     const question = {
         instruction: `Développer et réduire : $${statementTree.toTex()}$`,
         startStatement: statementTree.toTex(),
         answer,
         keys: ["x"],
         answerFormat: "tex",
-        identifiers: { a: affine.a, b: affine.b, coeff: coeff.value },
+        identifiers: { a: affine.a, b: affine.b, coeff: coeff },
     };
     return question;
 };
@@ -35,7 +33,9 @@ const getPropositions = (n, { answer, a, b, coeff }) => {
     (0, exercise_1.tryToAddWrongProp)(propositions, new affine_1.Affine(a, coeff * b).toTree().toTex());
     (0, exercise_1.tryToAddWrongProp)(propositions, affine.times(-coeff).toTree().toTex());
     while (propositions.length < n) {
-        const wrongAnswer = affine_1.AffineConstructor.random(interval, interval).toTree();
+        const wrongAnswer = affine_1.AffineConstructor.random(undefined, {
+            excludes: [0],
+        }).toTree();
         (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer.toTex());
     }
     return (0, shuffle_1.shuffle)(propositions);

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

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

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

@@ -3,15 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.thirdIdentity = exports.isThirdIdentityAnswerValid = exports.getThirdIdentityPropositions = exports.getThirdIdentityQuestion = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
-const integer_1 = require("../../../math/numbers/integer/integer");
 const affine_1 = require("../../../math/polynomials/affine");
-const discreteSet_1 = require("../../../math/sets/discreteSet");
-const intervals_1 = require("../../../math/sets/intervals/intervals");
 const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
 const shuffle_1 = require("../../../utils/shuffle");
-const interval = new intervals_1.Interval("[[-10; 10]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
 const getThirdIdentityQuestion = () => {
-    const affine = affine_1.AffineConstructor.random(interval, interval);
+    const affine = affine_1.AffineConstructor.random(undefined, { excludes: [0] });
     const affine2 = new affine_1.Affine(affine.a, -affine.b);
     const statementTree = new multiplyNode_1.MultiplyNode(affine.toTree(), affine2.toTree());
     const answer = affine.multiply(affine2).toTree().toTex();
@@ -38,7 +34,9 @@ const getThirdIdentityPropositions = (n, { answer, affine1Coeffs, affine2Coeffs
     (0, exercise_1.tryToAddWrongProp)(propositions, affine.multiply(affine).toTree().toTex());
     (0, exercise_1.tryToAddWrongProp)(propositions, affine2.multiply(affine2.opposite()).toTree().toTex());
     while (propositions.length < n) {
-        const affineTemp = affine_1.AffineConstructor.random(interval, interval);
+        const affineTemp = affine_1.AffineConstructor.random(undefined, {
+            excludes: [0],
+        });
         const affineTemp2 = new affine_1.Affine(affineTemp.a, -affineTemp.b);
         const wrongAnswer = affineTemp.multiply(affineTemp2).toTree();
         (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer.toTex());

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

@@ -1 +1 @@
-{"version":3,"file":"equationType2Exercise.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/equationType2Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAgBlC;;GAEG;AACH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAsDF,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,WAAW,CAa3D,CAAC"}
+{"version":3,"file":"equationType2Exercise.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/equationType2Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAgBlC;;GAEG;AACH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAqDF,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,WAAW,CAa3D,CAAC"}

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

@@ -6,7 +6,6 @@ const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQues
 const equationKeys_1 = require("../../../exercises/utils/keys/equationKeys");
 const rational_1 = require("../../../math/numbers/rationals/rational");
 const affine_1 = require("../../../math/polynomials/affine");
-const intervals_1 = require("../../../math/sets/intervals/intervals");
 const randint_1 = require("../../../math/utils/random/randint");
 const equationSolutionNode_1 = require("../../../tree/nodes/equations/equationSolutionNode");
 const equalNode_1 = require("../../../tree/nodes/equations/equalNode");
@@ -14,10 +13,9 @@ const discreteSetNode_1 = require("../../../tree/nodes/sets/discreteSetNode");
 const variableNode_1 = require("../../../tree/nodes/variables/variableNode");
 const shuffle_1 = require("../../../utils/shuffle");
 const getEquationType2ExerciseQuestion = () => {
-    const interval = new intervals_1.Interval("[[-10; 10]]");
-    const b = interval.getRandomElement();
+    const b = (0, randint_1.randint)(-10, 11);
     const a = (0, randint_1.randint)(-9, 10, [0, 1]);
-    const solution = new rational_1.Rational(b.value, a).simplify();
+    const solution = new rational_1.Rational(b, a).simplify();
     const affine = new affine_1.Affine(a, 0).toTree();
     const tree = new equalNode_1.EqualNode(affine, b.toTree());
     const answer = new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), solution.toTree()).toTex();
@@ -27,7 +25,7 @@ const getEquationType2ExerciseQuestion = () => {
         answer,
         keys: equationKeys_1.equationKeys,
         answerFormat: "tex",
-        identifiers: { a, b: b.value },
+        identifiers: { a, b: b },
     };
     return question;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"equationType3Exercise.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/equationType3Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAiBlC;;GAEG;AACH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAsDF,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,WAAW,CAc3D,CAAC"}
+{"version":3,"file":"equationType3Exercise.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/equationType3Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAiBlC;;GAEG;AACH,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAkDF,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,WAAW,CAc3D,CAAC"}

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

@@ -4,11 +4,8 @@ exports.equationType3Exercise = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const equationKeys_1 = require("../../../exercises/utils/keys/equationKeys");
-const integer_1 = require("../../../math/numbers/integer/integer");
 const rational_1 = require("../../../math/numbers/rationals/rational");
 const affine_1 = require("../../../math/polynomials/affine");
-const discreteSet_1 = require("../../../math/sets/discreteSet");
-const intervals_1 = require("../../../math/sets/intervals/intervals");
 const randint_1 = require("../../../math/utils/random/randint");
 const equationSolutionNode_1 = require("../../../tree/nodes/equations/equationSolutionNode");
 const equalNode_1 = require("../../../tree/nodes/equations/equalNode");
@@ -17,8 +14,6 @@ const variableNode_1 = require("../../../tree/nodes/variables/variableNode");
 const shuffle_1 = require("../../../utils/shuffle");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const getEquationType3ExerciseQuestion = () => {
-    const interval = new intervals_1.Interval("[[-10; 10]]");
-    const intervalStar = new intervals_1.Interval("[[-10; 10]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
     const b = (0, randint_1.randint)(-10, 11, [0]);
     const a = (0, randint_1.randint)(-10, 11, [0, 1]);
     const c = (0, randint_1.randint)(-10, 11);

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

@@ -1 +1 @@
-{"version":3,"file":"equationType4Exercise.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/equationType4Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAelC;;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;AAqEF,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,WAAW,CAc3D,CAAC"}
+{"version":3,"file":"equationType4Exercise.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/equation/equationType4Exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAelC;;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;AA2DF,eAAO,MAAM,qBAAqB,EAAE,YAAY,CAAC,WAAW,CAc3D,CAAC"}

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

@@ -4,11 +4,8 @@ exports.equationType4Exercise = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const equationKeys_1 = require("../../../exercises/utils/keys/equationKeys");
-const integer_1 = require("../../../math/numbers/integer/integer");
 const rational_1 = require("../../../math/numbers/rationals/rational");
 const affine_1 = require("../../../math/polynomials/affine");
-const discreteSet_1 = require("../../../math/sets/discreteSet");
-const intervals_1 = require("../../../math/sets/intervals/intervals");
 const randint_1 = require("../../../math/utils/random/randint");
 const equationSolutionNode_1 = require("../../../tree/nodes/equations/equationSolutionNode");
 const equalNode_1 = require("../../../tree/nodes/equations/equalNode");
@@ -16,15 +13,12 @@ const discreteSetNode_1 = require("../../../tree/nodes/sets/discreteSetNode");
 const variableNode_1 = require("../../../tree/nodes/variables/variableNode");
 const shuffle_1 = require("../../../utils/shuffle");
 const getEquationType4ExerciseQuestion = () => {
-    const interval = new intervals_1.Interval("[[-10; 10]]");
-    const intervalStar = new intervals_1.Interval("[[-10; 10]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
-    const a = intervalStar.getRandomElement();
-    const b = interval.getRandomElement();
-    const intervalC = new intervals_1.Interval("[[-10; 10]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0), new integer_1.Integer(a.value)]));
-    const c = intervalC.getRandomElement();
-    const d = interval.getRandomElement();
-    const affines = [new affine_1.Affine(a.value, b.value), new affine_1.Affine(c.value, d.value)];
-    const solution = new rational_1.Rational(d.value - b.value, a.value - c.value).simplify();
+    const a = (0, randint_1.randint)(-10, 11, [0]);
+    const b = (0, randint_1.randint)(-10, 11);
+    const c = (0, randint_1.randint)(-10, 11, [0, a]);
+    const d = (0, randint_1.randint)(-10, 11);
+    const affines = [new affine_1.Affine(a, b), new affine_1.Affine(c, d)];
+    const solution = new rational_1.Rational(d - b, a - c).simplify();
     const statementTree = new equalNode_1.EqualNode(affines[0].toTree(), affines[1].toTree());
     const answerTree = new equalNode_1.EqualNode(new variableNode_1.VariableNode("x"), solution.toTree());
     const answer = answerTree.toTex();
@@ -35,10 +29,10 @@ const getEquationType4ExerciseQuestion = () => {
         keys: equationKeys_1.equationKeys,
         answerFormat: "tex",
         identifiers: {
-            a: a.value,
-            b: b.value,
-            c: c.value,
-            d: d.value,
+            a: a,
+            b: b,
+            c: c,
+            d: d,
         },
     };
     return question;

package/lib/exercises/calculLitteral/factorisation/factoIdRmq1.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factoIdRmq1.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/factorisation/factoIdRmq1.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAiDF,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,WAAW,CAYjD,CAAC"}
+{"version":3,"file":"factoIdRmq1.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/factorisation/factoIdRmq1.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAgDF,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,WAAW,CAYjD,CAAC"}

package/lib/exercises/calculLitteral/factorisation/factoIdRmq1.js

@@ -3,17 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.factoIdRmq1 = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
-const integer_1 = require("../../../math/numbers/integer/integer");
 const affine_1 = require("../../../math/polynomials/affine");
-const discreteSet_1 = require("../../../math/sets/discreteSet");
-const intervals_1 = require("../../../math/sets/intervals/intervals");
 const randint_1 = require("../../../math/utils/random/randint");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
 const shuffle_1 = require("../../../utils/shuffle");
 const getFactoType1Question = () => {
-    const interval = new intervals_1.Interval("[[1; 10]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
-    const affine = affine_1.AffineConstructor.random(interval, interval);
+    const affine = affine_1.AffineConstructor.random(undefined, {
+        excludes: [0],
+    });
     const statementTree = affine.multiply(affine).toTree();
     const answerTree = new powerNode_1.PowerNode(affine.toTree(), new numberNode_1.NumberNode(2));
     const answer = answerTree.toTex();

package/lib/exercises/calculLitteral/factorisation/factoIdRmq2.js

@@ -3,18 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.factoIdRmq2 = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
-const integer_1 = require("../../../math/numbers/integer/integer");
 const affine_1 = require("../../../math/polynomials/affine");
-const discreteSet_1 = require("../../../math/sets/discreteSet");
-const intervals_1 = require("../../../math/sets/intervals/intervals");
 const randint_1 = require("../../../math/utils/random/randint");
 const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
 const powerNode_1 = require("../../../tree/nodes/operators/powerNode");
 const shuffle_1 = require("../../../utils/shuffle");
 const getFactoType1Question = () => {
-    const intervalA = new intervals_1.Interval("[[0; 10]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
-    const intervalB = new intervals_1.Interval("[[-10; 0]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
-    const affine = affine_1.AffineConstructor.random(intervalA, intervalB);
+    const affine = affine_1.AffineConstructor.random({
+        min: 0,
+        max: 11,
+    }, { min: -10, max: 0 });
     const statementTree = affine.multiply(affine).toTree();
     const answerTree = new powerNode_1.PowerNode(affine.toTree(), new numberNode_1.NumberNode(2));
     const answer = answerTree.toTex();

package/lib/exercises/calculLitteral/factorisation/factoIdRmq3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factoIdRmq3.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/factorisation/factoIdRmq3.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AA8EF,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,WAAW,CAYjD,CAAC"}
+{"version":3,"file":"factoIdRmq3.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/factorisation/factoIdRmq3.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB,CAAC;AAgFF,eAAO,MAAM,WAAW,EAAE,YAAY,CAAC,WAAW,CAYjD,CAAC"}

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

@@ -3,16 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.factoIdRmq3 = void 0;
 const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
-const integer_1 = require("../../../math/numbers/integer/integer");
 const affine_1 = require("../../../math/polynomials/affine");
-const discreteSet_1 = require("../../../math/sets/discreteSet");
-const intervals_1 = require("../../../math/sets/intervals/intervals");
 const randint_1 = require("../../../math/utils/random/randint");
 const multiplyNode_1 = require("../../../tree/nodes/operators/multiplyNode");
 const getFactoType1Question = () => {
-    const interval = new intervals_1.Interval("[[-10; 10]]").difference(new discreteSet_1.DiscreteSet([new integer_1.Integer(0)]));
-    const intervalPlus = new intervals_1.Interval("[[1; 10]]");
-    const affine = affine_1.AffineConstructor.random(intervalPlus, interval);
+    const affine = affine_1.AffineConstructor.random({
+        min: 1,
+        max: 11,
+    }, { excludes: [0] });
     const affine2 = new affine_1.Affine(affine.a, -affine.b);
     const statementTree = affine.multiply(affine2).toTree();
     const answerTree = new multiplyNode_1.MultiplyNode(affine.toTree(), affine2.toTree());

package/lib/exercises/calculLitteral/inequations/firstDegreeInequationsType0.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"firstDegreeInequationsType0.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/inequations/firstDegreeInequationsType0.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EACL,gBAAgB,EAGjB,MAAM,mCAAmC,CAAC;AAW3C,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,gBAAgB,CAAC;CAC5B,CAAC;AA8DF,eAAO,MAAM,2BAA2B,EAAE,YAAY,CAAC,WAAW,CAajE,CAAC"}
+{"version":3,"file":"firstDegreeInequationsType0.d.ts","sourceRoot":"","sources":["../../../../src/exercises/calculLitteral/inequations/firstDegreeInequationsType0.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EACL,gBAAgB,EAGjB,MAAM,mCAAmC,CAAC;AAW3C,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,gBAAgB,CAAC;CAC5B,CAAC;AA4DF,eAAO,MAAM,2BAA2B,EAAE,YAAY,CAAC,WAAW,CAajE,CAAC"}

package/lib/exercises/calculLitteral/inequations/firstDegreeInequationsType0.js

@@ -45,10 +45,8 @@ const getPropositions = (n, { answer, ineqType, b, c }) => {
 const isAnswerValid = (ans, { answer, ineqType, b, c }) => {
     const result = c - b;
     const ineq = new inequationNode_1.InequationNode([new variableNode_1.VariableNode("x"), new numberNode_1.NumberNode(result)], ineqType);
-    console.log(answer);
     const tree = new inequationSolutionNode_1.InequationSolutionNode(ineq.toInterval());
     const texs = tree.toAllValidTexs();
-    console.log(texs);
     return texs.includes(ans);
 };
 exports.firstDegreeInequationsType0 = {

package/lib/exercises/complex/argumentFromAlgebraicComplex.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"argumentFromAlgebraicComplex.d.ts","sourceRoot":"","sources":["../../../src/exercises/complex/argumentFromAlgebraicComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AA4CF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CAalE,CAAC"}
+{"version":3,"file":"argumentFromAlgebraicComplex.d.ts","sourceRoot":"","sources":["../../../src/exercises/complex/argumentFromAlgebraicComplex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EASb,MAAM,0BAA0B,CAAC;AAalC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AA4CF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CAalE,CAAC"}

package/lib/exercises/derivation/derivative/thirdDegreeFunctionVariation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"thirdDegreeFunctionVariation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/thirdDegreeFunctionVariation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAgBlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAsGF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CAsBlE,CAAC"}
+{"version":3,"file":"thirdDegreeFunctionVariation.d.ts","sourceRoot":"","sources":["../../../../src/exercises/derivation/derivative/thirdDegreeFunctionVariation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAiBlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAwHF,eAAO,MAAM,4BAA4B,EAAE,YAAY,CAAC,WAAW,CAsBlE,CAAC"}

package/lib/exercises/derivation/derivative/thirdDegreeFunctionVariation.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.thirdDegreeFunctionVariation = 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 polynomial_1 = require("../../../math/polynomials/polynomial");
 const randint_1 = require("../../../math/utils/random/randint");
@@ -27,12 +28,24 @@ const getThirdDegreeFunctionVariation = () => {
     const coin = (0, coinFlip_1.coinFlip)() ? -1 : 1;
     const instruction = `Soit $f$ la fonction représentée ci-dessous. Sur quel intervalle la dérivée de $f$ est-elle ` +
         (coin < 0 ? "négative ?" : "positive ?");
+    const racine1Tree = new numberNode_1.NumberNode(racine1);
+    const racine2Tree = new numberNode_1.NumberNode(racine2);
     const answer = coin * a < 0
-        ? `[${racine1};${racine2}]`
-        : `]-\\infty;${racine1}]\\cup[${racine2};+\\infty[`;
-    const commands = [polynome.toString()];
-    const ymax = Math.max(polynome.calculate(racine1), polynome.calculate(racine2));
-    const ymin = Math.min(polynome.calculate(racine1), polynome.calculate(racine2));
+        ? new intervalNode_1.IntervalNode(racine1Tree, racine2Tree, intervalNode_1.ClosureType.FF).toTex()
+        : new unionIntervalNode_1.UnionIntervalNode([
+            new intervalNode_1.IntervalNode(infiniteNode_1.MinusInfinityNode, racine1Tree, intervalNode_1.ClosureType.OF),
+            new intervalNode_1.IntervalNode(racine2Tree, infiniteNode_1.PlusInfinityNode, intervalNode_1.ClosureType.FO),
+        ]).toTex();
+    const commands = [
+        `f(x) = ${polynome.toString()}`,
+        `SetColor(f, "${(0, colors_1.randomColor)()}")`,
+    ];
+    const y1 = polynome.calculate(racine1);
+    const y2 = polynome.calculate(racine2);
+    const yMax = Math.max(y1, y2);
+    const yMin = Math.min(y1, y2);
+    const xMax = Math.max(racine1, racine2);
+    const xMin = Math.min(racine1, racine2);
     const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
         isAxesRatioFixed: false,
         isGridSimple: true,
@@ -42,14 +55,9 @@ const getThirdDegreeFunctionVariation = () => {
         instruction,
         startStatement: "S",
         answer,
-        keys: ["lbracket", "rbracket", "semicolon", "infty"],
+        keys: ["lbracket", "rbracket", "semicolon", "infty", "cup"],
         answerFormat: "tex",
-        coords: [
-            Math.min(racine1 - ((0, randint_1.randint)(7, 20) / 10) * (racine2 - racine1), -1),
-            Math.max(racine2 + ((0, randint_1.randint)(7, 20) / 10) * (racine2 - racine1), 1),
-            Math.min(ymin - ((ymax - ymin) * (0, randint_1.randint)(7, 20)) / 10, -1),
-            Math.max(ymax + ((ymax - ymin) * (0, randint_1.randint)(7, 20)) / 10, 1),
-        ],
+        coords: ggb.getAdaptedCoords({ xMin, xMax, yMin, yMax }),
         commands: ggb.commands,
         options: ggb.getOptions(),
         identifiers: { racine1, racine2, coin, a },
@@ -57,15 +65,22 @@ const getThirdDegreeFunctionVariation = () => {
     return question;
 };
 const getPropositions = (n, { answer, racine1, racine2 }) => {
+    const racine1Tree = new numberNode_1.NumberNode(racine1);
+    const racine2Tree = new numberNode_1.NumberNode(racine2);
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    (0, exercise_1.tryToAddWrongProp)(propositions, `[${racine2};+\\infty[`);
-    (0, exercise_1.tryToAddWrongProp)(propositions, `]-\\infty;${racine1}]`);
-    (0, exercise_1.tryToAddWrongProp)(propositions, `]-\\infty;${racine1}]\\cup[${racine2};+\\infty[`);
+    (0, exercise_1.tryToAddWrongProp)(propositions, new intervalNode_1.IntervalNode(racine2Tree, infiniteNode_1.PlusInfinityNode, intervalNode_1.ClosureType.FO).toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, new intervalNode_1.IntervalNode(infiniteNode_1.MinusInfinityNode, racine1Tree, intervalNode_1.ClosureType.OF).toTex());
+    (0, exercise_1.tryToAddWrongProp)(propositions, new unionIntervalNode_1.UnionIntervalNode([
+        new intervalNode_1.IntervalNode(infiniteNode_1.MinusInfinityNode, racine1Tree, intervalNode_1.ClosureType.OF),
+        new intervalNode_1.IntervalNode(racine2Tree, infiniteNode_1.PlusInfinityNode, intervalNode_1.ClosureType.FO),
+    ]).toTex());
     while (propositions.length < n) {
-        const racine1 = (0, randint_1.randint)(-5, 4);
-        const racine2 = (0, randint_1.randint)(racine1 + 1, 6);
-        const wrongAnswer = `[${racine1};${racine2}]`;
+        const root1 = (0, randint_1.randint)(-5, 4);
+        const root2 = (0, randint_1.randint)(root1 + 1, 6);
+        const root1Tree = new numberNode_1.NumberNode(racine1);
+        const root2Tree = new numberNode_1.NumberNode(racine2);
+        const wrongAnswer = new intervalNode_1.IntervalNode(root1Tree, root2Tree, intervalNode_1.ClosureType.FF).toTex();
         (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
     }
     return (0, shuffle_1.shuffle)(propositions);

package/lib/exercises/derivation/derivativeNumberReading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"derivativeNumberReading.d.ts","sourceRoot":"","sources":["../../../src/exercises/derivation/derivativeNumberReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,EAAE,CAAC;IACZ,CAAC,EAAE,MAAM,EAAE,CAAC;CACb,CAAC;AAiFF,eAAO,MAAM,uBAAuB,EAAE,YAAY,CAAC,WAAW,CAa7D,CAAC"}
+{"version":3,"file":"derivativeNumberReading.d.ts","sourceRoot":"","sources":["../../../src/exercises/derivation/derivativeNumberReading.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAmBlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,EAAE,CAAC;IACZ,CAAC,EAAE,MAAM,EAAE,CAAC;CACb,CAAC;AA4FF,eAAO,MAAM,uBAAuB,EAAE,YAAY,CAAC,WAAW,CAa7D,CAAC"}

package/lib/exercises/derivation/derivativeNumberReading.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.derivativeNumberReading = 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 integer_1 = require("../../math/numbers/integer/integer");
 const rational_1 = require("../../math/numbers/rationals/rational");
 const polynomial_1 = require("../../math/polynomials/polynomial");
@@ -35,19 +37,30 @@ const getDerivativeNumberReading = () => {
     const instruction = `Ci-dessous sont tracées la courbe $\\mathcal C_f$ de la fonction $f$ et la tangente à cette courbe au point d'abscisse $${xA}$.$\\\\$ Déterminer $f'(${xA})$.`;
     const commands = [
         `f(x) = ${polynome.toString()}`,
+        `SetColor(f, "${colors_1.blueMain}")`,
         `SetCaption(f, "$\\mathcal C_f$")`,
         `ShowLabel(f, true)`,
         `g(x) = (${penteString}) * x + (${originString})`,
+        `SetColor(g, "${colors_1.orange}")`,
         `A = (${xA},${yA})`,
+        "SetFixed(A, true)  ",
     ];
-    // const ggb = new GeogebraConstructor(commands);
+    const xMin = Math.min(xA, xB);
+    const yMin = Math.min(yA, yB);
+    const xMax = Math.max(xA, xB);
+    const yMax = Math.max(yA, yB);
+    const ggb = new geogebraConstructor_1.GeogebraConstructor(commands, {
+        isGridSimple: true,
+    });
     const answer = penteTree.toTex();
     const question = {
         instruction,
         startStatement: "a",
         answer,
-        commands,
-        coords: [xA - 5, xA + 5, yA - 5, yA + 5],
+        commands: ggb.commands,
+        // coords: ggb.getAdaptedCoords({ xMax, xMin, yMax, yMin }),
+        coords: [xMin - 5, xMax + 5, yMin - 5, yMax + 5],
+        options: ggb.getOptions(),
         answerFormat: "tex",
         keys: [],
         identifiers: { A: [xA, yA], B: [xB, yB] },

package/lib/exercises/exercise.d.ts

@@ -54,5 +54,5 @@ export interface MathExercise<TIdentifiers = {}> {
     isAnswerValid?: VEA<TIdentifiers>;
 }
 export type MathLevel = "6ème" | "5ème" | "4ème" | "3ème" | "2nde" | "1reTech" | "1reESM" | "1reSpé" | "TermSpé" | "TermTech" | "MathExp" | "MathComp" | "CAP" | "2ndPro" | "1rePro" | "TermPro";
-export type MathSection = "Aires" | "Arithmétique" | "Calcul littéral" | "Calculs" | "Combinatoire et dénombrement" | "Conversions" | "Dérivation" | "Droites" | "Ensembles et intervalles" | "Équations" | "Équations différentielles" | "Exponentielle" | "Fonction cube" | "Fonction inverse" | "Fonctions" | "Fonctions affines" | "Fonctions de référence" | "Fractions" | "Géométrie cartésienne" | "Géométrie euclidienne" | "Inéquations" | "Intégration" | "Limites" | "Logarithme népérien" | "Logarithme décimal" | "Nombres complexes" | "Périmètres" | "Pourcentages" | "Primitives" | "Probabilités" | "Produit scalaire" | "Proportionnalité" | "Puissances" | "Racines carrées" | "Second degré" | "Statistiques" | "Suites" | "Théorème de Pythagore" | "Théorème de Thalès" | "Trigonométrie" | "Valeur absolue" | "Vecteurs";
+export type MathSection = "Aires" | "Arithmétique" | "Calcul littéral" | "Calculs" | "Combinatoire et dénombrement" | "Conversions" | "Dérivation" | "Droites" | "Ensembles et intervalles" | "Équations" | "Équations différentielles" | "Exponentielle" | "Fonction cube" | "Fonction inverse" | "Fonctions" | "Fonctions affines" | "Fonctions de référence" | "Fractions" | "Géométrie cartésienne" | "Géométrie euclidienne" | "Inéquations" | "Intégration" | "Limites" | "Logarithme népérien" | "Logarithme décimal" | "Matrices" | "Nombres complexes" | "Périmètres" | "Pourcentages" | "Primitives" | "Probabilités" | "Produit scalaire" | "Proportionnalité" | "Puissances" | "Racines carrées" | "Second degré" | "Statistiques" | "Suites" | "Théorème de Pythagore" | "Théorème de Thalès" | "Trigonométrie" | "Valeur absolue" | "Vecteurs";
 //# sourceMappingURL=exercise.d.ts.map