math-exercises 2.0.0 → 2.0.2

package/lib/exercises/equaDiff/equaDiffGeneralFormeWithIC.js

@@ -5,32 +5,26 @@ const exercise_1 = require("../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
 const randint_1 = require("../../math/utils/random/randint");
 const expNode_1 = require("../../tree/nodes/functions/expNode");
-const oppositeNode_1 = require("../../tree/nodes/functions/oppositeNode");
 const numberNode_1 = require("../../tree/nodes/numbers/numberNode");
-const equalNode_1 = require("../../tree/nodes/operators/equalNode");
+const equalNode_1 = require("../../tree/nodes/equations/equalNode");
 const multiplyNode_1 = require("../../tree/nodes/operators/multiplyNode");
 const variableNode_1 = require("../../tree/nodes/variables/variableNode");
-const simplify_1 = require("../../tree/parsers/simplify");
 const shuffle_1 = require("../../utils/shuffle");
 const solveExponentialEquationWithIC = () => {
     const a = (0, randint_1.randint)(-9, 10, [0]);
     const initialY = (0, randint_1.randint)(-9, 10);
-    const myEquation = (0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode('y')));
-    const myAnswer = initialY === 0
+    const myEquation = new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode("y"));
+    const solution = initialY === 0
         ? new numberNode_1.NumberNode(0) // y(0) = 0 ==> y(x) = 0
-        : new equalNode_1.EqualNode(new variableNode_1.VariableNode('y'), initialY === 1
-            ? new expNode_1.ExpNode((0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode('x')))) // éviter les 1e^(x)
-            : initialY === -1
-                ? new oppositeNode_1.OppositeNode(new expNode_1.ExpNode((0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode('x'))))) // éviter les -1e^(x)
-                : new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(initialY), new expNode_1.ExpNode((0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode('x')))))); // y = y(0)e^(ax);
-    const answer = myAnswer.toTex();
+        : new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(initialY), new expNode_1.ExpNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode("x"))));
+    const answer = new equalNode_1.EqualNode(new variableNode_1.VariableNode("y"), solution).toTex();
     const question = {
-        instruction: `Résoudre l'équation différentielle suivante avec la condition initiale $y(0) = ${initialY}$ : $y' = ${myEquation.toTex()}$.`,
+        instruction: `Résoudre l'équation différentielle suivante : $y' = ${myEquation.toTex()} \\ $ et $\\ y(0) = ${initialY}$`,
         startStatement: `y(x)`,
         answer,
-        keys: ['x', 'y', 'epower', 'exp', 'equal'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer },
+        keys: ["x", "y", "epower", "exp", "equal"],
+        answerFormat: "tex",
+        identifiers: { a, initialY },
     };
     return question;
 };
@@ -40,26 +34,35 @@ const getPropositions = (n, { answer }) => {
     while (propositions.length < n) {
         const a = (0, randint_1.randint)(-9, 10, [0]);
         const initialY = (0, randint_1.randint)(-9, 10);
-        const myWrongAnswer = initialY === 0
-            ? new numberNode_1.NumberNode(0)
-            : new equalNode_1.EqualNode(new variableNode_1.VariableNode('y'), initialY === 1
-                ? new expNode_1.ExpNode((0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode('x'))))
-                : initialY === -1
-                    ? new oppositeNode_1.OppositeNode(new expNode_1.ExpNode((0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode('x')))))
-                    : new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(initialY), new expNode_1.ExpNode((0, simplify_1.simplifyNode)(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode('x'))))));
-        (0, exercise_1.tryToAddWrongProp)(propositions, myWrongAnswer.toTex());
+        const solution = initialY === 0
+            ? new numberNode_1.NumberNode(0) // y(0) = 0 ==> y(x) = 0
+            : new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(initialY), new expNode_1.ExpNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode("x"))));
+        const wrongAnswer = new equalNode_1.EqualNode(new variableNode_1.VariableNode("y"), solution);
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer.toTex());
     }
     return (0, shuffle_1.shuffle)(propositions);
 };
+const isAnswerValid = (ans, { a, initialY }) => {
+    const solution = initialY === 0
+        ? new numberNode_1.NumberNode(0) // y(0) = 0 ==> y(x) = 0
+        : new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(initialY), new expNode_1.ExpNode(new multiplyNode_1.MultiplyNode(new numberNode_1.NumberNode(a), new variableNode_1.VariableNode("x"))));
+    const answer = new equalNode_1.EqualNode(new variableNode_1.VariableNode("y"), solution, {
+        allowRawRightChildAsSolution: true,
+    });
+    const texs = answer.toAllValidTexs();
+    console.log(texs);
+    return texs.includes(ans);
+};
 exports.exponentialDifferentialEquationWithIC = {
-    id: 'exponentialDifferentialEquationWithIC',
-    connector: '=',
-    label: "Équation Différentielle : $y' = ay$ avec conditions initiales",
-    levels: ['1reSpé', 'MathComp', 'TermSpé'],
-    sections: ['Équations différentielles'],
+    id: "exponentialDifferentialEquationWithIC",
+    connector: "=",
+    label: "Équation différentielle $y' = ay$ avec conditions initiales",
+    levels: ["1reSpé", "MathComp", "TermSpé"],
+    sections: ["Équations différentielles"],
     isSingleStep: false,
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(solveExponentialEquationWithIC, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/equaDiff/index.d.ts

@@ -0,0 +1,3 @@
+export * from "./equaDiffGeneralForme";
+export * from "./equaDiffGeneralFormeWithIC";
+//# sourceMappingURL=index.d.ts.map

package/lib/exercises/equaDiff/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exercises/equaDiff/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,8BAA8B,CAAC"}

package/lib/exercises/equaDiff/index.js

@@ -0,0 +1,18 @@
+"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("./equaDiffGeneralForme"), exports);
+__exportStar(require("./equaDiffGeneralFormeWithIC"), exports);

package/lib/exercises/exercise.d.ts

@@ -1,46 +1,51 @@
-import { KeyId } from '../types/keyIds';
-export declare const addValidProp: (props: Proposition[], statement: string, format?: 'tex' | 'raw') => void;
-export declare const addWrongProp: (props: Proposition[], statement: string, format?: 'tex' | 'raw') => void;
-export declare const tryToAddWrongProp: (props: Proposition[], statement: string, format?: 'tex' | 'raw') => void;
+import { KeyId } from "../types/keyIds";
+export declare const addValidProp: (props: Proposition[], statement: string, format?: "tex" | "raw") => void;
+export declare const addWrongProp: (props: Proposition[], statement: string, format?: "tex" | "raw") => void;
+export declare const tryToAddWrongProp: (props: Proposition[], statement: string, format?: "tex" | "raw") => void;
 export declare const shuffleProps: (props: Proposition[], n: number) => Proposition[];
 export type GeneratorOptions = {};
 export type Proposition = {
     id: string;
     statement: string;
     isRightAnswer: boolean;
-    format: 'tex' | 'raw';
+    format: "tex" | "raw";
 };
-export interface Question<TQCMProps = {}, TVEAProps = {}> {
+export interface Question<TIdentifiers = {}> {
     instruction: string;
     startStatement?: string;
     answer: string;
-    answerFormat: 'tex' | 'raw';
+    answerFormat: "tex" | "raw";
     keys?: KeyId[];
     commands?: string[];
     coords?: number[];
     options?: any;
-    divisionFormat?: 'fraction' | 'obelus';
-    qcmGeneratorProps?: TQCMProps;
-    veaProps?: TVEAProps;
+    divisionFormat?: "fraction" | "obelus";
+    identifiers: TIdentifiers;
 }
-export type QCMGenerator<T> = (n: number, args: T) => Proposition[];
-export type VEA<T> = (studentAnswer: string, args: T) => boolean;
-export type QuestionGenerator<TQCMProps = {}, TVEAProps = {}, TOptions = {}> = (opts?: TOptions) => Question<TQCMProps, TVEAProps>;
-export interface MathExercise<TQCMProps = {}, TVEAProps = {}> {
+export type QCMGenerator<TIdentifiers> = (n: number, args: {
+    answer: string;
+} & TIdentifiers) => Proposition[];
+export type VEA<TIdentifiers> = (studentAnswer: string, args: {
+    answer: string;
+} & TIdentifiers) => boolean;
+export type QuestionGenerator<TIdentifiers = {}, TOptions = {}> = (opts?: TOptions) => Question<TIdentifiers>;
+export interface MathExercise<TIdentifiers = {}> {
     id: string;
     isSingleStep: boolean;
     label: string;
     sections: MathSection[];
     levels: MathLevel[];
-    connector?: '=' | '\\iff' | '\\approx';
-    generator: (n: number) => Question<TQCMProps, TVEAProps>[];
+    connector?: "=" | "\\iff" | "\\approx";
+    generator: (n: number) => Question<TIdentifiers>[];
     maxAllowedQuestions?: number;
-    answerType?: 'QCM' | 'free';
+    answerType?: "QCM" | "free";
     qcmTimer: number;
     freeTimer: number;
-    getPropositions?: QCMGenerator<TQCMProps>;
-    isAnswerValid?: VEA<TVEAProps>;
+    getPropositions?: QCMGenerator<{
+        answer: string;
+    } & 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 = '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' | 'Nombres complexes' | 'Pourcentages' | 'Primitives' | 'Probabilités' | 'Proportionnalité' | 'Puissances' | 'Racines carrées' | 'Second degré' | 'Statistiques' | 'Suites' | 'Trigonométrie' | 'Valeur absolue' | 'Vecteurs';
+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" | "Nombres complexes" | "Périmètres" | "Pourcentages" | "Primitives" | "Probabilités" | "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

package/lib/exercises/exercise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exercise.d.ts","sourceRoot":"","sources":["../../src/exercises/exercise.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"exercise.d.ts","sourceRoot":"","sources":["../../src/exercises/exercise.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAI3C,eAAO,MAAM,YAAY,UAChB,WAAW,EAAE,aACT,MAAM,WACT,KAAK,GAAG,KAAK,SAQtB,CAAC;AACF,eAAO,MAAM,YAAY,UAChB,WAAW,EAAE,aACT,MAAM,WACT,KAAK,GAAG,KAAK,SAQtB,CAAC;AACF,eAAO,MAAM,iBAAiB,UACrB,WAAW,EAAE,aACT,MAAM,WACT,KAAK,GAAG,KAAK,SAUtB,CAAC;AAEF,eAAO,MAAM,YAAY,UAAW,WAAW,EAAE,KAAK,MAAM,kBAE3D,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAElC,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,OAAO,CAAC;IACvB,MAAM,EAAE,KAAK,GAAG,KAAK,CAAC;CACvB,CAAC;AACF,MAAM,WAAW,QAAQ,CAAC,YAAY,GAAG,EAAE;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,KAAK,GAAG,KAAK,CAAC;IAC5B,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,cAAc,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAC;IACvC,WAAW,EAAE,YAAY,CAAC;CAC3B;AAED,MAAM,MAAM,YAAY,CAAC,YAAY,IAAI,CACvC,CAAC,EAAE,MAAM,EACT,IAAI,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,YAAY,KACpC,WAAW,EAAE,CAAC;AACnB,MAAM,MAAM,GAAG,CAAC,YAAY,IAAI,CAC9B,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,YAAY,KACpC,OAAO,CAAC;AACb,MAAM,MAAM,iBAAiB,CAAC,YAAY,GAAG,EAAE,EAAE,QAAQ,GAAG,EAAE,IAAI,CAChE,IAAI,CAAC,EAAE,QAAQ,KACZ,QAAQ,CAAC,YAAY,CAAC,CAAC;AAC5B,MAAM,WAAW,YAAY,CAAC,YAAY,GAAG,EAAE;IAC7C,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,GAAG,GAAG,OAAO,GAAG,UAAU,CAAC;IACvC,SAAS,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;IACnD,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,UAAU,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,YAAY,CAAC;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,YAAY,CAAC,CAAC;IAClE,aAAa,CAAC,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;CACnC;AAED,MAAM,MAAM,SAAS,GACjB,MAAM,GACN,MAAM,GACN,MAAM,GACN,MAAM,GACN,MAAM,GACN,SAAS,GACT,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,UAAU,GACV,SAAS,GACT,UAAU,GACV,KAAK,GACL,QAAQ,GACR,QAAQ,GACR,SAAS,CAAC;AAEd,MAAM,MAAM,WAAW,GACnB,OAAO,GACP,cAAc,GACd,iBAAiB,GACjB,SAAS,GACT,8BAA8B,GAC9B,aAAa,GACb,YAAY,GACZ,SAAS,GACT,0BAA0B,GAC1B,WAAW,GACX,2BAA2B,GAC3B,eAAe,GACf,eAAe,GACf,kBAAkB,GAClB,WAAW,GACX,mBAAmB,GACnB,wBAAwB,GACxB,WAAW,GACX,uBAAuB,GACvB,uBAAuB,GACvB,aAAa,GACb,aAAa,GACb,SAAS,GACT,qBAAqB,GACrB,mBAAmB,GACnB,YAAY,GACZ,cAAc,GACd,YAAY,GACZ,cAAc,GACd,kBAAkB,GAClB,YAAY,GACZ,iBAAiB,GACjB,cAAc,GACd,cAAc,GACd,QAAQ,GACR,uBAAuB,GACvB,oBAAoB,GACpB,eAAe,GACf,gBAAgB,GAChB,UAAU,CAAC"}

package/lib/exercises/exercise.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.shuffleProps = exports.tryToAddWrongProp = exports.addWrongProp = exports.addValidProp = void 0;
 const shuffle_1 = require("../utils/shuffle");
 const uuidv4_1 = require("uuidv4");
-const addValidProp = (props, statement, format = 'tex') => {
+const addValidProp = (props, statement, format = "tex") => {
     props.push({
         id: (0, uuidv4_1.uuid)(),
         statement,
@@ -12,7 +12,7 @@ const addValidProp = (props, statement, format = 'tex') => {
     });
 };
 exports.addValidProp = addValidProp;
-const addWrongProp = (props, statement, format = 'tex') => {
+const addWrongProp = (props, statement, format = "tex") => {
     props.push({
         id: (0, uuidv4_1.uuid)(),
         statement,
@@ -21,7 +21,7 @@ const addWrongProp = (props, statement, format = 'tex') => {
     });
 };
 exports.addWrongProp = addWrongProp;
-const tryToAddWrongProp = (props, statement, format = 'tex') => {
+const tryToAddWrongProp = (props, statement, format = "tex") => {
     if (!props.some((prop) => prop.statement === statement)) {
         props.push({
             id: (0, uuidv4_1.uuid)(),

package/lib/exercises/exercises.d.ts

@@ -1,3 +1,3 @@
-import { MathExercise } from './exercise';
+import { MathExercise } from "./exercise";
 export declare const exercises: MathExercise<any, any>[];
 //# sourceMappingURL=exercises.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"exercises.d.ts","sourceRoot":"","sources":["../../src/exercises/exercises.ts"],"names":[],"mappings":"AAkLA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AA8B1C,eAAO,MAAM,SAAS,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,EAkS7C,CAAC"}
+{"version":3,"file":"exercises.d.ts","sourceRoot":"","sources":["../../src/exercises/exercises.ts"],"names":[],"mappings":"AAkLA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAgC1C,eAAO,MAAM,SAAS,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,EAoS7C,CAAC"}

package/lib/exercises/exercises.js

@@ -198,6 +198,8 @@ const productDerivative_1 = require("./derivation/derivative/productDerivative")
 const quotientDerivative_1 = require("./derivation/derivative/quotientDerivative");
 const derivativeNumberCalcul_1 = require("./derivation/derivativeNumberCalcul");
 const averagePoint_1 = require("./probaStat/stats2var/averagePoint");
+const rationalFractionForbiddenValue_1 = require("./functions/rationalFraction/rationalFractionForbiddenValue");
+const moduloFromAlgebraicComplex_1 = require("./complex/moduloFromAlgebraicComplex");
 exports.exercises = [
     /**
      * calcul litteral
@@ -346,6 +348,7 @@ exports.exercises = [
     inverseImageFunction_1.inverseImageFunction,
     imageFunctionGeogebra_1.imageFunctionGeogebra,
     inverseImageFunctionGeogebra_1.inverseImageFunctionGeogebra,
+    rationalFractionForbiddenValue_1.rationalFractionForbiddenValue,
     /**
      * derivation
      */
@@ -444,6 +447,7 @@ exports.exercises = [
     inverseComplex_1.inverseComplex,
     divideComplex_1.divideComplex,
     conjugateDivideComplex_1.conjugateDivideComplex,
+    moduloFromAlgebraicComplex_1.moduloFromAlgebraicComplex,
     /**sets */
     inequalityToInterval_1.inequalityToInterval,
     setBelonging_1.setBelonging,

package/lib/exercises/functions/absolute/absoluteValueEquations.d.ts

@@ -1,10 +1,8 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
     a: number;
     b: number;
 };
-type VEAProps = {};
-export declare const absoluteValueEquations: MathExercise<QCMProps, VEAProps>;
+export declare const absoluteValueEquations: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=absoluteValueEquations.d.ts.map

package/lib/exercises/functions/absolute/absoluteValueEquations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"absoluteValueEquations.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/absolute/absoluteValueEquations.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AASlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AA2CnB,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWnE,CAAC"}
+{"version":3,"file":"absoluteValueEquations.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/absolute/absoluteValueEquations.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAgEF,eAAO,MAAM,sBAAsB,EAAE,YAAY,CAAC,WAAW,CAa5D,CAAC"}

package/lib/exercises/functions/absolute/absoluteValueEquations.js

@@ -5,6 +5,9 @@ const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const polynomial_1 = require("../../../math/polynomials/polynomial");
 const randint_1 = require("../../../math/utils/random/randint");
+const equationSolutionNode_1 = require("../../../tree/nodes/equations/equationSolutionNode");
+const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
+const discreteSetNode_1 = require("../../../tree/nodes/sets/discreteSetNode");
 const coinFlip_1 = require("../../../utils/coinFlip");
 const probaFlip_1 = require("../../../utils/probaFlip");
 const getAbsoluteValueEquationsQuestion = () => {
@@ -12,13 +15,17 @@ const getAbsoluteValueEquationsQuestion = () => {
     const a = (0, probaFlip_1.probaFlip)(0.9) ? (0, randint_1.randint)(1, 10) : (0, coinFlip_1.coinFlip)() ? 0 : (0, randint_1.randint)(-9, 0);
     //|x-b| = a
     const b = -poly.coefficients[0];
-    const answer = a === 0 ? `S=\\left\\{${b}\\right\\}` : a < 0 ? `S=\\emptyset` : `S=\\left\\{${b - a};${b + a}\\right\\}`;
+    const answer = a === 0
+        ? `S=\\left\\{${b}\\right\\}`
+        : a < 0
+            ? `S=\\emptyset`
+            : `S=\\left\\{${b - a};${b + a}\\right\\}`;
     const question = {
         answer: answer,
         instruction: `Résoudre l'équation $|${poly.toTree().toTex()}| = ${a}$.`,
-        keys: ['S', 'equal', 'emptyset', 'lbrace', 'semicolon', 'rbrace'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a, b },
+        keys: ["S", "equal", "emptyset", "lbrace", "semicolon", "rbrace"],
+        answerFormat: "tex",
+        identifiers: { a, b },
     };
     return question;
 };
@@ -42,15 +49,26 @@ const getPropositions = (n, { answer, a, b }) => {
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
+const isAnswerValid = (ans, { a, b }) => {
+    const sols = a === 0
+        ? [new numberNode_1.NumberNode(b)]
+        : a < 0
+            ? []
+            : [new numberNode_1.NumberNode(b - a), new numberNode_1.NumberNode(b + a)];
+    const answer = new equationSolutionNode_1.EquationSolutionNode(new discreteSetNode_1.DiscreteSetNode(sols));
+    const texs = answer.toAllValidTexs();
+    return texs.includes(ans);
+};
 exports.absoluteValueEquations = {
-    id: 'absoluteValueEquation',
-    connector: '\\iff',
-    label: 'Résoudre une équation avec valeur absolue',
-    levels: ['2nde', '1reESM'],
+    id: "absoluteValueEquation",
+    connector: "\\iff",
+    label: "Résoudre une équation avec valeur absolue",
+    levels: ["2nde", "1reESM"],
     isSingleStep: true,
-    sections: ['Valeur absolue', 'Équations'],
+    sections: ["Valeur absolue", "Équations"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAbsoluteValueEquationsQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/functions/absolute/absoluteValueInequations.d.ts

@@ -1,10 +1,9 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
     a: number;
     b: number;
+    isStrict: boolean;
 };
-type VEAProps = {};
-export declare const absoluteValueInequations: MathExercise<QCMProps, VEAProps>;
+export declare const absoluteValueInequations: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=absoluteValueInequations.d.ts.map

package/lib/exercises/functions/absolute/absoluteValueInequations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"absoluteValueInequations.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/absolute/absoluteValueInequations.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAMlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAiCnB,eAAO,MAAM,wBAAwB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAWrE,CAAC"}
+{"version":3,"file":"absoluteValueInequations.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/absolute/absoluteValueInequations.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AA+DF,eAAO,MAAM,wBAAwB,EAAE,YAAY,CAAC,WAAW,CAa9D,CAAC"}

package/lib/exercises/functions/absolute/absoluteValueInequations.js

@@ -5,6 +5,9 @@ const exercise_1 = require("../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../exercises/utils/getDistinctQuestions");
 const polynomial_1 = require("../../../math/polynomials/polynomial");
 const randint_1 = require("../../../math/utils/random/randint");
+const inequationSolutionNode_1 = require("../../../tree/nodes/inequations/inequationSolutionNode");
+const numberNode_1 = require("../../../tree/nodes/numbers/numberNode");
+const intervalNode_1 = require("../../../tree/nodes/sets/intervalNode");
 const coinFlip_1 = require("../../../utils/coinFlip");
 const getAbsoluteValueInequationsQuestion = () => {
     const poly = new polynomial_1.Polynomial([(0, randint_1.randint)(-9, 10, [0]), 1]);
@@ -15,10 +18,22 @@ const getAbsoluteValueInequationsQuestion = () => {
     const answer = isStrict ? `S=]${b - a};${b + a}[` : `S=[${b - a};${b + a}]`;
     const question = {
         answer,
-        instruction: `Résoudre l'inéquation $|${poly.toTree().toTex()}|${isStrict ? '<' : '\\le'}${a}$.`,
-        keys: ['S', 'equal', 'lbracket', 'semicolon', 'rbracket', 'emptyset'],
-        answerFormat: 'tex',
-        qcmGeneratorProps: { answer, a, b },
+        instruction: `Résoudre l'inéquation $|${poly.toTree().toTex()}|${isStrict ? "<" : "\\le"}${a}$.`,
+        keys: [
+            "S",
+            "equal",
+            "lbracket",
+            "semicolon",
+            "rbracket",
+            "emptyset",
+            "x",
+            "leq",
+            "geq",
+            "sup",
+            "inf",
+        ],
+        answerFormat: "tex",
+        identifiers: { a, b, isStrict },
     };
     return question;
 };
@@ -33,15 +48,22 @@ const getPropositions = (n, { answer, a, b }) => {
     }
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
+const isAnswerValid = (ans, { a, b, isStrict }) => {
+    const answer = new inequationSolutionNode_1.InequationSolutionNode(new intervalNode_1.IntervalNode(new numberNode_1.NumberNode(b - a), new numberNode_1.NumberNode(b + a), isStrict ? intervalNode_1.ClosureType.OO : intervalNode_1.ClosureType.FF));
+    const texs = answer.toAllValidTexs();
+    console.log(texs);
+    return texs.includes(ans);
+};
 exports.absoluteValueInequations = {
-    id: 'absoluteValueInequations',
-    connector: '\\iff',
-    label: 'Résoudre une inéquation avec valeur absolue',
-    levels: ['2nde', '1reESM'],
+    id: "absoluteValueInequations",
+    connector: "\\iff",
+    label: "Résoudre une inéquation avec valeur absolue",
+    levels: ["2nde", "1reESM"],
     isSingleStep: true,
-    sections: ['Valeur absolue', 'Inéquations', 'Ensembles et intervalles'],
+    sections: ["Valeur absolue", "Inéquations", "Ensembles et intervalles"],
     generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAbsoluteValueInequationsQuestion, nb),
     qcmTimer: 60,
     freeTimer: 60,
     getPropositions,
+    isAnswerValid,
 };

package/lib/exercises/functions/absolute/index.d.ts

@@ -0,0 +1,3 @@
+export * from "./absoluteValueEquations";
+export * from "./absoluteValueInequations";
+//# sourceMappingURL=index.d.ts.map

package/lib/exercises/functions/absolute/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/absolute/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,4BAA4B,CAAC"}

package/lib/exercises/functions/absolute/index.js

@@ -0,0 +1,18 @@
+"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("./absoluteValueEquations"), exports);
+__exportStar(require("./absoluteValueInequations"), exports);

package/lib/exercises/functions/affines/index.d.ts

@@ -0,0 +1,5 @@
+export * from "./leadingCoefficient";
+export * from "./leadingCoefficientCalculV1";
+export * from "./leadingCoefficientCalculV2";
+export * from "./signFunction";
+//# sourceMappingURL=index.d.ts.map

package/lib/exercises/functions/affines/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/affines/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gBAAgB,CAAC"}

package/lib/exercises/functions/affines/index.js

@@ -0,0 +1,20 @@
+"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("./leadingCoefficient"), exports);
+__exportStar(require("./leadingCoefficientCalculV1"), exports);
+__exportStar(require("./leadingCoefficientCalculV2"), exports);
+__exportStar(require("./signFunction"), exports);

package/lib/exercises/functions/affines/leadingCoefficient.d.ts

@@ -1,12 +1,10 @@
-import { MathExercise } from '../../../exercises/exercise';
-type QCMProps = {
-    answer: string;
+import { MathExercise } from "../../../exercises/exercise";
+type Identifiers = {
     xA: number;
     yA: number;
     xB: number;
     yB: number;
 };
-type VEAProps = {};
-export declare const leadingCoefficient: MathExercise<QCMProps, VEAProps>;
+export declare const leadingCoefficient: MathExercise<Identifiers>;
 export {};
 //# sourceMappingURL=leadingCoefficient.d.ts.map

package/lib/exercises/functions/affines/leadingCoefficient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"leadingCoefficient.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/affines/leadingCoefficient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAOb,MAAM,0BAA0B,CAAC;AAUlC,KAAK,QAAQ,GAAG;IACd,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AACF,KAAK,QAAQ,GAAG,EAAE,CAAC;AAsEnB,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAW/D,CAAC"}
+{"version":3,"file":"leadingCoefficient.d.ts","sourceRoot":"","sources":["../../../../src/exercises/functions/affines/leadingCoefficient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAQb,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AA8EF,eAAO,MAAM,kBAAkB,EAAE,YAAY,CAAC,WAAW,CAaxD,CAAC"}