pimath 0.0.132 → 0.0.134

package/lib/maths/algebra/linearSystem.ts

@@ -1,369 +0,0 @@
-import {Equation, ISolution} from "./equation";
-import {Monom} from "./monom";
-import {Fraction} from "../coefficients/fraction";
-import {Polynom} from "./polynom";
-import {Numeric} from "../numeric.ts";
-
-// TODO: Must check and rework
-export class LinearSystem {
-    // Stores the original equations
-    private _equations: Equation[];
-    // Determine the letters in the linear system, usually ['x', 'y']
-    private _letters: string[];
-    // Resolution steps contains each steps
-    // letter : target letter
-    // steps: {system: current LinearSystem, operations: [*3,/5] or [[*3,*2], [,*5], [*2,]]}
-    private _resolutionSteps: {
-        [key: string]: {
-            equations: Equation[],
-            operations: (string[])[]
-        }[]
-    };
-    // Get the solution of the equation
-    private _solutions: { [letter: string]: ISolution };
-
-    constructor(...equationStrings: (string | Equation)[]) {
-        // TODO: allow construction to accept an array of values (like a matrix) to build the equations
-        this._equations = [];
-        this._letters = 'xyz'.split('');
-
-        if (equationStrings !== undefined && equationStrings.length > 0) {
-            this.parse(...equationStrings);
-        }
-
-        return this;
-    }
-
-    // ------------------------------------------
-    // Getter and setter
-    // ------------------------------------------
-    get equations(): Equation[] {
-        return this._equations;
-    }
-
-    set equations(value) {
-        this._equations = value;
-    }
-
-    get letters(): string {
-        return this._letters.join('')
-    }
-
-    set letters(value: string) {
-        this._letters = value.split('');
-    }
-
-    get isSolvable(): boolean {
-        let V = this.variables;
-
-        // TODO: in some case, it is possible to resolve systems if there isn't the isSame number of vars and equations
-        if (V.length !== this._equations.length) {
-            return false;
-        }
-
-        //TODO: Must check if two equations isn't a linear combination of the others ?
-
-        return true;
-    }
-
-    get variables(): string[] {
-        return this._letters
-    }
-
-    get tex(): string {
-        // Build the array of values.
-        // Reorder
-        // This clone the system :!!!
-        //TODO: Avoid cloning this linear system
-        let LS = this.clone().reorder(),
-            letters = LS.variables
-
-        return this.buildTex(LS.equations)
-    }
-
-    get solution(): string {
-        let tex: string[] = [];
-
-        if (this._solutions === undefined) {
-            this.solve();
-        }
-
-        for (let letter in this._solutions) {
-            if (this._solutions[letter].display === "RR") {
-                return `\\left\\{ \\left(${this._letters.join(';')}\\right) \\big\\vert ${this.equations[0].tex} \\right\\}`;
-            }
-            if (this._solutions[letter].display === "O/") {
-                return `\\varnothing`
-            }
-
-            tex.push(this._solutions[letter].tex);
-        }
-        return `\\left(${tex.join(';')}\\right)`;
-    }
-
-    get solutionAsDisplay(): string {
-        let display: string[] = [];
-
-        if (this._solutions === undefined) {
-            this.solve();
-        }
-
-        for (let letter in this._solutions) {
-            if (this._solutions[letter].display === "RR") {
-                return `{(${this._letters.join(';')}) | ${this.equations[0].display} }`;
-            }
-            if (this._solutions[letter].display === "O/") {
-                return "O/"
-            }
-
-            display.push(this._solutions[letter].display);
-        }
-        return `(${display.join(';')})`;
-    }
-
-    get resolutionSteps(): { [p: string]: { equations: Equation[]; operations: string[][] }[] } {
-        return this._resolutionSteps;
-    }
-
-    buildTex = (equations: Equation[], operators?: (string[])[]): string => {
-        let equStr: string[],
-            equArray: string[] = [],
-            m: Monom,
-            letters: string[] = []
-
-        // Get the letters from the linear system
-        for (let equ of equations) {
-            letters = letters.concat(equ.letters())
-        }
-        letters = [...new Set(letters)]
-        letters.sort()
-
-        for (let i = 0; i < equations.length; i++) {
-            let equ = equations[i]
-
-            equStr = [];
-            for (let L of letters) {
-                m = equ.left.monomByLetter(L);
-
-                if (equStr.length === 0) {
-                    equStr.push(m.isZero() ? '' : m.tex);
-                } else {
-                    equStr.push(m.isZero() ? '' : ((m.coefficient.sign() === 1) ? '+' : '') + m.tex);
-                }
-            }
-
-            // Add the equal sign
-            equStr.push('=');
-
-            // Add the right hand part of the equation (should be only a number, because it has been reordered)
-            equStr.push(equ.right.tex);
-
-            // Add the operations if existing
-            if (operators !== undefined && operators[i] !== undefined) {
-                // add extra space at the end of the equation
-                equStr[equStr.length - 1] = equStr[equStr.length - 1] + ' \\phantom{\\quad}'
-                for (let o of operators[i]) {
-                    equStr.push(`\\ \\cdot\\ ${o.startsWith('-') ? "\\left(" + o + "\\right)" : o}`)
-                }
-            }
-
-            // Add to the list.
-            equArray.push(equStr.join('&'));
-        }
-
-        let operatorsColumns = 0
-        if (operators !== undefined && operators.length > 0) {
-            operatorsColumns = operators[0].length
-        }
-        return `\\left\\{\\begin{array}{${"r".repeat(letters.length)}cl ${"|l".repeat(operatorsColumns)}}${equArray.join('\\\\\ ')}\\end{array}\\right.`;
-    }
-
-    stepTex = (letter: string): string => {
-        const steps = this._resolutionSteps[letter]
-
-        if (steps === undefined) {
-            return ''
-        }
-
-        // steps = { equations[], operations: [[],[]]
-        let tex: string[] = []
-        for (let i = 0; i < steps.length; i++) {
-            tex.push(this.buildTex(steps[i].equations, steps[i].operations))
-        }
-
-        return `\\begin{aligned}&${tex.join('\\\\&')}\\end{aligned}`
-
-    }
-
-// ------------------------------------------
-    // Creation / parsing functions
-
-    // ------------------------------------------
-    parse = (...equations: (string | Equation)[]): LinearSystem => {
-        // make the original equations
-        this._equations = equations.map(value => new Equation(value));
-        // get the letters.
-        this._findLetters();
-        return this;
-    };
-
-    clone = (): LinearSystem => {
-        return new LinearSystem().parse(...this._equations.map(equ => equ.clone()));
-    };
-
-    // ------------------------------------------
-    reorder = (): LinearSystem => {
-        for (let E of this._equations) {
-            E.reorder();
-        }
-        return this;
-    };
-
-
-    // -----------------------------------------------
-    // Equations solving algorithms
-
-    solve = (withResolution?: boolean): LinearSystem => {
-        // Solve it by linear
-        this._solutions = {};
-        this._resolutionSteps = {};
-
-        // Reorder all equations.
-        this.reorder();
-
-        if (withResolution === undefined) {
-            withResolution = false
-        }
-
-        for (let letter of this.variables) {
-            this._solutions[letter] = this._solveOneLetter(letter, withResolution)
-        }
-
-        // TODO: LinearSystem - solve: optimization and handle undetermined and undefined systems.
-        return this;
-    };
-
-    mergeEquations = (eq1: Equation, eq2: Equation, factor1: Fraction, factor2: Fraction): Equation => {
-        // Set and clone the equations.
-
-        let eq1multiplied = eq1.clone().multiply(new Fraction(factor1)),
-            eq2multiplied = eq2.clone().multiply(new Fraction(factor2));
-
-        // Add both equations together.
-        eq1multiplied.left.add(eq2multiplied.left);
-        eq1multiplied.right.add(eq2multiplied.right);
-
-        return eq1multiplied;
-    }
-
-    private _findLetters = (): LinearSystem => {
-        // Find all letters used.
-        let variables: Set<string> = new Set();
-
-        for (let equ of this._equations) {
-            variables = new Set([...variables, ...equ.variables]);
-        }
-
-        this._letters = [...variables];
-        this._letters.sort()
-        return this;
-    }
-
-    private _linearReduction(eq1: Equation, eq2: Equation, letter: string): { merged: Equation, factors: Fraction[] } {
-        // Get the monom for the particular letter.
-        let c1 = eq1.left.monomByDegree(1, letter).coefficient.clone(),
-            c2 = eq2.left.monomByDegree(1, letter).coefficient.clone().opposed();
-
-        // Reduce c1 and c2 by the gcd
-        const gcdN = Numeric.gcd(c1.numerator, c2.numerator),
-            gcdD = Numeric.gcd(c1.denominator, c2.denominator)
-        c1.divide(gcdN).multiply(gcdD)
-        c2.divide(gcdN).multiply(gcdD)
-
-        // if one value is -1, use 1 and make the other one opposed
-        if (c2.isNegativeOne()) {
-            c1.opposed()
-            c2.opposed()
-        } else if (c1.isNegativeOne()) {
-            c1.opposed()
-            c2.opposed()
-        }
-
-        return {
-            merged: this.mergeEquations(eq1, eq2, c2, c1),
-            factors: [c2, c1]
-        }
-    }
-
-    /**
-     * Linear reduction of the equations to have only one letter
-     * @param letter    letter to isolate
-     * @private
-     */
-    private _solveOneLetter(letter: string, withResolution: boolean): ISolution {
-        // list of equations.
-        let LE: Equation[] = this.clone().equations,
-            reducedEquations: Equation[] = [],
-            lastIndex
-
-        this._resolutionSteps[letter] = []
-
-        // Reduce the equations.
-        // Do it as long as there is more than one step, but no more than the number of equations.
-        for (let L of this.variables) {
-            // Reset the stack
-            reducedEquations = [];
-
-            // remove the setLetter from all equations using linear combinations
-            if (L === letter) continue;
-
-            if (withResolution) {
-                this._resolutionSteps[letter].push({
-                    equations: LE.map(x => x.clone()),
-                    operations: [...new Array(LE.length)].map(x => [...new Array(LE.length - 1)].map(x => ""))
-                })
-                lastIndex = this._resolutionSteps[letter].length - 1
-            }
-
-            // Linear reduction.
-            for (let i = 0; i < LE.length - 1; i++) {
-                const result = this._linearReduction(LE[i], LE[i + 1], L)
-                reducedEquations.push(result.merged)
-
-                if (withResolution) {
-                    this._resolutionSteps[letter][lastIndex].operations[i][i] = result.factors[0].tex
-                    this._resolutionSteps[letter][lastIndex].operations[i + 1][i] = result.factors[1].tex
-                }
-            }
-
-            LE = [...reducedEquations]
-        }
-
-        // Solve the equations
-        // let E = this._resolutionSteps[this._resolutionSteps.length - 1].equations[0];
-        let E = LE[0];
-        E.solve()
-        const solution = E.solutions[0]
-
-        if (withResolution) {
-            this._resolutionSteps[letter].push({
-                equations: [LE[0]],
-                operations: [[LE[0].left.monoms[0].coefficient.tex]]
-            })
-
-            let P: Polynom
-            if (solution.exact instanceof Fraction || typeof solution.exact === "string") {
-                P = new Polynom(solution.exact)
-            } else {
-                P = new Polynom(solution.value)
-            }
-            this._resolutionSteps[letter].push({
-                equations: [new Equation(new Polynom(letter), P)],
-                operations: []
-            })
-
-        }
-        return E.solutions[0]
-    }
-
-}

package/lib/maths/algebra/logicalset.ts

@@ -1,183 +0,0 @@
-/**
- * Polynom module contains everything necessary to handle polynoms.
- * @module Logicalset
- */
-
-import {Shutingyard, ShutingyardMode} from '../shutingyard.ts';
-
-/**
- * Polynom class can handle polynoms, reorder, resolve, ...
- */
-export class Logicalset {
-    private _rawString: string;
-    private _rpn: { token: string, tokenType: string }[]
-
-    /**
-     *
-     * @param {string} value (optional) Default polynom to parse on class creation
-     */
-    constructor(value: string) {
-        this._rawString = value
-        this.parse(value)
-        return this;
-    }
-
-    get isLogicalset() {
-        return true;
-    };
-
-    get rpn(): { token: string, tokenType: string }[] {
-        return this._rpn
-    }
-
-    get tex(): string {
-        let varStack: { token: string, tokenType: string } [] = []
-
-        for (let token of this._rpn) {
-            if (token.tokenType === 'variable') {
-                varStack.push(token);
-            } else {
-                switch (token.token) {
-                    case '&':
-                        if (varStack.length >= 2) {
-                            let second = varStack.pop(),
-                                first = varStack.pop()
-
-                            if (first.tokenType === 'mix') {
-                                first.token = `( ${first.token} )`
-                            }
-                            if (second.tokenType === 'mix') {
-                                second.token = `( ${second.token} )`
-                            }
-                            varStack.push({token: `${first.token} \\cap ${second.token}`, tokenType: 'mix'})
-                        }
-                        break
-                    case '|':
-                        if (varStack.length >= 2) {
-                            let second = varStack.pop(),
-                                first = varStack.pop()
-
-                            if (first.tokenType === 'mix') {
-                                first.token = `( ${first.token} )`
-                            }
-                            if (second.tokenType === 'mix') {
-                                second.token = `( ${second.token} )`
-                            }
-                            varStack.push({token: `${first.token} \\cup ${second.token}`, tokenType: 'mix'})
-                        }
-                        break
-                    case '-':
-                        if (varStack.length >= 2) {
-                            let second = varStack.pop(),
-                                first = varStack.pop()
-
-                            if (first.tokenType === 'mix') {
-                                first.token = `( ${first.token} )`
-                            }
-                            if (second.tokenType === 'mix') {
-                                second.token = `( ${second.token} )`
-                            }
-                            varStack.push({token: `${first.token} \\setminus ${second.token}`, tokenType: 'mix'})
-                        }
-                        break
-                    case '!':
-                        if (varStack.length >= 1) {
-                            let first = varStack.pop()
-                            varStack.push({token: `\\overline{ ${first.token} }`, tokenType: 'variable'})
-                        }
-                        break
-                }
-            }
-        }
-
-        return varStack[0].token
-    }
-
-    evaluate(tokenSets: { [key: string]: unknown[] }, reference?: unknown[]): unknown[] {
-        let varStack: (Set<unknown>)[] = []
-
-        let referenceSet: Set<unknown>
-        if (reference === undefined) {
-            referenceSet = new Set()
-            for (let key in tokenSets) {
-                referenceSet = new Set([...referenceSet, ...tokenSets[key]])
-            }
-        } else {
-            referenceSet = new Set(reference)
-        }
-
-        for (let token of this._rpn) {
-            if (token.tokenType === 'variable') {
-                // The variable has no token - assume it's empty.
-                if (tokenSets[token.token] === undefined) {
-                    varStack.push(new Set())
-                } else {
-                    varStack.push(new Set(tokenSets[token.token]));
-                }
-
-            } else {
-                switch (token.token) {
-                    case '&':
-                        if (varStack.length >= 2) {
-                            let second = varStack.pop(),
-                                first = varStack.pop()
-
-                            varStack.push(new Set([...first].filter(x => second.has(x))))
-                        }
-                        break
-                    case '|':
-                        if (varStack.length >= 2) {
-                            let second = varStack.pop(),
-                                first = varStack.pop()
-                            varStack.push(new Set([...first, ...second]))
-                        }
-                        break
-                    case '-':
-                        if (varStack.length >= 2) {
-                            let second = varStack.pop(),
-                                first = varStack.pop()
-                            varStack.push(new Set([...first].filter(x => !second.has(x))))
-                        }
-                        break
-                    case '!':
-                        if (varStack.length >= 1) {
-                            let first = varStack.pop()
-
-                            varStack.push(new Set([...referenceSet].filter(x => !first.has(x))))
-                        }
-                        break
-                }
-            }
-        }
-
-        return [...varStack[0]].sort();
-    }
-
-    vennAB(): any[] {
-        return this.evaluate({
-                A: ['A', 'AB'],
-                B: ['B', 'AB']
-            },
-            ['A', 'B', 'AB', 'E']
-        )
-    }
-
-    vennABC(): any[] {
-        return this.evaluate({
-                A: ['A', 'AB', 'AC', 'ABC'],
-                B: ['B', 'AB', 'BC', 'ABC'],
-                C: ['C', 'AC', 'BC', 'ABC']
-            },
-            ['A', 'B', 'C', 'AB', 'AC', 'BC', 'E']
-        )
-    }
-
-    private parse = (value: string): Logicalset => {
-        // TODO: Must format the value string to convert some items...
-
-        // Parse the updated value to the shutingyard algorithm
-        this._rpn = new Shutingyard(ShutingyardMode.SET).parse(value).rpn;
-
-        return this;
-    }
-}