pimath 0.0.18 → 0.0.22

package/dev/index.html

@@ -18,41 +18,50 @@
 
 <script>
 
-	let C1 = new Pi.Geometry.Point(-5, 4),
-		r1 = 36,
-		C2 = new Pi.Geometry.Point(7, -2),
-		T = new Pi.Geometry.Point(2, 3)
+  let P = new Pi.Random.polynom({
+    degree: 4,
+    fraction: false
+  })
 
-	let G1 = new Pi.Geometry.Circle(C1, r1, true),
-		G2 = new Pi.Geometry.Circle(C2, T)
+	console.log(P.display)
 
-	console.log('G1', G1.tex)
-	console.log('G2', G2.tex)
-
-	let t = new Pi.Geometry.Line(
-		new Pi.Geometry.Vector(C2, T),
-		T
-	)
-
-	console.log(t.tex.canonical)
-	console.log(G1.relativePosition(t))
-
-	let d = new Pi.Geometry.Line(G1.center, G2.center)
-	console.log(d.tex.canonical)
-
-	let M = new Pi.Geometry.Point(
-		G1.center.x.clone().add(G2.center.x).divide(2),
-		G1.center.y.clone().add(G2.center.y).divide(2),
-	)
-
-	console.log(M.display)
-
-	let k = new Pi.Geometry.Line().parseByPointAndLine(
-		M, d,
-		Pi.Geometry.Line.PERPENDICULAR
-	)
-
-	console.log(k.tex.canonical)
+//	let C1 = new Pi.Geometry.Point(-5, 4),
+//		r1 = 36,
+//		C2 = new Pi.Geometry.Point(7, -2),
+//		T = new Pi.Geometry.Point(2, 3)
+//
+//	let G1 = new Pi.Geometry.Circle(C1, r1, true),
+//		G2 = new Pi.Geometry.Circle(C2, T)
+//
+//	console.log('G1', G1.tex)
+//	console.log('G2', G2.tex)
+//
+//	let t = new Pi.Geometry.Line(
+//		new Pi.Geometry.Vector(C2, T),
+//		T
+//	)
+//
+//	console.log(t.tex.canonical)
+//	console.log(G1.relativePosition(t))
+//
+//	let d = new Pi.Geometry.Line(G1.center, G2.center)
+//	console.log(d.tex.canonical)
+//
+//	let M = new Pi.Geometry.Point(
+//		G1.center.x.clone().add(G2.center.x).divide(2),
+//		G1.center.y.clone().add(G2.center.y).divide(2),
+//	)
+//
+//	console.log(M.display)
+//
+//	let k = new Pi.Geometry.Line().parseByPointAndLine(
+//		M, d,
+//		Pi.Geometry.Line.PERPENDICULAR
+//	)
+//
+//	console.log(k.tex.canonical)
+//
+//		console.log(G1.lineIntersection(d))
 </script>
 </body>
 </html>

package/dev/pi.js

@@ -84,6 +84,9 @@ class Equation {
     get tex() {
         return `${this._left.tex}${this.signAsTex}${this._right.tex}`;
     }
+    get display() {
+        return `${this._left.display}${this.signAsTex}${this._right.display}`;
+    }
     get raw() {
         return `${this._left.raw}${this.signAsTex}${this._right.raw}`;
     }
@@ -1981,9 +1984,9 @@ class Polynom {
                 resultPolynom.add(m.clone());
             }
             else {
-                pow = +m.literal[letter];
+                pow = m.literal[letter].clone();
                 delete m.literal[letter];
-                resultPolynom.add(P.clone().pow(pow).multiply(m));
+                resultPolynom.add(P.clone().pow(Math.abs(pow.numerator)).multiply(m));
             }
         }
         this._monoms = resultPolynom.reduce().reorder().monoms;
@@ -2941,27 +2944,6 @@ class Circle {
     get center() {
         return this._center;
     }
-    parse(...values) {
-        if (values.length === 1 && typeof values[0] === 'string') {
-            this.checkCircle(new algebra_1.Equation(values[0]));
-        }
-        else if (values.length >= 2) {
-            this._center = new point_1.Point(values[0]);
-            if (values[1] instanceof point_1.Point) {
-                this._squareRadius = new vector_1.Vector(this._center, values[1]).normSquare;
-            }
-            else {
-                if (values[2] === true) {
-                    this._squareRadius = new coefficients_1.Fraction(values[1]);
-                }
-                else {
-                    this._radius = new coefficients_1.Fraction(values[1]);
-                    this._squareRadius = this._radius.clone().pow(2);
-                }
-            }
-            this._cartesian = (new algebra_1.Equation(new algebra_1.Polynom(`(x-(${this._center.x.display}))^2+(y-(${this._center.y.display}))^2`), new algebra_1.Polynom(`${this._squareRadius.display}`))).moveLeft();
-        }
-    }
     get radius() {
         if (this._squareRadius.isSquare()) {
             return {
@@ -2996,6 +2978,33 @@ class Circle {
     get developed() {
         return this._cartesian.tex;
     }
+    get display() {
+        return this._cartesian.display;
+    }
+    get cartesian() {
+        return this._cartesian;
+    }
+    parse(...values) {
+        if (values.length === 1 && typeof values[0] === 'string') {
+            this.checkCircle(new algebra_1.Equation(values[0]));
+        }
+        else if (values.length >= 2) {
+            this._center = new point_1.Point(values[0]);
+            if (values[1] instanceof point_1.Point) {
+                this._squareRadius = new vector_1.Vector(this._center, values[1]).normSquare;
+            }
+            else {
+                if (values[2] === true) {
+                    this._squareRadius = new coefficients_1.Fraction(values[1]);
+                }
+                else {
+                    this._radius = new coefficients_1.Fraction(values[1]);
+                    this._squareRadius = this._radius.clone().pow(2);
+                }
+            }
+            this._cartesian = (new algebra_1.Equation(new algebra_1.Polynom(`(x-(${this._center.x.display}))^2+(y-(${this._center.y.display}))^2`), new algebra_1.Polynom(`${this._squareRadius.display}`))).moveLeft();
+        }
+    }
     checkCircle = (P) => {
         if (P.degree('x').value === 2 && P.degree('y').value === 2) {
             let x2 = P.left.monomByDegree(2, 'x'), y2 = P.left.monomByDegree(2, 'y'), x1, y1, c;
@@ -3024,6 +3033,15 @@ class Circle {
             return 2;
         }
     };
+    lineIntersection = (L) => {
+        let P1, P2;
+        const equ = this._cartesian.clone(), yLine = L.equation.clone().isolate('y');
+        if (yLine instanceof algebra_1.Equation) {
+            equ.replaceBy('y', yLine.right);
+            equ.solve();
+        }
+        return [];
+    };
 }
 exports.Circle = Circle;
 
@@ -3341,6 +3359,20 @@ class Line {
         }
         return false;
     }
+    getValueAtX = (value) => {
+        const equ = this.equation.clone().isolate('y');
+        if (equ instanceof algebra_1.Equation) {
+            return equ.right.evaluate({ x: value });
+        }
+        return;
+    };
+    getValueAtY = (value) => {
+        const equ = this.equation.clone().isolate('x');
+        if (equ instanceof algebra_1.Equation) {
+            return equ.right.evaluate({ y: value });
+        }
+        return;
+    };
     canonicalAsFloatCoefficient(decimals) {
         if (decimals === undefined) {
             decimals = 2;
@@ -4009,17 +4041,29 @@ var Random;
         return (new rndFraction_1.rndFraction(config)).generate();
     }
     Random.fraction = fraction;
-    function number(from, to) { return rndHelpers_1.rndHelpers.randomInt(from, to); }
+    function number(from, to) {
+        return rndHelpers_1.rndHelpers.randomInt(from, to);
+    }
     Random.number = number;
-    function numberSym(max, allowZero) { return rndHelpers_1.rndHelpers.randomIntSym(max, allowZero); }
+    function numberSym(max, allowZero) {
+        return rndHelpers_1.rndHelpers.randomIntSym(max, allowZero);
+    }
     Random.numberSym = numberSym;
-    function bool(percent) { return rndHelpers_1.rndHelpers.randomBool(percent); }
+    function bool(percent) {
+        return rndHelpers_1.rndHelpers.randomBool(percent);
+    }
     Random.bool = bool;
-    function array(arr, number) { return rndHelpers_1.rndHelpers.randomArray(arr, number); }
+    function array(arr, number) {
+        return rndHelpers_1.rndHelpers.randomArray(arr, number);
+    }
     Random.array = array;
-    function item(arr) { return rndHelpers_1.rndHelpers.randomItem(arr); }
+    function item(arr) {
+        return rndHelpers_1.rndHelpers.randomItem(arr);
+    }
     Random.item = item;
-    function shuffle(arr) { rndHelpers_1.rndHelpers.shuffleArray(arr); }
+    function shuffle(arr) {
+        rndHelpers_1.rndHelpers.shuffleArray(arr);
+    }
     Random.shuffle = shuffle;
 })(Random = exports.Random || (exports.Random = {}));
 
@@ -4075,7 +4119,8 @@ class rndFraction extends randomCore_1.randomCore {
         this._defaultConfig = {
             negative: true,
             reduced: true,
-            zero: true
+            zero: true,
+            natural: false
         };
         this._config = this.mergeConfig(userConfig, this._defaultConfig);
     }
@@ -4087,7 +4132,12 @@ class rndFraction extends randomCore_1.randomCore {
         else {
             Q.numerator = index_1.Random.number(this._config.zero ? 0 : 1, 10);
         }
-        Q.denominator = index_1.Random.number(1, 10);
+        if (this._config.natural) {
+            Q.denominator = 1;
+        }
+        else {
+            Q.denominator = index_1.Random.number(1, 10);
+        }
         return this._config.reduced ? Q.reduce() : Q;
     };
 }
@@ -4181,7 +4231,8 @@ class rndMonom extends randomCore_1.randomCore {
         let M = new monom_1.Monom();
         M.coefficient = index_1.Random.fraction({
             zero: this._config.zero,
-            reduced: true
+            reduced: true,
+            natural: !this._config.fraction
         });
         if (this._config.letters.length > 1) {
             for (let L of this._config.letters.split('')) {