Fixed math functions

arguiot · arguiot · commit dca250d454ef · 2017-08-06T18:16:44.000+02:00
diff --git a/dist/display.es6.js b/dist/display.es6.js
@@ -569,10 +569,10 @@ class DisplayJS {
 		return tmp;
 	}
 	sum(array) {
-		return array.reduce((a, b) => this.math().add(a, b), 0);
+		return array.reduce((a, b) => this.math.add(a, b), 0);
 	}
 	multiply(array) {
-		return array.reduce((a, b) => this.math().mul(a, b), 0);
+		return array.reduce((a, b) => this.math.mul(a, b), 0);
 	}
 	flatten(array) {
 		return array.reduce((a, b) => a.concat(b), []);
@@ -600,17 +600,17 @@ class DisplayJS {
 	}
 	average(array) {
 		const summed = this.sum(array);
-		const average = this.math().div(summed, array.length);
+		const average = this.math.div(summed, array.length);
 		return average;
 	}
 	median(array) {
-		array.sort( (a, b) => this.math().sub(a, b) );
-		const half = Math.floor(this.math().div(array.length,2));
+		array.sort( (a, b) => this.math.sub(a, b) );
+		const half = Math.floor(this.math.div(array.length,2));
 		if(array.length % 2) {
 			return array[half];
 		}
 		else {
-			return this.math().div(this.math().add(array[half-1], array[half]), 2.0);
+			return this.math.div(this.math.add(array[half-1], array[half]), 2.0);
 		}
 	}
 	predict(array, val, text=false) {
diff --git a/dist/display.es6.min.js b/dist/display.es6.min.js
diff --git a/dist/display.js b/dist/display.js
@@ -734,7 +734,7 @@ var DisplayJS = function () {
 			var _this6 = this;
 
 			return array.reduce(function (a, b) {
-				return _this6.math().add(a, b);
+				return _this6.math.add(a, b);
 			}, 0);
 		}
 	}, {
@@ -743,7 +743,7 @@ var DisplayJS = function () {
 			var _this7 = this;
 
 			return array.reduce(function (a, b) {
-				return _this7.math().mul(a, b);
+				return _this7.math.mul(a, b);
 			}, 0);
 		}
 	}, {
@@ -784,7 +784,7 @@ var DisplayJS = function () {
 		key: "average",
 		value: function average(array) {
 			var summed = this.sum(array);
-			var average = this.math().div(summed, array.length);
+			var average = this.math.div(summed, array.length);
 			return average;
 		}
 	}, {
@@ -793,13 +793,13 @@ var DisplayJS = function () {
 			var _this8 = this;
 
 			array.sort(function (a, b) {
-				return _this8.math().sub(a, b);
+				return _this8.math.sub(a, b);
 			});
-			var half = Math.floor(this.math().div(array.length, 2));
+			var half = Math.floor(this.math.div(array.length, 2));
 			if (array.length % 2) {
 				return array[half];
 			} else {
-				return this.math().div(this.math().add(array[half - 1], array[half]), 2.0);
+				return this.math.div(this.math.add(array[half - 1], array[half]), 2.0);
 			}
 		}
 	}, {
diff --git a/dist/display.min.js b/dist/display.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "display.js",
-  "version": "v1.2.0",
+  "version": "v1.2.1",
   "description": "A simple JavaScript framework for building ambitious UIs",
   "main": "dist/display.min.js",
   "directories": {
diff --git a/src/display.js b/src/display.js
@@ -569,10 +569,10 @@ class DisplayJS {
 		return tmp;
 	}
 	sum(array) {
-		return array.reduce((a, b) => this.math().add(a, b), 0);
+		return array.reduce((a, b) => this.math.add(a, b), 0);
 	}
 	multiply(array) {
-		return array.reduce((a, b) => this.math().mul(a, b), 0);
+		return array.reduce((a, b) => this.math.mul(a, b), 0);
 	}
 	flatten(array) {
 		return array.reduce((a, b) => a.concat(b), []);
@@ -600,17 +600,17 @@ class DisplayJS {
 	}
 	average(array) {
 		const summed = this.sum(array);
-		const average = this.math().div(summed, array.length);
+		const average = this.math.div(summed, array.length);
 		return average;
 	}
 	median(array) {
-		array.sort( (a, b) => this.math().sub(a, b) );
-		const half = Math.floor(this.math().div(array.length,2));
+		array.sort( (a, b) => this.math.sub(a, b) );
+		const half = Math.floor(this.math.div(array.length,2));
 		if(array.length % 2) {
 			return array[half];
 		}
 		else {
-			return this.math().div(this.math().add(array[half-1], array[half]), 2.0);
+			return this.math.div(this.math.add(array[half-1], array[half]), 2.0);
 		}
 	}
 	predict(array, val, text=false) {

Original file line number	Diff line number	Diff line change
`@@ -569,10 +569,10 @@ class DisplayJS {`
`569`	`569`	`return tmp;`
`570`	`570`	`}`
`571`	`571`	`sum(array) {`
`572`		`- return array.reduce((a, b) => this.math().add(a, b), 0);`
	`572`	`+ return array.reduce((a, b) => this.math.add(a, b), 0);`
`573`	`573`	`}`
`574`	`574`	`multiply(array) {`
`575`		`- return array.reduce((a, b) => this.math().mul(a, b), 0);`
	`575`	`+ return array.reduce((a, b) => this.math.mul(a, b), 0);`
`576`	`576`	`}`
`577`	`577`	`flatten(array) {`
`578`	`578`	`return array.reduce((a, b) => a.concat(b), []);`
`@@ -600,17 +600,17 @@ class DisplayJS {`
`600`	`600`	`}`
`601`	`601`	`average(array) {`
`602`	`602`	`const summed = this.sum(array);`
`603`		`- const average = this.math().div(summed, array.length);`
	`603`	`+ const average = this.math.div(summed, array.length);`
`604`	`604`	`return average;`
`605`	`605`	`}`
`606`	`606`	`median(array) {`
`607`		`- array.sort( (a, b) => this.math().sub(a, b) );`
`608`		`- const half = Math.floor(this.math().div(array.length,2));`
	`607`	`+ array.sort( (a, b) => this.math.sub(a, b) );`
	`608`	`+ const half = Math.floor(this.math.div(array.length,2));`
`609`	`609`	`if(array.length % 2) {`
`610`	`610`	`return array[half];`
`611`	`611`	`}`
`612`	`612`	`else {`
`613`		`- return this.math().div(this.math().add(array[half-1], array[half]), 2.0);`
	`613`	`+ return this.math.div(this.math.add(array[half-1], array[half]), 2.0);`
`614`	`614`	`}`
`615`	`615`	`}`
`616`	`616`	`predict(array, val, text=false) {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "display.js",`
`3`		`- "version": "v1.2.0",`
	`3`	`+ "version": "v1.2.1",`
`4`	`4`	`"description": "A simple JavaScript framework for building ambitious UIs",`
`5`	`5`	`"main": "dist/display.min.js",`
`6`	`6`	`"directories": {`