math-exercises 2.2.69 → 2.2.71

package/lib/exercises/math/functions/trinoms/findSecondRoot.d.ts

@@ -1,8 +1,8 @@
 import { Exercise } from "../../../../exercises/exercise";
-import { GeneralTrinomIdentifiers } from "../../../../math/polynomials/generalTrinom";
+import { TrinomNodeIdentifiers } from "../../../../tree/nodes/polynomials/trinomNode";
 import { NodeIdentifiers } from "../../../../tree/nodes/nodeConstructor";
 type Identifiers = {
-    trinomIdentifiers: GeneralTrinomIdentifiers;
+    trinomIdentifiers: TrinomNodeIdentifiers;
     firstRootIdentifiers: NodeIdentifiers;
 };
 export declare const findSecondRoot: Exercise<Identifiers>;

package/lib/exercises/math/functions/trinoms/findSecondRoot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findSecondRoot.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/trinoms/findSecondRoot.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAGL,wBAAwB,EACzB,MAAM,sCAAsC,CAAC;AAI9C,OAAO,EAEL,eAAe,EAChB,MAAM,kCAAkC,CAAC;AAO1C,KAAK,WAAW,GAAG;IACjB,iBAAiB,EAAE,wBAAwB,CAAC;IAC5C,oBAAoB,EAAE,eAAe,CAAC;CACvC,CAAC;AAiHF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAiBhD,CAAC"}
+{"version":3,"file":"findSecondRoot.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/trinoms/findSecondRoot.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAGL,qBAAqB,EACtB,MAAM,yCAAyC,CAAC;AAIjD,OAAO,EAEL,eAAe,EAChB,MAAM,kCAAkC,CAAC;AAO1C,KAAK,WAAW,GAAG;IACjB,iBAAiB,EAAE,qBAAqB,CAAC;IACzC,oBAAoB,EAAE,eAAe,CAAC;CACvC,CAAC;AAiHF,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,WAAW,CAiBhD,CAAC"}

package/lib/exercises/math/functions/trinoms/findSecondRoot.js

@@ -4,7 +4,7 @@ exports.findSecondRoot = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
 const rationalVEA_1 = require("../../../../exercises/vea/rationalVEA");
-const generalTrinom_1 = require("../../../../math/polynomials/generalTrinom");
+const trinomNode_1 = require("../../../../tree/nodes/polynomials/trinomNode");
 const randint_1 = require("../../../../math/utils/random/randint");
 const oppositeNode_1 = require("../../../../tree/nodes/functions/oppositeNode");
 const nodeConstructor_1 = require("../../../../tree/nodes/nodeConstructor");
@@ -21,7 +21,7 @@ const getPropositions = (n, { answer }) => {
 };
 const getAnswer = (identifiers) => {
     const { trinomIdentifiers, firstRootIdentifiers } = identifiers;
-    const trinom = generalTrinom_1.GeneralTrinomConstructor.fromIdentifiers(trinomIdentifiers);
+    const trinom = trinomNode_1.TrinomNodeConstructor.fromIdentifiers(trinomIdentifiers);
     const firstRoot = nodeConstructor_1.NodeConstructor.fromIdentifiers(firstRootIdentifiers);
     const firstRootTex = firstRoot.toTex();
     const roots = trinom.getRoots().map((e) => e.toTex());
@@ -29,7 +29,7 @@ const getAnswer = (identifiers) => {
 };
 const getInstruction = (identifiers) => {
     const { trinomIdentifiers, firstRootIdentifiers } = identifiers;
-    const trinom = generalTrinom_1.GeneralTrinomConstructor.fromIdentifiers(trinomIdentifiers);
+    const trinom = trinomNode_1.TrinomNodeConstructor.fromIdentifiers(trinomIdentifiers);
     const firstRoot = nodeConstructor_1.NodeConstructor.fromIdentifiers(firstRootIdentifiers);
     const firstRootTex = firstRoot.toTex();
     return `Soit $f$ la fonction polynôme du second degré définie sur $\\mathbb{R}$ par :
@@ -54,7 +54,7 @@ En remplaçant les valeurs par celles données dans l'énoncé, on peut détermi
 };
 const getCorrection = (identifiers) => {
     const { trinomIdentifiers, firstRootIdentifiers } = identifiers;
-    const trinom = generalTrinom_1.GeneralTrinomConstructor.fromIdentifiers(trinomIdentifiers);
+    const trinom = trinomNode_1.TrinomNodeConstructor.fromIdentifiers(trinomIdentifiers);
     const firstRoot = nodeConstructor_1.NodeConstructor.fromIdentifiers(firstRootIdentifiers);
     const cOverA = (0, fractionNode_1.frac)(trinom.c, trinom.a).simplify();
     return `On sait que le produit des racines $x_1$ et $x_2$ de $f$ vaut :
@@ -95,7 +95,7 @@ const getFindSecondRootQuestion = (ops) => {
     //first*second = c/a
     const identifiers = {
         firstRootIdentifiers: firstRoot.toTree().toIdentifiers(),
-        trinomIdentifiers: new generalTrinom_1.GeneralTrinom(a, b, c).toIdentifiers(),
+        trinomIdentifiers: new trinomNode_1.TrinomNode(a, b, c).toIdentifiers(),
     };
     const question = {
         answer: getAnswer(identifiers),

package/lib/exercises/math/functions/trinoms/rootsProduct.d.ts

@@ -1,7 +1,7 @@
 import { Exercise } from "../../../../exercises/exercise";
-import { GeneralTrinomIdentifiers } from "../../../../math/polynomials/generalTrinom";
+import { TrinomNodeIdentifiers } from "../../../../tree/nodes/polynomials/trinomNode";
 type Identifiers = {
-    trinomIdentifiers: GeneralTrinomIdentifiers;
+    trinomIdentifiers: TrinomNodeIdentifiers;
 };
 export declare const rootsProduct: Exercise<Identifiers>;
 export {};

package/lib/exercises/math/functions/trinoms/rootsProduct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rootsProduct.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/trinoms/rootsProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAGL,wBAAwB,EACzB,MAAM,sCAAsC,CAAC;AAO9C,KAAK,WAAW,GAAG;IACjB,iBAAiB,EAAE,wBAAwB,CAAC;CAC7C,CAAC;AA0GF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAiB9C,CAAC"}
+{"version":3,"file":"rootsProduct.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/trinoms/rootsProduct.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAGL,qBAAqB,EACtB,MAAM,yCAAyC,CAAC;AAOjD,KAAK,WAAW,GAAG;IACjB,iBAAiB,EAAE,qBAAqB,CAAC;CAC1C,CAAC;AA0GF,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,WAAW,CAiB9C,CAAC"}

package/lib/exercises/math/functions/trinoms/rootsProduct.js

@@ -4,7 +4,7 @@ exports.rootsProduct = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
 const rationalVEA_1 = require("../../../../exercises/vea/rationalVEA");
-const generalTrinom_1 = require("../../../../math/polynomials/generalTrinom");
+const trinomNode_1 = require("../../../../tree/nodes/polynomials/trinomNode");
 const randint_1 = require("../../../../math/utils/random/randint");
 const oppositeNode_1 = require("../../../../tree/nodes/functions/oppositeNode");
 const fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
@@ -12,7 +12,7 @@ const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const getPropositions = (n, { answer, trinomIdentifiers }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    const trinom = generalTrinom_1.GeneralTrinomConstructor.fromIdentifiers(trinomIdentifiers);
+    const trinom = trinomNode_1.TrinomNodeConstructor.fromIdentifiers(trinomIdentifiers);
     (0, exercise_1.tryToAddWrongProp)(propositions, (0, fractionNode_1.frac)((0, oppositeNode_1.opposite)(trinom.b), trinom.a).simplify().toTex());
     (0, exercise_1.tryToAddWrongProp)(propositions, (0, fractionNode_1.frac)((0, oppositeNode_1.opposite)(trinom.c), trinom.a).simplify().toTex());
     (0, exercise_1.tryToAddWrongProp)(propositions, (0, fractionNode_1.frac)((0, oppositeNode_1.opposite)(trinom.b), (0, multiplyNode_1.multiply)(2, trinom.a)).simplify().toTex());
@@ -23,13 +23,13 @@ const getPropositions = (n, { answer, trinomIdentifiers }) => {
 };
 const getAnswer = (identifiers) => {
     const { trinomIdentifiers } = identifiers;
-    const trinom = generalTrinom_1.GeneralTrinomConstructor.fromIdentifiers(trinomIdentifiers);
+    const trinom = trinomNode_1.TrinomNodeConstructor.fromIdentifiers(trinomIdentifiers);
     const ans = (0, fractionNode_1.frac)(trinom.c, trinom.a).simplify().toTex();
     return ans;
 };
 const getInstruction = (identifiers) => {
     const { trinomIdentifiers } = identifiers;
-    const trinom = generalTrinom_1.GeneralTrinomConstructor.fromIdentifiers(trinomIdentifiers);
+    const trinom = trinomNode_1.TrinomNodeConstructor.fromIdentifiers(trinomIdentifiers);
     return `Soit $f$ la fonction définie sur $\\mathbb{R}$ par :
     
 $$
@@ -49,7 +49,7 @@ $$`;
 };
 const getCorrection = (identifiers) => {
     const { trinomIdentifiers } = identifiers;
-    const trinom = generalTrinom_1.GeneralTrinomConstructor.fromIdentifiers(trinomIdentifiers);
+    const trinom = trinomNode_1.TrinomNodeConstructor.fromIdentifiers(trinomIdentifiers);
     const aTex = trinom.a.toTex();
     const cTex = trinom.c.toTex();
     const ans = (0, fractionNode_1.frac)(trinom.c, trinom.a);
@@ -78,7 +78,7 @@ const getRootsProductQuestion = (ops) => {
     const a = (0, randint_1.randint)(-10, 10, [0]);
     const b = (0, randint_1.randint)(-10, 10);
     const c = (a / Math.abs(a)) * (0, randint_1.randint)(-10, 0, !b ? [0] : []);
-    const trinom = new generalTrinom_1.GeneralTrinom(a, b, c);
+    const trinom = new trinomNode_1.TrinomNode(a, b, c);
     const identifiers = {
         trinomIdentifiers: trinom.toIdentifiers(),
     };

package/lib/exercises/math/functions/trinoms/rootsSum.d.ts

@@ -1,7 +1,7 @@
 import { Exercise } from "../../../../exercises/exercise";
-import { GeneralTrinomIdentifiers } from "../../../../math/polynomials/generalTrinom";
+import { TrinomNodeIdentifiers } from "../../../../tree/nodes/polynomials/trinomNode";
 type Identifiers = {
-    trinomIdentifiers: GeneralTrinomIdentifiers;
+    trinomIdentifiers: TrinomNodeIdentifiers;
 };
 export declare const rootsSum: Exercise<Identifiers>;
 export {};

package/lib/exercises/math/functions/trinoms/rootsSum.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rootsSum.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/trinoms/rootsSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAGL,wBAAwB,EACzB,MAAM,sCAAsC,CAAC;AAO9C,KAAK,WAAW,GAAG;IACjB,iBAAiB,EAAE,wBAAwB,CAAC;CAC7C,CAAC;AAoGF,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,WAAW,CAiB1C,CAAC"}
+{"version":3,"file":"rootsSum.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/functions/trinoms/rootsSum.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAcT,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAGL,qBAAqB,EACtB,MAAM,yCAAyC,CAAC;AAOjD,KAAK,WAAW,GAAG;IACjB,iBAAiB,EAAE,qBAAqB,CAAC;CAC1C,CAAC;AAoGF,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,WAAW,CAiB1C,CAAC"}

package/lib/exercises/math/functions/trinoms/rootsSum.js

@@ -4,7 +4,7 @@ exports.rootsSum = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
 const rationalVEA_1 = require("../../../../exercises/vea/rationalVEA");
-const generalTrinom_1 = require("../../../../math/polynomials/generalTrinom");
+const trinomNode_1 = require("../../../../tree/nodes/polynomials/trinomNode");
 const randint_1 = require("../../../../math/utils/random/randint");
 const oppositeNode_1 = require("../../../../tree/nodes/functions/oppositeNode");
 const fractionNode_1 = require("../../../../tree/nodes/operators/fractionNode");
@@ -12,7 +12,7 @@ const multiplyNode_1 = require("../../../../tree/nodes/operators/multiplyNode");
 const getPropositions = (n, { answer, trinomIdentifiers }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    const trinom = generalTrinom_1.GeneralTrinomConstructor.fromIdentifiers(trinomIdentifiers);
+    const trinom = trinomNode_1.TrinomNodeConstructor.fromIdentifiers(trinomIdentifiers);
     (0, exercise_1.tryToAddWrongProp)(propositions, (0, fractionNode_1.frac)(trinom.b, trinom.a).simplify().toTex());
     (0, exercise_1.tryToAddWrongProp)(propositions, (0, fractionNode_1.frac)(trinom.c, trinom.a).simplify().toTex());
     (0, exercise_1.tryToAddWrongProp)(propositions, (0, fractionNode_1.frac)((0, oppositeNode_1.opposite)(trinom.b), (0, multiplyNode_1.multiply)(2, trinom.a)).simplify().toTex());
@@ -23,13 +23,13 @@ const getPropositions = (n, { answer, trinomIdentifiers }) => {
 };
 const getAnswer = (identifiers) => {
     const { trinomIdentifiers } = identifiers;
-    const trinom = generalTrinom_1.GeneralTrinomConstructor.fromIdentifiers(trinomIdentifiers);
+    const trinom = trinomNode_1.TrinomNodeConstructor.fromIdentifiers(trinomIdentifiers);
     const ans = (0, fractionNode_1.frac)((0, oppositeNode_1.opposite)(trinom.b), trinom.a).simplify().toTex();
     return ans;
 };
 const getInstruction = (identifiers) => {
     const { trinomIdentifiers } = identifiers;
-    const trinom = generalTrinom_1.GeneralTrinomConstructor.fromIdentifiers(trinomIdentifiers);
+    const trinom = trinomNode_1.TrinomNodeConstructor.fromIdentifiers(trinomIdentifiers);
     return `Soit $f$ la fonction définie sur $\\mathbb{R}$ par :
   
 $$
@@ -49,7 +49,7 @@ $$`;
 };
 const getCorrection = (identifiers) => {
     const { trinomIdentifiers } = identifiers;
-    const trinom = generalTrinom_1.GeneralTrinomConstructor.fromIdentifiers(trinomIdentifiers);
+    const trinom = trinomNode_1.TrinomNodeConstructor.fromIdentifiers(trinomIdentifiers);
     const aTex = trinom.a.toTex();
     const bTex = trinom.b.toTex();
     const ans = (0, fractionNode_1.frac)((0, oppositeNode_1.opposite)(trinom.b), trinom.a);
@@ -77,8 +77,8 @@ const getRootsSumQuestion = (ops) => {
     const a = (0, randint_1.randint)(-10, 10, [0]);
     const b = (0, randint_1.randint)(-10, 10);
     const c = (a / Math.abs(a)) * (0, randint_1.randint)(-10, 0, !b ? [0] : []);
-    // const trinom = GeneralTrinomConstructor.randomNiceRoots(2);
-    const trinom = new generalTrinom_1.GeneralTrinom(a, b, c);
+    // const trinom = TrinomNodeConstructor.randomNiceRoots(2);
+    const trinom = new trinomNode_1.TrinomNode(a, b, c);
     const identifiers = {
         trinomIdentifiers: trinom.toIdentifiers(),
     };

package/lib/exercises/math/functions/trinoms/trinomSignFromRoots.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.trinomSignFromRoots = void 0;
 const exercise_1 = require("../../../../exercises/exercise");
 const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
-const generalTrinom_1 = require("../../../../math/polynomials/generalTrinom");
+const trinomNode_1 = require("../../../../tree/nodes/polynomials/trinomNode");
 const intervals_1 = require("../../../../math/sets/intervals/intervals");
 const infiniteNode_1 = require("../../../../tree/nodes/numbers/infiniteNode");
 const closure_1 = require("../../../../tree/nodes/sets/closure");
@@ -13,7 +13,7 @@ const coinFlip_1 = require("../../../../utils/alea/coinFlip");
 const getPropositions = (n, { answer, trinomCoeffs, isAskingPositive }) => {
     const propositions = [];
     (0, exercise_1.addValidProp)(propositions, answer);
-    const trinom = generalTrinom_1.GeneralTrinomConstructor.fromCoeffs(trinomCoeffs);
+    const trinom = trinomNode_1.TrinomNodeConstructor.fromCoeffs(trinomCoeffs);
     const roots = trinom.getRoots();
     const a = trinomCoeffs[2];
     const b = trinomCoeffs[1];
@@ -26,7 +26,7 @@ const getPropositions = (n, { answer, trinomCoeffs, isAskingPositive }) => {
     return (0, exercise_1.shuffleProps)(propositions, n);
 };
 const getAnswerNode = (identifiers) => {
-    const trinom = generalTrinom_1.GeneralTrinomConstructor.fromCoeffs(identifiers.trinomCoeffs);
+    const trinom = trinomNode_1.TrinomNodeConstructor.fromCoeffs(identifiers.trinomCoeffs);
     const roots = trinom.getRoots();
     const a = identifiers.trinomCoeffs[2];
     return a > 0 === identifiers.isAskingPositive
@@ -40,7 +40,7 @@ const getAnswer = (identifiers) => {
     return getAnswerNode(identifiers).toTex();
 };
 const getInstruction = (identifiers) => {
-    const trinom = generalTrinom_1.GeneralTrinomConstructor.fromCoeffs(identifiers.trinomCoeffs);
+    const trinom = trinomNode_1.TrinomNodeConstructor.fromCoeffs(identifiers.trinomCoeffs);
     const roots = trinom.getRoots();
     return `Soit $f$ une fonction polynôme de degré $2$ définie sur $\\mathbb{R}$ par $f(x) = ${trinom.toTex()}$. 
   
@@ -52,7 +52,7 @@ const getHint = (identifiers) => {
     return `Une fonction polynôme de degré $2$ est du signe de son coefficient $a$, sauf entre ses racines.`;
 };
 const getCorrection = (identifiers) => {
-    const trinom = generalTrinom_1.GeneralTrinomConstructor.fromCoeffs(identifiers.trinomCoeffs);
+    const trinom = trinomNode_1.TrinomNodeConstructor.fromCoeffs(identifiers.trinomCoeffs);
     const roots = trinom.getRoots();
     const a = identifiers.trinomCoeffs[2];
     const answer = getAnswer(identifiers);
@@ -79,7 +79,7 @@ const isAnswerValid = (ans, { answer, isAskingPositive, trinomCoeffs }) => {
     return texs.includes(ans);
 };
 const getTrinomSignFromRootsQuestion = () => {
-    const trinom = generalTrinom_1.GeneralTrinomConstructor.randomNiceRoots(2);
+    const trinom = trinomNode_1.TrinomNodeConstructor.randomNiceRoots(2);
     const isAskingPositive = (0, coinFlip_1.coinFlip)();
     const identifiers = {
         isAskingPositive,

package/lib/exercises/math/geometry/angles/index.d.ts

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

package/lib/exercises/math/geometry/angles/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/angles/index.ts"],"names":[],"mappings":"AAAA,cAAc,sBAAsB,CAAC"}

package/lib/exercises/math/geometry/angles/index.js

@@ -0,0 +1,17 @@
+"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("./recognizeAngleType"), exports);

package/lib/exercises/math/geometry/angles/recognizeAngleType.d.ts

@@ -0,0 +1,11 @@
+import { Exercise } from "../../../../exercises/exercise";
+import { PointIdentifiers } from "../../../../math/geometry/point";
+type Identifiers = {
+    points: PointIdentifiers[];
+    angleType: string;
+    angleIndex: number;
+    apexIndex: number;
+};
+export declare const recognizeAngleType: Exercise<Identifiers>;
+export {};
+//# sourceMappingURL=recognizeAngleType.d.ts.map

package/lib/exercises/math/geometry/angles/recognizeAngleType.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"recognizeAngleType.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/angles/recognizeAngleType.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAkBT,MAAM,0BAA0B,CAAC;AASlC,OAAO,EAGL,gBAAgB,EACjB,MAAM,2BAA2B,CAAC;AAWnC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,gBAAgB,EAAE,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA8TF,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,WAAW,CAkBpD,CAAC"}

package/lib/exercises/math/geometry/angles/recognizeAngleType.js

@@ -0,0 +1,272 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.recognizeAngleType = void 0;
+const exercise_1 = require("../../../../exercises/exercise");
+const getDistinctQuestions_1 = require("../../../../exercises/utils/getDistinctQuestions");
+const geogebraConstructor_1 = require("../../../../geogebra/geogebraConstructor");
+const angle_1 = require("../../../../math/geometry/angle");
+const line_1 = require("../../../../math/geometry/line");
+const point_1 = require("../../../../math/geometry/point");
+const randfloat_1 = require("../../../../math/utils/random/randfloat");
+const randint_1 = require("../../../../math/utils/random/randint");
+const numberNode_1 = require("../../../../tree/nodes/numbers/numberNode");
+const random_1 = require("../../../../utils/alea/random");
+const isLetter_1 = require("../../../../utils/strings/isLetter");
+const randomLetter_1 = require("../../../../utils/strings/randomLetter");
+const getAngle = (identifiers) => {
+    const indexes = getAnglePointsIndexes(identifiers.angleIndex, identifiers.apexIndex);
+    return new angle_1.Angle(indexes.map((i) => point_1.PointConstructor.fromIdentifiers(identifiers.points[i])));
+};
+const getAnglePointsIndexes = (angleIndex, apexIndex) => {
+    const angles = [
+        [apexIndex + 2, apexIndex, apexIndex + 1],
+        [(apexIndex + 3 + 12) % 12, apexIndex, apexIndex + 2],
+        [(apexIndex - 3 + 12) % 12, apexIndex, (apexIndex + 3 + 12) % 12],
+        [apexIndex + 1, apexIndex, (apexIndex - 3 + 12) % 12],
+    ];
+    //les angles 0 ne peuvent pas etre alterne-interne
+    return angles[angleIndex];
+};
+const getPropositions = (n, { answer, angleIndex, angleType, apexIndex, points }) => {
+    const propositions = [];
+    (0, exercise_1.addValidProp)(propositions, answer);
+    let anglesPointsIndexes = [];
+    switch (angleType) {
+        case "alterne-interne":
+            //angles 0 exclus
+            if (angleIndex === 1) {
+                //angle+1 de l'apex supérieur
+                //angles 1: une solution :
+                anglesPointsIndexes = [
+                    getAnglePointsIndexes(angleIndex, (apexIndex + 3) % 12),
+                    getAnglePointsIndexes((angleIndex + 2) % 4, (apexIndex + 3) % 12),
+                    getAnglePointsIndexes((angleIndex + 3) % 4, (apexIndex + 3) % 12),
+                ];
+            }
+            if (angleIndex === 2) {
+                //angles 2 ont deux solution :
+                //-- apex inférieur : angle -1
+                //-- apex supérieur : angle +1
+                //on choisit l'apex supérieur arbitrairement
+                anglesPointsIndexes = [
+                    getAnglePointsIndexes(angleIndex, (apexIndex + 3 + 12) % 12),
+                    getAnglePointsIndexes((angleIndex + 2) % 4, (apexIndex + 3 + 12) % 12),
+                    getAnglePointsIndexes((angleIndex + 3) % 4, (apexIndex + 3 + 12) % 12),
+                ];
+            }
+            //angles 3 : une solution :
+            //-- angle-1 de l'apex inférieur
+            if (angleIndex === 3) {
+                anglesPointsIndexes = [
+                    getAnglePointsIndexes(angleIndex, (apexIndex - 3 + 12) % 12),
+                    getAnglePointsIndexes((angleIndex + 2) % 4, (apexIndex - 3 + 12) % 12),
+                    getAnglePointsIndexes((angleIndex + 1) % 4, (apexIndex - 3 + 12) % 12),
+                ];
+            }
+            break;
+        case "correspondant":
+            //deux solutions :
+            //-- apex supérieur: angle-1
+            //-- apex inférieur : angle +1
+            //on choisit l'apex supérieur arbitrairement
+            anglesPointsIndexes = [
+                getAnglePointsIndexes(angleIndex, (apexIndex + 3 + 12) % 12),
+                getAnglePointsIndexes((angleIndex + 1) % 4, (apexIndex + 3 + 12) % 12),
+                getAnglePointsIndexes((angleIndex + 2) % 4, (apexIndex + 3 + 12) % 12),
+            ];
+            break;
+        case "opposé par le sommet":
+        default:
+            //sol == angle +2 du meme apex
+            anglesPointsIndexes = [
+                getAnglePointsIndexes(angleIndex, apexIndex),
+                getAnglePointsIndexes((angleIndex + 1) % 4, apexIndex),
+                getAnglePointsIndexes((angleIndex + 3) % 4, apexIndex),
+            ];
+            break;
+    }
+    anglesPointsIndexes.forEach((indexes) => {
+        (0, exercise_1.tryToAddWrongProp)(propositions, new angle_1.Angle(indexes.map((i) => point_1.PointConstructor.fromIdentifiers(points[i]))).toTex());
+    });
+    return (0, exercise_1.shuffleProps)(propositions, n);
+};
+const getAnswerAngle = (identifiers) => {
+    const { angleIndex, angleType, apexIndex, points } = identifiers;
+    let anglePointsIndexes = [];
+    switch (angleType) {
+        case "alterne-interne":
+            //angles 0 exclus
+            if (angleIndex === 1) {
+                //angles 1: une solution :
+                //angle+1 de l'apex supérieur
+                anglePointsIndexes = getAnglePointsIndexes((angleIndex + 1) % 4, (identifiers.apexIndex + 3) % 12);
+            }
+            if (angleIndex === 2) {
+                //angles 2 ont deux solution :
+                //-- apex inférieur : angle -1
+                //-- apex supérieur : angle +1
+                //on choisit l'apex supérieur arbitrairement
+                anglePointsIndexes = getAnglePointsIndexes((angleIndex + 1) % 4, (identifiers.apexIndex + 3 + 12) % 12);
+            }
+            //angles 3 : une solution :
+            //-- angle-1 de l'apex inférieur
+            if (angleIndex === 3) {
+                anglePointsIndexes = getAnglePointsIndexes((angleIndex - 1 + 4) % 4, (identifiers.apexIndex - 3 + 12) % 12);
+            }
+            break;
+        case "correspondant":
+            //deux solutions :
+            //-- apex supérieur: angle-1
+            //-- apex inférieur : angle +1
+            //on choisit l'apex supérieur arbitrairement
+            anglePointsIndexes = getAnglePointsIndexes((angleIndex - 1 + 4) % 4, (identifiers.apexIndex + 3 + 12) % 12);
+            break;
+        case "opposé par le sommet":
+        default:
+            //angle +2 du meme apex
+            anglePointsIndexes = getAnglePointsIndexes((angleIndex + 2) % 4, identifiers.apexIndex);
+            break;
+    }
+    const angle = new angle_1.Angle(anglePointsIndexes.map((i) => point_1.PointConstructor.fromIdentifiers(points[i])));
+    return angle;
+};
+const getAnswer = (identifiers) => {
+    return getAnswerAngle(identifiers).toTex();
+};
+const getInstruction = (identifiers) => {
+    const angleTex = getAngle(identifiers).toTex();
+    return `Donner un angle ${identifiers.angleType} à l'angle $${angleTex}$.`;
+};
+// const getHint: GetHint<Identifiers> = (identifiers) => {};
+// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {};
+const getGGBOptions = (identifiers) => {
+    const points = identifiers.points.map(point_1.PointConstructor.fromIdentifiers);
+    const lines = [
+        new line_1.Line(points[0], points[3]),
+        new line_1.Line(points[3], points[6]),
+        new line_1.Line(points[6], points[9]),
+        new line_1.Line(points[9], points[0]),
+    ];
+    const angle = getAngle(identifiers);
+    const ggb = new geogebraConstructor_1.GeogebraConstructor({
+        commands: [
+            ...points.flatMap((p) => p.toGGBCommand()),
+            ...lines.flatMap((l) => l.toGGBCommands(false)),
+            ...angle.toCommands({ color: "red" }),
+        ],
+        hideAxes: true,
+        hideGrid: true,
+    });
+    return ggb.getOptions({
+        coords: [-5, 5, -5, 5],
+    });
+};
+const getKeys = (identifiers) => {
+    const points = identifiers.points.map(point_1.PointConstructor.fromIdentifiers);
+    //! devrait on mettre widehat
+    return points.map((p) => p.name);
+};
+const isAnswerValid = (ans, { answer, angleIndex, angleType, apexIndex, points }) => {
+    let formated = ans;
+    if (ans.includes("widehat")) {
+        formated = formated.replaceAll("\\widehat{", "").replaceAll("}", "");
+    }
+    const pointsNames = Array.from(new Set(formated.split("")));
+    if (pointsNames.length !== 3 || pointsNames.some((char) => !(0, isLetter_1.isLetter)(char)))
+        return false;
+    const studentPoints = pointsNames.map((char) => point_1.PointConstructor.fromIdentifiers(points.find((p) => p.name === char)));
+    const answerAngle = getAngle({ angleIndex, apexIndex, points });
+    const studentAngle = new angle_1.Angle(studentPoints);
+    //? on va accpter aussi des angles correspondants ou alternes-internes qui ne sont pas définis par les sécantes tracées
+    //? c'est chelou mais dans le fond ça fait sens (c'est vrai mathémtiquement)
+    switch (angleType) {
+        case "opposé par le sommet":
+            return studentAngle.isSummitOpposite(answerAngle);
+        case "alterne-interne":
+            return studentAngle.isAlterneInterne(answerAngle);
+            break;
+        case "correspondant":
+        default:
+            return studentAngle.isCorrespondant(answerAngle);
+            break;
+    }
+    return false;
+};
+//deux paires de sécantes
+const getRecognizeAngleTypeQuestion = (opts) => {
+    const angleType = (0, random_1.random)([
+        "alterne-interne",
+        "correspondant",
+        "opposé par le sommet",
+    ]);
+    const names = [];
+    for (let i = 0; i < 12; i++) {
+        names.push((0, randomLetter_1.randomLetter)(true, names));
+    }
+    const buildIntersectionsPoints = (index) => {
+        //les 4 intersections sont (+-2, +-2)
+        let [x, y] = [index < 3 || index > 8 ? -2 : 2, index < 6 ? 2 : -2];
+        //bruit
+        x += (0, randfloat_1.randfloat)(-1, 1, 1);
+        y += (0, randfloat_1.randfloat)(-1, 1, 1);
+        return new point_1.Point(names[index], x.toTree(), y.toTree());
+    };
+    const intersections = [0, 3, 6, 9].map(buildIntersectionsPoints);
+    const buildAnglesPoints = (index) => {
+        const intersectionIndex = Math.floor(index / 3);
+        const apex = intersections[intersectionIndex];
+        const next = intersections[(intersectionIndex + 1) % 4];
+        const prev = intersections[(intersectionIndex - 1 + 4) % 4];
+        let [x, y] = [apex.x.evaluate(), apex.y.evaluate()];
+        if (index % 2 === 0) {
+            const line = new line_1.Line(apex, intersectionIndex % 2 === 0 ? prev : next);
+            //lignes verticales (ordonnées +-1)
+            y = y + (y < 0 ? -1 : 1);
+            return line.getPointWithY(new numberNode_1.NumberNode(y), names[index]);
+        }
+        else {
+            //lignes horizontales (abscisse +-1)
+            const line = new line_1.Line(apex, intersectionIndex % 2 === 0 ? next : prev);
+            x = x + (x < 0 ? -1 : 1);
+            return line.getPointWithX(new numberNode_1.NumberNode(x), names[index]);
+        }
+    };
+    const points = names.map((n, i) => i % 3 === 0 ? intersections[Math.floor(i / 3)] : buildAnglesPoints(i));
+    const apex = (0, random_1.random)([0, 3, 6, 9]);
+    //les angles 0 ne peuvent pas etre alterne-interne
+    let angleIndex = (0, randint_1.randint)(angleType !== "alterne-interne" ? 0 : 1, 4);
+    const identifiers = {
+        angleType,
+        apexIndex: apex,
+        angleIndex,
+        points: points.map((p) => p.toIdentifiers()),
+    };
+    const question = {
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
+        keys: getKeys(identifiers),
+        answerFormat: "tex",
+        identifiers,
+        // hint: getHint(identifiers),
+        // correction: getCorrection(identifiers),
+        ggbOptions: getGGBOptions(identifiers),
+    };
+    return question;
+};
+exports.recognizeAngleType = {
+    id: "recognizeAngleType",
+    label: "Reconnaître un angle alterne-interne, correspondant, opposé par le sommet",
+    isSingleStep: true,
+    generator: (nb, opts) => (0, getDistinctQuestions_1.getDistinctQuestions)(() => getRecognizeAngleTypeQuestion(opts), nb),
+    qcmTimer: 60,
+    freeTimer: 60,
+    getPropositions,
+    isAnswerValid,
+    subject: "Mathématiques",
+    // getHint,
+    // getCorrection,
+    getInstruction,
+    getAnswer,
+    getGGBOptions,
+    hasGeogebra: true,
+};

package/lib/exercises/math/geometry/areas/rightTriangleArea.d.ts

@@ -1,6 +1,8 @@
 import { Exercise } from "../../../../exercises/exercise";
+import { TriangleIdentifiers } from "../../../../math/geometry/triangle";
 type Identifiers = {
-    sidesLengths: number[];
+    /**!! old */
+    triangleIdentifiers: TriangleIdentifiers;
 };
 export declare const rightTriangleArea: Exercise<Identifiers>;
 export {};

package/lib/exercises/math/geometry/areas/rightTriangleArea.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rightTriangleArea.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/areas/rightTriangleArea.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AASlC,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AAgFF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAcnD,CAAC"}
+{"version":3,"file":"rightTriangleArea.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/geometry/areas/rightTriangleArea.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAQT,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAKnE,KAAK,WAAW,GAAG;IACjB,YAAY;IAEZ,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C,CAAC;AAgEF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAcnD,CAAC"}