pimath 0.0.63 → 0.0.66

package/src/maths/algebra/study.ts

@@ -8,6 +8,7 @@ import {ISolution} from "./equation";
 import {Polynom} from "./polynom";
 import {Fraction} from "../coefficients/fraction";
 import {Point} from "../geometry/point";
+import {NumExp} from "../expressions/numexp";
 
 export type StudyableFunction = Rational
 
@@ -31,11 +32,13 @@ export enum ASYMPTOTE {
 }
 
 export interface IAsymptote {
+    fx: Polynom,
     deltaX: StudyableFunction
     limits: string,
     tex: string,
     type: ASYMPTOTE,
     zero: IZero,
+    tableOfSign: ITableOfSigns
 }
 
 export enum FUNCTION_EXTREMA {
@@ -65,6 +68,7 @@ export interface ITableOfSigns {
     signs: (string[])[],
     type: TABLE_OF_SIGNS
     zeroes: IZero[],
+    tex: string
 }
 
 export enum TABLE_OF_SIGNS {
@@ -122,7 +126,7 @@ export class Study {
         return this._derivative;
     }
 
-    get tex(): string {
+    get texSigns(): string {
         return this._makeTexFromTableOfSigns(this._signs)
     }
 
@@ -144,6 +148,11 @@ export class Study {
         this._derivative = this.makeDerivative()
 
         this._variations = this.makeVariation()
+
+        this._signs.tex = this.texSigns
+        this._derivative.tex = this.texGrows
+        this._variations.tex = this.texVariations
+
     };
 
     indexOfZero = (zeroes: IZero[], zero: IZero | ISolution): number => {
@@ -223,7 +232,7 @@ export class Study {
         return resultLine
     }
 
-    makeGrowsResult = (fx: StudyableFunction, tos: ITableOfSigns): { growsLine: string[], extremes: { [Key: string]: IExtrema } } => {
+    makeGrowsResult = (tos: ITableOfSigns): { growsLine: string[], extremes: { [Key: string]: IExtrema } } => {
 
         // Use the last line (=> resultLine) to grab the necessary information
         let signsAsArray = Object.values(tos.signs),
@@ -245,9 +254,12 @@ export class Study {
                     xTex: string, yTex: string,
                     pointType: FUNCTION_EXTREMA
 
+                // TODO: NumExp should parse something that isn't yet plotFunction
+                let exp = new NumExp(this.fx.plotFunction)
+
                 if (zero instanceof Fraction) {
                     let value: Fraction = zero,
-                        evalY = fx.evaluate(value)
+                        evalY = this.fx.evaluate(value)
 
                     x = zero.value
                     y = evalY.value
@@ -255,7 +267,7 @@ export class Study {
                     yTex = evalY.tex
                 } else {
                     x = zeroes[i].value
-                    y = fx.evaluate(zeroes[i].value).value
+                    y = exp.evaluate({x})
 
                     xTex = x.toFixed(2)
                     yTex = y.toFixed(2)
@@ -298,7 +310,7 @@ export class Study {
         return {growsLine, extremes}
     }
 
-    makeVariationsResult = (fx: StudyableFunction, tos: ITableOfSigns): { varsLine: string[], extremes: { [Key: string]: IExtrema } } => {
+    makeVariationsResult = (tos: ITableOfSigns): { varsLine: string[], extremes: { [Key: string]: IExtrema } } => {
         // TODO: make variations result is not yet implemented.
         let extremes = {},
             varsLine: string[] = []
@@ -316,7 +328,8 @@ export class Study {
             factors: [],
             zeroes: [],
             signs: [],
-            extremes: {}
+            extremes: {},
+            tex: ''
         }
     };
 
@@ -331,7 +344,8 @@ export class Study {
             factors: [],
             zeroes: [],
             signs: [],
-            extremes: {}
+            extremes: {},
+            tex: ''
         }
     }
 
@@ -342,7 +356,8 @@ export class Study {
             factors: [],
             zeroes: [],
             signs: [],
-            extremes: {}
+            extremes: {},
+            tex: ''
         }
     }
 
@@ -381,4 +396,41 @@ export class Study {
 
         return tex
     }
+
+    drawCode = (): string => {
+        // Function as string
+        let code = `f(x)=${this.fx.plotFunction}`
+
+        // Asymptotes
+        let i: number = 1
+        this.asymptotes.forEach(asymptote => {
+            if (asymptote.type === ASYMPTOTE.VERTICAL) {
+                code += `\nav_${i}=line x=${asymptote.zero.value}->red,dash`
+                i++
+            } else if (asymptote.type === ASYMPTOTE.HORIZONTAL) {
+                code += `\nah=line y=${asymptote.fx.monoms[0].coefficient.value}->orange,dash`
+            } else if (asymptote.type === ASYMPTOTE.SLOPE) {
+                code += `\nao=line y=${asymptote.fx.plotFunction}->red,dash`
+            }
+            i++
+        })
+
+        // Extremes
+        for (let zero in this.derivative.extremes) {
+            let extreme = this.derivative.extremes[zero]
+
+            code += `\nM_${i}(${extreme.value.x},${extreme.value.y})*`
+            i++
+        }
+
+        // Zeroes
+        this.zeroes.forEach(zero => {
+            if (zero.type === ZEROTYPE.ZERO) {
+                code += `\nZ_${i}(${zero.value},0)*`
+                i++
+            }
+        })
+
+        return code
+    }
 }

package/tests/algebra/study.test.ts

@@ -1,6 +1,8 @@
 import {describe} from "mocha";
 import {Rational} from "../../src/maths/algebra/rational";
 import {RationalStudy} from "../../src/maths/algebra/study/rationalStudy";
+import {expect} from "chai";
+import {ASYMPTOTE} from "../../src/maths/algebra/study";
 
 describe('Study tests', () => {
     it('should get the zeroes', function () {
@@ -9,10 +11,33 @@ describe('Study tests', () => {
             new Rational('(3x-2)(x-3)(x+4)', 'x^2-5x+6')
         )
 
-        console.log(study.tex)
-        console.log(study.asymptotes)
-        console.log(study.derivative.fx.texFactors)
-        console.log(study.texGrows)
+        // console.log(study.texSigns)
+        // console.log(study.asymptotes)
+        // console.log(study.derivative.fx.texFactors)
+        // console.log(study.texGrows)
+        //
+        //
+        // console.log('----------------')
 
+
+        let AO = study.asymptotes.filter(x => x.type === ASYMPTOTE.SLOPE)[0]
+
+        console.log(AO.tableOfSign.signs)
+    });
+
+    it('should create draw code block', function () {
+        const study = new RationalStudy(
+            new Rational("(3x-4)(2x+5)", "(x-4)(x+4)")
+        )
+
+        expect(study.drawCode()).to.be.equal("f(x)=(6*x^(2)+7*x-20)/(x^(2)-16)\n" +
+            "av_1=line x=-4->red,dash\n" +
+            "av_3=line x=4->red,dash\n" +
+            "ah=line y=6->orange,dash\n" +
+            "M_6(-20.950583847231826,5.832940216581962)*\n" +
+            "M_7(-0.7637018670538883,1.4170597834180383)*\n" +
+            "Z_8(-2.5,0)*\n" +
+            "Z_9(1.3333333333333333,0)*")
     });
+
 })