pimath 0.0.20 → 0.0.24

package/dev/index.html

@@ -18,43 +18,51 @@
 
 <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 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))
+  let L = new Pi.Geometry.Line('6x-8y+12=0')
+
+	console.log(L.a.display, L.b.display, L.c.display)
+    L.simplify()
+	console.log(L.a.display, L.b.display, L.c.display)
+
+	console.log(L.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

@@ -3220,6 +3220,14 @@ class Line {
                     (values[2] instanceof coefficients_1.Fraction || typeof values[2] === 'number')) {
                 return this.parseByCoefficient(values[0], values[1], values[2]);
             }
+            else if (values[0] instanceof point_1.Point && values[1] instanceof vector_1.Vector) {
+                if (values[2] === LinePropriety.Perpendicular) {
+                    return this.parseByPointAndNormal(values[0], values[1]);
+                }
+                else if (values[2] === LinePropriety.Parallel) {
+                    return this.parseByPointAndVector(values[0], values[1]);
+                }
+            }
         }
         console.log('Someting wrong happend while creating the line');
         return this;
@@ -3291,6 +3299,11 @@ class Line {
     isSameAs = (line) => {
         return this.slope.isEqual(line.slope) && this.height.isEqual(line.height);
     };
+    simplify = () => {
+        let lcm = numeric_1.Numeric.lcm(this._a.denominator, this._b.denominator, this._c.denominator), gcd = numeric_1.Numeric.gcd(this._a.numerator, this._b.numerator, this._c.numerator);
+        this.parseByCoefficient(this._a.clone().multiply(lcm).divide(gcd), this._b.clone().multiply(lcm).divide(gcd), this._c.clone().multiply(lcm).divide(gcd));
+        return this;
+    };
     simplifyDirection = () => {
         let lcm = numeric_1.Numeric.lcm(this._d.x.denominator, this._d.y.denominator), gcd = numeric_1.Numeric.gcd(this._d.x.numerator, this._d.y.numerator);
         this._d.x.multiply(lcm).divide(gcd);
@@ -3360,16 +3373,16 @@ class Line {
         return false;
     }
     getValueAtX = (value) => {
-        const equ = this.equation.clone().isolate('y');
+        const equ = this.equation.clone().isolate('y'), F = new coefficients_1.Fraction(value);
         if (equ instanceof algebra_1.Equation) {
-            return equ.right.evaluate({ x: value });
+            return equ.right.evaluate({ x: F });
         }
         return;
     };
     getValueAtY = (value) => {
-        const equ = this.equation.clone().isolate('x');
+        const equ = this.equation.clone().isolate('x'), F = new coefficients_1.Fraction(value);
         if (equ instanceof algebra_1.Equation) {
-            return equ.right.evaluate({ y: value });
+            return equ.right.evaluate({ y: F });
         }
         return;
     };
@@ -4041,17 +4054,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 = {}));
 
@@ -4107,7 +4132,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);
     }
@@ -4119,7 +4145,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;
     };
 }
@@ -4213,7 +4244,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('')) {