fable 3.1.32 → 3.1.34

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

@@ -58,7 +58,7 @@ class FableServiceProgressTime extends libFableServiceBase
 	{
 		let tmpTimeStampHash = (typeof(pTimeStampHash) == 'string') ? pTimeStampHash : 'Default';
 		let tmpReferenceTime = false;
-		
+
 		// This function allows the user to pass in either a reference time in ms, or, a hash of a timestamp.
 		if (typeof(pReferenceTime) == 'string')
 		{
@@ -102,7 +102,7 @@ class FableServiceProgressTime extends libFableServiceBase
 	{
 		let tmpTimeStampHash = (typeof(pTimeStampHash) == 'string') ? pTimeStampHash : 'Default';
 		let tmpReferenceTime = false;
-		
+
 		// This function allows the user to pass in either a reference time in ms, or, a hash of a timestamp.
 		if (typeof(pReferenceTime) == 'string')
 		{
@@ -156,4 +156,4 @@ class FableServiceProgressTime extends libFableServiceBase
 	}
 }
 
-module.exports = FableServiceProgressTime;
+module.exports = FableServiceProgressTime;

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

@@ -44,7 +44,7 @@ class FableServiceRestClient extends libFableServiceBase
 			if (tmpCookieKeys.length > 0)
 			{
 				// Only grab the first for now.
-				pRequestOptions.headers.cookie = libCookie.serialize(tmpCookieKeys[0], tmpCookieObject[tmpCookieKeys[0]]);				
+				pRequestOptions.headers.cookie = libCookie.serialize(tmpCookieKeys[0], tmpCookieObject[tmpCookieKeys[0]]);
 			}
 		}
 		return pRequestOptions;
@@ -319,4 +319,4 @@ class FableServiceRestClient extends libFableServiceBase
 	}
 }
 
-module.exports = FableServiceRestClient;
+module.exports = FableServiceRestClient;

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

@@ -13,9 +13,9 @@ class FableServiceTemplate extends libFableServiceBase
 	// TODO: Make this use precedent, add configuration, add debugging.
 	constructor(pFable, pOptions, pServiceHash)
 	{
-        super(pFable, pOptions, pServiceHash);
+		super(pFable, pOptions, pServiceHash);
 
-        this.serviceType = 'Template';
+		this.serviceType = 'Template';
 
 		// These are the exact regex's used in lodash/underscore
 		// TODO: Switch this to precedent
@@ -49,7 +49,7 @@ class FableServiceTemplate extends libFableServiceBase
 		// This is defined as such to underscore that it is a dynamic programming
 		// function on this class.
 		this.renderFunction = false;
-        this.templateString = false;
+		this.templateString = false;
 	}
 
 	renderTemplate(pData)
@@ -103,4 +103,4 @@ class FableServiceTemplate extends libFableServiceBase
 	}
 }
 
-module.exports = FableServiceTemplate;
+module.exports = FableServiceTemplate;

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

@@ -19,7 +19,7 @@ class FableServiceUtility extends libFableServiceBase
 	// TODO: Make this use precedent, add configuration, add debugging.
 	constructor(pFable, pOptions, pServiceHash)
 	{
-        super(pFable, pOptions, pServiceHash);
+		super(pFable, pOptions, pServiceHash);
 
 		this.templates = {};
 
@@ -92,7 +92,7 @@ class FableServiceUtility extends libFableServiceBase
 
 		return tmpChunkCache;
 	}
-	
+
 	/**
 	 * Get a value from fable/pict by hash/address
 	 * @param {string} pValueAddress - The manyfest hash/address of the value to get
@@ -207,7 +207,7 @@ class FableServiceUtility extends libFableServiceBase
 		{
 			return [];
 		}
-		
+
 		let tmpValueHashes = Array.prototype.slice.call(arguments);
 		return this.createValueArrayByHashes(this.fable, tmpValueHashes);
 	}
@@ -325,9 +325,9 @@ class FableServiceUtility extends libFableServiceBase
 
 	objectValuesSortByExternalArray(pArray, pObjectArray, pDescending, pSearchAddress)
 	{
-		let tmpDescending = (typeof(pDescending) == 'boolean') ? pDescending : 
-							((typeof(pDescending) == 'number') && (pDescending == 1)) ? true : 
-							((typeof(pDescending) == 'string') && (pDescending == '1')) ? true : 
+		let tmpDescending = (typeof(pDescending) == 'boolean') ? pDescending :
+							((typeof(pDescending) == 'number') && (pDescending == 1)) ? true :
+							((typeof(pDescending) == 'string') && (pDescending == '1')) ? true :
 							false;
 		let tmpManifest = this.fable.newManyfest();
 

package/test/ExpressionParser_tests.js

@@ -461,6 +461,47 @@ suite
 									Expect(parseFloat(tmpResult)).to.be.at.most(13.78);
 
 
+									return fDone();
+								}
+							);
+						test
+							(
+								'Test integration prepartion..',
+								(fDone) =>
+								{
+									let testFable = new libFable();
+									let _Parser = testFable.instantiateServiceProviderIfNotExists('ExpressionParser');
+
+									let tmpManifest = testFable.newManyfest();
+									let tmpDataSourceObject = {};
+									let tmpDataDestinationObject = {};
+									let tmpParserResultsObject = {};
+
+									// Approximate an integration of the function 1000 + (n / 2) from 13.2 and 25 every 0.2 values
+									let tmpResult = _Parser.solve('IntegrationApproximationResult = SERIES FROM 13.2 TO 25 STEP 0.2 :  1000 + (n / 2)', tmpDataSourceObject, tmpParserResultsObject, tmpManifest, tmpDataDestinationObject);
+									Expect(tmpDataDestinationObject.IntegrationApproximationResult[0]).to.equal("1006.6");
+									Expect(tmpDataDestinationObject.IntegrationApproximationResult[1]).to.equal("1006.7");
+									Expect(tmpDataDestinationObject.IntegrationApproximationResult[59]).to.equal("1012.5");
+
+									let tmpResultWithStep = _Parser.solve('IntegrationApproximationResultWithStep = SERIES FROM 13.2 TO 25 STEP 0.5 : (1000 * stepIndex) + n', tmpDataSourceObject, tmpParserResultsObject, tmpManifest, tmpDataDestinationObject);
+									Expect(tmpDataDestinationObject.IntegrationApproximationResultWithStep[0]).to.equal("13.2");
+									Expect(tmpDataDestinationObject.IntegrationApproximationResultWithStep[1]).to.equal("1013.7");
+									Expect(tmpDataDestinationObject.IntegrationApproximationResultWithStep[23]).to.equal("23024.7");
+
+									testFable.AppData =
+									{
+										StartValue: 5,
+										EndValue: 10,
+										StepValue: 0.5,
+										BaseValue: 200,
+									};
+									let tmpResultWithVariables = _Parser.solve('XValues = SERIES FROM StartValue TO EndValue STEP StepValue : (BaseValue * stepIndex) + n',
+										testFable.AppData, tmpParserResultsObject, tmpManifest, testFable.AppData);
+									Expect(testFable.AppData.XValues.length).to.equal(11);
+									Expect(testFable.AppData.XValues[0]).to.equal('5');
+									Expect(testFable.AppData.XValues[5]).to.equal('1007.5');
+									Expect(testFable.AppData.XValues[10]).to.equal('2010');
+
 									return fDone();
 								}
 							);
@@ -702,6 +743,32 @@ suite
 									Expect(tmpDestinationObject.PreciseEquals).to.equal('no');
 								}
 							);
+
+						test
+							(
+								'Series + Regression',
+								() =>
+								{
+									let testFable = new libFable();
+
+									let testCityData = require('./data/cities.json');
+									testFable.AppData =
+									{
+										Cities: testCityData.slice(0, 4),
+										Null: null,
+									};
+
+									// Now through the solver
+									let _Parser = testFable.instantiateServiceProviderIfNotExists('ExpressionParser');
+
+									_Parser.solve('Coefficients = LINEST(FLATTEN(AppData.Cities[].latitude), FLATTEN(AppData.Cities[].population))', testFable, testFable.AppData, false, testFable.AppData);
+									testFable.log.info('Regression Coefficients:', testFable.AppData.Coefficients);
+									_Parser.solve('SeriesFromCoefficients = SERIES FROM 100 TO 1000 STEP 100 : AppData.Coefficients[0] + n * AppData.Coefficients[1]', testFable, testFable.AppData, false, testFable.AppData);
+									testFable.log.info('Series From Coefficients Result:', testFable.AppData.SeriesFromCoefficients);
+									_Parser.solve('IntegratedSeries = SUM(FLATTEN(AppData.SeriesFromCoefficients))', testFable, testFable.AppData, false, testFable.AppData);
+									testFable.log.info('Integrated Series Result:', testFable.AppData.IntegratedSeries);
+								}
+							);
 					}
 				);
 		}

package/test/Math_test.js

@@ -462,8 +462,88 @@ suite
 
 						return fDone();
 					}
-				)
+				);
+
+				test
+				(
+					'Least Squares Regression',
+					function()
+					{
+						let testFable = new libFable();
+
+						const predict = (coeffs, x) => testFable.Math.addPrecise(coeffs[0], coeffs.slice(1).reduce((sum, b, i) =>
+							{
+								return testFable.Math.addPrecise(sum, testFable.Math.multiplyPrecise(b, x[i]));
+							}, 0));
+						// Example: predict y from x1 and x2
+						const X_1 = [ 1, 2, 3, 4 ];
+						const y_1 = [ 3, 2, 1, 0 ];
+
+						const coeffs_1 = testFable.Math.leastSquares(X_1, y_1);
+						testFable.log.info('Coefficients:', coeffs_1);
+
+
+						testFable.log.info('Prediction for [2,1]:', predict(coeffs_1, [2.5]));
+
+						// Example: predict y from x1 and x2
+						const X = [
+							[1, 2],
+							[2, 0],
+							[3, 1],
+							[4, 3]
+						];
+
+						const y = [3, 2, 4, 5];
+
+						const coeffs = testFable.Math.leastSquares(X, y);
+						testFable.log.info('Coefficients:', coeffs);
+
+						testFable.log.info('Prediction for [1,2] (training value is 3):', predict(coeffs, [1, 2]));
+						testFable.log.info('Prediction for [2,0] (training value is 2):', predict(coeffs, [2, 0]));
+						testFable.log.info('Prediction for [3,1] (training value is 4):', predict(coeffs, [3, 1]));
+						Expect(Number(predict(coeffs, [3, 1]))).to.be.closeTo(4, 0.51);
+						testFable.log.info('Prediction for [4,3] (training value is 5):', predict(coeffs, [4, 3]));
+						Expect(Number(predict(coeffs, [4, 3]))).to.be.closeTo(5, 0.25);
+						testFable.log.info('Prediction for [2,1]:', predict(coeffs, [2, 1]));
+					}
+				);
+
+				test
+				(
+					'Linear regression',
+					function(fDone)
+					{
+						let testFable = new libFable();
 
+						const x = [0, 1, 2, 3, 4];
+						const y = [1, 2.2, 2.9, 3.7, 4.1];
+
+						for (let degree = 1; degree < 5; degree++)
+						{
+							const coeffs = testFable.Math.polynomialRegression(x, y, degree);
+
+							function predict(x, coeffs)
+							{
+								return coeffs.reduce((sum, a, i) => sum + a * Math.pow(x, i), 0);
+							}
+
+							testFable.log.info(`degree ${degree} coefficients:`, coeffs);
+
+							Expect(coeffs.length).to.equal(degree + 1); // quadratic
+							for (let i = 0; i < x.length; i++)
+							{
+								const tmpPrediction = predict(x[i], coeffs);
+								testFable.log.info(`x: ${x[i]}, predicted: ${tmpPrediction}, actual: ${y[i]}`);
+								if (i === 0 || i === x.length - 1)
+								{
+									Expect(tmpPrediction).to.be.closeTo(y[i], 1 / degree);
+								}
+							}
+						}
+
+						return fDone();
+					}
+				);
 			}
 		);
 	}