math-exercises 3.0.136 → 3.0.137

package/lib/math/utils/functions/functionComparison.js

@@ -35,10 +35,6 @@ const getSafeEvaluationDictForEqualityCheck = (node1, node2, nbSafeX = 4) => {
 };
 const isEqualFromRandomEvaluations = (node1, node2) => {
     return Object.values(getSafeEvaluationDictForEqualityCheck(node1, node2)).every((arrSafeEval) => {
-        // console.log(
-        //   "arrSafeEval",
-        //   arrSafeEval.map((safeEval) => safeEval.value),
-        // );
         return arrSafeEval
             .slice(1)
             .every((safeEval) => substract(arrSafeEval[0].value, safeEval.value).evaluate() === 0);

package/lib/math/utils/functions/functionComposition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"functionComposition.d.ts","sourceRoot":"","sources":["../../../../src/math/utils/functions/functionComposition.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,eAAe,EAChB,MAAM,mCAAmC,CAAC;AAU3C,OAAO,EAEL,YAAY,EACb,MAAM,4CAA4C,CAAC;AAEpD,eAAO,MAAM,qBAAqB,GAChC,aAAa,aAAa,EAC1B,cAAc,aAAa,EAC3B,eAAc,YAA2C,kBAiB1D,CAAC;AAMF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,MAAM,aAAa,wBA4ClD,CAAC;AAMF,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,CAAC,WAAW,GAAG,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC;CAChD,CAAC;AA6BF,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,aAAa,EAC1B,IAAI,EAAE,QAAQ,EACd,YAAY,EAAE,aAAa,EAC3B,iBAAiB,GAAE,MAAW,EAC9B,eAAe,GAAE,eAAoB,iBAiEtC"}
+{"version":3,"file":"functionComposition.d.ts","sourceRoot":"","sources":["../../../../src/math/utils/functions/functionComposition.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,eAAe,EAChB,MAAM,mCAAmC,CAAC;AAU3C,OAAO,EAEL,YAAY,EACb,MAAM,4CAA4C,CAAC;AAEpD,eAAO,MAAM,qBAAqB,GAChC,aAAa,aAAa,EAC1B,cAAc,aAAa,EAC3B,eAAc,YAA2C,kBAiB1D,CAAC;AAMF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,MAAM,aAAa,wBA4ClD,CAAC;AAMF,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,CAAC,WAAW,GAAG,YAAY,GAAG,OAAO,CAAC,EAAE,CAAC;CAChD,CAAC;AA6BF,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,aAAa,EAC1B,IAAI,EAAE,QAAQ,EACd,YAAY,EAAE,aAAa,EAC3B,iBAAiB,GAAE,MAAW,EAC9B,eAAe,GAAE,eAAoB,iBAsDtC"}

package/lib/math/utils/functions/functionComposition.js

@@ -65,11 +65,6 @@ function operatorNodeByReplacingRightChild(opNode, nodeRightChildNew) {
     return NodeConstructor.fromIdentifiers(nodeIds);
 }
 export function nodeByReplacingNodeAtPath(nodeCarrier, path, nodeInjected, simplifyUpToLevel = -1, simplifyOptions = {}) {
-    // console.log("nodeByReplacingNodeAtPath", {
-    //   node: nodeCarrier.toTex(),
-    //   key: path.keys.join("."),
-    //   nodeInjected: nodeInjected.toTex(),
-    // });
     function getNodeForKey(node, key) {
         if (key === "leftChild" || key === "rightChild") {
             return node[key];
@@ -82,11 +77,6 @@ export function nodeByReplacingNodeAtPath(nodeCarrier, path, nodeInjected, simpl
         }
     }
     function nodeByReplacingChildAtKey(node, key, nodeInjected) {
-        // console.log("nodeByReplacingChildAtKey", {
-        //   node: node.toTex(),
-        //   key: key,
-        //   nodeInjected: nodeInjected.toTex(),
-        // });
         if (key === "leftChild" && isOperatorNode(node)) {
             return operatorNodeByReplacingLeftChild(node, nodeInjected);
         }

package/lib/math/utils/functions/functionDecomposition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"functionDecomposition.d.ts","sourceRoot":"","sources":["../../../../src/math/utils/functions/functionDecomposition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAYlE,OAAO,EAEL,YAAY,EACb,MAAM,4CAA4C,CAAC;AAcpD,eAAO,MAAM,sBAAsB,GACjC,MAAM,aAAa,EACnB,eAAc,YAA2C;WAElC,aAAa;WAAS,aAAa;GA8Q3D,CAAC;AAwEF,eAAO,MAAM,mBAAmB,GAAI,MAAM,aAAa,EAAE,QAAQ,MAAM,kBAItE,CAAC;AAEF,wBAAgB,YAAY,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,iBAMtE;AAMD,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAmBtE"}
+{"version":3,"file":"functionDecomposition.d.ts","sourceRoot":"","sources":["../../../../src/math/utils/functions/functionDecomposition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAYlE,OAAO,EAEL,YAAY,EACb,MAAM,4CAA4C,CAAC;AAcpD,eAAO,MAAM,sBAAsB,GACjC,MAAM,aAAa,EACnB,eAAc,YAA2C;WAElC,aAAa;WAAS,aAAa;GAyO3D,CAAC;AAqEF,eAAO,MAAM,mBAAmB,GAAI,MAAM,aAAa,EAAE,QAAQ,MAAM,kBAItE,CAAC;AAEF,wBAAgB,YAAY,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,iBAMtE;AAMD,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAmBtE"}

package/lib/math/utils/functions/functionDecomposition.js

@@ -43,7 +43,6 @@ export const functionDecompositions = (node, variableNode = "x".toTree()) => {
     const levelPicks = getCartesiansProducts(nodePathsWithVariableAtEnd.map((nodePathWithNodes) => [
         ...Array(nodePathWithNodes.nodePath.keys.length).keys(),
     ]));
-    // console.log("levelPicks", levelPicks.length);
     levelPicks.forEach((levelPick) => {
         if (counter > 1000) {
             return outArr;
@@ -53,18 +52,6 @@ export const functionDecompositions = (node, variableNode = "x".toTree()) => {
                 const level = levelPick[i];
                 return nodePathUpward(nodePathWithNodes, level);
             });
-            // console.log(
-            //   "nodePathsUpByLevel",
-            //   nodePathsUpByLevel.map((nodePathWithNodes) => {
-            //     return {
-            //       endNode:
-            //         nodePathWithNodes.arrNode[
-            //           nodePathWithNodes.arrNode.length - 1
-            //         ].toTex(),
-            //       keypath: nodePathWithNodes.nodePath.keys.join("."),
-            //     };
-            //   }),
-            // );
             //merge wrt collision (collision means that some of the wrappedVariables trees are superimposing, and we don't want that)
             const mergedNodePathsUpByLevel = nodePathsUpByLevel.reduce((acc, incomingNodePathWithNodes) => {
                 const incomingNodePathsString = incomingNodePathWithNodes.nodePath.keys.join(".");
@@ -89,18 +76,6 @@ export const functionDecompositions = (node, variableNode = "x".toTree()) => {
                     return [...acc, incomingNodePathWithNodes];
                 }
             }, []);
-            // console.log(
-            //   "mergedNodePathsUpByLevel",
-            //   mergedNodePathsUpByLevel.map((nodePathWithNodes) => {
-            //     return {
-            //       endNode:
-            //         nodePathWithNodes.arrNode[
-            //           nodePathWithNodes.arrNode.length - 1
-            //         ].toTex(),
-            //       keypath: nodePathWithNodes.nodePath.keys.join("."),
-            //     };
-            //   }),
-            // );
             const wrappedVariables = mergedNodePathsUpByLevel.map((nodePathWithNodes) => nodePathWithNodes &&
                 nodePathWithNodes.arrNode[nodePathWithNodes.arrNode.length - 1]);
             for (let index = 0; index < wrappedVariables.length; index++) {
@@ -119,15 +94,6 @@ export const functionDecompositions = (node, variableNode = "x".toTree()) => {
                 else {
                     //attempt salvation
                     const comparisonDicts = otherWrappedVariables.map((node) => getComparisonDict(node, sameNodeCandidate));
-                    // console.log(
-                    //   "comparisonDicts",
-                    //   comparisonDicts.map((comparisonDict) => {
-                    //     return {
-                    //       sub: comparisonDict?.sub?.toTex(),
-                    //       frac: comparisonDict?.frac?.toTex(),
-                    //     };
-                    //   }),
-                    // );
                     const isSalvationPossible = comparisonDicts.every((comparisonDict) => comparisonDict?.sub !== undefined ||
                         comparisonDict?.frac !== undefined);
                     if (isSalvationPossible) {
@@ -139,10 +105,6 @@ export const functionDecompositions = (node, variableNode = "x".toTree()) => {
                                 return multiply(comparisonDict.frac, variableNode);
                             }
                         });
-                        // console.log(
-                        //   "nodeGaskets",
-                        //   nodeGaskets.map((node) => node.toTex()),
-                        // );
                         const nodeUEnds = [...Array(wrappedVariables.length).keys()].map((i) => {
                             if (i === index) {
                                 return variableNode;
@@ -207,10 +169,6 @@ function getComparisonDict(node1, node2) {
                 : undefined,
             frac: (() => {
                 const successfulEvalsWithoutZeroV2 = successfulEvals.filter(({ v2 }) => v2 !== 0);
-                // console.log(
-                //   "successfulEvalsWithoutZeroV2",
-                //   successfulEvalsWithoutZeroV2,
-                // );
                 return successfulEvalsWithoutZeroV2
                     .slice(1)
                     .every(({ v1, v2 }) => substract(frac(v1, v2), frac(successfulEvalsWithoutZeroV2[0].v1, successfulEvalsWithoutZeroV2[0].v2)).evaluate() === 0)

package/lib/utils/arrays/arrayIntersection.d.ts

@@ -0,0 +1,2 @@
+export declare function intersect<T>(arrArr: Array<Array<T>>): T[];
+//# sourceMappingURL=arrayIntersection.d.ts.map

package/lib/utils/arrays/arrayIntersection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"arrayIntersection.d.ts","sourceRoot":"","sources":["../../../src/utils/arrays/arrayIntersection.ts"],"names":[],"mappings":"AAAA,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAOnD"}

package/lib/utils/arrays/arrayIntersection.js

@@ -0,0 +1,8 @@
+export function intersect(arrArr) {
+    if (arrArr.length === 0) {
+        return [];
+    }
+    return arrArr
+        .slice(1)
+        .reduce((acc, x) => acc.filter(Set.prototype.has, new Set(x)), arrArr[0]);
+}

package/package.json

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