math-exercises 3.0.172 → 3.0.173

package/lib/math/utils/sequences/situations/seqGeometricUtils.d.ts

@@ -0,0 +1,12 @@
+import { EqualNode } from "../../../../tree/nodes/equations/equalNode.js";
+export declare const seqGeometricUtils: {
+    valueForRank: (initial: number, reason: number, rank: number) => number;
+    valueSumForRank: (initial: number, reason: number, rank: number) => number;
+    getAnswerNodeExplicitFormula: (initial: number, reason: number, firstRank: number) => EqualNode;
+    getAnswerNodeRecurrenceFormula: (_initial: number, reason: number, _firstRank: number) => EqualNode;
+    getAnswerNodeRandomTerm: (initial: number, reason: number, firstRank: number, rankAsked: number) => import("../../../../tree/nodes/operators/multiplyNode.js").MultiplyNode;
+    getAnswerNodeRandomRank: (initial: number, reason: number, _firstRank: number, valueAsked: number) => import("../../../../tree/nodes/operators/fractionNode.js").FractionNode;
+    randThreshold: (initial: number, reason: number, firstRank: number, roundTo: number) => number;
+    randSumThreshold: (initial: number, reason: number, firstRank: number, roundTo: number) => number;
+};
+//# sourceMappingURL=seqGeometricUtils.d.ts.map

package/lib/math/utils/sequences/situations/seqGeometricUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"seqGeometricUtils.d.ts","sourceRoot":"","sources":["../../../../../src/math/utils/sequences/situations/seqGeometricUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AA4IpE,eAAO,MAAM,iBAAiB;4BAjIC,MAAM,UAAU,MAAM,QAAQ,MAAM;+BAIjC,MAAM,UAAU,MAAM,QAAQ,MAAM;4CAK3D,MAAM,UACP,MAAM,aACH,MAAM;+CAaP,MAAM,UACR,MAAM,cACF,MAAM;uCAWT,MAAM,UACP,MAAM,aACH,MAAM,aACN,MAAM;uCAUR,MAAM,UACP,MAAM,cACF,MAAM,cACN,MAAM;6BAuCT,MAAM,UACP,MAAM,aACH,MAAM,WACR,MAAM;gCAgBN,MAAM,UACP,MAAM,aACH,MAAM,WACR,MAAM;CAwBhB,CAAC"}

package/lib/math/utils/sequences/situations/seqGeometricUtils.js

@@ -0,0 +1,90 @@
+import { EqualNode } from "../../../../tree/nodes/equations/equalNode.js";
+import { abs } from "../../../../tree/nodes/functions/absNode.js";
+import { LogNode } from "../../../../tree/nodes/functions/logNode.js";
+import { frac } from "../../../../tree/nodes/operators/fractionNode.js";
+import { multiply } from "../../../../tree/nodes/operators/multiplyNode.js";
+import { power } from "../../../../tree/nodes/operators/powerNode.js";
+import { substract } from "../../../../tree/nodes/operators/substractNode.js";
+import { probaFlip } from "../../../../utils/alea/probaFlip.js";
+import { random, randomMany } from "../../../../utils/alea/random.js";
+import { randfloat } from "../../random/randfloat.js";
+const valueForRank = (initial, reason, rank) => {
+    return initial * Math.pow(reason, rank);
+};
+const valueSumForRank = (initial, reason, rank) => {
+    return (initial * (1 - Math.pow(reason, rank))) / (1 - reason);
+};
+const getAnswerNodeExplicitFormula = (initial, reason, firstRank) => {
+    //u_n = u_0 * q ^ n
+    const nodeFormula = multiply(initial, power(reason, substract("n".toTree(), firstRank).simplify()));
+    const equalNode = new EqualNode("u_n".toTree(), nodeFormula);
+    return equalNode;
+};
+const getAnswerNodeRecurrenceFormula = (_initial, reason, _firstRank) => {
+    //u_{n+1} = u_n * q
+    const nodeFormRecurLhs = "u_{n+1}".toTree();
+    const nodeFormRecurRhs = multiply(reason, "u_n".toTree());
+    const equalNode = new EqualNode(nodeFormRecurLhs, nodeFormRecurRhs);
+    return equalNode;
+};
+const getAnswerNodeRandomTerm = (initial, reason, firstRank, rankAsked) => {
+    //u_n = u_0 * q ^ n
+    return multiply(initial, power(reason, substract(rankAsked, firstRank).simplify()));
+};
+const getAnswerNodeRandomRank = (initial, reason, _firstRank, valueAsked) => {
+    //u_n = u_0 * q ^ n
+    //n = ln(|u_n / u_0|) / ln(|q|)
+    return frac(new LogNode(abs(frac(valueAsked, initial))), new LogNode(abs(reason)));
+};
+// const getAnswerNodeThresholdRank = (
+//   initial: number,
+//   reason: number,
+//   firstRank: number,
+//   valueThreshold: number,
+//   inequationSymbol: InequationSymbol,
+// ) => {
+//   //u_n = u_0 * q ^ n >= t
+//   //depending on u_0:
+//   //n >= ln(|t / u_0|) / ln(|q|)  ou n <= ln(|t / u_0|) / ln(|q|)
+//   const inequationSymbolForRank =
+//     reason < 0 ? inequationSymbol.toReversed() : inequationSymbol;
+//   const value = (() => {
+//     switch (inequationSymbolForRank.symbol) {
+//       case "<":
+//       case "\\le":
+//         return Math.floor((valueThreshold - initial) / reason) + firstRank;
+//       case ">":
+//       case "\\ge":
+//         return Math.ceil((valueThreshold - initial) / reason) + firstRank;
+//     }
+//   })();
+//   return value.toTree();
+// };
+const randThreshold = (initial, reason, firstRank, roundTo) => {
+    const poolOfRanks = [...Array(10).keys()].map((i) => i + 5);
+    const [minRank, maxRank] = randomMany(poolOfRanks, 2).toSorted((i1, i2) => i1 - i2);
+    const [valueMinRank, valueMaxRank] = [minRank, maxRank].map((rank) => getAnswerNodeRandomTerm(initial, reason, firstRank, rank).evaluate());
+    const valueThreshold = probaFlip(0.75)
+        ? randfloat(valueMinRank, valueMaxRank, roundTo)
+        : random([valueMinRank, valueMaxRank]);
+    return valueThreshold;
+};
+const randSumThreshold = (initial, reason, firstRank, roundTo) => {
+    const poolOfRanks = [...Array(10).keys()].map((i) => i + 5);
+    const [minRank, maxRank] = randomMany(poolOfRanks, 2).toSorted((i1, i2) => i1 - i2);
+    const [valueMinRank, valueMaxRank] = [minRank, maxRank].map((rank) => getAnswerNodeRandomTerm(initial, reason, firstRank, rank).evaluate());
+    const valueThreshold = probaFlip(0.75)
+        ? randfloat(valueMinRank, valueMaxRank, roundTo)
+        : random([valueMinRank, valueMaxRank]);
+    return valueThreshold;
+};
+export const seqGeometricUtils = {
+    valueForRank,
+    valueSumForRank,
+    getAnswerNodeExplicitFormula,
+    getAnswerNodeRecurrenceFormula,
+    getAnswerNodeRandomTerm,
+    getAnswerNodeRandomRank,
+    randThreshold,
+    randSumThreshold,
+};

package/lib/tests/exosTest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exosTest.d.ts","sourceRoot":"","sources":["../../src/tests/exosTest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAQvD,eAAO,MAAM,QAAQ,GAAI,MAAM,QAAQ,CAAC,MAAM,CAAC,EAAE,SAwDhD,CAAC"}
+{"version":3,"file":"exosTest.d.ts","sourceRoot":"","sources":["../../src/tests/exosTest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAQvD,eAAO,MAAM,QAAQ,GAAI,MAAM,QAAQ,CAAC,MAAM,CAAC,EAAE,SAsDhD,CAAC"}

package/lib/tests/exosTest.js

@@ -11,8 +11,6 @@ export const exosTest = (exos) => {
     // const allExos = [MathExercises.inflexionPointQuadrinomials];
     exos.forEach((exo) => {
         console.log(exo.id);
-        console.log(exo);
-        console.log(exo.label);
         try {
             const times = exoTest(exo);
             veaTimes.push(times.veaTime);

package/lib/tree/nodes/operators/binomialCoefficientNode.d.ts

@@ -1,4 +1,4 @@
-import { AlgebraicNode } from "../algebraicNode.js";
+import { AlgebraicNode, SimplifyOptions } from "../algebraicNode.js";
 import { Node, NodeIds, NodeOptions, NodeType } from "../node.js";
 import { OperatorIds, OperatorNode } from "./operatorNode.js";
 export declare const isBinomialCoefficientNode: (a: Node) => a is BinomialCoefficientNode;
@@ -17,7 +17,7 @@ export declare class BinomialCoefficientNode implements OperatorNode {
     constructor(leftChild: AlgebraicNode, rightChild: AlgebraicNode, opts?: NodeOptions);
     equals(node: AlgebraicNode): boolean;
     evaluate(): number;
-    simplify(): AlgebraicNode | BinomialCoefficientNode;
+    simplify(_opts?: SimplifyOptions): AlgebraicNode | BinomialCoefficientNode;
     toAllValidTexs(): string[];
     toSignInequationTex(): string;
     toDetailedEvaluation(vars: Record<string, AlgebraicNode>): BinomialCoefficientNode;
@@ -34,6 +34,6 @@ export declare class BinomialCoefficientNode implements OperatorNode {
     toMathString(): string;
     toTex(): string;
     derivative(): AlgebraicNode;
-    toSimplificationTex(): string;
+    toSimplificationTex(opts?: SimplifyOptions): string;
 }
 //# sourceMappingURL=binomialCoefficientNode.d.ts.map

package/lib/tree/nodes/operators/binomialCoefficientNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"binomialCoefficientNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/binomialCoefficientNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGlE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,mBAAmB,CAAC;AAG9E,eAAO,MAAM,yBAAyB,GACpC,GAAG,IAAI,KACN,CAAC,IAAI,uBACuD,CAAC;AAEhE,eAAO,MAAM,KAAK,GAChB,GAAG,aAAa,GAAG,MAAM,GAAG,MAAM,EAClC,GAAG,aAAa,GAAG,MAAM,GAAG,MAAM,4BAOnC,CAAC;AACF,qBAAa,uBAAwB,YAAW,YAAY;IAC1D,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB;;;OAGG;IACH,EAAE,EAAE,WAAW,CAAC;IAChB,SAAS,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,aAAa,CAAC;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;gBAEjB,SAAS,EAAE,aAAa,EACxB,UAAU,EAAE,aAAa,EACzB,IAAI,CAAC,EAAE,WAAW;IASpB,MAAM,CAAC,IAAI,EAAE,aAAa;IAO1B,QAAQ;IAGR,QAAQ;IAoBR,cAAc;IAGd,mBAAmB;IAOnB,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAMxD,iBAAiB;IAGjB,aAAa;;;;;;;;;IAOb,YAAY;IAGZ,KAAK;IAGL,UAAU,IAAI,aAAa;IAG3B,mBAAmB,IAAI,MAAM;CAG9B"}
+{"version":3,"file":"binomialCoefficientNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/binomialCoefficientNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAErE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGlE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,mBAAmB,CAAC;AAG9E,eAAO,MAAM,yBAAyB,GACpC,GAAG,IAAI,KACN,CAAC,IAAI,uBACuD,CAAC;AAEhE,eAAO,MAAM,KAAK,GAChB,GAAG,aAAa,GAAG,MAAM,GAAG,MAAM,EAClC,GAAG,aAAa,GAAG,MAAM,GAAG,MAAM,4BAOnC,CAAC;AACF,qBAAa,uBAAwB,YAAW,YAAY;IAC1D,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB;;;OAGG;IACH,EAAE,EAAE,WAAW,CAAC;IAChB,SAAS,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,aAAa,CAAC;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;gBAEjB,SAAS,EAAE,aAAa,EACxB,UAAU,EAAE,aAAa,EACzB,IAAI,CAAC,EAAE,WAAW;IASpB,MAAM,CAAC,IAAI,EAAE,aAAa;IAO1B,QAAQ;IAGR,QAAQ,CAAC,KAAK,CAAC,EAAE,eAAe;IAoBhC,cAAc;IAGd,mBAAmB;IAOnB,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAMxD,iBAAiB;IAGjB,aAAa;;;;;;;;;IAOb,YAAY;IAGZ,KAAK;IAGL,UAAU,IAAI,aAAa;IAG3B,mBAAmB,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,MAAM;CAKpD"}

package/lib/tree/nodes/operators/binomialCoefficientNode.js

@@ -38,7 +38,7 @@ export class BinomialCoefficientNode {
     evaluate() {
         return combinations(this.rightChild.evaluate(), this.leftChild.evaluate());
     }
-    simplify() {
+    simplify(_opts) {
         const copy = new BinomialCoefficientNode(this.leftChild.simplify(), this.rightChild.simplify());
         if (copy.leftChild.isNumeric && copy.rightChild.isNumeric) {
             return frac(facto(copy.leftChild), multiply(facto(copy.rightChild), facto(substract(copy.leftChild, copy.rightChild)))).simplify();
@@ -78,7 +78,10 @@ export class BinomialCoefficientNode {
     derivative() {
         throw new Error("unimplemented derivative");
     }
-    toSimplificationTex() {
-        throw new Error("unimplemented");
+    toSimplificationTex(opts) {
+        const simp = this.simplify(opts);
+        if (simp.toTex() !== this.toTex())
+            return this.toTex() + "=" + simp.toTex();
+        return this.toTex();
     }
 }

package/lib/tree/parsers/vectorParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vectorParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/vectorParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAGvD,eAAO,MAAM,YAAY,GAAI,KAAK,MAAM,mBAUvC,CAAC"}
+{"version":3,"file":"vectorParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/vectorParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAIvD,eAAO,MAAM,YAAY,GAAI,KAAK,MAAM,mBAgBvC,CAAC"}

package/lib/tree/parsers/vectorParser.js

@@ -1,6 +1,14 @@
 import { Vector } from "../../math/geometry/vector.js";
+import { isBinomialCoefficientNode } from "../nodes/operators/binomialCoefficientNode.js";
 import { parseAlgebraic } from "./latexParser.js";
 export const vectorParser = (ans) => {
+    if (ans.includes("binom")) {
+        const parsed = parseAlgebraic(ans);
+        if (!isBinomialCoefficientNode(parsed))
+            return false;
+        const vec = new Vector("u", parsed.leftChild, parsed.rightChild);
+        return vec;
+    }
     const formated = ans
         .replaceAll("\\left", "")
         .replaceAll("\\right", "")

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "math-exercises",
   "type": "module",
-  "version": "3.0.172",
+  "version": "3.0.173",
   "description": "Math exercises generator for middle school and high school",
   "main": "lib/index.js",
   "files": [