math-exercises 2.2.2 → 2.2.4

package/lib/exercises/exercise.d.ts

@@ -83,9 +83,10 @@ export interface Exercise<TIdentifiers = {}> {
     isAnswerValid?: VEA<TIdentifiers>;
     isGGBAnswerValid?: GGBVEA<TIdentifiers>;
     hasGeogebra?: boolean;
+    hasHintAndCorrection?: boolean;
     subject: "Mathématiques" | "Chimie" | "Physique";
 }
 export type MathLevel = "6ème" | "5ème" | "4ème" | "3ème" | "2nde" | "1reTech" | "1reESM" | "1reSpé" | "TermSpé" | "TermTech" | "MathExp" | "MathComp" | "CAP" | "2ndPro" | "1rePro" | "TermPro";
 export type MathSection = "Aires" | "Arithmétique" | "Calcul littéral" | "Calculs" | "Combinatoire et dénombrement" | "Conversions" | "Dérivation" | "Droites" | "Ensembles et intervalles" | "Équations" | "Équations différentielles" | "Exponentielle" | "Fonction cube" | "Fonction inverse" | "Fonctions" | "Fonctions affines" | "Fonctions de référence" | "Fractions" | "Géométrie cartésienne" | "Géométrie euclidienne" | "Inéquations" | "Intégration" | "Limites" | "Logarithme népérien" | "Logarithme décimal" | "Matrices" | "Nombres complexes" | "Périmètres" | "Pourcentages" | "Primitives" | "Probabilités" | "Produit scalaire" | "Proportionnalité" | "Python" | "Puissances" | "Python" | "Racines carrées" | "Second degré" | "Statistiques" | "Suites" | "Systèmes" | "Théorème de Pythagore" | "Théorème de Thalès" | "Trigonométrie" | "Valeur absolue" | "Vecteurs";
-export type PCSection = "Réaction chimique" | "Chimie des solutions" | "Forces" | "Chimie organique" | "Mécanique" | "Lumière" | "Acide / Base" | "Constitution et transformations de la matière" | "Ondes" | "Son" | "Corps purs et mélanges" | "Fluides" | "Mol" | "Électricité" | "Spectrophotométrie" | "Quantique";
+export type PCSection = "Réaction chimique" | "Chimie des solutions" | "Forces" | "Chimie organique" | "Mécanique" | "Lumière" | "Acide / Base" | "Constitution et transformations de la matière" | "Ondes" | "Son" | "Corps purs et mélanges" | "Fluides" | "Mol" | "Électricité" | "Mécanique gravitationnelle" | "Spectrophotométrie" | "Quantique" | "Thermodynamique" | "Énergie";
 //# 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":"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"}

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

@@ -1,3 +1,5 @@
 export * from "./proportionalityTable";
 export * from "./proportionalityTableCoefficient";
+export * from "./scaleCalculation";
+export * from "./scaleUsage";
 //# sourceMappingURL=index.d.ts.map

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

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

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

@@ -16,3 +16,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./proportionalityTable"), exports);
 __exportStar(require("./proportionalityTableCoefficient"), exports);
+__exportStar(require("./scaleCalculation"), exports);
+__exportStar(require("./scaleUsage"), exports);

package/lib/exercises/math/calcul/proportionality/scaleCalculation.d.ts

@@ -0,0 +1,9 @@
+import { Exercise } from "../../../../exercises/exercise";
+type Identifiers = {
+    scale: number;
+    isSmallScale: boolean;
+    fakeDistance: number;
+};
+export declare const scaleCalculation: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=scaleCalculation.d.ts.map

package/lib/exercises/math/calcul/proportionality/scaleCalculation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scaleCalculation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/scaleCalculation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,OAAO,CAAC;IAEtB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAmFF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAelD,CAAC"}

package/lib/exercises/math/calcul/proportionality/scaleCalculation.js

@@ -0,0 +1,90 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.scaleCalculation = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const rational_1 = require("../../../../math/numbers/rationals/rational");
+const randint_1 = require("../../../../math/utils/random/randint");
+const measure_1 = require("../../../../pc/measure/measure");
+const distanceUnits_1 = require("../../../../pc/units/distanceUnits");
+const coinFlip_1 = require("../../../../utils/coinFlip");
+const getScaleCalculationQuestion = () => {
+    const isSmallScale = (0, coinFlip_1.coinFlip)();
+    const scale = isSmallScale ? (0, randint_1.randint)(1, 5) * 10 : (0, randint_1.randint)(5, 100) * 1000;
+    const realUnit = isSmallScale ? distanceUnits_1.DistanceUnit.m : distanceUnits_1.DistanceUnit.km;
+    const cm = distanceUnits_1.DistanceUnit.cm;
+    const fakeDistanceNb = isSmallScale ? (0, randint_1.randint)(5, 100) : (0, randint_1.randint)(1, 100);
+    const fakeDistance = new measure_1.Measure(fakeDistanceNb, 0, cm);
+    const realDistanceNb = (scale * fakeDistance.evaluate()) / (isSmallScale ? 100 : 100000);
+    const realDistance = new measure_1.Measure(realDistanceNb, 0, realUnit);
+    const instruction = isSmallScale
+        ? `Un bateau de $${realDistance.toTex({
+            notScientific: true,
+        })}$ est représenté par un modèle réduit de $${fakeDistance.toTex({
+            notScientific: true,
+        })}$. Quelle est l'échelle du modèle réduit ?`
+        : `La distance entre deux villes est de $${realDistance.toTex({
+            notScientific: true,
+        })}$. Sur une carte, cette distance mesure $${fakeDistance.toTex({
+            notScientific: true,
+        })}$. Quelle est l'échelle de la carte ?`;
+    const answer = new rational_1.Rational(1, scale).toTex();
+    const question = {
+        answer,
+        instruction,
+        keys: [],
+        answerFormat: "tex",
+        hint: `Convertis les longueurs en $${cm.toTex()}$, puis fais un calcul de propotionnalité.`,
+        correction: `On convertit d'abord les longueurs en cm : 
+    
+$${realDistance.toTex({ notScientific: true })} = ${realDistance
+            .convert("cm")
+            .toTex({ notScientific: true })}$
+
+Puis, on fait un calcul de proportionnalité : puisque $${fakeDistance.toTex({
+            notScientific: true,
+        })}$ représentent $${realDistance.convert("cm").toTex({
+            notScientific: true,
+        })}$ réels, alors $1${cm.toTex()}$ représente $\\frac{${realDistance
+            .convert("cm")
+            .toTex({ notScientific: true, hideUnit: true })}}{${fakeDistance.toTex({
+            notScientific: true,
+            hideUnit: true,
+        })}}=${scale}${cm.toTex()}$ réels.
+
+L'échelle est donc de $${answer}$.
+    `,
+        identifiers: {
+            scale,
+            fakeDistance: fakeDistanceNb,
+            isSmallScale,
+        },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, scale, isSmallScale }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, new rational_1.Rational(1, isSmallScale ? (0, randint_1.randint)(1, 5) * 10 : (0, randint_1.randint)(5, 100) * 1000).toTex());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
+exports.scaleCalculation = {
+    id: "scaleCalculation",
+    connector: "=",
+    label: "Calculer une échelle",
+    levels: [],
+    isSingleStep: true,
+    sections: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getScaleCalculationQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    hasHintAndCorrection: true,
+};

package/lib/exercises/math/calcul/proportionality/scaleUsage.d.ts

@@ -0,0 +1,9 @@
+import { Exercise } from "../../../../exercises/exercise";
+type Identifiers = {
+    scale: number;
+    isSmallScale: boolean;
+    fakeDistance: number;
+};
+export declare const scaleUsage: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=scaleUsage.d.ts.map

package/lib/exercises/math/calcul/proportionality/scaleUsage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scaleUsage.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calcul/proportionality/scaleUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,OAAO,CAAC;IAEtB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAiGF,eAAO,MAAM,UAAU,EAAE,QAAQ,CAAC,WAAW,CAc5C,CAAC"}

package/lib/exercises/math/calcul/proportionality/scaleUsage.js

@@ -0,0 +1,95 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.scaleUsage = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const rational_1 = require("../../../../math/numbers/rationals/rational");
+const randint_1 = require("../../../../math/utils/random/randint");
+const measure_1 = require("../../../../pc/measure/measure");
+const distanceUnits_1 = require("../../../../pc/units/distanceUnits");
+const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
+const coinFlip_1 = require("../../../../utils/coinFlip");
+const getScaleUsageQuestion = () => {
+    const isSmallScale = (0, coinFlip_1.coinFlip)();
+    const isFakeAsked = (0, coinFlip_1.coinFlip)();
+    const scale = isSmallScale ? (0, randint_1.randint)(1, 5) * 10 : (0, randint_1.randint)(5, 100) * 1000;
+    const realUnit = isSmallScale ? distanceUnits_1.DistanceUnit.m : distanceUnits_1.DistanceUnit.km;
+    const cm = distanceUnits_1.DistanceUnit.cm;
+    const fakeDistanceNb = isSmallScale ? (0, randint_1.randint)(5, 100) : (0, randint_1.randint)(1, 100);
+    const fakeDistance = new measure_1.Measure(fakeDistanceNb, 0, cm);
+    const realDistanceNb = (scale * fakeDistance.evaluate()) / (isSmallScale ? 100 : 100000);
+    const realDistance = new measure_1.Measure(realDistanceNb, 0, realUnit);
+    const scaleFrac = new rational_1.Rational(1, scale).toTex();
+    const answer = (isFakeAsked ? fakeDistanceNb : realDistanceNb).frenchify();
+    const instruction = `Une carte est à l'échelle $${scaleFrac}$. ${!isFakeAsked
+        ? `Quelle est la distance réelle représentée par $${fakeDistance.toTex({
+            notScientific: true,
+        })}$ sur cette carte ? Donner la réponse en $${realUnit.toTex()}$.`
+        : `Quelle est la distance représentée sur la carte pour une distance réelle de $${realDistance.toTex({ notScientific: true })}$ ? Donner la distance en $${cm.toTex()}$.`}`;
+    const question = {
+        answer,
+        instruction,
+        keys: [],
+        answerFormat: "tex",
+        hint: `La carte est à l'échelle $${scaleFrac}$ : cela signifie que $1${cm.toTex()}$ sur cette carte représente $${scale}${cm.toTex()}$ dans la réalité. Il faut donc faire un calcul de proportionnalité.`,
+        correction: `La carte est à l'échelle $${scaleFrac}$ : cela signifie que $1${cm.toTex()}$ sur cette carte représente $${scale}${cm.toTex()}$ dans la réalité.
+
+    ${isFakeAsked
+            ? `
+On convertit d'abord la distance réelle en $${cm.toTex()}$ : 
+
+    
+$${realDistance.toTex({ notScientific: true })} = ${realDistance
+                .convert("cm")
+                .toTex({ notScientific: true })}$
+
+Ainsi, $${realDistance.toTex({
+                notScientific: true,
+            })}$ dans la réalité représentent $\\frac{
+            ${realDistance.convert("cm").toTex({
+                notScientific: true,
+            })}}{${scale}} = ${fakeDistance.toTex({
+                notScientific: true,
+            })}$ sur la carte.`
+            : `
+Donc, $${fakeDistance.toTex({
+                notScientific: true,
+            })}$ sur la carte représentent $${new multiplyNode_1.MultiplyNode(fakeDistanceNb.toTree(), scale.toTree()).toTex()} = ${realDistance.convert("cm").toTex({
+                notScientific: true,
+            })}$ dans la réalité. On convertit alors en $${realUnit.toTex()}$ : la distance réelle est donc $${answer}${realUnit.toTex()}$.`}
+    
+    `,
+        identifiers: {
+            scale,
+            fakeDistance: fakeDistanceNb,
+            isSmallScale,
+        },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, scale, isSmallScale }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, new rational_1.Rational(1, isSmallScale ? (0, randint_1.randint)(1, 5) * 10 : (0, randint_1.randint)(5, 100) * 1000).toTex());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer }) => {
+    return ans === answer;
+};
+exports.scaleUsage = {
+    id: "scaleUsage",
+    connector: "=",
+    label: "Calculer une échelle",
+    levels: [],
+    isSingleStep: true,
+    sections: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getScaleUsageQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    hasHintAndCorrection: true,
+};

package/lib/exercises/math/calculLitteral/distributivity/canonicalFormDevelopment.d.ts

@@ -0,0 +1,7 @@
+import { Exercise } from "../../../../exercises/exercise";
+type Identifiers = {
+    coeffs: number[];
+};
+export declare const canonicalFormDevelopment: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=canonicalFormDevelopment.d.ts.map

package/lib/exercises/math/calculLitteral/distributivity/canonicalFormDevelopment.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"canonicalFormDevelopment.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/canonicalFormDevelopment.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAUlC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAsDF,eAAO,MAAM,wBAAwB,EAAE,QAAQ,CAAC,WAAW,CAc1D,CAAC"}

package/lib/exercises/math/calculLitteral/distributivity/canonicalFormDevelopment.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.canonicalFormDevelopment = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const affine_1 = require("../../../../math/polynomials/affine");
+const trinom_1 = require("../../../../math/polynomials/trinom");
+const addNode_1 = require("../../../../tree/nodes/operators/addNode");
+const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
+const getCanonicalFormDevelopmentQuestion = () => {
+    const trinom = trinom_1.TrinomConstructor.randomCanonical();
+    const answer = trinom.toTree().toTex();
+    const cano = trinom.getCanonicalForm();
+    const a = trinom.a;
+    const alpha = trinom.getAlpha();
+    const beta = trinom.getBeta();
+    const question = {
+        answer,
+        instruction: `Développer et réduire : $${cano.toTex()}$`,
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers: { coeffs: trinom.coefficients },
+        hint: "Développe d'abord le terme qui est au carré en te servant d'une identité remarquable.",
+        correction: `
+$${cano.toTex()}$
+
+$= ${new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(a.toTree(), new affine_1.Affine(1, -alpha).square().toTree()), beta.toTree()).toTex()}$
+    
+$= ${answer}$
+    `,
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, trinom_1.TrinomConstructor.random({ min: -100, max: 100 }, { min: -100, max: 100 }, { min: -100, max: 100 }).toTex());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer, coeffs }) => {
+    const trinom = trinom_1.TrinomConstructor.fromCoeffs(coeffs);
+    return trinom.toTree().toAllValidTexs().includes(ans);
+};
+exports.canonicalFormDevelopment = {
+    id: "canonicalFormDevelopment",
+    connector: "=",
+    label: "Développer une forme canonique $a(x-\\alpha)^2 + \\beta$",
+    levels: [],
+    isSingleStep: true,
+    sections: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getCanonicalFormDevelopmentQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+};

package/lib/exercises/math/calculLitteral/distributivity/doubleDistributivityWithCoeff.d.ts

@@ -0,0 +1,9 @@
+import { Exercise } from "../../../../exercises/exercise";
+type Identifiers = {
+    coeff: number;
+    affine1: number[];
+    affine2: number[];
+};
+export declare const doubleDistributivityWithCoeff: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=doubleDistributivityWithCoeff.d.ts.map

package/lib/exercises/math/calculLitteral/distributivity/doubleDistributivityWithCoeff.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"doubleDistributivityWithCoeff.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/doubleDistributivityWithCoeff.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAUT,MAAM,0BAA0B,CAAC;AAQlC,KAAK,WAAW,GAAG;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAiGF,eAAO,MAAM,6BAA6B,EAAE,QAAQ,CAAC,WAAW,CAe/D,CAAC"}

package/lib/exercises/math/calculLitteral/distributivity/doubleDistributivityWithCoeff.js

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.doubleDistributivityWithCoeff = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const affine_1 = require("../../../../math/polynomials/affine");
+const trinom_1 = require("../../../../math/polynomials/trinom");
+const randint_1 = require("../../../../math/utils/random/randint");
+const addNode_1 = require("../../../../tree/nodes/operators/addNode");
+const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
+const getDoubleDistributivityWithCoeffQuestion = () => {
+    const coeff = (0, randint_1.randint)(-10, 11, [-1, 0, 1]);
+    const affine1 = affine_1.AffineConstructor.random(undefined, {
+        excludes: [0],
+    });
+    const affine2 = affine_1.AffineConstructor.random(undefined, {
+        excludes: [0],
+    });
+    const statement = new multiplyNode_1.MultiplyNode(new multiplyNode_1.MultiplyNode(coeff.toTree(), affine1.toTree()), affine2.toTree()).toTex();
+    const affine3 = affine1.times(coeff);
+    const answer = affine3.multiply(affine2).toTree().toTex();
+    const question = {
+        answer,
+        instruction: `Développer et réduire : $${statement}$`,
+        keys: ["x"],
+        answerFormat: "tex",
+        identifiers: {
+            coeff,
+            affine1: affine1.coefficients,
+            affine2: affine2.coefficients,
+        },
+        hint: `Choisis deux facteurs de ce produit et multiplie les entre eux. Puis, multiplier le résultat obtenu par le troisième terme.`,
+        correction: `On commence par multiplier les deux premiers termes entre eux : 
+    
+$${statement} = ${new multiplyNode_1.MultiplyNode(affine1.times(coeff).toTree(), affine2.toTree()).toTex()}$
+
+Puis, on utilise la double distributivité : 
+
+$${new multiplyNode_1.MultiplyNode(affine3.toTree(), affine2.toTree()).toTex()} = ${new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new affine_1.Affine(affine3.a, 0).toTree(), new affine_1.Affine(affine2.a, 0).toTree()), new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(new affine_1.Affine(affine3.a, 0).toTree(), affine2.b.toTree()), new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(affine3.b.toTree(), new affine_1.Affine(affine2.a, 0).toTree()), new multiplyNode_1.MultiplyNode(affine3.b.toTree(), affine2.b.toTree())))).toTex()} = ${answer}$.
+    `,
+    };
+    return question;
+};
+const getPropositions = (n, { answer }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        (0, exercise_1.tryToAddWrongProp)(propositions, trinom_1.TrinomConstructor.random({ min: -100, max: 100 }, { min: -100, max: 100 }, { min: -100, max: 100 })
+            .toTree()
+            .toTex());
+    }
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const isAnswerValid = (ans, { answer, affine1, affine2, coeff }) => {
+    const affine1Obj = affine_1.AffineConstructor.fromCoeffs(affine1);
+    const affine2Obj = affine_1.AffineConstructor.fromCoeffs(affine2);
+    const answerTree = affine1Obj.times(coeff).multiply(affine2Obj).toTree();
+    return answerTree.toAllValidTexs().includes(ans);
+};
+const isGGBAnswerValid = (ans, { ggbAnswer }) => {
+    throw Error("GGBVea not implemented");
+};
+exports.doubleDistributivityWithCoeff = {
+    id: "doubleDistributivityWithCoeff",
+    connector: "=",
+    label: "Développer une expression du type $a(bx+c)(dx+e)$",
+    levels: [],
+    isSingleStep: true,
+    sections: [],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getDoubleDistributivityWithCoeffQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    isGGBAnswerValid,
+    subject: "Mathématiques",
+};

package/lib/exercises/math/calculLitteral/distributivity/index.d.ts

@@ -4,4 +4,6 @@ export { firstIdentity } from "./firstIdentity";
 export { secondIdentity } from "./secondIdentity";
 export * from "./simpleDistributivity";
 export { thirdIdentity } from "./thirdIdentity";
+export * from "./doubleDistributivityWithCoeff";
+export * from "./canonicalFormDevelopment";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/calculLitteral/distributivity/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,cAAc,wBAAwB,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/calculLitteral/distributivity/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,cAAc,wBAAwB,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,cAAc,iCAAiC,CAAC;AAChD,cAAc,4BAA4B,CAAC"}

package/lib/exercises/math/calculLitteral/distributivity/index.js

@@ -24,3 +24,5 @@ Object.defineProperty(exports, "secondIdentity", { enumerable: true, get: functi
 __exportStar(require("./simpleDistributivity"), exports);
 var thirdIdentity_1 = require("./thirdIdentity");
 Object.defineProperty(exports, "thirdIdentity", { enumerable: true, get: function () { return thirdIdentity_1.thirdIdentity; } });
+__exportStar(require("./doubleDistributivityWithCoeff"), exports);
+__exportStar(require("./canonicalFormDevelopment"), exports);

package/lib/exercises/math/conversion/lengthConversion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lengthConversion.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/conversion/lengthConversion.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,QAAQ,EAQT,MAAM,gBAAgB,CAAC;AAIxB,KAAK,WAAW,GAAG;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,0BAA0B,EAAE,MAAM,CAAC;IACnC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAyDF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAalD,CAAC"}
+{"version":3,"file":"lengthConversion.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/conversion/lengthConversion.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,QAAQ,EAQT,MAAM,gBAAgB,CAAC;AAIxB,KAAK,WAAW,GAAG;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,0BAA0B,EAAE,MAAM,CAAC;IACnC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AA+DF,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,WAAW,CAalD,CAAC"}

package/lib/exercises/math/conversion/lengthConversion.js

@@ -3,20 +3,34 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.lengthConversion = void 0;
 const decimal_1 = require("../../../math/numbers/decimals/decimal");
 const randint_1 = require("../../../math/utils/random/randint");
+const measure_1 = require("../../../pc/measure/measure");
+const distanceUnits_1 = require("../../../pc/units/distanceUnits");
 const shuffle_1 = require("../../../utils/shuffle");
 const exercise_1 = require("../../exercise");
 const getDistinctQuestions_1 = require("../../utils/getDistinctQuestions");
 const units = ["mm", "cm", "dm", "m", "dam", "hm", "km"];
+const unitsObj = [
+    distanceUnits_1.DistanceUnit.mm,
+    distanceUnits_1.DistanceUnit.cm,
+    distanceUnits_1.DistanceUnit.dm,
+    distanceUnits_1.DistanceUnit.m,
+    distanceUnits_1.DistanceUnit.dam,
+    distanceUnits_1.DistanceUnit.hm,
+    distanceUnits_1.DistanceUnit.km,
+];
 const getLengthConversion = () => {
     const randomUnitIndex = (0, randint_1.randint)(0, 7);
     const randomUnitInstructionIndex = (0, randint_1.randint)(0, 7, [randomUnitIndex]);
     const randomLength = decimal_1.DecimalConstructor.random(0, 1000, (0, randint_1.randint)(0, 4));
+    const measure = new measure_1.Measure(randomLength.value, 0, unitsObj[randomUnitIndex]);
     console.log("length conv q");
-    const answer = (randomLength.multiplyByPowerOfTen(randomUnitIndex - randomUnitInstructionIndex).value + "").replace(".", ",");
+    const answer = measure
+        .convert(units[randomUnitInstructionIndex])
+        .toTex({ notScientific: true });
     const question = {
-        instruction: `Compléter : $${randomLength.value
-            .toString()
-            .replace(".", ",")} \\textrm{${units[randomUnitIndex]}} = \\ldots  \\textrm{${units[randomUnitInstructionIndex]}}$`,
+        instruction: `Compléter : $${measure.toTex({
+            notScientific: true,
+        })} = \\ldots  ${unitsObj[randomUnitInstructionIndex].toTex()}$`,
         answer,
         keys: [],
         answerFormat: "tex",

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

@@ -0,0 +1,10 @@
+import { Exercise } from "../../../../exercises/exercise";
+type Identifiers = {
+    xA: number;
+    xB: number;
+    yA: number;
+    yB: number;
+};
+export declare const affineExpressionFromTwoImages: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=affineExpressionFromTwoImages.d.ts.map

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

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

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

@@ -0,0 +1,81 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.affineExpressionFromTwoImages = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const rational_1 = require("../../../../math/numbers/rationals/rational");
+const affine_1 = require("../../../../math/polynomials/affine");
+const randint_1 = require("../../../../math/utils/random/randint");
+const addNode_1 = require("../../../../tree/nodes/operators/addNode");
+const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
+const substractNode_1 = require("../../../../tree/nodes/operators/substractNode");
+const variableNode_1 = require("../../../../tree/nodes/variables/variableNode");
+const shuffle_1 = require("../../../../utils/shuffle");
+const getAffineExpressionFromTwoImagesQuestion = () => {
+    const [xA, yA] = [1, 2].map((el) => (0, randint_1.randint)(-9, 10));
+    const xB = (0, randint_1.randint)(-9, 10, [xA]);
+    const yB = (0, randint_1.randint)(-9, 10);
+    const a = new rational_1.Rational(yB - yA, xB - xA).simplify().toTree();
+    //yA = axA+b donc b = yA-axA
+    const b = new substractNode_1.SubstractNode(yA.toTree(), new multiplyNode_1.MultiplyNode(a, xA.toTree())).simplify();
+    const answer = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(a, new variableNode_1.VariableNode("x")), b)
+        .simplify({ forceDistributeFractions: true })
+        .toTex();
+    console.log(a.toTex(), b.toTex());
+    const question = {
+        instruction: `Soit $f$ une fonction affine telle que $f(${xA}) = ${yA}$ et $f(${xB}) = ${yB}$.
+    
+Quelle est l'expression algébrique de $f$ ?`,
+        startStatement: "a",
+        answer,
+        hint: "Calcule d'abord le taux d'accroissement de $f$ en utilisant la formule $a = \\frac{y_2-y_1}{x_2-x_1}$. Ensuite, utilise les coordonnées d'un des deux points pour déterminer l'ordonnée à l'origine.",
+        correction: `On calcule d'abord le taux d'accroissement $a$ : 
+    
+$a = \\frac{y_2-y_1}{x_2-x_1} = \\frac{${yB}-${yA}}{${xB}-${xA}} = ${a.toTex()}$
+
+Il faut ensuite trouver l'ordonnée à l'origine $b$. On sait que $f(${xA}) = ${yA}$. Or pour tout $x$ réel, on a $f(x) = ax+b$. 
+
+Donc $${yA} = ${new multiplyNode_1.MultiplyNode(a, xA.toTree()).toTex()}+b$. On a donc $b = ${new substractNode_1.SubstractNode(yA.toTree(), new multiplyNode_1.MultiplyNode(a, xA.toTree())).toTex()} = ${b.toTex()}$.
+
+Ainsi, $f(x) = ${answer}$.
+    `,
+        answerFormat: "tex",
+        keys: ["x"],
+        identifiers: { xA, xB, yA, yB },
+    };
+    return question;
+};
+const getPropositions = (n, { answer, xA, xB, yA, yB }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    while (propositions.length < n) {
+        const wrongAnswer = affine_1.AffineConstructor.random().toTex();
+        (0, exercise_1.tryToAddWrongProp)(propositions, wrongAnswer);
+    }
+    return (0, shuffle_1.shuffle)(propositions);
+};
+const isAnswerValid = (ans, { xA, xB, yA, yB }) => {
+    const a = new rational_1.Rational(yB - yA, xB - xA).simplify().toTree();
+    //yA = axA+b donc b = yA-axA
+    const b = new substractNode_1.SubstractNode(yA.toTree(), new multiplyNode_1.MultiplyNode(a, xA.toTree())).simplify();
+    const answer = new addNode_1.AddNode(new multiplyNode_1.MultiplyNode(a, new variableNode_1.VariableNode("x")), b, {
+        allowFractionToDecimal: true,
+    }).simplify({ forceDistributeFractions: true });
+    const texs = answer.toAllValidTexs();
+    return texs.includes(ans);
+};
+exports.affineExpressionFromTwoImages = {
+    id: "affineExpressionFromTwoImages",
+    connector: "=",
+    label: "Expression algébrique d'une fonction affine via deux images",
+    levels: ["3ème", "2nde", "2ndPro", "1rePro", "1reTech"],
+    isSingleStep: true,
+    sections: ["Fonctions affines", "Droites"],
+    generator: (nb) => (0, getDistinctQuestions_1.getDistinctQuestions)(getAffineExpressionFromTwoImagesQuestion, nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    hasHintAndCorrection: true,
+};

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

@@ -10,4 +10,5 @@ export * from "./affineAdjustment";
 export * from "./affineAdjustmentRsquared";
 export * from "./affineAdjustmentComplete";
 export * from "./affineMeanValue";
+export * from "./affineExpressionFromTwoImages";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iCAAiC,CAAC;AAChD,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/affines/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC;AACnC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iCAAiC,CAAC;AAChD,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC;AAClC,cAAc,iCAAiC,CAAC"}

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

@@ -26,3 +26,4 @@ __exportStar(require("./affineAdjustment"), exports);
 __exportStar(require("./affineAdjustmentRsquared"), exports);
 __exportStar(require("./affineAdjustmentComplete"), exports);
 __exportStar(require("./affineMeanValue"), exports);
+__exportStar(require("./affineExpressionFromTwoImages"), exports);

package/lib/exercises/pc/calibrationCurveOfSolution.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.calibrationCurveOfSolution = void 0;
 const getDistinctQuestions_1 = require("../../exercises/utils/getDistinctQuestions");
 const randint_1 = require("../../math/utils/random/randint");
-const molecule_1 = require("../../pc/molecularChemistry/molecule");
+const molecule_1 = require("../../pc/constants/molecularChemistry/molecule");
 const arrayEqual_1 = require("../../utils/arrayEqual");
 const random_1 = require("../../utils/random");
 const requiresApostropheBefore_1 = require("../../utils/requiresApostropheBefore");