math-exercises 3.0.201 → 3.0.202

package/lib/exercises/math/geometry/parametric/pointFromParametricLine.js

@@ -4,7 +4,10 @@ import { ParametricLine } from "../../../../math/geometry/parametricLine.js";
 import { SpacePointConstructor } from "../../../../math/geometry/spacePoint.js";
 import { SpaceVectorConstructor } from "../../../../math/geometry/spaceVector.js";
 import { randint } from "../../../../math/utils/random/randint.js";
+import { frac } from "../../../../tree/nodes/operators/fractionNode.js";
+import { substract } from "../../../../tree/nodes/operators/substractNode.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
+import { doWhile } from "../../../../utils/doWhile.js";
 import { randomLetter } from "../../../../utils/strings/randomLetter.js";
 const getPropositions = (n, { answer }) => {
     const propositions = [];
@@ -31,14 +34,57 @@ où $t\\in \\mathbb{R}$.
 Le point $${askedPoint.toTexWithCoords()}$ appartient-il à $d$ ?
   `;
 };
-// const getHint: GetHint<Identifiers> = (identifiers) => {};
-// const getCorrection: GetCorrection<Identifiers> = (identifiers) => {};
+const getHint = () => {
+    return `Remplace $x$, $y$ et $z$ dans l'équation paramétrique par les coordonnées du point. 
+  
+Le point appartient à la droite $d$ si et seulement s'il existe une valeur de $t$ qui est solution des trois équations.`;
+};
+const getCorrection = (identifiers) => {
+    const { isOnLine, askedPointName, askedPointCoords, startPoint, vector } = identifiers;
+    const askedPoint = SpacePointConstructor.fromScalars(askedPointCoords, askedPointName);
+    const line = new ParametricLine(SpacePointConstructor.fromScalars(startPoint), SpaceVectorConstructor.fromScalars(vector));
+    //t1 = x-p.x / v.x
+    const t1 = frac(substract(askedPointCoords[0], startPoint[0]), vector[0]);
+    const t2 = frac(substract(askedPointCoords[1], startPoint[1]), vector[1]);
+    const t3 = frac(substract(askedPointCoords[2], startPoint[2]), vector[2]);
+    return `On remplace $x$, $y$ et $z$ par les coordonnées du point :
+  
+
+$$
+\\left\\{\\begin{matrix}
+${askedPoint.x.toTex()}=${line.equations[0].toTex()} \\\\
+${askedPoint.y.toTex()}=${line.equations[1].toTex()} \\\\
+${askedPoint.z.toTex()}=${line.equations[2].toTex()} 
+\\end{matrix}
+\\right.
+$$
+
+On résout alors les trois équations : 
+
+$$
+\\left\\{\\begin{matrix}
+t=${t1.toSimplificationTex()}  \\\\
+t=${t2.toSimplificationTex()} \\\\
+t=${t3.toSimplificationTex()} 
+\\end{matrix}
+\\right.
+$$
+
+${isOnLine
+        ? `Puisque $t = ${t1
+            .simplify()
+            .toTex()}$ est solution du système, le point $${askedPointName}$ appartient bien à la droite.`
+        : `Puisque ce système n'a pas de solution, le point $${askedPointName}$ n'appartient pas à la droite.`}
+  `;
+};
 const getKeys = () => {
     return [];
 };
 const getPointFromParametricLineQuestion = () => {
     const startPoint = SpacePointConstructor.random("A");
-    const vector = SpaceVectorConstructor.random("B");
+    const vector = doWhile(() => SpaceVectorConstructor.random("B"), (v) => v.x.equals((0).toTree()) ||
+        v.y.equals((0).toTree()) ||
+        v.z.equals((0).toTree()));
     const isOnLine = coinFlip();
     const askedPointName = randomLetter(true, ["O"]);
     let askedPoint;
@@ -68,8 +114,8 @@ const getQuestionFromIdentifiers = (identifiers) => {
         keys: getKeys(identifiers),
         answerFormat: "tex",
         identifiers,
-        // hint: getHint(identifiers),
-        // correction: getCorrection(identifiers),
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -90,4 +136,5 @@ export const pointFromParametricLine = {
     answerType: "QCU",
     getInstruction,
     getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/integration/fromExpr/areaBetweenCrossingCurvesFixedPosFromExpr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"areaBetweenCrossingCurvesFixedPosFromExpr.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/integration/fromExpr/areaBetweenCrossingCurvesFixedPosFromExpr.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAmBT,MAAM,6BAA6B,CAAC;AAarC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAc7C,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,eAAe,CAAC;IAC1B,QAAQ,EAAE,eAAe,CAAC;IAC1B,aAAa,EAAE,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;CACnD,CAAC;AAojBF,KAAK,OAAO,GAAG;IACb,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAkDF,eAAO,MAAM,yCAAyC,EAAE,QAAQ,CAC9D,WAAW,EACX,OAAO,CAsBR,CAAC"}
+{"version":3,"file":"areaBetweenCrossingCurvesFixedPosFromExpr.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/integration/fromExpr/areaBetweenCrossingCurvesFixedPosFromExpr.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAmBT,MAAM,6BAA6B,CAAC;AAgBrC,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AAc7C,KAAK,WAAW,GAAG;IACjB,QAAQ,EAAE,eAAe,CAAC;IAC1B,QAAQ,EAAE,eAAe,CAAC;IAC1B,aAAa,EAAE,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;CACnD,CAAC;AA6iBF,KAAK,OAAO,GAAG;IACb,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC;AAkDF,eAAO,MAAM,yCAAyC,EAAE,QAAQ,CAC9D,WAAW,EACX,OAAO,CAsBR,CAAC"}

package/lib/exercises/math/integration/fromExpr/areaBetweenCrossingCurvesFixedPosFromExpr.js

@@ -315,43 +315,34 @@ const createRandomIdentifiers = (opts) => {
     const [nodeBoundLow, nodeBoundHigh] = [valueBoundLow, valueBoundHigh].map((v) => v.toTree());
     const [nodePBottom, nodePTop] = (() => {
         const [point1, point2] = zip(["P1", "P2"], [nodeBoundLow, nodeBoundHigh]).map(([name, nodeAbscissa]) => new Point(name, nodeAbscissa, randint(0, 6)));
-        switch (opts.typeCrossingCurves) {
-            case "Trinôme/Trinôme": {
-                const [nodeABottom, nodeATop] = [
-                    frac(randint(1, 3), 10),
-                    frac(randint(-2, 0), 10),
-                ];
-                const [nodePBottom, nodePTop] = [nodeABottom, nodeATop].map((nodeA) => createNodeFTrinomFromPoints(nodeA, [point1, point2]));
-                return [nodePBottom, nodePTop];
+        const [nodeABottom, nodeATop] = (() => {
+            switch (opts.typeCrossingCurves) {
+                case "Trinôme/Trinôme": {
+                    return [frac(randint(1, 3), 10), frac(randint(-2, 0), 10)];
+                }
+                case "Trinôme/Affine": {
+                    return [(0).toTree(), frac(randint(-2, 0), 10)];
+                }
+                case "Affine/Trinôme": {
+                    return [frac(randint(1, 3), 10), (0).toTree()];
+                }
+                default:
+                    throw new Error("Unsupported opts.typeCrossingCurves: " + opts.typeCrossingCurves);
             }
-            case "Trinôme/Affine": {
-                const [nodeABottom, nodeATop] = [
-                    (0).toTree(),
-                    frac(randint(-2, 0), 10),
-                ];
-                const [nodePBottom, nodePTop] = [nodeABottom, nodeATop].map((nodeA) => createNodeFTrinomFromPoints(nodeA, [point1, point2]));
-                return [nodePBottom, nodePTop];
-            }
-            case "Affine/Trinôme": {
-                const [nodeABottom, nodeATop] = [frac(randint(1, 3), 10), (0).toTree()];
-                const [nodePBottom, nodePTop] = [nodeABottom, nodeATop].map((nodeA) => createNodeFTrinomFromPoints(nodeA, [point1, point2]));
-                return [nodePBottom, nodePTop];
-            }
-            default:
-                throw new Error("Unsupported opts.typeCrossingCurves: " + opts.typeCrossingCurves);
-        }
+        })();
+        const isShouldSimplify = true;
+        const simplifyOptionsPass1 = {
+            towardsDistribute: true,
+            calculatePowers: true,
+            forceAddFractions: true,
+        };
+        const simplifyOptionsPass2 = {
+            forbidFactorize: false,
+            forceAddFractions: true,
+        };
+        return [nodeABottom, nodeATop].map((nodeA) => createNodeFTrinomFromPoints(nodeA, [point1, point2], isShouldSimplify, simplifyOptionsPass1, simplifyOptionsPass2));
     })();
-    const [nodeF, nodeG] = [nodePBottom, nodePTop].map((nodeP) => nodeP
-        .simplify({
-        towardsDistribute: true,
-        calculatePowers: true,
-        forceAddFractions: true,
-    })
-        .simplify({
-        towardsDistribute: true,
-        forceDistributeFractions: true,
-        forbidFactorize: true,
-    }));
+    const [nodeF, nodeG] = [nodePBottom, nodePTop];
     const identifiers = {
         nodeIdsF: nodeF.toIdentifiers(),
         nodeIdsG: nodeG.toIdentifiers(),

package/lib/exercises/math/integration/fromExpr/index.d.ts

@@ -3,6 +3,7 @@ export * from "./byParts/index.js";
 export * from "./meanValue/index.js";
 export * from "./boundIntegralByManualRectanglesMethodFromExpr.js";
 export * from "./boundIntegralByBoundingFunctionWithAffinesFromExpr.js";
+export * from "./areaBetweenCrossingCurvesFixedPosFromExpr.js";
 export * from "./integralFromExpr.js";
 export * from "./checkIsPrimitiveFromExpr.js";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/integration/fromExpr/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/integration/fromExpr/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AAErC,cAAc,oDAAoD,CAAC;AACnE,cAAc,yDAAyD,CAAC;AAExE,cAAc,uBAAuB,CAAC;AACtC,cAAc,+BAA+B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/integration/fromExpr/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AAErC,cAAc,oDAAoD,CAAC;AACnE,cAAc,yDAAyD,CAAC;AACxE,cAAc,gDAAgD,CAAC;AAC/D,cAAc,uBAAuB,CAAC;AACtC,cAAc,+BAA+B,CAAC"}

package/lib/exercises/math/integration/fromExpr/index.js

@@ -3,6 +3,6 @@ export * from "./byParts/index.js";
 export * from "./meanValue/index.js";
 export * from "./boundIntegralByManualRectanglesMethodFromExpr.js";
 export * from "./boundIntegralByBoundingFunctionWithAffinesFromExpr.js";
-// export * from "./areaBetweenCrossingCurvesFixedPosFromExpr.js";
+export * from "./areaBetweenCrossingCurvesFixedPosFromExpr.js";
 export * from "./integralFromExpr.js";
 export * from "./checkIsPrimitiveFromExpr.js";

package/lib/exercises/math/primitive/constantPrimitive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constantPrimitive.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/primitive/constantPrimitive.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAGR,0BAA0B,EAE1B,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAOJ,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAgCF,eAAO,MAAM,oBAAoB,EAAE,iBAAiB,CAAC,WAAW,EAAE,OAAO,CAMxE,CAAC;AAEF,eAAO,MAAM,2CAA2C,EAAE,0BAA0B,CAClF,WAAW,EACX,OAAO,CAaR,CAAC;AACF,eAAO,MAAM,gCAAgC,EAAE,YAAY,CAAC,WAAW,EAAE,OAAO,CAmB/E,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,GAAG,CAAC,WAAW,EAAE,OAAO,CAQpE,CAAC;AAYF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAc5D,CAAC"}
+{"version":3,"file":"constantPrimitive.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/primitive/constantPrimitive.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAGR,0BAA0B,EAE1B,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EASJ,MAAM,6BAA6B,CAAC;AAQrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAEF,KAAK,OAAO,GAAG;IACb,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAyDF,eAAO,MAAM,oBAAoB,EAAE,iBAAiB,CAAC,WAAW,EAAE,OAAO,CAMxE,CAAC;AAEF,eAAO,MAAM,2CAA2C,EAAE,0BAA0B,CAClF,WAAW,EACX,OAAO,CAeR,CAAC;AACF,eAAO,MAAM,gCAAgC,EAAE,YAAY,CACzD,WAAW,EACX,OAAO,CAoBR,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,GAAG,CAAC,WAAW,EAAE,OAAO,CAQpE,CAAC;AAYF,eAAO,MAAM,iBAAiB,EAAE,QAAQ,CAAC,WAAW,EAAE,OAAO,CAe5D,CAAC"}

package/lib/exercises/math/primitive/constantPrimitive.js

@@ -16,13 +16,34 @@ const getInstruction = (identifiers, opts) => {
     const { c } = identifiers;
     const isAskingParticularPrimitive = opts?.askParticularPrimitive;
     return `${isAskingParticularPrimitive
-        ? "Déterminer une primitive en particulier de la fonction constante $f$ définie par"
+        ? "Donner une des primitives de la fonction constante $f$ définie par"
         : "Déterminer la forme générale des primitives de la fonction constante $f$ définie par"} : 
   
 $$
 f(x) = ${c}
 $$`;
 };
+const getHint = (identifiers) => {
+    const { c } = identifiers;
+    return `Quelles sont les fonctions qui ont pour dérivée $x\\mapsto ${c}$ ?`;
+};
+const getCorrection = (identifiers, opts) => {
+    if (opts?.askParticularPrimitive)
+        return `Une primitive de $f$ est : 
+  
+$$
+F(x) = ${getAnswerNode(identifiers, opts).toTex()}
+$$
+
+En effet, en dérivant $F(x)$, on obtient bien $F'(x) = f(x)$.`;
+    return `La forme générale des primitives de la fonction $f$ est : 
+  
+$$
+F(x) = ${getAnswerNode(identifiers, opts).toTex()}
+$$
+
+où $C$ est un réel. En effet, en dérivant $F(x)$, on obtient bien $F'(x) = f(x)$.`;
+};
 const getAnswer = (identifiers, opts) => {
     return getAnswerNode(identifiers, opts).toTex();
 };
@@ -39,6 +60,8 @@ export const getConstantPrimitiveQuestionFromIdentifiers = (identifiers, opts) =
         keys: opts?.askParticularPrimitive ? ["x"] : ["x", "C"],
         answerFormat: "tex",
         identifiers,
+        hint: getHint(identifiers, opts),
+        correction: getCorrection(identifiers, opts),
         options: opts,
     };
     return question;
@@ -82,4 +105,5 @@ export const constantPrimitive = {
     subject: "Mathématiques",
     getQuestionFromIdentifiers: getConstantPrimitiveQuestionFromIdentifiers,
     options,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/primitive/exponentialPrimitive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exponentialPrimitive.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/primitive/exponentialPrimitive.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAGR,0BAA0B,EAE1B,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAKJ,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAwBF,eAAO,MAAM,uBAAuB,EAAE,iBAAiB,CAAC,WAAW,CAIlE,CAAC;AAEF,eAAO,MAAM,8CAA8C,EAAE,0BAA0B,CACrF,WAAW,CAYZ,CAAC;AAEF,eAAO,MAAM,mCAAmC,EAAE,YAAY,CAAC,WAAW,CAgCzE,CAAC;AAEF,eAAO,MAAM,iCAAiC,EAAE,GAAG,CAAC,WAAW,CAY9D,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CAatD,CAAC"}
+{"version":3,"file":"exponentialPrimitive.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/primitive/exponentialPrimitive.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAKR,0BAA0B,EAE1B,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAKJ,MAAM,6BAA6B,CAAC;AAYrC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;CACX,CAAC;AAwBF,eAAO,MAAM,uBAAuB,EAAE,iBAAiB,CAAC,WAAW,CAIlE,CAAC;AAqBF,eAAO,MAAM,8CAA8C,EAAE,0BAA0B,CACrF,WAAW,CAcZ,CAAC;AAEF,eAAO,MAAM,mCAAmC,EAAE,YAAY,CAAC,WAAW,CAgCzE,CAAC;AAEF,eAAO,MAAM,iCAAiC,EAAE,GAAG,CAAC,WAAW,CAY9D,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,WAAW,CActD,CAAC"}

package/lib/exercises/math/primitive/exponentialPrimitive.js

@@ -28,6 +28,20 @@ export const getExponentialPrimitive = () => {
     const identifiers = { a };
     return getExponentialPrimitiveQuestionFromIdentifiers(identifiers);
 };
+const getHint = (identifiers) => {
+    const { a } = identifiers;
+    const integratedFuction = new MultiplyNode(new NumberNode(a), new ExpNode(new VariableNode("x")));
+    return `Quelles sont les fonctions qui ont pour dérivée $x\\mapsto ${integratedFuction.toTex()}$ ?`;
+};
+const getCorrection = (identifiers) => {
+    return `La forme générale des primitives de la fonction $f$ est : 
+  
+$$
+F(x) = ${getAnswer(identifiers)}
+$$
+
+où $C$ est un réel. En effet, en dérivant $F(x)$, on obtient bien $F'(x) = f(x)$.`;
+};
 export const getExponentialPrimitiveQuestionFromIdentifiers = (identifiers) => {
     const question = {
         instruction: getInstruction(identifiers),
@@ -36,6 +50,8 @@ export const getExponentialPrimitiveQuestionFromIdentifiers = (identifiers) => {
         keys: ["x", "C", "epower", "exp"],
         answerFormat: "tex",
         identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -80,4 +96,5 @@ export const exponentialPrimitive = {
     subject: "Mathématiques",
     pdfOptions: { shouldSpreadPropositions: true },
     getQuestionFromIdentifiers: getExponentialPrimitiveQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/primitive/polynomialPrimitive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"polynomialPrimitive.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/primitive/polynomialPrimitive.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAGR,0BAA0B,EAE1B,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAIJ,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAiBF,eAAO,MAAM,sBAAsB,EAAE,iBAAiB,CAAC,WAAW,CAKjE,CAAC;AAEF,eAAO,MAAM,6CAA6C,EAAE,0BAA0B,CACpF,WAAW,CAYZ,CAAC;AAEF,eAAO,MAAM,kCAAkC,EAAE,YAAY,CAAC,WAAW,CAexE,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,GAAG,CAAC,WAAW,CA8B7D,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAYrD,CAAC"}
+{"version":3,"file":"polynomialPrimitive.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/primitive/polynomialPrimitive.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAKR,0BAA0B,EAE1B,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAIJ,MAAM,6BAA6B,CAAC;AAWrC,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAiCF,eAAO,MAAM,sBAAsB,EAAE,iBAAiB,CAAC,WAAW,CAKjE,CAAC;AAEF,eAAO,MAAM,6CAA6C,EAAE,0BAA0B,CACpF,WAAW,CAcZ,CAAC;AAEF,eAAO,MAAM,kCAAkC,EAAE,YAAY,CAAC,WAAW,CAexE,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,GAAG,CAAC,WAAW,CA8B7D,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,QAAQ,CAAC,WAAW,CAarD,CAAC"}

package/lib/exercises/math/primitive/polynomialPrimitive.js

@@ -6,13 +6,26 @@ import { parseAlgebraic } from "../../../tree/parsers/latexParser.js";
 import { shuffle } from "../../../utils/alea/shuffle.js";
 import { handleVEAError } from "../../../utils/errors/handleVEAError.js";
 const getInstruction = (identifiers) => {
-    const polynomial = new Polynomial(identifiers.coeffs);
+    const polynomial = new Polynomial(identifiers.coeffs).toTree();
     return `Déterminer la forme générale des primitives de la fonction polynomiale $f$ définie par : 
 
 $$
 f(x) = ${polynomial.toTex()}
 $$`;
 };
+const getHint = (identifiers) => {
+    const polynomial = new Polynomial(identifiers.coeffs).toTree();
+    return `Quelles sont les fonctions qui ont pour dérivée $x\\mapsto ${polynomial.toTex()}$ ?`;
+};
+const getCorrection = (identifiers) => {
+    return `La forme générale des primitives de la fonction $f$ est : 
+  
+$$
+F(x) = ${getAnswer(identifiers)}
+$$
+
+où $C$ est un réel. En effet, en dérivant $F(x)$, on obtient bien $F'(x) = f(x)$.`;
+};
 const getAnswer = (identifiers) => {
     const polynomial = new Polynomial(identifiers.coeffs);
     const integralPolynomial = polynomial.integrateToNode();
@@ -33,6 +46,8 @@ export const getPolynomialPrimitiveQuestionFromIdentifiers = (identifiers) => {
         keys: ["x", "C"],
         answerFormat: "tex",
         identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -85,4 +100,5 @@ export const polynomialPrimitive = {
     isAnswerValid: isPolynomialPrimitiveAnswerValid,
     subject: "Mathématiques",
     getQuestionFromIdentifiers: getPolynomialPrimitiveQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/primitive/sinCosPrimitive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sinCosPrimitive.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/primitive/sinCosPrimitive.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAGR,0BAA0B,EAE1B,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAIJ,MAAM,6BAA6B,CAAC;AAarC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAwBF,eAAO,MAAM,kBAAkB,EAAE,iBAAiB,CAAC,WAAW,CAM7D,CAAC;AAEF,eAAO,MAAM,yCAAyC,EAAE,0BAA0B,CAChF,WAAW,CAYZ,CAAC;AACF,eAAO,MAAM,8BAA8B,EAAE,YAAY,CAAC,WAAW,CA4BpE,CAAC;AACF,eAAO,MAAM,4BAA4B,EAAE,GAAG,CAAC,WAAW,CAYzD,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAYjD,CAAC"}
+{"version":3,"file":"sinCosPrimitive.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/primitive/sinCosPrimitive.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAKR,0BAA0B,EAE1B,YAAY,EAEZ,iBAAiB,EACjB,GAAG,EAIJ,MAAM,6BAA6B,CAAC;AAarC,KAAK,WAAW,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAwBF,eAAO,MAAM,kBAAkB,EAAE,iBAAiB,CAAC,WAAW,CAM7D,CAAC;AAoBF,eAAO,MAAM,yCAAyC,EAAE,0BAA0B,CAChF,WAAW,CAcZ,CAAC;AACF,eAAO,MAAM,8BAA8B,EAAE,YAAY,CAAC,WAAW,CA4BpE,CAAC;AACF,eAAO,MAAM,4BAA4B,EAAE,GAAG,CAAC,WAAW,CAYzD,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAajD,CAAC"}

package/lib/exercises/math/primitive/sinCosPrimitive.js

@@ -34,6 +34,22 @@ export const getSinCosPrimitive = () => {
     const identifiers = { a, isCos };
     return getSinCosPrimitiveQuestionFromIdentifiers(identifiers);
 };
+const getHint = (identifiers) => {
+    const { a, isCos } = identifiers;
+    const selectedFunction = isCos
+        ? new MultiplyNode(new NumberNode(a), new CosNode(new VariableNode("x")))
+        : new MultiplyNode(new NumberNode(a), new SinNode(new VariableNode("x")));
+    return `Quelles sont les fonctions qui ont pour dérivée $x\\mapsto ${selectedFunction.toTex()}$ ?`;
+};
+const getCorrection = (identifiers) => {
+    return `La forme générale des primitives de la fonction $f$ est : 
+  
+$$
+F(x) = ${getAnswer(identifiers)}
+$$
+
+où $C$ est un réel. En effet, en dérivant $F(x)$, on obtient bien $F'(x) = f(x)$.`;
+};
 export const getSinCosPrimitiveQuestionFromIdentifiers = (identifiers) => {
     const question = {
         instruction: getInstruction(identifiers),
@@ -42,6 +58,8 @@ export const getSinCosPrimitiveQuestionFromIdentifiers = (identifiers) => {
         keys: ["x", "C", "sin", "cos"],
         answerFormat: "tex",
         identifiers,
+        hint: getHint(identifiers),
+        correction: getCorrection(identifiers),
     };
     return question;
 };
@@ -74,7 +92,7 @@ export const isSinCosPrimitiveAnswerValid = (ans, { isCos, a }) => {
 export const sinCosPrimitive = {
     id: "sinCosPrimitive",
     connector: "=",
-    label: "Primitive de sin et cos",
+    label: "Primitive de $\\sin$ et $\\cos$",
     isSingleStep: false,
     generator: (nb) => getDistinctQuestions(getSinCosPrimitive, nb),
     qcmTimer: 60,
@@ -83,4 +101,5 @@ export const sinCosPrimitive = {
     isAnswerValid: isSinCosPrimitiveAnswerValid,
     subject: "Mathématiques",
     getQuestionFromIdentifiers: getSinCosPrimitiveQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/primitive/usualPrimitives.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usualPrimitives.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/primitive/usualPrimitives.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAOT,MAAM,6BAA6B,CAAC;AA4BrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,CAAC,CAAC,EAAE,MAAM,CAAC;CACZ,CAAC;AA+HF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAajD,CAAC"}
+{"version":3,"file":"usualPrimitives.d.ts","sourceRoot":"","sources":["../../../../src/exercises/math/primitive/usualPrimitives.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAOT,MAAM,6BAA6B,CAAC;AA4BrC,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,CAAC,CAAC,EAAE,MAAM,CAAC;CACZ,CAAC;AA+HF,eAAO,MAAM,eAAe,EAAE,QAAQ,CAAC,WAAW,CAcjD,CAAC"}

package/lib/exercises/math/primitive/usualPrimitives.js

@@ -131,4 +131,5 @@ export const usualPrimitives = {
     subject: "Mathématiques",
     pdfOptions: { shouldSpreadPropositions: true },
     getQuestionFromIdentifiers,
+    hasHintAndCorrection: true,
 };

package/lib/exercises/math/sets/cartesianProduct/findCardinalOfCartesianProductOfFiniteSets.js

@@ -75,21 +75,21 @@ avec comme premier élément un élement de $D$, et comme deuxième élément un
 Voici un exemple : 
   
 $$
-C = \\lbrace 32, 42, 52 \\rbrace
+C = \\lbrace 32 ; 42 ; 52 \\rbrace
 $$
 
 $$
-D = \\lbrace u, v \\rbrace
+D = \\lbrace u ; v \\rbrace
 $$
 
 Voici les couples appartenant à $D \\times C$ :
 
 $$
-(u,32),(u,42),(u,52),
+(u;32),(u;42),(u;52),
 $$
 
 $$
-(v,32),(v,42),(v,52)
+(v;32),(v;42),(v;52)
 $$
 
 Le cardinal de $D \\times C$ est donc $2\\times3=6$.`;

package/lib/exercises/math/sets/cartesianProduct/findCardinalOfCartesianProductOfFiniteSetsFromSituation.js

@@ -108,15 +108,15 @@ Chaque carte peut être soit Pique, soit Coeur.
 Voici toutes les cartes possibles :
 
 $$
-(\\text{Valet},\\text{Pique}),(\\text{Valet},\\text{Coeur})
+(\\text{Valet};\\text{Pique}),(\\text{Valet};\\text{Coeur})
 $$
 
 $$
-(\\text{Dame},\\text{Pique}),(\\text{Dame},\\text{Coeur})
+(\\text{Dame};\\text{Pique}),(\\text{Dame};\\text{Coeur})
 $$
 
 $$
-(\\text{Roi},\\text{Pique}),(\\text{Roi},\\text{Coeur})
+(\\text{Roi};\\text{Pique}),(\\text{Roi};\\text{Coeur})
 $$
 
 Il y en a $3\\times2=6$.`;

package/lib/exercises/math/sets/cartesianProduct/proposeElementInCartesianProductOfFiniteSets.js

@@ -54,21 +54,21 @@ avec comme premier élément un élement de $D$, et comme deuxième élément un
 Voici un exemple : 
   
 $$
-C = \\lbrace 32, 42, 52 \\rbrace
+C = \\lbrace 32 ; 42 ; 52 \\rbrace
 $$
 
 $$
-D = \\lbrace u, v \\rbrace
+D = \\lbrace u ; v \\rbrace
 $$
 
 Voici les couples appartenant à $D \\times C$ :
 
 $$
-(u,32),(u,42),(u,52),
+(u;32),(u;42),(u;52),
 $$
 
 $$
-(v,32),(v,42),(v,52)
+(v;32),(v;42),(v;52)
 $$
 
 `;

package/lib/exercises/math/spaceGeometry/basis/spaceCoordinatesOfPointInCubeCoordSystemFromVecPath.js

@@ -271,7 +271,7 @@ const getHint = (identifiers) => {
     return `Le point $M$ est l'image du point $F$ par la translation de vecteur $${nodeEquationForVecs.rightChild.toTex()}$.
 Tu as deux possibilités : 
 - soit tu arrives à visualiser mentalement l'emplacement du point $M$ sur la figure et tu détermines ses coordonnées
-- soit tu détermines les coordonnées de $F$ et celles du vecteur $${nodeEquationForVecs.rightChild.toTex()}$ puis tu les additionne.`;
+- soit tu détermines les coordonnées de $F$ et celles du vecteur $${nodeEquationForVecs.rightChild.toTex()}$ puis tu les additionnes.`;
 };
 const getCorrection = (identifiers) => {
     const { nodeIdsEquationForVecs } = identifiers;

package/lib/exercises/math/spaceGeometry/orthogonalProjection/findOrthogonalProjectionOfPointOnPlane.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findOrthogonalProjectionOfPointOnPlane.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/spaceGeometry/orthogonalProjection/findOrthogonalProjectionOfPointOnPlane.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAgBT,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EAGL,qBAAqB,EACtB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAGL,sBAAsB,EACvB,MAAM,oCAAoC,CAAC;AAS5C,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AA0G7C,KAAK,QAAQ,GAAG;IACd,sBAAsB,EAAE,qBAAqB,CAAC;IAC9C,oBAAoB,EAAE,sBAAsB,CAAC;IAC7C,oBAAoB,EAAE,eAAe,CAAC;IACtC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,QAAQ,CAAC;IACf,cAAc,EAAE,qBAAqB,CAAC;IACtC,qBAAqB,EAAE,qBAAqB,EAAE,CAAC;CAChD,CAAC;AA0ZF,KAAK,OAAO,GAAG;IACb,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAqBF,eAAO,MAAM,sCAAsC,EAAE,QAAQ,CAC3D,WAAW,EACX,OAAO,CAqBR,CAAC"}
+{"version":3,"file":"findOrthogonalProjectionOfPointOnPlane.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/spaceGeometry/orthogonalProjection/findOrthogonalProjectionOfPointOnPlane.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAgBT,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EAGL,qBAAqB,EACtB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAGL,sBAAsB,EACvB,MAAM,oCAAoC,CAAC;AAS5C,OAAO,EAEL,eAAe,EAChB,MAAM,qCAAqC,CAAC;AA2G7C,KAAK,QAAQ,GAAG;IACd,sBAAsB,EAAE,qBAAqB,CAAC;IAC9C,oBAAoB,EAAE,sBAAsB,CAAC;IAC7C,oBAAoB,EAAE,eAAe,CAAC;IACtC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,WAAW,GAAG;IACjB,IAAI,EAAE,QAAQ,CAAC;IACf,cAAc,EAAE,qBAAqB,CAAC;IACtC,qBAAqB,EAAE,qBAAqB,EAAE,CAAC;CAChD,CAAC;AAgZF,KAAK,OAAO,GAAG;IACb,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAqBF,eAAO,MAAM,sCAAsC,EAAE,QAAQ,CAC3D,WAAW,EACX,OAAO,CAqBR,CAAC"}

package/lib/exercises/math/spaceGeometry/orthogonalProjection/findOrthogonalProjectionOfPointOnPlane.js

@@ -16,6 +16,7 @@ import { NodeComparator } from "../../../../tree/utilities/nodeComparator.js";
 import { coinFlip } from "../../../../utils/alea/coinFlip.js";
 import { random, randomMany } from "../../../../utils/alea/random.js";
 import { shuffle } from "../../../../utils/alea/shuffle.js";
+import { zip } from "../../../../utils/arrays/arrayZip.js";
 import { alignTex } from "../../../../utils/latex/alignTex.js";
 const [nodeVarX, nodeVarY, nodeVarZ] = ["x", "y", "z"].map((name) => new VariableNode(name));
 const createNodeCheckForIsPointBelongingToPlane = (spacePoint, nodePlaneEquation) => {
@@ -232,35 +233,21 @@ const getPropositions = (n, { answer, ...identifiers }) => {
 };
 const createRandomIdentifiers = (opts) => {
     const { typeDataForPlane } = opts;
-    const funcRand1 = () => randint(-3, 4, coinFlip() ? [0] : []).toTree();
-    const funcRand2 = () => randint(-6, 7, coinFlip() ? [0] : []).toTree();
-    const funcRand3 = () => randint(-9, 10, coinFlip() ? [0] : []).toTree();
-    function createRandomOrthogonalVector(vecSrc) {
-        const [nodeX, nodeY, nodeZ] = [vecSrc.x, vecSrc.y, vecSrc.z];
-        const nodeZero = (0).toTree();
-        const vec1 = new SpaceVector("v1", opposite(nodeY), nodeX, nodeZero);
-        const vec2 = new SpaceVector("v2", nodeZero, opposite(nodeZ), nodeY);
-        const vec3 = new SpaceVector("v3", opposite(nodeZ), nodeZero, nodeX);
-        const [factor1, factor2, factor3] = shuffle(random([
-            [coinFlip(), false, false],
-            [coinFlip(), coinFlip(), false],
-        ])).map((isCanBeZero) => randint(-3, 4, isCanBeZero ? [] : [0]).toTree());
-        return vec1
-            .times(factor1)
-            .add(vec2.times(factor2))
-            .add(vec3.times(factor3));
-    }
+    const funcRand1 = (isCanBeZero) => randint(-3, 4, isCanBeZero ? [] : [0]).toTree();
+    const funcRand2 = (isCanBeZero) => randint(-6, 7, isCanBeZero ? [] : [0]).toTree();
+    const funcRand3 = (isCanBeZero) => randint(-9, 10, isCanBeZero ? [] : [0]).toTree();
     //create vecR, vecS, vecT (base)
     const vecR = (() => {
-        const [funcRandX, funcRandY, funcRandZ] = shuffle([
-            funcRand1,
-            funcRand2,
-            funcRand3,
-        ]);
-        return new SpaceVector("r", funcRandX(), funcRandY(), funcRandZ());
+        const arrIsCanBeZero = shuffle(random([
+            [coinFlip(), false, false],
+            [coinFlip(), coinFlip(), false],
+        ]));
+        const arrFuncRand = shuffle([funcRand1, funcRand2, funcRand3]);
+        const [nodeX, nodeY, nodeZ] = zip(arrIsCanBeZero, arrFuncRand).map(([isCanBeZero, funcRand]) => funcRand(isCanBeZero));
+        return new SpaceVector("r", nodeX, nodeY, nodeZ);
     })();
     const vecS = (() => {
-        const vecRaw = createRandomOrthogonalVector(vecR);
+        const vecRaw = vecR.getRandomOrthogonalVectorNonZero();
         return new SpaceVector("s", vecRaw.x, vecRaw.y, vecRaw.z);
     })();
     const [vecU, vecV] = (() => {

package/lib/exercises/math/spaceGeometry/orthogonalProjection/index.d.ts

@@ -1,2 +1,2 @@
-export {};
+export * from "./findOrthogonalProjectionOfPointOnPlane.js";
 //# sourceMappingURL=index.d.ts.map

package/lib/exercises/math/spaceGeometry/orthogonalProjection/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/spaceGeometry/orthogonalProjection/index.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/spaceGeometry/orthogonalProjection/index.ts"],"names":[],"mappings":"AAAA,cAAc,6CAA6C,CAAC"}

package/lib/exercises/math/spaceGeometry/orthogonalProjection/index.js

@@ -1,2 +1 @@
-export {};
-// export * from "./findOrthogonalProjectionOfPointOnPlane.js";
+export * from "./findOrthogonalProjectionOfPointOnPlane.js";

package/lib/exercises/math/spaceGeometry/planes/findNormalVectorFromPlanePointsCoords.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findNormalVectorFromPlanePointsCoords.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/spaceGeometry/planes/findNormalVectorFromPlanePointsCoords.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAGL,qBAAqB,EACtB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAGL,sBAAsB,EACvB,MAAM,oCAAoC,CAAC;AAsE5C,KAAK,WAAW,GAAG;IACjB,wBAAwB,EAAE,qBAAqB,EAAE,CAAC;IAClD,sBAAsB,EAAE,sBAAsB,EAAE,CAAC;CAClD,CAAC;AAkRF,eAAO,MAAM,qCAAqC,EAAE,QAAQ,CAAC,WAAW,CAmBvE,CAAC"}
+{"version":3,"file":"findNormalVectorFromPlanePointsCoords.d.ts","sourceRoot":"","sources":["../../../../../src/exercises/math/spaceGeometry/planes/findNormalVectorFromPlanePointsCoords.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAaT,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAGL,qBAAqB,EACtB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAGL,sBAAsB,EACvB,MAAM,oCAAoC,CAAC;AAqE5C,KAAK,WAAW,GAAG;IACjB,wBAAwB,EAAE,qBAAqB,EAAE,CAAC;IAClD,sBAAsB,EAAE,sBAAsB,EAAE,CAAC;CAClD,CAAC;AAwQF,eAAO,MAAM,qCAAqC,EAAE,QAAQ,CAAC,WAAW,CAmBvE,CAAC"}

package/lib/exercises/math/spaceGeometry/planes/findNormalVectorFromPlanePointsCoords.js

@@ -3,7 +3,6 @@ import { getDistinctQuestions } from "../../../../exercises/utils/getDistinctQue
 import { SpacePoint, SpacePointConstructor, } from "../../../../math/geometry/spacePoint.js";
 import { SpaceVector, SpaceVectorConstructor, } from "../../../../math/geometry/spaceVector.js";
 import { randint } from "../../../../math/utils/random/randint.js";
-import { opposite } from "../../../../tree/nodes/functions/oppositeNode.js";
 import { frac } from "../../../../tree/nodes/operators/fractionNode.js";
 import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
 import { substract } from "../../../../tree/nodes/operators/substractNode.js";
@@ -133,35 +132,21 @@ const getPropositions = (n, { answer, ...identifiers }) => {
     return shuffleProps(propositions, n);
 };
 const createRandomIdentifiers = () => {
-    const funcRand1 = () => randint(-3, 4, coinFlip() ? [0] : []).toTree();
-    const funcRand2 = () => randint(-6, 7, coinFlip() ? [0] : []).toTree();
-    const funcRand3 = () => randint(-9, 10, coinFlip() ? [0] : []).toTree();
-    function createRandomOrthogonalVector(vecSrc) {
-        const [nodeX, nodeY, nodeZ] = [vecSrc.x, vecSrc.y, vecSrc.z];
-        const nodeZero = (0).toTree();
-        const vec1 = new SpaceVector("v1", opposite(nodeY), nodeX, nodeZero);
-        const vec2 = new SpaceVector("v2", nodeZero, opposite(nodeZ), nodeY);
-        const vec3 = new SpaceVector("v3", opposite(nodeZ), nodeZero, nodeX);
-        const [factor1, factor2, factor3] = shuffle(random([
-            [coinFlip(), false, false],
-            [coinFlip(), coinFlip(), false],
-        ])).map((isCanBeZero) => randint(-3, 4, isCanBeZero ? [] : [0]).toTree());
-        return vec1
-            .times(factor1)
-            .add(vec2.times(factor2))
-            .add(vec3.times(factor3));
-    }
+    const funcRand1 = (isCanBeZero) => randint(-3, 4, isCanBeZero ? [] : [0]).toTree();
+    const funcRand2 = (isCanBeZero) => randint(-6, 7, isCanBeZero ? [] : [0]).toTree();
+    const funcRand3 = (isCanBeZero) => randint(-9, 10, isCanBeZero ? [] : [0]).toTree();
     //create vecR, vecS, vecT (base)
     const vecR = (() => {
-        const [funcRandX, funcRandY, funcRandZ] = shuffle([
-            funcRand1,
-            funcRand2,
-            funcRand3,
-        ]);
-        return new SpaceVector("r", funcRandX(), funcRandY(), funcRandZ());
+        const arrIsCanBeZero = shuffle(random([
+            [coinFlip(), false, false],
+            [coinFlip(), coinFlip(), false],
+        ]));
+        const arrFuncRand = shuffle([funcRand1, funcRand2, funcRand3]);
+        const [nodeX, nodeY, nodeZ] = zip(arrIsCanBeZero, arrFuncRand).map(([isCanBeZero, funcRand]) => funcRand(isCanBeZero));
+        return new SpaceVector("r", nodeX, nodeY, nodeZ);
     })();
     const vecS = (() => {
-        const vecRaw = createRandomOrthogonalVector(vecR);
+        const vecRaw = vecR.getRandomOrthogonalVectorNonZero();
         return new SpaceVector("s", vecRaw.x, vecRaw.y, vecRaw.z);
     })();
     const [vecU, vecV] = (() => {