pimath 0.0.120 → 0.0.122

package/src/maths/expressions/polynomexp.ts

@@ -1,310 +0,0 @@
-import {Polynom, PolynomParsingType} from "../algebra/polynom";
-import {Fraction, FractionParsingType} from "../coefficients/fraction";
-
-type PolynomExpMathFunctionType = { name: string; fn: Function, tex: string }
-
-export class PolynomExpFactor {
-    constructor(polynom: PolynomParsingType, degree?: FractionParsingType, mathFunction?: PolynomExpMathFunctionType) {
-        this._polynom = new Polynom(polynom)
-        this._degree = new Fraction(degree === undefined ? 1 : degree)
-        this._fn = mathFunction
-        this._powerAsInteger = true
-        this._forceParenthesis = true
-
-    }
-
-    private _forceParenthesis: boolean
-
-    get forceParenthesis(): boolean {
-        return this._forceParenthesis;
-    }
-
-    set forceParenthesis(value: boolean) {
-        this._forceParenthesis = value;
-    }
-
-    private _fn: PolynomExpMathFunctionType
-
-    get fn(): PolynomExpMathFunctionType {
-        return this._fn;
-    }
-
-    set fn(value: PolynomExpMathFunctionType) {
-        this._fn = value;
-    }
-
-    private _powerAsInteger: boolean
-
-    get powerAsInteger(): boolean {
-        return this._powerAsInteger;
-    }
-
-    set powerAsInteger(value: boolean) {
-        this._powerAsInteger = value;
-    }
-
-    private _polynom: Polynom
-
-    get polynom(): Polynom {
-        return this._polynom;
-    }
-
-    set polynom(value: Polynom) {
-        this._polynom = value;
-    }
-
-    private _degree: Fraction
-
-    get degree(): Fraction {
-        return this._degree;
-    }
-
-    set degree(value: Fraction) {
-        this._degree = value;
-    }
-
-    get tex(): string {
-        let tex
-
-        if (this._degree.isOne() && (this._fn !== undefined || !this._forceParenthesis)) {
-            // If degree is one, no need to add the parenthesis.
-            tex = this._polynom.tex
-        } else {
-            // the degree is not one, add the parenthesis.
-            if (this._powerAsInteger && !this._degree.isRelative()) {
-                // the degree is a fraction and we want natural powers => use sqrt.
-                tex = `\\sqrt${this._degree.denominator !== 2 ? `[ ${this._degree.denominator} ]` : ''}{ ${this._polynom.tex} }^{ ${this._degree.numerator} }`
-            } else if (this.isCoefficient && this.firstCoefficient.isNatural()) {
-                // the value is a natural number (eg 3, 7, ...)
-                tex = this._polynom.tex + this._texDegree
-            } else {
-                // In any other case, add the parenthesis by default
-                tex = `\\left( ${this._polynom.tex} \\right)${this._texDegree}`
-            }
-        }
-
-        if (this._fn !== undefined && this._fn.tex !== undefined) {
-            tex = `${this._fn.tex}\\left( ${tex} \\right)`
-        }
-        return tex
-    }
-
-    get isCoefficient(): boolean {
-        // TODO: Maybe reduce the coefficient if it isn't of degree one.
-        return this._polynom.degree().isZero();
-
-    }
-
-    get firstCoefficient(): Fraction {
-        return this._polynom.monomByDegree().coefficient
-    }
-
-    private get _texDegree(): string {
-        if (this._degree.isOne()) {
-            return ''
-        } else {
-            return `^{ ${this._degree.tfrac} }`
-        }
-    }
-
-    setForceParenthesis(value?: boolean): PolynomExpFactor {
-        this._forceParenthesis = value === undefined || value
-        return this
-    }
-
-    derivative(letter?: string): PolynomExpProduct {
-        if (this._degree.isOne()) {
-            return new PolynomExpProduct(
-                new PolynomExpFactor(this._polynom.clone().derivative(letter))
-            )
-        } else {
-            return new PolynomExpProduct(
-                new PolynomExpFactor(this._degree.clone()),
-                new PolynomExpFactor(this._polynom.clone().derivative(letter)),
-                new PolynomExpFactor(this._polynom.clone(), this._degree.clone().subtract(1))
-            )
-        }
-    }
-}
-
-export class PolynomExpProduct {
-    constructor(...values: PolynomExpFactor[]) {
-        this._factors = values || []
-        this._positive = true
-        this._asPositiveDegree = true
-    }
-
-    private _fn: PolynomExpMathFunctionType
-
-    get fn(): PolynomExpMathFunctionType {
-        return this._fn;
-    }
-
-    set fn(value: PolynomExpMathFunctionType) {
-        this._fn = value;
-    }
-
-    private _factors: PolynomExpFactor[]
-
-    get factors(): PolynomExpFactor[] {
-        return this._factors;
-    }
-
-    set factors(value: PolynomExpFactor[]) {
-        this._factors = value;
-    }
-
-    private _positive: boolean
-
-    get positive(): boolean {
-        return this._positive;
-    }
-
-    set positive(value: boolean) {
-        this._positive = value;
-    }
-
-    private _asPositiveDegree: boolean
-
-    get asPositiveDegree(): boolean {
-        return this._asPositiveDegree;
-    }
-
-    set asPositiveDegree(value: boolean) {
-        this._asPositiveDegree = value;
-    }
-
-    get tex(): string {
-        let parenthesis = this._factors.length>1
-        // Default value
-        let tex = this._factors.map(factor => factor.setForceParenthesis(parenthesis).tex).join(' \\cdot ')
-
-        // Change the value in some cases...
-        if (this._asPositiveDegree) {
-            const numerators = this._factors.filter(x => x.degree.isPositive()),
-                denominators = this._factors.filter(x => x.degree.isNegative())
-
-            let numeratorsAsTex, denominatorsAsTex
-
-            if (denominators.length > 0) {
-                if (numerators.length === 0) {
-                    numeratorsAsTex = [1]
-                } else if (numerators.length === 1) {
-                    numeratorsAsTex = [numerators[0].setForceParenthesis(false).tex]
-                } else {
-                    parenthesis = numerators.length>1
-                    numeratorsAsTex = numerators.map(factor => factor.setForceParenthesis(parenthesis).tex)
-                }
-
-                // Change all denominators degrees to positive.
-                denominators.map(x => x.degree.opposed())
-                if (denominators.length === 1) {
-                    denominatorsAsTex = [denominators[0].setForceParenthesis(false).tex]
-                } else {
-                    parenthesis = denominators.length>1
-                    denominatorsAsTex = denominators.map(factor => factor.setForceParenthesis(parenthesis).tex)
-                }
-                // restore all degrees to negative again.
-                denominators.map(x => x.degree.opposed())
-
-                tex = `\\frac{ ${numeratorsAsTex.join(' \\cdot ')} }{ ${denominatorsAsTex.join(' \\cdot ')} }`
-            }
-        }
-
-        // Apply the modification
-        if (this._fn !== undefined && this._fn.name !== undefined && this._fn.name !== '') {
-            tex = `${this._fn.tex}\\left( ${tex} \\right)`
-        }
-        return tex
-    }
-
-    reduce(): PolynomExpProduct {
-        let coefficients = this._factors.filter(factor => factor.isCoefficient),
-            polynoms = this._factors.filter(factor => !factor.isCoefficient)
-
-        let result = new Fraction().one()
-
-        if (coefficients.length > 1) {
-            for (const factor of coefficients) {
-                if (factor.degree.isPositive()) {
-                    result.multiply(factor.polynom.monoms[0].coefficient.pow(factor.degree))
-                } else {
-                    result.divide(factor.polynom.monoms[0].coefficient.pow(factor.degree.clone().abs()))
-                }
-            }
-        } else if (coefficients.length === 1) {
-            result = coefficients[0].polynom.monoms[0].coefficient
-        }
-
-        if (result.isOne()) {
-            this._factors = [...polynoms]
-        } else if (!result.isRelative()) {
-            this._factors = [
-                new PolynomExpFactor(result.numerator),
-                new PolynomExpFactor(result.denominator, -1),
-                ...polynoms
-            ]
-        } else {
-            this._factors = [
-                new PolynomExpFactor(result),
-                ...polynoms
-            ]
-        }
-        return this
-    }
-
-    integrate(letter?: string): PolynomExpProduct {
-        // Handle this kind of case:
-        // A * f' * F^n
-        // A * f' / F^n, n != 1
-        // A * f_1 * f_2 * f_3, where (f_1 * f_2)' = f_3
-        if (this._factors.length === 2) {
-            // Check polynoms degree: one must of one degree less than the other.
-            let d1 = this._factors[0].polynom.degree(letter).value,
-                d2 = this._factors[1].polynom.degree(letter).value
-
-            if (d1 === d2 + 1) {
-                return this._integrateWithInternalDerivative(this._factors[0], this._factors[1], letter)
-            } else if (d1 + 1 === d2) {
-                return this._integrateWithInternalDerivative(this._factors[1], this._factors[0], letter)
-            }
-        }
-        return
-    }
-
-    public applyMathFunction(mathFn: PolynomExpMathFunctionType): PolynomExpProduct {
-        this._fn = mathFn
-        return this
-    }
-
-    private _integrateWithInternalDerivative(P: PolynomExpFactor, Pinternal: PolynomExpFactor, letter?: string): PolynomExpProduct {
-        // Get the internal derivative
-        let internalDerivative: Polynom = P.polynom.clone().derivative(letter)
-
-        // Get the factor.
-        let {quotient, reminder} = Pinternal.polynom.clone().euclidian(internalDerivative)
-
-        if (reminder.isZero() && quotient.degree(letter).isZero()) {
-            // All the conditions are done. Actual situation is
-            // (4x-10)(x^2-5x+7)^9
-            // P1 = (x^2-5x+7), P2 = (2x-5)
-            // => 1/10 * quotient * (x^2-5x+7)^10
-
-            if (P.degree.isEqual(-1)) {
-                return (new PolynomExpProduct(
-                    new PolynomExpFactor(quotient, 1),
-                    new PolynomExpFactor(P.polynom.clone(), 1, {
-                        name: 'ln', tex: '\\ln', fn: (x: number) => Math.log(x)
-                    })
-                ))
-            } else {
-                return new PolynomExpProduct(
-                    new PolynomExpFactor(P.degree.clone().add(1).invert(), 1),
-                    new PolynomExpFactor(quotient, 1),
-                    new PolynomExpFactor(P.polynom.clone(), P.degree.clone().add(1))
-                )
-            }
-        }
-        return
-    }
-}

package/tests/expressions/expressions.test.ts

@@ -1,145 +0,0 @@
-import {ExpFactorVariable} from "../../src/maths/expressions/factors/ExpFactorVariable";
-import {expect} from "chai";
-import {ExpFactorNumber} from "../../src/maths/expressions/factors/ExpFactorNumber";
-import {Expression} from "../../src/maths/expressions/expression";
-import {ExpFactorTrigo} from "../../src/maths/expressions/factors/ExpFactorTrigo";
-import {ExpFactor} from "../../src/maths/expressions/factors/ExpFactor";
-import {ExpressionMember} from "../../src/maths/expressions/expressionMember";
-import {ExpressionParser} from "../../src/maths/expressions/expressionParser";
-import {expressionOperators} from "../../src/maths/expressions/expressionOperators";
-
-describe('Expressions tests', () => { // the tests container
-    it('should make some test', () => {
-
-        // let a = new ExpressionParser('3x').expression
-        // let a = new ExpressionParser('3x+5').expression
-        // let a = new ExpressionParser('3x^2+5').expression
-        // let a = new ExpressionParser('3x^(2/3)+5').expression
-        // let a = new ExpressionParser('3x(x+4)').expression
-        // let a = new ExpressionParser('sin(cos(3picos(3pi)-5))+sqrt(e-sin(3pi/2))').expression
-        // let a = new ExpressionParser('3-nthrt(x-3,5)').expression
-        // console.log(a.isPolynom())
-        // let b = new ExpressionParser('3/2x^2-5x+7').expression
-        // console.log(b.tex, b.isPolynom())
-        // console.log(b.members[0].member.coefficient().tex)
-        // console.log(b.members[0].member.litteral().tex)
-        // console.log(b.structure())
-        //
-
-        // let c = new ExpressionParser('3/2x^2+5/3x-7').expression
-        // console.log(c.tex)
-        // console.log(c.display)
-
-        // let d = new ExpressionParser('sqrt(16)*sqrt(15^4)+9/15').expression
-        let d = new ExpressionParser('nthrt(16,4)').expression
-        console.log(d.tex)
-        console.log(d.members[0].member.reduce().tex)
-        console.log(d.structure())
-        // console.log(d.display)
-
-        // console.log(d.structure())
-        // console.log(c.display)
-        // console.log(c.members[0].member.literal().factors.length)
-        // console.log(c.members[0].member.reduce().tex);
-        // console.log(c.members[1].member.reduce().tex);
-    })
-
-    it('should make some operations', ()=>{
-        let a = new ExpressionParser('3x').expression,
-            b = new ExpressionParser('5x^2').expression,
-            c = new ExpressionParser('9x-2').expression
-
-        console.log(a.tex)
-        console.log(b.tex)
-        console.log(c.tex)
-
-        let sum = expressionOperators.add(a, b, c)
-        console.log(sum.tex)
-
-        let diff = expressionOperators.subtract(a, b)
-        console.log(diff.tex)
-
-        let mult = expressionOperators.multiply(a, b, c)
-        console.log(mult.tex)
-
-        let div = expressionOperators.divide(a, c)
-        console.log(div.tex)
-    })
-    it('should work :)', () => {
-
-        const expVar = new ExpFactorVariable('y', 3, 5)
-        expect(expVar.tex).to.be.equal('\\sqrt[5]{ y }^{ 3 }')
-
-        const expNum = new ExpFactorNumber(17, 3, 5)
-        expect(expNum.tex).to.be.equal('\\sqrt[5]{ 17 }^{ 3 }')
-
-        const expProduct1 = new ExpressionMember(expNum, expVar)
-        const expProduct2 = new ExpressionMember(
-            new ExpFactorNumber(4),
-            new ExpFactorVariable('t', 7, 2)
-        )
-        expect(expProduct2.tex).to.be.equal("4\\sqrt{ t }^{ 7 }")
-
-        const expr = new Expression(
-            expProduct1,
-            expProduct2
-        )
-
-        const ExpSin = new ExpFactorTrigo(
-            'sin',
-            expr,
-            3, 7
-        )
-
-        const expNum1 = new Expression(
-            new ExpressionMember(
-                new ExpFactorNumber(3, 2, 7),
-                new ExpFactorNumber(4, -3, 2)
-            ),
-            new ExpressionMember(
-                new ExpFactorNumber(5),
-                new ExpFactor(
-                    new Expression(
-                        new ExpressionMember(
-                            new ExpFactorNumber(3, 2),
-                            new ExpFactorNumber(2, 1, 3)
-                        ),
-                        new ExpressionMember(
-                            new ExpFactorNumber(-4, 3),
-                            new ExpFactorNumber(7, 2, 6)
-                        ),
-                        new ExpressionMember(
-                            new ExpFactorNumber(-3),
-                            ExpSin
-                        )
-                    ), 2, 3
-                )
-            )
-        )
-
-        expect(expNum1.hasVariable()).to.be.false;
-        const expNumSin = new Expression(
-            new ExpressionMember(
-                new ExpFactorTrigo('sin', expNum1)
-            )
-        )
-
-        expect(expNumSin.isNumeric()).to.be.true;
-
-    })
-
-    it('should parse an expression', () => {
-
-        // let E = new Expression().parse('3x')
-        // console.log(E.tex)
-        //
-        // const SY5: Shutingyard = new Shutingyard().parse('3/2*x^(-3)-5*x*y-12');
-        //
-        // console.log(SY5.rpn.map(x=>x.token))
-        // console.log(SY5.rpn)
-        //
-        // const expr = new Expression()
-        // expr.parse('3/2*x^(-3)-5*x*y-12')
-    })
-
-});

package/tests/expressions/expressiontree.test.ts

@@ -1,11 +0,0 @@
-import {ExpressionTree} from "../../src/maths/expressions/ExpressionTree";
-
-describe('Expressions test', () => { // the tests container
-    it('Parsing tree', () => {
-        // let ET = new ExpressionTree('3(x-4)^2')
-        let ET = new ExpressionTree('3(x-7)^2-5sqrt(5x-3)')
-
-        console.log(ET.tex)
-    })
-
-});

package/tests/polynomexp.test.ts

@@ -1,12 +0,0 @@
-import {describe} from "mocha";
-import {PolynomExpFactor, PolynomExpProduct} from "../src/maths/expressions/polynomexp";
-
-describe('PolynomExpression concepts', () => {
-    it('should display tex', function () {
-        const F1 = new PolynomExpFactor('2x-5', 2.5),
-            F2 = new PolynomExpFactor('2-x', 0.5),
-            PP = new PolynomExpProduct(F1, F2)
-
-        const D = F1.derivative()
-    });
-})