math-exercises 2.2.10 → 2.2.11

package/lib/exercises/math/calcul/ordering/decimalOrdering.js

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decimalOrdering = 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 coinFlip_1 = require("../../../../utils/coinFlip");
+const getDecimalOrderingQuestion = () => {
+    const type = (0, randint_1.randint)(1, 5);
+    let a = 0;
+    let b = 0;
+    while (b == a) {
+        switch (type) {
+            case 1:
+                //+-x vs +-x.y
+                a = (0, randint_1.randint)(-100, 100);
+                b = (0, randfloat_1.randfloat)(Math.floor(a), Math.floor(a) + 1, (0, randint_1.randint)(1, 3));
+                break;
+            case 2:
+                //+-x.y vs +-x.y
+                a = (0, randfloat_1.randfloat)(-100, 100, 1);
+                b = (0, randfloat_1.randfloat)(Math.floor(a), Math.floor(a) + 1, 1);
+                break;
+            case 3:
+                //+-x.yy vs +-x.yy
+                a = (0, randfloat_1.randfloat)(-100, 100, 2);
+                b = (0, randfloat_1.randfloat)(Math.floor(a), Math.floor(a) + 1, 2);
+                break;
+            case 4:
+            default:
+                //+-x.yy vs +-x ou +-x.y
+                a = (0, randfloat_1.randfloat)(-100, 100, 2);
+                b = (0, coinFlip_1.coinFlip)()
+                    ? Math.floor(a)
+                    : (0, randfloat_1.randfloat)(Math.floor(a), Math.floor(a) + 1, 1);
+                break;
+        }
+    }
+    const answer = a < b ? "<" : a === b ? "=" : ">";
+    const question = {
+        answer,
+        instruction: `Compléter par le bon symbole : 
+    
+$$${a.frenchify()}\\ ...... \\ ${b.frenchify()}$$`,
+        keys: [],
+        answerFormat: "tex",
+        identifiers: { type, a, b },
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, "<");
+    (0, exercise_1.tryToAddWrongProp)(propositions, ">");
+    (0, exercise_1.tryToAddWrongProp)(propositions, "=");
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
+exports.decimalOrdering = {
+    id: "decimalOrdering",
+    connector: "\\iff",
+    label: "Comparer des nombres décimaux",
+    levels: [],
+    isSingleStep: true,
+    sections: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getDecimalOrderingQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    answerType: "QCU",
+};

package/lib/exercises/math/calcul/ordering/framing.d.ts

@@ -0,0 +1,10 @@
+import { Exercise } from "../../../../exercises/exercise";
+type Identifiers = {
+    type: number;
+    nbIds: any;
+    nbValue: number;
+    pow: number;
+};
+export declare const framing: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=framing.d.ts.map

package/lib/exercises/math/calcul/ordering/framing.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"framing.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/ordering/framing.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAmBlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,GAAG,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAyJF,eAAO,MAAM,OAAO,EAAE,QAAQ,CAAC,WAAW,CAazC,CAAC"}

package/lib/exercises/math/calcul/ordering/framing.js

@@ -0,0 +1,143 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.framing = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const decimal_1 = require("../../../../math/numbers/decimals/decimal");
+const randint_1 = require("../../../../math/utils/random/randint");
+const sqrtNode_1 = require("../../../../tree/nodes/functions/sqrtNode");
+const nodeConstructor_1 = require("../../../../tree/nodes/nodeConstructor");
+const piNode_1 = require("../../../../tree/nodes/numbers/piNode");
+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 powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
+const coinFlip_1 = require("../../../../utils/coinFlip");
+const random_1 = require("../../../../utils/random");
+//fraction: 1/3, 2/3, 1/6, 5/6, x/7
+//décimal
+const getFramingQuestion = () => {
+    const type = (0, randint_1.randint)(1, 5);
+    let nb;
+    const pow = -(0, randint_1.randint)(1, 4);
+    let a;
+    let b;
+    let ev;
+    let dec;
+    switch (type) {
+        case 1:
+            //CL(pi)
+            nb = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode((0, random_1.random)([(0, randint_1.randint)(-3, 0), (0, randint_1.randint)(1, 4), 10, -10]).toTree(), piNode_1.PiNode), (0, randint_1.randint)(-10, 10).toTree());
+            ev = nb.evaluate({});
+            dec = new decimal_1.Decimal(ev);
+            a = dec.toLowerBound(pow).toTree();
+            b = dec.toUpperBound(pow).toTree();
+            break;
+        case 2:
+            //CL(sqrt(2))
+            nb = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode((0, random_1.random)([(0, randint_1.randint)(-3, 0), (0, randint_1.randint)(1, 4), 10, -10]).toTree(), new sqrtNode_1.SqrtNode((2).toTree())), (0, randint_1.randint)(-10, 10).toTree());
+            ev = nb.evaluate({});
+            dec = new decimal_1.Decimal(ev);
+            a = dec.toLowerBound(pow).toTree();
+            b = dec.toUpperBound(pow).toTree();
+            break;
+        case 3:
+            //fraction
+            nb = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode((0, random_1.random)([(0, randint_1.randint)(-2, 0), (0, randint_1.randint)(1, 3), 10, -10]).toTree(), (0, random_1.random)([
+                new fractionNode_1.FractionNode((1).toTree(), (3).toTree()),
+                new fractionNode_1.FractionNode((2).toTree(), (3).toTree()),
+            ]), { forceTimesSign: true }), (0, randint_1.randint)(-10, 10).toTree());
+            ev = nb.evaluate({});
+            dec = new decimal_1.Decimal(ev);
+            a = dec.toLowerBound(pow).toTree();
+            b = dec.toUpperBound(pow).toTree();
+            break;
+        case 4:
+        default:
+            dec = decimal_1.DecimalConstructor.random(-200, 200, (0, randint_1.randint)(-pow, -pow + 3));
+            nb = dec.toTree();
+            a = dec.toLowerBound(pow).toTree();
+            b = dec.toUpperBound(pow).toTree();
+            break;
+    }
+    const answer = `${a.toTex()}<${nb.toTex()}<${b.toTex()}`;
+    const question = {
+        answer,
+        instruction: `Encadrer à $${new powerNode_1.PowerNode((10).toTree(), pow.toTree()).toTex()}$ près le nombre suivant : 
+
+$$
+${nb.toTex()}
+$$
+
+Donner une réponse sous la forme $a<${nb.toTex()}<b$.
+
+${type === 2
+            ? "On rappelle que $\\sqrt 2 \\approx 1,41421$."
+            : type === 1
+                ? "On rappelle que $\\pi \\approx 3,  14159$."
+                : ""}`,
+        keys: [
+            "pi",
+            "inf",
+            "sup",
+            {
+                id: "custom",
+                label: nb.toTex(),
+                labelType: "tex",
+                mathfieldInstructions: {
+                    method: "write",
+                    content: nb.toTex(),
+                },
+            },
+        ],
+        answerFormat: "tex",
+        identifiers: {
+            type,
+            nbIds: nb.toIdentifiers(),
+            nbValue: nb.evaluate({}),
+            pow,
+        },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, nbIds, nbValue, pow }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    const dec = new decimal_1.Decimal(nbValue);
+    const node = nodeConstructor_1.NodeConstructor.fromIdentifiers(nbIds);
+    console.log(nbValue, pow);
+    while (propositions.length < n) {
+        const fakePower = -(0, randint_1.randint)(1, 4, [pow]);
+        const fakeDec = new decimal_1.Decimal(dec.value * (0, randint_1.randint)(-3, 3, [0, 1]));
+        (0, coinFlip_1.coinFlip)()
+            ? (0, exercise_1.tryToAddWrongProp)(propositions, `${dec.toLowerBound(fakePower).toTree().toTex()}<${node.toTex()}<${dec
+                .toUpperBound(fakePower)
+                .toTree()
+                .toTex()}`)
+            : (0, exercise_1.tryToAddWrongProp)(propositions, `${fakeDec
+                .toLowerBound(pow)
+                .toTree()
+                .toTex()}<${node.toTex()}<${fakeDec
+                .toUpperBound(pow)
+                .toTree()
+                .toTex()}`);
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
+exports.framing = {
+    id: "framing",
+    connector: "=",
+    label: "Encadrer un nombre réel à $10^{-n}$",
+    levels: [],
+    isSingleStep: true,
+    sections: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getFramingQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+};

package/lib/exercises/math/calcul/ordering/index.d.ts

@@ -0,0 +1,4 @@
+export * from "./integerOrdering";
+export * from "./decimalOrdering";
+export * from "./framing";
+//# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/calcul/ordering/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/ordering/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,WAAW,CAAC"}

package/lib/exercises/math/calcul/ordering/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./integerOrdering"), exports);
+__exportStar(require("./decimalOrdering"), exports);
+__exportStar(require("./framing"), exports);

package/lib/exercises/math/calcul/ordering/integerOrdering.d.ts

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

package/lib/exercises/math/calcul/ordering/integerOrdering.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"integerOrdering.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/ordering/integerOrdering.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAMlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA0CF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAejD,CAAC"}

package/lib/exercises/math/calcul/ordering/integerOrdering.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.integerOrdering = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const randint_1 = require("../../../../math/utils/random/randint");
+const coinFlip_1 = require("../../../../utils/coinFlip");
+const probaFlip_1 = require("../../../../utils/probaFlip");
+const getIntegerOrderingQuestion = () => {
+    let a;
+    let b;
+    if ((0, probaFlip_1.probaFlip)(0.66)) {
+        a = (0, randint_1.randint)(-20, 0);
+        b = (0, randint_1.randint)(-20, 0, [a]);
+    }
+    else {
+        if ((0, coinFlip_1.coinFlip)()) {
+            a = (0, randint_1.randint)(-20, 0);
+            b = (0, randint_1.randint)(0, 20, [a]);
+        }
+        else {
+            a = (0, randint_1.randint)(0, 20);
+            b = (0, randint_1.randint)(0, 20, [a]);
+        }
+    }
+    const answer = a < b ? "<" : ">";
+    const question = {
+        answer,
+        instruction: `Compléter par le bon symbole : $${a}\\ ...... \\ ${b}$`,
+        keys: [],
+        answerFormat: "tex",
+        identifiers: { a, b },
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, "<");
+    (0, exercise_1.tryToAddWrongProp)(propositions, ">");
+    (0, exercise_1.tryToAddWrongProp)(propositions, "=");
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
+exports.integerOrdering = {
+    id: "integerOrdering",
+    connector: "\\iff",
+    label: "Comparer des nombres entiers relatifs",
+    levels: [],
+    isSingleStep: true,
+    sections: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getIntegerOrderingQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    answerType: "QCU",
+    subject: "Mathématiques",
+};

package/lib/exercises/math/derivation/derivative/powerFunctionDerivative.js

@@ -58,7 +58,7 @@ const isAnswerValid = (ans, { a, power }) => {
 exports.powerFunctionDerivative = {
     id: "powerFunctionDerivative",
     connector: "=",
-    label: "Dérivée d'une fonction puissance",
+    label: "Dérivée d'une fonction monôme",
     levels: ["1reESM", "1reSpé", "1reTech", "MathComp"],
     sections: ["Dérivation"],
     isSingleStep: false,

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

@@ -38,7 +38,7 @@ const generateExercise = () => {
     const flip = (0, coinFlip_1.coinFlip)();
     const f = affine_1.AffineConstructor.random();
     const instruction = `Soit la fonction affine $f(x)=${f.toTex()}$. ${flip
-        ? `Déterminer la valeur du coefficient directeur`
+        ? `Déterminer la valeur du coefficient directeur.`
         : `Déterminer la valeur de l'ordonnée à l'origine.`}`;
     return {
         instruction,

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

@@ -76,8 +76,8 @@ const getGraphicInequationQuestion = () => {
     const yMax = Math.max(...splinePoints.map((point) => point[1]));
     const intervalsNodes = intervals.map((i) => new intervalNode_1.IntervalNode(new numberNode_1.NumberNode(i.a), new numberNode_1.NumberNode(i.b), i.closure));
     const answer = intervalsNodes.length === 1
-        ? `S=\\ ${intervalsNodes[0].toTex()}`
-        : `S=\\ ${new unionIntervalNode_1.UnionIntervalNode(intervalsNodes).toTex()}`;
+        ? `S=${intervalsNodes[0].toTex()}`
+        : `S=${new unionIntervalNode_1.UnionIntervalNode(intervalsNodes).toTex()}`;
     const commands = [
         `S =Spline(${splinePoints
             .map((point) => `(${point[0]},${point[1]})`)
@@ -123,20 +123,20 @@ const getPropositions = (n, { answer, intervals, splinePoints, yValue }) => {
         (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\varnothing`);
     if (intervals.length === 1) {
         const interval = new intervalNode_1.IntervalNode(intervals[0].a.toTree(), intervals[0].b.toTree(), intervals[0].closure);
-        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\ ${interval.toRandomDifferentClosure().toTex()}`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=${interval.toRandomDifferentClosure().toTex()}`);
     }
     else if (intervals.length === 2) {
         const rightIntervals = intervals.map((i) => new intervalNode_1.IntervalNode(i.a.toTree(), i.b.toTree(), i.closure));
         const fakeIntervals = intervals.map((i) => new intervalNode_1.IntervalNode(i.a.toTree(), i.b.toTree(), i.closure));
-        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\ ${rightIntervals[(0, coinFlip_1.coinFlip)() ? 0 : 1].toTex()}`);
-        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\ ${new unionIntervalNode_1.UnionIntervalNode(fakeIntervals.map((i) => i.toRandomDifferentClosure())).toTex()}`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=${rightIntervals[(0, coinFlip_1.coinFlip)() ? 0 : 1].toTex()}`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=${new unionIntervalNode_1.UnionIntervalNode(fakeIntervals.map((i) => i.toRandomDifferentClosure())).toTex()}`);
     }
     while (propositions.length < n) {
         let a = (0, randint_1.randint)(splinePoints[0][0], splinePoints[splinePoints.length - 1][0] + 1);
         let b = (0, randint_1.randint)(splinePoints[0][0], splinePoints[splinePoints.length - 1][0] + 1, [a]);
         if (a > b)
             [a, b] = [b, a];
-        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\ ${new intervalNode_1.IntervalNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b), closure_1.ClosureType.FF).toTex()}`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=${new intervalNode_1.IntervalNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b), closure_1.ClosureType.FF).toTex()}`);
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };

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

@@ -110,8 +110,8 @@ const getTwoFunctionsInequationQuestion = () => {
     });
     const intervalsNodes = intervals.map((i) => new intervalNode_1.IntervalNode(new numberNode_1.NumberNode(i.a), new numberNode_1.NumberNode(i.b), i.closure));
     const answer = intervalsNodes.length === 1
-        ? `S=\\ ${intervalsNodes[0].toTex()}`
-        : `S=\\ ${new unionIntervalNode_1.UnionIntervalNode(intervalsNodes).toTex()}`;
+        ? `S=${intervalsNodes[0].toTex()}`
+        : `S=${new unionIntervalNode_1.UnionIntervalNode(intervalsNodes).toTex()}`;
     const question = {
         answer,
         instruction: `Déterminer graphiquement les solutions de l'inéquation $f(x) ${ineq.symbol} g(x)$ où $f$ et $g$ sont les fonctions représentées ci-dessous.`,
@@ -147,13 +147,13 @@ const getPropositions = (n, { answer, intervals, fSplinePoints, ineqSymbol }) =>
         (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\varnothing`);
     if (intervals.length === 1) {
         const interval = new intervalNode_1.IntervalNode(intervals[0].a.toTree(), intervals[0].b.toTree(), intervals[0].closure);
-        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\ ${interval.toRandomDifferentClosure().toTex()}`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=${interval.toRandomDifferentClosure().toTex()}`);
     }
     else {
         const rightIntervals = intervals.map((i) => new intervalNode_1.IntervalNode(i.a.toTree(), i.b.toTree(), i.closure));
         const fakeIntervals = intervals.map((i) => new intervalNode_1.IntervalNode(i.a.toTree(), i.b.toTree(), i.closure));
-        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\ ${rightIntervals[(0, coinFlip_1.coinFlip)() ? 0 : 1].toTex()}`);
-        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\ ${new unionIntervalNode_1.UnionIntervalNode(fakeIntervals.map((i) => i.toRandomDifferentClosure())).toTex()}`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=${rightIntervals[(0, coinFlip_1.coinFlip)() ? 0 : 1].toTex()}`);
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=${new unionIntervalNode_1.UnionIntervalNode(fakeIntervals.map((i) => i.toRandomDifferentClosure())).toTex()}`);
     }
     while (propositions.length < n) {
         const isStrict = ineqSymbol === "<" || ineqSymbol === ">";
@@ -161,7 +161,7 @@ const getPropositions = (n, { answer, intervals, fSplinePoints, ineqSymbol }) =>
         const x2 = (0, randint_1.randint)(x1 + 1, x1 + 5);
         const x3 = (0, randint_1.randint)(x2 + 3, x2 + 6);
         const x4 = (0, randint_1.randint)(x3 + 1, x3 + 3);
-        (0, exercise_1.tryToAddWrongProp)(propositions, `S=\\ ${new unionIntervalNode_1.UnionIntervalNode([
+        (0, exercise_1.tryToAddWrongProp)(propositions, `S=${new unionIntervalNode_1.UnionIntervalNode([
             new intervalNode_1.IntervalNode(x1.toTree(), x2.toTree(), isStrict ? closure_1.ClosureType.FO : closure_1.ClosureType.FF),
             new intervalNode_1.IntervalNode(x3.toTree(), x4.toTree(), isStrict ? closure_1.ClosureType.OF : closure_1.ClosureType.FF),
         ]).toTex()}`);

package/lib/exercises/math/percent/htToTTC.d.ts

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

package/lib/exercises/math/percent/htToTTC.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"htToTTC.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/htToTTC.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAgCF,eAAO,MAAM,OAAO,EAAE,QAAQ,CAAC,WAAW,CAazC,CAAC"}

package/lib/exercises/math/percent/htToTTC.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.htToTTC = 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 coinFlip_1 = require("../../../utils/coinFlip");
+const random_1 = require("../../../utils/random");
+const getHtToTtcQuestion = () => {
+    const TVA = (0, random_1.random)([20, 5.5]);
+    const ht = (0, coinFlip_1.coinFlip)() ? (0, randint_1.randint)(50, 1000) : (0, randfloat_1.randfloat)(20, 200, 2);
+    const answer = (0, round_1.round)(ht * (1 + TVA / 100), 2).frenchify();
+    const question = {
+        answer,
+        instruction: `Un object coûte $${ht.frenchify()}€$ en HT. Quel est son prix TTC, sachant que la TVA est de $${TVA.frenchify()}\\%$ ? (arrondir au centième)`,
+        keys: [],
+        answerFormat: "tex",
+        identifiers: { TVA, ht },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, TVA, ht }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, (0, round_1.round)((ht * TVA) / 100, 2).frenchify());
+    (0, exercise_1.tryToAddWrongProp)(propositions, (0, round_1.round)(ht + TVA / 100, 2).frenchify());
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, randfloat_1.randfloat)(50, 400, 2).frenchify());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
+exports.htToTTC = {
+    id: "htToTTC",
+    connector: "=",
+    label: "Passer d'un prix HT à un prix TTC",
+    levels: [],
+    isSingleStep: true,
+    sections: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getHtToTtcQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+};

package/lib/exercises/math/percent/index.d.ts

@@ -8,4 +8,6 @@ export * from "./valuePercent";
 export * from "./findProportion";
 export * from "./isTableProportional";
 export * from "./cmToEvolution";
+export * from "./htToTTC";
+export * from "./ttcToHT";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/percent/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC"}

package/lib/exercises/math/percent/index.js

@@ -24,3 +24,5 @@ __exportStar(require("./valuePercent"), exports);
 __exportStar(require("./findProportion"), exports);
 __exportStar(require("./isTableProportional"), exports);
 __exportStar(require("./cmToEvolution"), exports);
+__exportStar(require("./htToTTC"), exports);
+__exportStar(require("./ttcToHT"), exports);

package/lib/exercises/math/percent/ttcToHT.d.ts

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

package/lib/exercises/math/percent/ttcToHT.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ttcToHT.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/percent/ttcToHT.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAuCF,eAAO,MAAM,OAAO,EAAE,QAAQ,CAAC,WAAW,CAazC,CAAC"}

package/lib/exercises/math/percent/ttcToHT.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ttcToHT = 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 coinFlip_1 = require("../../../utils/coinFlip");
+const random_1 = require("../../../utils/random");
+const getTtcToHtQuestion = () => {
+    const TVA = (0, random_1.random)([20, 5.5]);
+    const TTC = (0, coinFlip_1.coinFlip)() ? (0, randint_1.randint)(50, 1000) : (0, randfloat_1.randfloat)(20, 200, 2);
+    const answer = (0, round_1.round)(TTC / (1 + TVA / 100), 2).frenchify();
+    const question = {
+        answer,
+        instruction: `Un object coûte $${TTC.frenchify()}€$ en TTC. Quel est son prix HT, sachant que la TVA est de $${TVA.frenchify()}\\%$ ? (arrondir au centième)`,
+        keys: [],
+        answerFormat: "tex",
+        identifiers: { TTC, TVA },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, TTC, TVA }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    (0, exercise_1.tryToAddWrongProp)(propositions, (0, round_1.round)(TTC * (1 + TVA / 100), 2).frenchify());
+    (0, exercise_1.tryToAddWrongProp)(propositions, (0, round_1.round)(TTC - (1 + TVA / 100) * TTC, 2).frenchify());
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, randfloat_1.randfloat)(50, 400, 2).frenchify());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
+exports.ttcToHT = {
+    id: "ttcToHT",
+    connector: "=",
+    label: "Passer d'un prix TTC à un prix HT",
+    levels: [],
+    isSingleStep: true,
+    sections: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getTtcToHtQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+};

package/lib/exercises/math/probaStat/stats1var/marginalAndConditionalFrequency.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marginalAndConditionalFrequency.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/marginalAndConditionalFrequency.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,QAAQ,EAQT,MAAM,mBAAmB,CAAC;AAG3B,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AA2IF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAcjE,CAAC"}
+{"version":3,"file":"marginalAndConditionalFrequency.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/probaStat/stats1var/marginalAndConditionalFrequency.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,QAAQ,EAQT,MAAM,mBAAmB,CAAC;AAG3B,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAkIF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAcjE,CAAC"}

package/lib/exercises/math/probaStat/stats1var/marginalAndConditionalFrequency.js

@@ -8,15 +8,6 @@ const exercise_1 = require("../../../exercise");
 const getDistinctQuestions_1 = require("../../../utils/getDistinctQuestions");
 const getAnswer = (rand, x1, x2, x3, x4) => {
     const x = x1 + x2 + x3 + x4;
-    const total = x1 + x2 + x3 + x4;
-    const totalA = x1 + x3;
-    const totalB = x2 + x4;
-    const totalC = x1 + x2;
-    const totalD = x3 + x4;
-    const A_C = x1;
-    const A_D = x3;
-    const B_C = x2;
-    const B_D = x4;
     let freqString;
     let frequence;
     let answer;
@@ -112,8 +103,8 @@ const getPropositions = (n, { answer, rand, x1, x2, x3, x4 }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
     while (propositions.length < n) {
-        const rand = (0, randint_1.randint)(0, 12);
-        const { answer: answerTree } = getAnswer(rand, x1, x2, x3, x4);
+        const fakeRand = (0, randint_1.randint)(0, 12);
+        const { answer: answerTree } = getAnswer(fakeRand, x1, x2, x3, x4);
         (0, exercise_1.tryToAddWrongProp)(propositions, answerTree.toTex());
     }
     return (0, shuffle_1.shuffle)(propositions);

package/lib/exercises/pc/chemicalReactions/stoichiometricReaction.js

@@ -64,6 +64,6 @@ exports.stoichiometricReaction = {
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
-    answerType: "QCM",
+    answerType: "QCU",
     subject: "Physique",
 };

package/lib/exercises/pc/electricity/ohmicConductorOrGenerator.js

@@ -88,7 +88,7 @@ exports.ohmicConductorOrGenerator = {
     freeTimer: 60,
     getPropositions,
     isAnswerValid,
-    answerType: "QCM",
+    answerType: "QCU",
     maxAllowedQuestions: 10,
     subject: "Physique",
     hasHintAndCorrection: true,

package/lib/exercises/pc/motion/typeOfAcceleration.js

@@ -92,6 +92,6 @@ exports.typeOfAcceleration = {
     getPropositions,
     isAnswerValid,
     hasGeogebra: true,
-    answerType: "QCM",
+    answerType: "QCU",
     subject: "Physique",
 };