math-exercises 2.2.9 → 2.2.11

package/lib/exercises/math/calcul/operations/expressionNature.js

@@ -1,81 +1,181 @@
 "use strict";
-// import {
-//   Exercise,
-//   Proposition,
-//   QCMGenerator,
-//   Question,
-//   QuestionGenerator,
-//   VEA,
-//   GGBVEA,
-//   addValidProp,
-//   shuffleProps,
-//   tryToAddWrongProp,
-// } from "../../../../exercises/exercise";
-// import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQuestions";
-// import { AddNode } from "../../../../tree/nodes/operators/addNode";
-// import { diceFlip } from "../../../../utils/diceFlip";
-// type Identifiers = {};
-// const getExpressionNatureQuestion: QuestionGenerator<Identifiers> = () => {
-//   let answer  = "";
-//   let statement = "";
-//   let numbers = [0, 0];
-//   const type = diceFlip(4)
-//   switch(type){
-//     case 0 :
-//       //somme
-//       //ab+c , ac + bc, a/b + c, a + b/c
-//       const node= new AddNode(
-//       )
-//       answer = "une somme"
-//     break;
-//     case 1 :
-//       //différence
-//       answer = "une différence"
-//     break;
-//     case 2 :
-//       //produit
-//       answer = "un produit"
-//     break;
-//     case 3 :
-//     default:
-//       //quotient
-//       answer = "un quotient"
-//     break;
-//   }
-//   const question: Question<Identifiers> = {
-//     answer,
-//     instruction: `L'expression ${statement} est : `,
-//     keys: [],
-//     answerFormat: "tex",
-//     identifiers: {},
-//   };
-//   return question;
-// };
-// const getPropositions: QCMGenerator<Identifiers> = (n, { answer }) => {
-//   const propositions: Proposition[] = [];
-//   addValidProp(propositions, answer);
-//   tryToAddWrongProp(propositions, "une somme");
-//   tryToAddWrongProp(propositions, "un produit");
-//   tryToAddWrongProp(propositions, "une différence");
-//   tryToAddWrongProp(propositions, "un quotient");
-//   return shuffleProps(propositions, n);
-// };
-// const isAnswerValid: VEA<Identifiers> = (ans, { answer }) => {
-//   return ans === answer;
-// };
-// export const expressionNature: Exercise<Identifiers> = {
-//   id: "expressionNature",
-//   connector: "=",
-//   label:
-//     "Déterminer la nature d'une expression (somme/produit/différence/quotient)",
-//   levels: [],
-//   isSingleStep: true,
-//   sections: [],
-//   generator: (nb: number) =>
-//     getDistinctQuestions(getExpressionNatureQuestion, nb),
-//   qcmTimer: 60,
-//   freeTimer: 60,
-//   getPropositions,
-//   isAnswerValid,
-//   subject: "Mathématiques",
-// };
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.expressionNature = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const randint_1 = require("../../../../math/utils/random/randint");
+const addNode_1 = require("../../../../tree/nodes/operators/addNode");
+const divideNode_1 = require("../../../../tree/nodes/operators/divideNode");
+const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
+const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
+const diceFlip_1 = require("../../../../utils/diceFlip");
+const getExpressionNatureQuestion = () => {
+    let answer = "";
+    let statement = "";
+    let node;
+    let subType;
+    //   const type = diceFlip(4);
+    const a = (0, randint_1.randint)(1, 10).toTree();
+    const b = (0, randint_1.randint)(1, 10).toTree();
+    const c = (0, randint_1.randint)(1, 10).toTree();
+    const d = (0, randint_1.randint)(1, 10).toTree();
+    const type = (0, randint_1.randint)(0, 4);
+    switch (type) {
+        case 0:
+            //somme
+            subType = (0, diceFlip_1.diceFlip)(5);
+            switch (subType) {
+                case 1:
+                    //ab+c
+                    node = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(a, b), c);
+                    node.shuffle();
+                    break;
+                case 2:
+                    //ab + cd
+                    node = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(a, b), new multiplyNode_1.MultiplyNode(c, d));
+                    break;
+                case 3:
+                    //a/b + c
+                    node = new addNode_1.AddNode(new divideNode_1.DivideNode(a, b), c);
+                    node.shuffle();
+                    break;
+                case 4:
+                    //ab + c/d
+                    node = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(a, b), new divideNode_1.DivideNode(c, d));
+                    node.shuffle();
+                    break;
+                case 5:
+                    //a/b + c/d
+                    node = new addNode_1.AddNode(new divideNode_1.DivideNode(a, b), new divideNode_1.DivideNode(c, d));
+                    break;
+            }
+            answer = "une somme";
+            break;
+        case 1:
+            //différence
+            subType = (0, diceFlip_1.diceFlip)(5);
+            switch (subType) {
+                case 1:
+                    //ab+c
+                    node = new substractNode_1.SubstractNode(new multiplyNode_1.MultiplyNode(a, b), c);
+                    node.dangerouslyShuffle();
+                    break;
+                case 2:
+                    //ab - cd
+                    node = new substractNode_1.SubstractNode(new multiplyNode_1.MultiplyNode(a, b), new multiplyNode_1.MultiplyNode(c, d));
+                    break;
+                case 3:
+                    //a/b - c
+                    node = new substractNode_1.SubstractNode(new divideNode_1.DivideNode(a, b), c);
+                    node.dangerouslyShuffle();
+                    break;
+                case 4:
+                    //ab - c/d
+                    node = new substractNode_1.SubstractNode(new multiplyNode_1.MultiplyNode(a, b), new divideNode_1.DivideNode(c, d));
+                    node.dangerouslyShuffle();
+                    break;
+                case 5:
+                    //a/b - c/d
+                    node = new substractNode_1.SubstractNode(new divideNode_1.DivideNode(a, b), new divideNode_1.DivideNode(c, d));
+                    break;
+            }
+            answer = "une différence";
+            break;
+        case 2:
+            //produit
+            subType = (0, diceFlip_1.diceFlip)(5);
+            switch (subType) {
+                case 1:
+                    //(a+b)*c
+                    node = new multiplyNode_1.MultiplyNode(new addNode_1.AddNode(a, b), c);
+                    node.shuffle();
+                    break;
+                case 2:
+                    //(a-b)*c
+                    node = new multiplyNode_1.MultiplyNode(new substractNode_1.SubstractNode(a, b), c);
+                    node.shuffle();
+                    break;
+                case 3:
+                    //(a+b)(c+d)
+                    node = new multiplyNode_1.MultiplyNode(new addNode_1.AddNode(a, b), new addNode_1.AddNode(c, d));
+                    break;
+                case 4:
+                    //(a+b)(c-d)
+                    node = new multiplyNode_1.MultiplyNode(new addNode_1.AddNode(a, b), new substractNode_1.SubstractNode(c, d));
+                    node.shuffle();
+                    break;
+                case 5:
+                    //(a-b)(c-d)
+                    node = new multiplyNode_1.MultiplyNode(new substractNode_1.SubstractNode(a, b), new substractNode_1.SubstractNode(c, d));
+                    break;
+            }
+            answer = "un produit";
+            break;
+        case 3:
+        default:
+            //quotient
+            subType = (0, diceFlip_1.diceFlip)(5);
+            switch (subType) {
+                case 1:
+                    //(a+b)/c
+                    node = new divideNode_1.DivideNode(new addNode_1.AddNode(a, b), c);
+                    node.dangerouslyShuffle();
+                    break;
+                case 2:
+                    //(a-b)/c
+                    node = new divideNode_1.DivideNode(new substractNode_1.SubstractNode(a, b), c);
+                    node.dangerouslyShuffle();
+                    break;
+                case 3:
+                    //(a+b)/(c+d)
+                    node = new divideNode_1.DivideNode(new addNode_1.AddNode(a, b), new addNode_1.AddNode(c, d));
+                    break;
+                case 4:
+                    //(a+b)/(c-d)
+                    node = new divideNode_1.DivideNode(new addNode_1.AddNode(a, b), new substractNode_1.SubstractNode(c, d));
+                    node.dangerouslyShuffle();
+                    break;
+                case 5:
+                    //(a-b)/(c-d)
+                    node = new divideNode_1.DivideNode(new substractNode_1.SubstractNode(a, b), new substractNode_1.SubstractNode(c, d));
+                    break;
+            }
+            answer = "un quotient";
+            break;
+    }
+    statement = node.toTex();
+    const question = {
+        answer,
+        instruction: `L'expression $${statement}$ est : `,
+        keys: [],
+        answerFormat: "raw",
+        identifiers: { nodeIds: node.toIdentifiers(), type, subType },
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer, "raw");
+    (0, exercise_1.tryToAddWrongProp)(propositions, "une somme", "raw");
+    (0, exercise_1.tryToAddWrongProp)(propositions, "un produit", "raw");
+    (0, exercise_1.tryToAddWrongProp)(propositions, "une différence", "raw");
+    (0, exercise_1.tryToAddWrongProp)(propositions, "un quotient", "raw");
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer, nodeIds }) => {
+    return ans === answer;
+};
+exports.expressionNature = {
+    id: "expressionNature",
+    connector: "=",
+    label: "Déterminer la nature d'une expression (somme/produit/différence/quotient)",
+    levels: [],
+    isSingleStep: true,
+    sections: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getExpressionNatureQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+};

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

@@ -1,3 +1,6 @@
 export * from "./operationsPriorities";
 export * from "./operationsPrioritiesWithoutRelative";
+export * from "./expressionNature";
+export * from "./operationsPrioritiesParenthesis";
+export * from "./operationsPrioritiesParenthesisNoRelatives";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/operations/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,uCAAuC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/operations/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,uCAAuC,CAAC;AACtD,cAAc,oBAAoB,CAAC;AACnC,cAAc,mCAAmC,CAAC;AAClD,cAAc,8CAA8C,CAAC"}

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

@@ -16,3 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./operationsPriorities"), exports);
 __exportStar(require("./operationsPrioritiesWithoutRelative"), exports);
+__exportStar(require("./expressionNature"), exports);
+__exportStar(require("./operationsPrioritiesParenthesis"), exports);
+__exportStar(require("./operationsPrioritiesParenthesisNoRelatives"), exports);

package/lib/exercises/math/calcul/operations/operationsPriorities.d.ts

@@ -11,7 +11,7 @@ type Identifiers = {
     a: number;
     b: number;
     c: number;
-    d: number;
+    d: number | undefined;
 };
 export declare const operationsPriorities: Exercise<Identifiers>;
 export {};

package/lib/exercises/math/calcul/operations/operationsPriorities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operationsPriorities.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/operations/operationsPriorities.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAgIF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAatD,CAAC"}
+{"version":3,"file":"operationsPriorities.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/operations/operationsPriorities.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACvB,CAAC;AAmJF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAatD,CAAC"}

package/lib/exercises/math/calcul/operations/operationsPriorities.js

@@ -18,7 +18,7 @@ const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const coinFlip_1 = require("../../../../utils/coinFlip");
 const shuffle_1 = require("../../../../utils/shuffle");
 const getPriorityQuestions = () => {
-    const type = (0, randint_1.randint)(1, 6);
+    const type = (0, randint_1.randint)(1, 9);
     let startStatement = "";
     let answer = "";
     let a, b, c, d;
@@ -71,15 +71,30 @@ const getPriorityQuestions = () => {
             startStatement = statement.toTex();
             answer = (a / b + c / d).toString();
             break;
-        case 5: // a*b*c ± d
-            [b, d] = [1, 2].map((el) => (0, randint_1.randint)(-10, 11, [0]));
-            a = b * (0, randint_1.randint)(0, 11);
-            c = d * (0, randint_1.randint)(0, 11);
+        case 6: // a*b*c ± d
+            [a, b, c, d] = [1, 2, 3, 4].map((el) => (0, randint_1.randint)(-10, 11, [0]));
             statement = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new numberNode_1.NumberNode(b)), new numberNode_1.NumberNode(c)), new numberNode_1.NumberNode(d));
             statement.shuffle();
             startStatement = statement.toTex();
             answer = (a * b * c + d).toString();
             break;
+        case 7: //a/b*c et c*a/b
+            b = (0, randint_1.randint)(2, 10);
+            a = b * (0, randint_1.randint)(2, 10);
+            c = (0, randint_1.randint)(2, 10);
+            statement = new multiplyNode_1.MultiplyNode(new divideNode_1.DivideNode(a.toTree(), b.toTree()), c.toTree());
+            statement.shuffle();
+            answer = ((a / b) * c).frenchify();
+            startStatement = statement.toTex();
+            break;
+        case 8: //a+-b+-c
+            a = (0, randint_1.randint)(-15, 15);
+            b = (0, randint_1.randint)(-10, 10);
+            c = b > 0 ? (0, randint_1.randint)(-10, 0) : (0, randint_1.randint)(-10, 10);
+            statement = new addNode_1.AddNode(new addNode_1.AddNode(a.toTree(), b.toTree()), c.toTree());
+            answer = (a + b + c).frenchify();
+            startStatement = statement.toTex();
+            break;
         default:
             throw Error("impossible");
     }

package/lib/exercises/math/calcul/operations/operationsPrioritiesParenthesis.d.ts

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

package/lib/exercises/math/calcul/operations/operationsPrioritiesParenthesis.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"operationsPrioritiesParenthesis.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/operations/operationsPrioritiesParenthesis.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,GAAG,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAkHF,eAAO,MAAM,+BAA+B,EAAE,QAAQ,CAAC,WAAW,CAcjE,CAAC"}

package/lib/exercises/math/calcul/operations/operationsPrioritiesParenthesis.js

@@ -0,0 +1,111 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.operationsPrioritiesParenthesis = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const randint_1 = require("../../../../math/utils/random/randint");
+const addNode_1 = require("../../../../tree/nodes/operators/addNode");
+const divideNode_1 = require("../../../../tree/nodes/operators/divideNode");
+const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
+const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
+const coinFlip_1 = require("../../../../utils/coinFlip");
+const getOperationsPrioritiesParenthesisQuestion = () => {
+    const type = (0, randint_1.randint)(1, 5);
+    let a, b, c, d;
+    let statement;
+    let answer = "";
+    switch (type) {
+        case 1: //a*(b+-c)
+            a = (0, randint_1.randint)(-10, 11, [0, 1, -1]);
+            [b, c] = [1, 2].map((el) => (0, randint_1.randint)(-10, 11, [0]));
+            statement = new multiplyNode_1.MultiplyNode(a.toTree(), new addNode_1.AddNode(b.toTree(), c.toTree()));
+            statement.shuffle();
+            answer = (a * (b + c)).frenchify();
+            break;
+        case 2: //a/(b+-c) ou (b+-c)/a
+            if ((0, coinFlip_1.coinFlip)()) {
+                //a/(b+-c)
+                b = (0, randint_1.randint)(-10, 11);
+                c = (0, randint_1.randint)(-10, 11, [-b]);
+                a = (b + c) * (0, randint_1.randint)(2, 10);
+                statement = new divideNode_1.DivideNode(a.toTree(), new addNode_1.AddNode(b.toTree(), c.toTree()));
+                answer = (a / (b + c)).frenchify();
+            }
+            else {
+                //(b+-c)/a
+                a = (0, randint_1.randint)(2, 10);
+                let k = a * (0, randint_1.randint)(2, 10);
+                b = k - (0, randint_1.randint)(-10, 11, [0]);
+                c = k - b;
+                statement = new divideNode_1.DivideNode(new addNode_1.AddNode(b.toTree(), c.toTree()), a.toTree());
+                answer = ((b + c) / a).frenchify();
+            }
+            break;
+        case 3: // (a+-b)*/(c+-d)
+            if ((0, coinFlip_1.coinFlip)()) {
+                //(a+-b)*(c+-d)
+                [a, b, c, d] = [1, 2, 3, 4].map((el) => (0, randint_1.randint)(-10, 11, [0]));
+                statement = new multiplyNode_1.MultiplyNode(new addNode_1.AddNode(a.toTree(), b.toTree()), new addNode_1.AddNode(c.toTree(), d.toTree()));
+                answer = ((a + b) * (c + d)).frenchify();
+            }
+            else {
+                //(a+-b)/(c+-d)
+                c = (0, randint_1.randint)(-10, 11, [0]);
+                d = (0, randint_1.randint)(-10, 11, [0, -c]);
+                let k = (0, randint_1.randint)(2, 10) * (c + d);
+                a = k - (0, randint_1.randint)(-10, 11, [0]);
+                b = k - a;
+                statement = new divideNode_1.DivideNode(new addNode_1.AddNode(a.toTree(), b.toTree()), new addNode_1.AddNode(c.toTree(), d.toTree()));
+                answer = ((a + b) / (c + d)).frenchify();
+            }
+            break;
+        case 4: // a +- (b+- c/*d)
+        default:
+            a = (0, randint_1.randint)(-10, 11, [0]);
+            b = (0, randint_1.randint)(-10, 11, [0]);
+            d = (0, randint_1.randint)(2, 10);
+            const isAdd = (0, coinFlip_1.coinFlip)();
+            const isDivide = (0, coinFlip_1.coinFlip)();
+            if (isDivide)
+                c = d * (0, randint_1.randint)(2, 10);
+            else
+                c = (0, randint_1.randint)(-10, 11, [0]);
+            const isAdd2 = (0, coinFlip_1.coinFlip)();
+            statement = new (isAdd ? addNode_1.AddNode : substractNode_1.SubstractNode)(a.toTree(), new (isAdd2 ? addNode_1.AddNode : substractNode_1.SubstractNode)(b.toTree(), new (isDivide ? divideNode_1.DivideNode : multiplyNode_1.MultiplyNode)(c.toTree(), d.toTree()), { forceParenthesis: isAdd }));
+            answer = statement.evaluate({}).toString();
+            break;
+    }
+    const question = {
+        answer,
+        instruction: `Calculer : $${statement.toTex()}$`,
+        keys: [],
+        answerFormat: "tex",
+        identifiers: { nodeIds: statement.toIdentifiers(), type },
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, randint_1.randint)(-100, 100) + "");
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
+exports.operationsPrioritiesParenthesis = {
+    id: "operationsPrioritiesParenthesis",
+    connector: "=",
+    label: "Priorités opératoires avec parenthèses",
+    levels: [],
+    isSingleStep: true,
+    sections: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getOperationsPrioritiesParenthesisQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+};

package/lib/exercises/math/calcul/operations/operationsPrioritiesParenthesisNoRelatives.d.ts

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

package/lib/exercises/math/calcul/operations/operationsPrioritiesParenthesisNoRelatives.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"operationsPrioritiesParenthesisNoRelatives.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/operations/operationsPrioritiesParenthesisNoRelatives.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,GAAG,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAoIF,eAAO,MAAM,0CAA0C,EAAE,QAAQ,CAAC,WAAW,CAkB1E,CAAC"}

package/lib/exercises/math/calcul/operations/operationsPrioritiesParenthesisNoRelatives.js

@@ -0,0 +1,127 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.operationsPrioritiesParenthesisNoRelatives = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const randint_1 = require("../../../../math/utils/random/randint");
+const addNode_1 = require("../../../../tree/nodes/operators/addNode");
+const divideNode_1 = require("../../../../tree/nodes/operators/divideNode");
+const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
+const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
+const coinFlip_1 = require("../../../../utils/coinFlip");
+const getOperationsPrioritiesParenthesisNoRelativesQuestion = () => {
+    const type = (0, randint_1.randint)(1, 5);
+    let a, b, c, d;
+    let statement;
+    let answer = "";
+    switch (type) {
+        case 1: //a*(b+-c)
+            a = (0, randint_1.randint)(2, 11);
+            b = (0, randint_1.randint)(1, 11);
+            c = (0, randint_1.randint)(-b, 11, [0]);
+            statement = new multiplyNode_1.MultiplyNode(a.toTree(), new addNode_1.AddNode(b.toTree(), c.toTree()));
+            statement.shuffle();
+            answer = (a * (b + c)).frenchify();
+            break;
+        case 2: //a/(b+-c) ou (b+-c)/a
+            if ((0, coinFlip_1.coinFlip)()) {
+                //a/(b+-c)
+                b = (0, randint_1.randint)(1, 11);
+                c = (0, randint_1.randint)(-b + 1, 11);
+                a = (b + c) * (0, randint_1.randint)(2, 10);
+                statement = new divideNode_1.DivideNode(a.toTree(), new addNode_1.AddNode(b.toTree(), c.toTree()));
+                answer = (a / (b + c)).frenchify();
+            }
+            else {
+                //(b+-c)/a
+                a = (0, randint_1.randint)(2, 10);
+                let k = a * (0, randint_1.randint)(2, 10);
+                b = Math.max(k - (0, randint_1.randint)(-10, 11, [0]), 1);
+                c = k - b;
+                statement = new divideNode_1.DivideNode(new addNode_1.AddNode(b.toTree(), c.toTree()), a.toTree());
+                answer = ((b + c) / a).frenchify();
+            }
+            break;
+        case 3: // (a+-b)*/(c+-d)
+            if ((0, coinFlip_1.coinFlip)()) {
+                //(a+-b)*(c+-d)
+                [a, c] = [1, 2].map((el) => (0, randint_1.randint)(1, 11));
+                b = (0, randint_1.randint)(-a, 11, [0]);
+                d = (0, randint_1.randint)(-c, 11, [0]);
+                statement = new multiplyNode_1.MultiplyNode(new addNode_1.AddNode(a.toTree(), b.toTree()), new addNode_1.AddNode(c.toTree(), d.toTree()));
+                answer = ((a + b) * (c + d)).frenchify();
+            }
+            else {
+                //(a+-b)/(c+-d)
+                c = (0, randint_1.randint)(1, 11);
+                d = (0, randint_1.randint)(-c + 1, 11, [0]);
+                let k = (0, randint_1.randint)(2, 10) * (c + d);
+                a = Math.max(k - (0, randint_1.randint)(-10, 11, [0]), 1);
+                b = k - a;
+                statement = new divideNode_1.DivideNode(new addNode_1.AddNode(a.toTree(), b.toTree()), new addNode_1.AddNode(c.toTree(), d.toTree()));
+                answer = ((a + b) / (c + d)).frenchify();
+            }
+            break;
+        case 4: // a +- (b+- c/*d)
+        default:
+            d = (0, randint_1.randint)(2, 10);
+            const isAdd = (0, coinFlip_1.coinFlip)();
+            const isDivide = (0, coinFlip_1.coinFlip)();
+            const isAdd2 = (0, coinFlip_1.coinFlip)();
+            let secondValue = 0;
+            if (isDivide)
+                c = d * (0, randint_1.randint)(2, 10);
+            else
+                c = (0, randint_1.randint)(1, 11);
+            if (isAdd2) {
+                b = (0, randint_1.randint)(1, 11);
+                secondValue = b + (isDivide ? c / d : c * d);
+            }
+            else {
+                b = (0, randint_1.randint)(isDivide ? c / d + 1 : c * d + 1, isDivide ? c / d + 10 : c * d + 10);
+                secondValue = b - (isDivide ? c / d : c * d);
+            }
+            if (isAdd) {
+                a = (0, randint_1.randint)(1, 11);
+            }
+            else {
+                a = (0, randint_1.randint)(secondValue + 1, secondValue + 10);
+            }
+            statement = new (isAdd ? addNode_1.AddNode : substractNode_1.SubstractNode)(a.toTree(), new (isAdd2 ? addNode_1.AddNode : substractNode_1.SubstractNode)(b.toTree(), new (isDivide ? divideNode_1.DivideNode : multiplyNode_1.MultiplyNode)(c.toTree(), d.toTree()), { forceParenthesis: isAdd }));
+            answer = statement.evaluate({}).toString();
+            break;
+    }
+    const question = {
+        answer,
+        instruction: `Calculer : $${statement.toTex()}$`,
+        keys: [],
+        answerFormat: "tex",
+        identifiers: { nodeIds: statement.toIdentifiers(), type },
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, (0, randint_1.randint)(10, 100) + "");
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
+exports.operationsPrioritiesParenthesisNoRelatives = {
+    id: "operationsPrioritiesParenthesisNoRelatives",
+    connector: "=",
+    label: "Priorités opératoires avec parenthèses (sans relatifs)",
+    levels: [],
+    isSingleStep: true,
+    sections: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getOperationsPrioritiesParenthesisNoRelativesQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+};

package/lib/exercises/math/calcul/operations/operationsPrioritiesWithoutRelative.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operationsPrioritiesWithoutRelative.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/operations/operationsPrioritiesWithoutRelative.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA4QF,eAAO,MAAM,mCAAmC,EAAE,QAAQ,CAAC,WAAW,CAcrE,CAAC"}
+{"version":3,"file":"operationsPrioritiesWithoutRelative.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/operations/operationsPrioritiesWithoutRelative.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAWlC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAiSF,eAAO,MAAM,mCAAmC,EAAE,QAAQ,CAAC,WAAW,CAcrE,CAAC"}

package/lib/exercises/math/calcul/operations/operationsPrioritiesWithoutRelative.js

@@ -18,7 +18,7 @@ const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const coinFlip_1 = require("../../../../utils/coinFlip");
 const shuffle_1 = require("../../../../utils/shuffle");
 const getOperationsPrioritiesWithoutRelative = () => {
-    const type = (0, randint_1.randint)(1, 7);
+    const type = (0, randint_1.randint)(1, 9);
     const flip = (0, randint_1.randint)(1, 4);
     let startStatement = "";
     let answer = "";
@@ -161,6 +161,23 @@ const getOperationsPrioritiesWithoutRelative = () => {
                 answer = (a * b * c + d).toString();
             }
             break;
+        case 7: //a/b*c et c*a/b
+            b = (0, randint_1.randint)(2, 10);
+            a = b * (0, randint_1.randint)(2, 10);
+            c = (0, randint_1.randint)(2, 10);
+            statement = new multiplyNode_1.MultiplyNode(new divideNode_1.DivideNode(a.toTree(), b.toTree()), c.toTree());
+            statement.shuffle();
+            answer = ((a / b) * c).frenchify();
+            startStatement = statement.toTex();
+            break;
+        case 8: //a+-b+-c
+            a = (0, randint_1.randint)(5, 15);
+            b = (0, randint_1.randint)(-a, 10);
+            c = b > 0 ? (0, randint_1.randint)(-(a + b), 0) : (0, randint_1.randint)(-(a + b), 10);
+            statement = new addNode_1.AddNode(new addNode_1.AddNode(a.toTree(), b.toTree()), c.toTree());
+            answer = (a + b + c).frenchify();
+            startStatement = statement.toTex();
+            break;
         default:
             throw Error("impossible");
     }