fable 3.1.18 → 3.1.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fable",
-  "version": "3.1.18",
+  "version": "3.1.19",
   "description": "A service dependency injection, configuration and logging library.",
   "main": "source/Fable.js",
   "scripts": {

package/source/services/Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-FunctionMap.json

@@ -129,6 +129,11 @@
 		"Address": "fable.Utility.getInternalValueByHash"
 	},
 
+	"createarrayfromabsolutevalues": {
+		"Name": "Create Array from Absolute Values",
+		"Address": "fable.Utility.createArrayFromAbsoluteValues"
+	},
+
 	"flatten": {
 		"Name": "flatten an array of values",
 		"Address": "fable.Utility.flattenArrayOfSolverInputs"

package/source/services/Fable-Service-Math.js

@@ -668,8 +668,10 @@ class FableServiceMath extends libFableServiceBase
 		return tmpSortedHistogram;
 	}
 
-	cleanValueArray(pValueArray)
+	cleanValueArray(pValueArray, pRemoveZeroes)
 	{
+		let tmpRemoveZeroes = (typeof (pRemoveZeroes) === 'undefined') ? false : pRemoveZeroes;
+
 		if (!Array.isArray(pValueArray))
 		{
 			return [];
@@ -679,7 +681,7 @@ class FableServiceMath extends libFableServiceBase
 		for (let i = 0; i < pValueArray.length; i++)
 		{
 			let tmpValue = this.parsePrecise(pValueArray[i], NaN);
-			if (!isNaN(tmpValue))
+			if (!isNaN(tmpValue) && (!tmpRemoveZeroes || (tmpValue != "0")))
 			{
 				tmpCleanedArray.push(tmpValue);
 			}

package/source/services/Fable-Service-Utility.js

@@ -486,6 +486,20 @@ class FableServiceUtility extends libFableServiceBase
 		};
 		return pInputArray.flatMap(tmpArrayFlattener);
 	}
+
+	/**
+	 * Take a set of arbitrary parameters and build an array from them
+	 * @returns {Array} - An array built from the absolute values of the parameters
+	 */
+	createArrayFromAbsoluteValues()
+	{
+		let tmpArray = [];
+		for (let i = 0; i < arguments.length; i++)
+		{
+			tmpArray.push(arguments[i]);
+		}
+		return tmpArray;
+	}
 }
 
 module.exports = FableServiceUtility;

package/test/ExpressionParser_tests.js

@@ -398,6 +398,13 @@ suite
 						// Now through the solver
 
 						let _Parser = testFable.instantiateServiceProviderIfNotExists('ExpressionParser');
+
+						testFable.AppData.Value1 = "100"; // Comment
+						testFable.AppData.Value2 = "-80.5"; // Comment
+						testFable.AppData.Value3 = "10000"; // Comment
+						testFable.AppData.Value4 = "-333.333"; // Comment
+						testFable.AppData.Value5 = "0"; // Comment
+
 						let tmpResultsObject = {};
 						let tmpDestinationObject = {};
 
@@ -405,6 +412,24 @@ suite
 						_Parser.solve('AggregationResult = aggregationHistogram("AppData.Cities", "state", "population")', testFable, tmpResultsObject, false, tmpDestinationObject);
 						_Parser.solve('PopSum = sum(flatten(AppData.Cities[].population, AppData.Cities[].latitude))', testFable, tmpResultsObject, false, tmpDestinationObject);
 
+						//_Parser.solve('MadeUpValueArray = ROUND(AVG(createarrayfromabsolutevalues(100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100)),2)', testFable, tmpResultsObject, false, tmpDestinationObject);
+						//Expect(tmpDestinationObject.MadeUpValueArray).to.equal('600');
+						_Parser.solve('MadeUpValueArray = ROUND(AVG(createarrayfromabsolutevalues(AppData.Value1, AppData.Value2, AppData.Value3, AppData.Value4, AppData.Value5)),2)', testFable, tmpResultsObject, false, tmpDestinationObject);
+						Expect(tmpDestinationObject.MadeUpValueArray).to.equal('1937.23');
+
+						_Parser.solve('MadeUpValueArray = ROUND(AVG(cleanvaluearray(createarrayfromabsolutevalues(AppData.Value1, AppData.Value2, AppData.Value3, AppData.Value4, AppData.Value5), 1)),2)', testFable, tmpResultsObject, false, tmpDestinationObject);
+						Expect(tmpDestinationObject.MadeUpValueArray).to.equal('2421.54');
+
+//						_Parser.solve('MadeUpValueArray = ROUND(AVG(createarrayfromabsolutevalues(100, -80.5, 10000, -333.333, 0)),2)', testFable, tmpResultsObject, false, tmpDestinationObject);
+//						Expect(tmpDestinationObject.MadeUpValueArray).to.equal('600');
+
+
+						_Parser.solve('MadeUpValueArray = ROUND(AVG(createarrayfromabsolutevalues(100, 10, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1100)),2)', testFable, tmpResultsObject, false, tmpDestinationObject);
+						Expect(tmpDestinationObject.MadeUpValueArray).to.equal('550.83');
+
+						// _Parser.solve('MadeUpValueArray = ROUND(AVG(createarrayfromabsolutevalues(-5, 5, 0, -10, 10, -25, 25, -50, 50)),2)', testFable, tmpResultsObject, false, tmpDestinationObject);
+						// Expect(tmpDestinationObject.MadeUpValueArray).to.equal('25');
+
 
 						Expect(tmpDestinationObject.DistributionResult.Alabama).to.equal(12);
 						Expect(tmpDestinationObject.DistributionResult.Colorado).to.equal(21);

package/test/Utility_tests.js

@@ -411,6 +411,23 @@ suite
 						return fDone();
 					}
 				);
+				test
+				(
+					'createArrayFromAbsoluteValues works as expected',
+					function(fDone)
+					{
+						testFable = new libFable();
+
+						let tmpResult = testFable.services.Utility.createArrayFromAbsoluteValues(0,3,5,9);
+						Expect(tmpResult).to.be.an('array');
+						Expect(tmpResult.length).to.equal(4);
+						Expect(tmpResult[0]).to.equal(0);
+						Expect(tmpResult[1]).to.equal(3);
+						Expect(tmpResult[2]).to.equal(5);
+						Expect(tmpResult[3]).to.equal(9);
+						return fDone();
+					}
+				)
 			}
 		);
 	}