math-exercises 2.2.34 → 2.2.35

package/README.md

@@ -1,73 +1,17 @@
 # math-exercises
 
-This is a generator of Math exercises for middle school and high school.
-
-So far, exercises are written in French, but any translation is welcome !
-
-This library is used by [Mathlive.fr](https://www.mathlive.fr) for collaborative quizzes.
+This library is used by [Mathlive.fr](https://www.mathlive.fr) and [XPLive.fr](https://www.xplive.fr).
 
 ## 🚧 Work in progress !
 
 This library is still in beta and the architecture may very well completely change in the future.
 
-Incoming improvements :
-
-- Random images generation using tikZ
-
-- Steps within answers
-
-- Coverage of all topics up to 12th grade
-
-- Better classification of exercises
-
-## Exercises format
-
-Each Exercise has a `generator` that will return distinct questions for this exercise.
-
-The Question in itself has an `instruction`, a `startStatement` and an `answer` (which are all tex strings).
-
-You can see all the exercises implemented so far [by playing with the select input here](https://www.mathlive.fr/teacher/createActivity/quizCollab/623366c277e90f70691aee70/).
-
-## How to use
-
-Example with (ax+b)^2 questions :
-
-```js
-import { firstIdentity } from "exercises/calculLitteral/distributivity/firstIdentity";
-
-console.log(firstIdentity.instruction);
-const question = firstIdentity.generator(1);
-console.log(question.startStatement);
-console.log(question.answer);
-
-//output :
-// Développer et réduire :
-// (2x+3)^2
-// 4x^2 + 12x + 9
-```
-
-Some exercises do not have instructions, because the instruction is directly in the question itself.
-
-A list of all exercises is exported from root.
-
-## Expression tree and latex parser
-
-Math expressions are implemented via a tree of Nodes that you'll find inside `tree/nodes`.
-
-Any expression can be turned into a valid latex output via the `.toTex()` method.
-
-They also can be simplified via the `simplifyNode` method.
-
-## Math objects
-
-This library also aims to implement pretty much all mathematical objects and notions up to 12th grade : all types of numbers and operations on them, but also points, vectors, polynomials, sets... Thus it can also be used for basic mathematics work.
-
-## Minimal dependencies
+## CAS & ASTs
 
-We're trying to keep to our dependencies to a minimum. So far we're only using mathjs as an external library, to evaluate and simplify expression trees. We would love to have our own way of simplifying expressions in the future.
+Math expressions are implemented through ASTs.
 
-## How to contribute
+This library implements its own CAS.
 
-Any contribution is welcomed.
+## Copyright
 
-There are tons of exercises left to implement !
+All rights reserved. MathLive and XpLive are registered trademarks. MathLive and XpLive are edited by Heureux Hasard.

package/lib/exercises/math/geometry/vectors/vectorNormCalculation.js

@@ -16,7 +16,7 @@ const getAnswer = (identifiers) => {
     return correctAnswer.simplify().toTex();
 };
 const getHint = (identifiers) => {
-    return `La norme d'un vecteur est la racine carrée de la somme des carrés de ses coordonnées. En d'autres termes, la norme du vecteur $$\\overrightarrow{u}\\begin{pmatrix}x\\\\y\\end{pmatrix}$$ est :
+    return `La norme d'un vecteur est la racine carrée de la somme des carrés de ses coordonnées. En d'autres termes, la norme du vecteur $$\\overrightarrow{u}\\begin{pmatrix}x\\\\y\\end{pmatrix}$$ est :
   
 $$
 \\lVert \\overrightarrow u \\rVert = \\sqrt{x^2+y^2}
@@ -27,7 +27,7 @@ const getCorrection = (identifiers) => {
     const x = identifiers.x.toTree();
     const y = identifiers.y.toTree();
     const answer = getAnswer(identifiers);
-    return `La norme d'un vecteur est la racine carrée de la somme des carrés de ses coordonnées. Ici, on a donc : 
+    return `La norme d'un vecteur est la racine carrée de la somme des carrés de ses coordonnées. Ici, on a donc : 
 
 ${(0, alignTex_1.alignTex)([
         [

package/lib/exercises/math/spaceGeometry/vectors/spaceVectorNormCalculation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spaceVectorNormCalculation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/spaceGeometry/vectors/spaceVectorNormCalculation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAST,MAAM,0BAA0B,CAAC;AAYlC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAwEF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAc5D,CAAC"}
+{"version":3,"file":"spaceVectorNormCalculation.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/spaceGeometry/vectors/spaceVectorNormCalculation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,0BAA0B,CAAC;AAelC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AA2FF,eAAO,MAAM,0BAA0B,EAAE,QAAQ,CAAC,WAAW,CAkB5D,CAAC"}

package/lib/exercises/math/spaceGeometry/vectors/spaceVectorNormCalculation.js

@@ -9,40 +9,49 @@ const sqrtNode_1 = require("../../../../tree/nodes/functions/sqrtNode");
 const addNode_1 = require("../../../../tree/nodes/operators/addNode");
 const powerNode_1 = require("../../../../tree/nodes/operators/powerNode");
 const alignTex_1 = require("../../../../utils/latex/alignTex");
+const getHint = (identifiers) => {
+    return "La norme d'un vecteur de l'espace est la racine carrée de la somme des carrés de ses coordonnées.";
+};
+const getCorrection = ({ x, y, z }) => {
+    const answer = getAnswer({ x, y, z });
+    return `La norme d'un vecteur de l'espace est la racine carrée de la somme des carrés de ses coordonnées. Ici, on a donc : 
+ 
+${(0, alignTex_1.alignTex)([
+        [
+            "\\lVert \\overrightarrow u \\rVert",
+            "=",
+            new sqrtNode_1.SqrtNode(new addNode_1.AddNode(new powerNode_1.SquareNode(x.toTree()), new addNode_1.AddNode(new powerNode_1.SquareNode(y.toTree()), new powerNode_1.SquareNode(z.toTree())))).toTex(),
+        ],
+        ["", "=", new sqrtNode_1.SqrtNode((x ** 2 + y ** 2 + z ** 2).toTree()).toTex()],
+    ])}
+
+Donc $\\lVert \\overrightarrow u \\rVert = ${answer}$.
+`;
+};
+const getAnswer = (identifiers) => {
+    const u = new spaceVector_1.SpaceVector("u", identifiers.x.toTree(), identifiers.y.toTree(), identifiers.z.toTree());
+    const correctAnswer = u.getNorm();
+    return correctAnswer.simplify().toTex();
+};
+const getInstruction = (identifiers) => {
+    const u = new spaceVector_1.SpaceVector("u", identifiers.x.toTree(), identifiers.y.toTree(), identifiers.z.toTree());
+    return `Cacluler la norme du vecteur $${u.toTexWithCoords()}$`;
+};
 const getSpaceVectorNormCalculationQuestion = () => {
     const u = spaceVector_1.SpaceVectorConstructor.random("u", false);
-    const correctAnswer = u.getNorm();
-    const answer = correctAnswer.simplify().toTex();
+    const identifiers = {
+        x: u.x.evaluate({}),
+        y: u.y.evaluate({}),
+        z: u.z.evaluate({}),
+    };
     const question = {
-        answer,
-        instruction: `Cacluler la norme du vecteur $${u.toTexWithCoords()}$`,
+        answer: getAnswer(identifiers),
+        instruction: getInstruction(identifiers),
         keys: [],
         answerFormat: "tex",
-        identifiers: {
-            x: u.x.evaluate({}),
-            y: u.y.evaluate({}),
-            z: u.z.evaluate({}),
-        },
-        hint: "La norme d'un vecteur de l'espace est la racine carrée de la somme des carrés de ses coordonnées.",
-        correction: `La norme d'un vecteur de l'espace est la racine carrée de la somme des carrés de ses coordonnées. Ici, on a donc : 
- 
-${(0, alignTex_1.alignTex)([
-            [
-                "\\lVert \\overrightarrow u \\rVert",
-                "=",
-                new sqrtNode_1.SqrtNode(new addNode_1.AddNode(new powerNode_1.SquareNode(u.x), new addNode_1.AddNode(new powerNode_1.SquareNode(u.y), new powerNode_1.SquareNode(u.z)))).toTex(),
-            ],
-            [
-                "",
-                "=",
-                new sqrtNode_1.SqrtNode((u.x.evaluate({}) ** 2 +
-                    u.y.evaluate({}) ** 2 +
-                    u.z.evaluate({}) ** 2).toTree()).toTex(),
-            ],
-        ])}
-
-Donc $\\lVert \\overrightarrow u \\rVert = ${answer}$.
-`,
+        identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -76,4 +85,8 @@ exports.spaceVectorNormCalculation = {
     isAnswerValid,
     subject: "Mathématiques",
     hasHintAndCorrection: true,
+    getHint,
+    getCorrection,
+    getAnswer,
+    getInstruction,
 };

package/lib/utils/markdown/mdCode.d.ts

@@ -0,0 +1,2 @@
+export declare const mdCode: (str: string) => string;
+//# sourceMappingURL=mdCode.d.ts.map

package/lib/utils/markdown/mdCode.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mdCode.d.ts","sourceRoot":"","sources":["../../../src/utils/markdown/mdCode.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,MAAM,QAAS,MAAM,WAIjC,CAAC"}

package/lib/utils/markdown/mdCode.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mdCode = void 0;
+const mdCode = (str) => {
+    return `\`\`\`
+${str}
+\`\`\``;
+};
+exports.mdCode = mdCode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "math-exercises",
-  "version": "2.2.34",
+  "version": "2.2.35",
   "description": "Math exercises generator for middle school and high school",
   "main": "lib/index.js",
   "files": [