math-exercises 3.0.216 → 3.0.218

package/lib/math/graphs/graph.js

@@ -265,44 +265,100 @@ export class Graph {
         return visited.every((v) => v);
         //AI CODE (Edge) }
     }
-    getWeaklyConnectedSubgraphChainsAsArrIndex() {
+    getWeaklyConnectedSubgraphCoveringChainsAsArrIndex() {
         const adjMatrix = (this.isDirected ? this.undirectedGraph() : this)
             .adjacencyMatrix()
             .elements.map((row) => row.map((elt) => elt.evaluate()));
-        //AI CODE (Edge) {
-        // Validate input
-        if (!Array.isArray(adjMatrix) || adjMatrix.length === 0) {
-            throw new Error("Adjacency matrix must be a non-empty 2D array.");
-        }
         const n = adjMatrix.length;
-        if (!adjMatrix.every((row) => Array.isArray(row) && row.length === n)) {
-            throw new Error("Adjacency matrix must be square.");
-        }
-        const visited = new Array(n).fill(false);
-        const subgraphs = [];
-        // DFS to collect connected nodes
-        function dfs(node, component) {
-            visited[node] = true;
-            component.push(node);
-            for (let neighbor = 0; neighbor < n; neighbor++) {
-                if (adjMatrix[node][neighbor] !== 0 && !visited[neighbor]) {
-                    dfs(neighbor, component);
+        const linked = (i, j) => i !== j &&
+            ((adjMatrix[i]?.[j] ?? 0) !== 0 || (adjMatrix[j]?.[i] ?? 0) !== 0);
+        // Voisinage non orienté
+        const neighbors = Array.from({ length: n }, (_, i) => {
+            const list = [];
+            for (let j = 0; j < n; j++)
+                if (linked(i, j))
+                    list.push(j);
+            return list;
+        });
+        // 1. Composantes connexes
+        const seen = new Array(n).fill(false);
+        const components = [];
+        for (let start = 0; start < n; start++) {
+            if (seen[start])
+                continue;
+            const component = [];
+            const stack = [start];
+            seen[start] = true;
+            while (stack.length > 0) {
+                const node = stack.pop();
+                component.push(node);
+                for (const nb of neighbors[node]) {
+                    if (!seen[nb]) {
+                        seen[nb] = true;
+                        stack.push(nb);
+                    }
                 }
             }
+            components.push(component.sort((a, b) => a - b));
         }
-        // Find connected components
-        for (let i = 0; i < n; i++) {
-            if (!visited[i]) {
-                const component = [];
-                dfs(i, component);
-                if (component.length > 1) {
-                    // Only keep subgraphs with ≥ 2 nodes
-                    subgraphs.push(component);
+        // 2. Chaîne couvrant une composante
+        const coveringChain = (component) => {
+            if (component.length === 1)
+                return [...component];
+            // Arbre couvrant en profondeur (donne des branches longues)
+            const tree = new Map(component.map((v) => [v, []]));
+            const inTree = new Set([component[0]]);
+            const grow = (u) => {
+                for (const v of neighbors[u]) {
+                    if (!inTree.has(v)) {
+                        inTree.add(v);
+                        tree.get(u).push(v);
+                        tree.get(v).push(u);
+                        grow(v);
+                    }
                 }
-            }
-        }
-        return subgraphs;
-        //AI CODE (Edge) }
+            };
+            grow(component[0]);
+            // Sommet le plus éloigné (BFS dans l'arbre) + parents pour remonter la branche
+            const farthest = (src) => {
+                const parent = new Map([[src, -1]]);
+                const queue = [src];
+                for (let i = 0; i < queue.length; i++) {
+                    for (const v of tree.get(queue[i])) {
+                        if (!parent.has(v)) {
+                            parent.set(v, queue[i]);
+                            queue.push(v);
+                        }
+                    }
+                }
+                return { last: queue[queue.length - 1], parent };
+            };
+            // Diamètre de l'arbre : de a à b
+            const a = farthest(component[0]).last;
+            const { last: b, parent } = farthest(a);
+            const onDiameter = new Set();
+            for (let v = b; v !== -1; v = parent.get(v))
+                onDiameter.add(v);
+            // Parcours depuis a : les sous-arbres annexes d'abord (avec retour),
+            // la branche du diamètre en dernier (sans retour)
+            const chain = [];
+            const visit = (u, from) => {
+                chain.push(u);
+                const children = tree
+                    .get(u)
+                    .filter((v) => v !== from)
+                    .sort((x, y) => Number(onDiameter.has(x)) - Number(onDiameter.has(y)));
+                for (const child of children) {
+                    visit(child, u);
+                    if (!onDiameter.has(child))
+                        chain.push(u); // retour arrière
+                }
+            };
+            visit(a, -1);
+            // Normalisation : commencer par la plus petite extrémité
+            return chain[0] > chain[chain.length - 1] ? chain.reverse() : chain;
+        };
+        return components.map(coveringChain);
     }
     getSomePathsWithNbEdges(nbEdges, nbToFindIfPossible) {
         const n = nbEdges;

package/lib/math/utils/graphs/graphRenderer.d.ts

@@ -1,6 +1,4 @@
 import { Graph } from "../../graphs/graph.js";
-import * as TSGraphViz from "ts-graphviz";
-import { Engine } from "@hpcc-js/wasm-graphviz";
 export interface GraphNode {
     label: string;
     x: number;
@@ -10,14 +8,14 @@ export interface GraphEdge {
     from: string;
     to: string;
 }
+export type RandomLayoutOptions = {
+    width?: number;
+    height?: number;
+    minDistance?: number;
+    maxAttempts?: number;
+};
 export declare class GraphRenderer {
-    static convertToGraphVizGraph(graph: Graph): TSGraphViz.Digraph;
-    static renderToSVG(graph: Graph, layoutEngineIn?: Engine): string;
-    static convertSVGToNodesAndEdges(strSVG: string): {
-        nodes: GraphNode[];
-        edges: GraphEdge[];
-    };
-    static renderToNodesAndEdges(graph: Graph, layoutEngineIn?: Engine): {
+    static renderToNodesAndEdges(graph: Graph, { width, height, minDistance, maxAttempts, }?: RandomLayoutOptions): {
         nodes: GraphNode[];
         edges: GraphEdge[];
     };

package/lib/math/utils/graphs/graphRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphRenderer.d.ts","sourceRoot":"","sources":["../../../../src/math/utils/graphs/graphRenderer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAE9C,OAAO,KAAK,UAAU,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAY,MAAM,wBAAwB,CAAC;AAM1D,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,qBAAa,aAAa;IACxB,MAAM,CAAC,sBAAsB,CAAC,KAAK,EAAE,KAAK,GAAG,UAAU,CAAC,OAAO;IAkE/D,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,cAAc,CAAC,EAAE,MAAM;IA0BxD,MAAM,CAAC,yBAAyB,CAAC,MAAM,EAAE,MAAM,GAAG;QAChD,KAAK,EAAE,SAAS,EAAE,CAAC;QACnB,KAAK,EAAE,SAAS,EAAE,CAAC;KACpB;IAwDD,MAAM,CAAC,qBAAqB,CAAC,KAAK,EAAE,KAAK,EAAE,cAAc,CAAC,EAAE,MAAM;eA1DzD,SAAS,EAAE;eACX,SAAS,EAAE;;CA6DrB"}
+{"version":3,"file":"graphRenderer.d.ts","sourceRoot":"","sources":["../../../../src/math/utils/graphs/graphRenderer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAE9C,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,qBAAa,aAAa;IACxB,MAAM,CAAC,qBAAqB,CAC1B,KAAK,EAAE,KAAK,EACZ,EACE,KAAU,EACV,MAAW,EACX,WAAiB,EACjB,WAAiB,GAClB,GAAE,mBAAwB,GAC1B;QAAE,KAAK,EAAE,SAAS,EAAE,CAAC;QAAC,KAAK,EAAE,SAAS,EAAE,CAAA;KAAE;CAoC9C"}

package/lib/math/utils/graphs/graphRenderer.js

@@ -1,123 +1,31 @@
-import * as TSGraphViz from "ts-graphviz";
-import { Graphviz } from "@hpcc-js/wasm-graphviz";
-const graphviz = await Graphviz.load();
-import { JSDOM } from "jsdom";
-import { random } from "../../../utils/alea/random.js";
 export class GraphRenderer {
-    static convertToGraphVizGraph(graph) {
-        const digraph = new TSGraphViz.Digraph();
-        // Create nodes
-        const dictGraphvizNode = Object.fromEntries(graph.vertexNames.map((nameVertex) => {
-            const graphvizNode = new TSGraphViz.Node(nameVertex, {});
-            return [nameVertex, graphvizNode];
-        }));
-        // Create edges between the nodes
-        const arrConnectionNoDuplicate = (() => {
-            const arrConnection = Object.entries(graph.dictConnections()).flatMap(([nameVertexStart, dictConnections]) => {
-                return Object.entries(dictConnections)
-                    .filter(([_, isConnection]) => isConnection)
-                    .map(([nameVertexEnd, _]) => [nameVertexStart, nameVertexEnd]);
-            });
-            if (graph.isDirected) {
-                return arrConnection;
+    static renderToNodesAndEdges(graph, { width = 10, height = 10, minDistance = 1.5, maxAttempts = 100, } = {}) {
+        // 1. Placement aléatoire des sommets, en évitant les chevauchements
+        const nodes = [];
+        for (const label of graph.vertexNames) {
+            let best = { x: 0, y: 0 };
+            let bestDist = -Infinity;
+            for (let attempt = 0; attempt < maxAttempts; attempt++) {
+                const x = Math.random() * width;
+                const y = Math.random() * height;
+                const dist = nodes.reduce((min, node) => Math.min(min, Math.hypot(node.x - x, node.y - y)), Infinity);
+                // on garde le candidat le plus éloigné des autres (repli si la zone est trop petite)
+                if (dist > bestDist) {
+                    best = { x, y };
+                    bestDist = dist;
+                }
+                if (dist >= minDistance)
+                    break;
             }
-            else {
-                return arrConnection
-                    .map(([nameVertexStart, nameVertexEnd]) => [nameVertexStart, nameVertexEnd].join("-"))
-                    .reduce((acc, strEdge) => {
-                    const strEdgeReversed = strEdge.split("").toReversed().join("");
-                    if (acc.includes(strEdgeReversed)) {
-                        //ignore
-                    }
-                    else {
-                        acc = [...acc, strEdge];
-                    }
-                    return acc;
-                }, [])
-                    .map((strEdge) => {
-                    const [nameVertexStart, nameVertexEnd] = strEdge.split("-");
-                    return [nameVertexStart, nameVertexEnd];
-                });
-            }
-        })();
-        const arrEdge = arrConnectionNoDuplicate.map(([nameVertexStart, nameVertexEnd]) => {
-            const [graphvizNodeStart, graphvizNodeEnd] = [
-                nameVertexStart,
-                nameVertexEnd,
-            ].map((nameVertex) => dictGraphvizNode[nameVertex]);
-            const graphvizEdge = new TSGraphViz.Edge([graphvizNodeStart, graphvizNodeEnd], {});
-            return graphvizEdge;
-        });
-        // Add elements to the graph
-        Object.entries(dictGraphvizNode).forEach(([_, graphvizNode]) => digraph.addNode(graphvizNode));
-        arrEdge.forEach((graphvizEdge) => digraph.addEdge(graphvizEdge));
-        return digraph;
-    }
-    static renderToSVG(graph, layoutEngineIn) {
-        const digraph = GraphRenderer.convertToGraphVizGraph(graph);
-        const dot = TSGraphViz.toDot(digraph);
-        // Render DOT to SVG
-        /*
-        const arrLayoutEngine = [
-          "circo",
-          "dot",
-          "fdp",
-          "neato",
-          "nop",
-          "nop2",
-          // "osage",
-          // "patchwork",
-          "sfdp",
-          "twopi",
-        ];
-        */
-        const layoutEngine = layoutEngineIn ?? random(["fdp", "circo"]);
-        const svg = graphviz.layout(dot, "svg", layoutEngine);
-        return svg;
-    }
-    static convertSVGToNodesAndEdges(strSVG) {
-        function parseSvgGraph(svgString) {
-            const domParser = new new JSDOM().window.DOMParser();
-            const doc = domParser.parseFromString(svgString, "image/svg+xml");
-            const svgEl = doc.querySelector("svg");
-            const height = parseFloat(svgEl?.getAttribute("height") ?? "0");
-            // Translation du groupe racine (pattern classique Graphviz)
-            const graphGroup = doc.querySelector("g.graph") ?? doc.querySelector("svg > g");
-            const transform = graphGroup?.getAttribute("transform") ?? "";
-            const match = transform.match(/translate\(([-\d.]+)[ ,]([-\d.]+)\)/);
-            const [tx, ty] = match
-                ? [parseFloat(match[1]), parseFloat(match[2])]
-                : [0, 0];
-            // Sommets
-            const nodes = Array.from(doc.querySelectorAll("g.node")).map((g) => {
-                const ellipse = g.querySelector("ellipse");
-                const text = g.querySelector("text");
-                const label = text?.textContent?.trim() ??
-                    g.querySelector("title")?.textContent?.trim() ??
-                    "";
-                const cx = parseFloat(ellipse?.getAttribute("cx") ?? "0");
-                const cy = parseFloat(ellipse?.getAttribute("cy") ?? "0");
-                return {
-                    label,
-                    x: cx + tx,
-                    y: height - (cy + ty), // flip vertical SVG -> GeoGebra
-                };
-            });
-            // Arêtes : lues directement depuis le <title> de chaque g.edge (ex: "A->B")
-            const edges = Array.from(doc.querySelectorAll("g.edge"))
-                .map((g) => g.querySelector("title")?.textContent?.trim() ?? "")
-                .map((title) => {
-                const [from, to] = title.split(/-&gt;|->/).map((s) => s.trim());
-                return { from, to };
-            })
-                .filter((e) => Boolean(e.from && e.to));
-            return { nodes, edges };
+            nodes.push({ label, ...best });
         }
-        const { nodes, edges } = parseSvgGraph(strSVG);
+        // 2. Arêtes (une seule fois par paire si le graphe n'est pas orienté)
+        const indexOf = new Map(graph.vertexNames.map((name, i) => [name, i]));
+        const edges = graph
+            .arrConnection()
+            .filter(([from, to, isConnection]) => isConnection &&
+            (graph.isDirected || indexOf.get(from) <= indexOf.get(to)))
+            .map(([from, to]) => ({ from, to }));
         return { nodes, edges };
     }
-    static renderToNodesAndEdges(graph, layoutEngineIn) {
-        const strSVG = this.renderToSVG(graph, layoutEngineIn);
-        return this.convertSVGToNodesAndEdges(strSVG);
-    }
 }

package/lib/tree/nodes/algebraicNode.d.ts

@@ -21,6 +21,7 @@ export type SimplifyOptions = {
     forbidPowerMultiply?: boolean;
     forbidPowerDivision?: boolean;
     forbidPowerPower?: boolean;
+    forbidLogSimplify?: boolean;
 };
 export type EvaluateOptions = {
     degreeMode?: boolean;
@@ -41,4 +42,5 @@ export declare abstract class CAlgebraicNode {
     private static toString;
 }
 export declare const isAlgebraicNode: (node: Node) => node is AlgebraicNode;
+export declare const isFactorizedNode: (node: Node) => node is AlgebraicNode;
 //# sourceMappingURL=algebraicNode.d.ts.map

package/lib/tree/nodes/algebraicNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"algebraicNode.d.ts","sourceRoot":"","sources":["../../../src/tree/nodes/algebraicNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAE9C,MAAM,MAAM,eAAe,GAAG;IAC5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,kCAAkC,CAAC,EAAE,OAAO,CAAC;IAC7C,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAG5B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AACF,MAAM,WAAW,aAAc,SAAQ,IAAI;IACzC,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,eAAe,KAAK,MAAM,CAAC;IAC5E,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,KAAK,aAAa,CAAC;IAC7E,iBAAiB,EAAE,CAAC,IAAI,CAAC,EAAE,WAAW,KAAK,aAAa,EAAE,CAAC;IAC3D,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAE,eAAe,EAAE,GAAG,CAAC,EAAE,OAAO,KAAK,aAAa,CAAC;IACnE,MAAM,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,OAAO,CAAC;IACzC,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,aAAa,CAAC;IAChD,mBAAmB,EAAE,CAAC,IAAI,CAAC,EAAE,eAAe,KAAK,MAAM,CAAC;IACxD,mBAAmB,EAAE,MAAM,MAAM,CAAC;CACnC;AACD,8BAAsB,cAAc;;IAElC,OAAO,CAAC,MAAM,CAAC,QAAQ;CAGxB;AACD,eAAO,MAAM,eAAe,GAAI,MAAM,IAAI,KAAG,IAAI,IAAI,aACI,CAAC"}
+{"version":3,"file":"algebraicNode.d.ts","sourceRoot":"","sources":["../../../src/tree/nodes/algebraicNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAI9C,MAAM,MAAM,eAAe,GAAG;IAC5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,kCAAkC,CAAC,EAAE,OAAO,CAAC;IAC7C,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAG7B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AACF,MAAM,WAAW,aAAc,SAAQ,IAAI;IACzC,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,eAAe,KAAK,MAAM,CAAC;IAC5E,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,KAAK,aAAa,CAAC;IAC7E,iBAAiB,EAAE,CAAC,IAAI,CAAC,EAAE,WAAW,KAAK,aAAa,EAAE,CAAC;IAC3D,QAAQ,EAAE,CAAC,IAAI,CAAC,EAAE,eAAe,EAAE,GAAG,CAAC,EAAE,OAAO,KAAK,aAAa,CAAC;IACnE,MAAM,EAAE,CAAC,IAAI,EAAE,aAAa,KAAK,OAAO,CAAC;IACzC,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,aAAa,CAAC;IAChD,mBAAmB,EAAE,CAAC,IAAI,CAAC,EAAE,eAAe,KAAK,MAAM,CAAC;IACxD,mBAAmB,EAAE,MAAM,MAAM,CAAC;CACnC;AACD,8BAAsB,cAAc;;IAElC,OAAO,CAAC,MAAM,CAAC,QAAQ;CAGxB;AACD,eAAO,MAAM,eAAe,GAAI,MAAM,IAAI,KAAG,IAAI,IAAI,aACI,CAAC;AAE1D,eAAO,MAAM,gBAAgB,GAAI,MAAM,IAAI,KAAG,IAAI,IAAI,aASrD,CAAC"}

package/lib/tree/nodes/algebraicNode.js

@@ -1,3 +1,6 @@
+import { isOppositeNode } from "./functions/oppositeNode.js";
+import { isMultiplyNode } from "./operators/multiplyNode.js";
+import { isPowerNode, isSquareNode } from "./operators/powerNode.js";
 export class CAlgebraicNode {
     constructor() { }
     static toString() {
@@ -5,3 +8,11 @@ export class CAlgebraicNode {
     }
 }
 export const isAlgebraicNode = (node) => Object.prototype.hasOwnProperty.call(node, "isNumeric");
+export const isFactorizedNode = (node) => {
+    return (isMultiplyNode(node) ||
+        isPowerNode(node) ||
+        isSquareNode(node) ||
+        (isOppositeNode(node) && isMultiplyNode(node.child)) ||
+        (isOppositeNode(node) && isPowerNode(node.child)) ||
+        (isOppositeNode(node) && isSquareNode(node.child)));
+};

package/lib/tree/nodes/functions/log10Node.d.ts

@@ -1,6 +1,6 @@
 import { Node, NodeIds, NodeOptions, NodeType } from "../node.js";
 import { FunctionNode, FunctionsIds } from "./functionNode.js";
-import { AlgebraicNode } from "../algebraicNode.js";
+import { AlgebraicNode, SimplifyOptions } from "../algebraicNode.js";
 export declare function isLog10Node(a: Node): a is Log10Node;
 export declare const log10: (a: AlgebraicNode | number | string) => Log10Node;
 export declare class Log10Node implements FunctionNode {
@@ -22,7 +22,7 @@ export declare class Log10Node implements FunctionNode {
     toEquivalentNodes(): AlgebraicNode[];
     toSignInequationTex(): string;
     toAllValidTexs(): string[];
-    simplify(): AlgebraicNode;
+    simplify(opts?: SimplifyOptions): AlgebraicNode;
     evaluate(vars?: Record<string, number>): number;
     equals(node: AlgebraicNode): boolean;
     toDetailedEvaluation(vars: Record<string, AlgebraicNode>): Log10Node;

package/lib/tree/nodes/functions/log10Node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log10Node.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/functions/log10Node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAkB,MAAM,mBAAmB,CAAC;AAE/E,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAMpD,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,SAAS,CAEnD;AAED,eAAO,MAAM,KAAK,GAAI,GAAG,aAAa,GAAG,MAAM,GAAG,MAAM,cAIvD,CAAC;AACF,qBAAa,SAAU,YAAW,YAAY;IAC5C,EAAE,EAAE,YAAY,CAAC;IACjB,KAAK,EAAE,aAAa,CAAC;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;gBACP,KAAK,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,WAAW;IAOpD,aAAa;;;;;;IAMb,YAAY,IAAI,MAAM;IAGtB,mBAAmB;IAQnB,KAAK,IAAI,MAAM;IAaf,iBAAiB,IAAI,aAAa,EAAE;IAQpC,mBAAmB;IAOnB,cAAc,IAAI,MAAM,EAAE;IAG1B,QAAQ,IAAI,aAAa;IAiCzB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAGtC,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;IAGpC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAGxD,UAAU,IAAI,aAAa;CAG5B"}
+{"version":3,"file":"log10Node.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/functions/log10Node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAkB,MAAM,mBAAmB,CAAC;AAE/E,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAMrE,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,SAAS,CAEnD;AAED,eAAO,MAAM,KAAK,GAAI,GAAG,aAAa,GAAG,MAAM,GAAG,MAAM,cAIvD,CAAC;AACF,qBAAa,SAAU,YAAW,YAAY;IAC5C,EAAE,EAAE,YAAY,CAAC;IACjB,KAAK,EAAE,aAAa,CAAC;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;gBACP,KAAK,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,WAAW;IAOpD,aAAa;;;;;;IAMb,YAAY,IAAI,MAAM;IAGtB,mBAAmB;IAQnB,KAAK,IAAI,MAAM;IAaf,iBAAiB,IAAI,aAAa,EAAE;IAQpC,mBAAmB;IAOnB,cAAc,IAAI,MAAM,EAAE;IAG1B,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IAkC/C,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAGtC,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;IAGpC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAGxD,UAAU,IAAI,aAAa;CAG5B"}

package/lib/tree/nodes/functions/log10Node.js

@@ -78,9 +78,11 @@ export class Log10Node {
     toAllValidTexs() {
         return this.toEquivalentNodes().map((node) => node.toTex());
     }
-    simplify() {
+    simplify(opts) {
         const simplifiedChild = this.child.simplify();
         const copy = new Log10Node(simplifiedChild, this.opts);
+        if (opts?.forbidLogSimplify)
+            return copy;
         if (isNumberNode(simplifiedChild)) {
             const value = simplifiedChild.value;
             const log10 = Math.log10(value);

package/lib/tree/nodes/functions/logNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/functions/logNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAkB,MAAM,mBAAmB,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAQrE,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,OAAO,CAE/C;AAED,eAAO,MAAM,IAAI,GAAI,GAAG,aAAa,GAAG,MAAM,GAAG,MAAM,YAItD,CAAC;AAEF,qBAAa,OAAQ,YAAW,YAAY;IAC1C,EAAE,EAAE,YAAY,CAAC;IACjB,KAAK,EAAE,aAAa,CAAC;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;gBACP,KAAK,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,WAAW;IAOpD,aAAa;;;;;;IAMb,YAAY,IAAI,MAAM;IAGtB,mBAAmB;IAQnB,KAAK,IAAI,MAAM;IAaf,iBAAiB,IAAI,aAAa,EAAE;IAQpC,mBAAmB;IAOnB,cAAc,IAAI,MAAM,EAAE;IAG1B,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IAoC/C,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAGtC,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;IAGpC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAGxD,UAAU,IAAI,aAAa;CAG5B"}
+{"version":3,"file":"logNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/functions/logNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAkB,MAAM,mBAAmB,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAQrE,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,OAAO,CAE/C;AAED,eAAO,MAAM,IAAI,GAAI,GAAG,aAAa,GAAG,MAAM,GAAG,MAAM,YAItD,CAAC;AAEF,qBAAa,OAAQ,YAAW,YAAY;IAC1C,EAAE,EAAE,YAAY,CAAC;IACjB,KAAK,EAAE,aAAa,CAAC;IACrB,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;gBACP,KAAK,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,WAAW;IAOpD,aAAa;;;;;;IAMb,YAAY,IAAI,MAAM;IAGtB,mBAAmB;IAQnB,KAAK,IAAI,MAAM;IAaf,iBAAiB,IAAI,aAAa,EAAE;IAQpC,mBAAmB;IAOnB,cAAc,IAAI,MAAM,EAAE;IAG1B,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IAqC/C,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAGtC,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;IAGpC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAGxD,UAAU,IAAI,aAAa;CAG5B"}

package/lib/tree/nodes/functions/logNode.js

@@ -81,6 +81,8 @@ export class LogNode {
     simplify(opts) {
         const simplifiedChild = this.child.simplify(opts);
         const copy = new LogNode(simplifiedChild, this.opts);
+        if (opts?.forbidLogSimplify)
+            return copy; //on autorise la simplification du child mais pas les formules de simpliifications du log en elles memes
         if (isNumberNode(simplifiedChild)) {
             const value = simplifiedChild.value;
             if (value <= 0)

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

@@ -313,7 +313,7 @@ const addSort = (a, b, opts) => {
                 parsedA.variable.localeCompare(parsedB.variable));
         }
     }
-    return 0;
+    return Number(isNumberNode(b)) - Number(isNumberNode(a));
 };
 const addSimplifyFrac = (a, b, opts) => {
     if (isFractionNode(a) &&

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

@@ -102,7 +102,7 @@ export class FractionNode {
         const simp = this.simplify();
         if (isNumberNode(simp))
             return true;
-        let denum = simp.leftChild.evaluate();
+        let denum = simp.rightChild.evaluate();
         let counter = 0;
         while (denum % 2 === 0) {
             counter++;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "math-exercises",
   "type": "module",
-  "version": "3.0.216",
+  "version": "3.0.218",
   "description": "Math exercises generator for middle school and high school",
   "main": "lib/index.js",
   "files": [
@@ -28,22 +28,16 @@
   "author": "Heureux Hasard",
   "license": "ISC",
   "dependencies": {
-    "@flatten-js/core": "^1.6.14",
-    "@hpcc-js/wasm-graphviz": "^1.29.1",
     "d3-node": "^4.0.1",
-    "jsdom": "^29.1.1",
     "katex": "^0.16.21",
     "lodash.isequal": "^4.5.0",
-    "ts-graphviz": "^3.0.7",
     "uuidv4": "^6.2.13"
   },
   "devDependencies": {
     "@eslint/js": "^9.34.0",
     "@types/cors": "^2.8.13",
-    "@types/deasync": "^0.1.5",
     "@types/express": "^4.17.17",
     "@types/jest": "^29.5.6",
-    "@types/jsdom": "^30.0.0",
     "@types/lodash.isequal": "^4.5.8",
     "@types/node": "^20.10.6",
     "body-parser": "^1.20.2",