fable 3.1.32 → 3.1.33

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

@@ -294,6 +294,11 @@
 		"Address": "fable.Math.cleanValueObject"
 	},
 
+	"polynomialregression": {
+		"Name": "Perform an nth degree Polynomial Regression on a Set of X and Y Values",
+		"Address": "fable.Math.polynomialRegression"
+	},
+
 	"randominteger": {
 		"Name": "Random Integer",
 		"Address": "fable.DataGeneration.randomInteger"
@@ -397,5 +402,39 @@
 	"createvalueobjectbyhashes": {
 		"Name": "Create Value Object by Hashes",
 		"Address": "fable.Utility.createValueObjectByHashes"
+	},
+
+	"polynomialregression": {
+		"Name": "Perform an nth degree Polynomial Regression on a Set of X and Y Values",
+		"Address": "fable.Math.polynomialRegression"
+	},
+	"leastsquares": {
+		"Name": "Perform a Least Squares Regression on a Set of Independent Variable Vectors and a Dependent Variable Vector",
+		"Address": "fable.Math.leastSquares"
+	},
+	"linest": {
+		"Name": "Perform a Least Squares Regression on a Set of Independent Variable Vectors and a Dependent Variable Vector",
+		"Address": "fable.Math.leastSquares"
+	},
+
+	"matrixtranspose": {
+		"Name": "Transpose a Matrix",
+		"Address": "fable.Math.matrixTranspose"
+	},
+	"matrixmultiply": {
+		"Name": "Multiply Two Matrices",
+		"Address": "fable.Math.matrixMultiply"
+	},
+	"matrixvectormultiply": {
+		"Name": "Multiply a Matrix by a Vector",
+		"Address": "fable.Math.matrixVectorMultiply"
+	},
+	"matrixinverse": {
+		"Name": "Inverse a Matrix",
+		"Address": "fable.Math.matrixInverse"
+	},
+	"gaussianelimination": {
+		"Name": "Solve a System of Linear Equations using Gaussian Elimination",
+		"Address": "fable.Math.gaussianElimination"
 	}
 }

package/source/services/Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-SolvePostfixedExpression.js

@@ -135,7 +135,7 @@ class ExpressionParserSolver extends libExpressionParserOperationBase
 					catch (pError)
 					{
 						tmpResults.ExpressionParserLog.push(`ERROR: ExpressionParser.solvePostfixedExpression failed to solve step ${i} with function ${tmpStepResultObject.ExpressionStep.Operation.Token}: ${pError}`);
-						this.log.error(tmpResults.ExpressionParserLog[tmpResults.ExpressionParserLog.length-1]);
+						this.log.error(tmpResults.ExpressionParserLog[tmpResults.ExpressionParserLog.length-1], { Stack: pError.stack });
 						return false;
 					}
 				}
@@ -151,7 +151,7 @@ class ExpressionParserSolver extends libExpressionParserOperationBase
 					catch (pError)
 					{
 						tmpResults.ExpressionParserLog.push(`ERROR: ExpressionParser.solvePostfixedExpression failed to solve step ${i} with function ${tmpStepResultObject.ExpressionStep.Operation.Token}: ${pError}`);
-						this.log.error(tmpResults.ExpressionParserLog[tmpResults.ExpressionParserLog.length-1]);
+						this.log.error(tmpResults.ExpressionParserLog[tmpResults.ExpressionParserLog.length-1], { Stack: pError.stack });
 						return false;
 					}
 				}

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

@@ -8,6 +8,15 @@
 			"Type": "Assignment"
 		},
 
+	":":
+		{
+			"Name": "Expression Begin",
+			"Token": ":",
+			"Function": "fable.Math.expressionBegin",
+			"Precedence": 0,
+			"Type": "Assignment"
+		},
+
 	"?=":
 		{
 			"Name": "Null or Empty Coalescing Assign Value",

package/source/services/Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-ValueMarshal.js

@@ -10,7 +10,7 @@ class ExpressionParserValueMarshal extends libExpressionParserOperationBase
 
 	/**
 	 * Substitutes values in tokenized objects based on the provided data source and manifest.
-	 * 
+	 *
 	 * TODO: Move this to its own file in the "Fable-Service-ExpressionParser" directory.
 	 *
 	 * @param {Array} pTokenizedObjects - The array of tokenized objects.
@@ -154,4 +154,4 @@ class ExpressionParserValueMarshal extends libExpressionParserOperationBase
 	}
 }
 
-module.exports = ExpressionParserValueMarshal;
+module.exports = ExpressionParserValueMarshal;

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

@@ -1,24 +1,23 @@
-const { PE } = require('big.js');
 const libFableServiceBase = require('fable-serviceproviderbase');
 
 /* Trying a different pattern for this service ...
  *
  * This service is a simple expression parser that can handle math expressions, with magic(tm) lookup of addresses with a manifest.
- * 
+ *
  * Each method works multiple ways.
- * 
+ *
  * 1. You can pass in a results object, and, it will put the state for that step outcome into the results object.
  * 2. It always returns the state, and works without the results object.
- * 
- * 
+ *
+ *
  * Learned a lot from this npm package: https://www.npmjs.com/package/math-expression-evaluator
  * And its related code at github: https://github.com/bugwheels94/math-expression-evaluator
- * 
+ *
  * There were two problems with the codebase above...
- * 
+ *
  * First, the code was very unreadable and determining it was correct or extending it
  * was out of the question.
- * 
+ *
  * Second, and this is a larger issue, is that we need the expressions to be parsed as
  * arbitrary precision.  When I determined that extending the library to use string-based
  * numbers and an arbitrary precision library as the back-end would have taken a significantly
@@ -37,6 +36,11 @@ class FableServiceExpressionParser extends libFableServiceBase
 	{
 		super(pFable, pOptions, pServiceHash);
 
+		/** @type {import('../Fable.js') & { Math: import('./Fable-Service-Math.js') }} */
+		this.fable;
+		/** @type {any} */
+		this.log;
+
 		// The configuration for tokens that the solver recognizes, with precedence and friendly names.
 		this.tokenMap = require('./Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-TokenMap.json');
 
@@ -88,6 +92,7 @@ class FableServiceExpressionParser extends libFableServiceBase
 
 		// These are sub-services for the tokenizer, linter, compiler, marshaler and solver.
 		this.fable.addServiceTypeIfNotExists('ExpressionParser-Tokenizer', require('./Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-ExpressionTokenizer.js'));
+		this.fable.addServiceTypeIfNotExists('ExpressionParser-TokenizerDirectiveMutation', require('./Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-ExpressionTokenizer-DirectiveMutation.js'));
 		this.fable.addServiceTypeIfNotExists('ExpressionParser-Linter', require('./Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-Linter.js'));
 		this.fable.addServiceTypeIfNotExists('ExpressionParser-Postfix', require('./Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-Postfix.js'));
 		this.fable.addServiceTypeIfNotExists('ExpressionParser-ValueMarshal', require('./Fable-Service-ExpressionParser/Fable-Service-ExpressionParser-ValueMarshal.js'));
@@ -98,6 +103,7 @@ class FableServiceExpressionParser extends libFableServiceBase
 
 		// This code instantitates these fable services to child objects of this service, but does not pollute the main fable with them.
 		this.Tokenizer = this.fable.instantiateServiceProviderWithoutRegistration('ExpressionParser-Tokenizer');
+		this.Tokenizer.TokenizerDirectiveMutation = this.fable.instantiateServiceProviderWithoutRegistration('ExpressionParser-TokenizerDirectiveMutation');
 		this.Linter = this.fable.instantiateServiceProviderWithoutRegistration('ExpressionParser-Linter');
 		this.Postfix = this.fable.instantiateServiceProviderWithoutRegistration('ExpressionParser-Postfix');
 		this.ValueMarshal = this.fable.instantiateServiceProviderWithoutRegistration('ExpressionParser-ValueMarshal');
@@ -113,7 +119,7 @@ class FableServiceExpressionParser extends libFableServiceBase
 		this.Messaging.connectExpressionParser(this);
 
 		this.GenericManifest = this.fable.newManyfest();
-		
+
 		// This will look for a LogNoisiness on fable (or one that falls in from pict) and if it doesn't exist, set one for this service.
 		this.LogNoisiness = ('LogNoisiness' in this.fable) ? this.fable.LogNoisiness : 0;
 	}
@@ -156,7 +162,7 @@ class FableServiceExpressionParser extends libFableServiceBase
 
 	/**
 	 * Substitutes values in tokenized objects.
-	 * 
+	 *
 	 * This means marshaling data from pDataSource into the array of objects with the passed in Manifest (or a generic manifest) to prepare for solving.
 	 *
 	 * @param {Array} pTokenizedObjects - The array of tokenized objects.
@@ -186,12 +192,12 @@ class FableServiceExpressionParser extends libFableServiceBase
 
 	/**
 	 * Solves the given expression using the provided data and manifest.
-	 * 
+	 *
 	 * @param {string} pExpression - The expression to solve.
-	 * @param {object} pDataSourceObject - (optional) The data source object (e.g. AppData).
-	 * @param {object} pResultObject - (optional) The result object containing the full postfix expression list, internal variables and solver history.
-	 * @param {object} pManifest - (optional) The manifest object for dereferencing variables.
-	 * @param {object} pDataDestinationObject - (optional) The data destination object for where to marshal the result into.
+	 * @param {Record<string, any>} [pDataSourceObject] - (optional) The data source object (e.g. AppData).
+	 * @param {Record<string, any>} [pResultObject] - (optional) The result object containing the full postfix expression list, internal variables and solver history.
+	 * @param {import('manyfest')} [pManifest] - (optional) The manifest object for dereferencing variables.
+	 * @param {Record<string, any>} [pDataDestinationObject] - (optional) The data destination object for where to marshal the result into.
 	 * @returns {any} - The result of solving the expression.
 	 */
 	solve(pExpression, pDataSourceObject, pResultObject, pManifest, pDataDestinationObject)
@@ -202,15 +208,111 @@ class FableServiceExpressionParser extends libFableServiceBase
 
 		// This is technically a "pre-compile" and we can keep this Results Object around to reuse for better performance.  Not required.
 		this.tokenize(pExpression, tmpResultsObject);
+
+		// Lint the tokenized expression to make sure it's valid
 		this.lintTokenizedExpression(tmpResultsObject.RawTokens, tmpResultsObject);
 		this.buildPostfixedSolveList(tmpResultsObject.RawTokens, tmpResultsObject);
-		
-		// This is where the data from variables gets marshaled into their symbols (from AppData or the like)
-		this.substituteValuesInTokenizedObjects(tmpResultsObject.PostfixTokenObjects, tmpDataSourceObject, tmpResultsObject, pManifest);
-		
-		// Finally this is the expr solving method, which returns a string and also marshals it into tmpDataDestinationObject
-		return this.solvePostfixedExpression(tmpResultsObject.PostfixSolveList, tmpDataDestinationObject, tmpResultsObject, pManifest);
+
+		if (tmpResultsObject.SolverDirectives.Code == 'SERIES')
+		{
+			// Make sure tmpResultsObject.SolverDirective values for From: null, To: null, Step: null are all numeric and non-zero where applicable
+			let tmpFrom = this.fable.Math.parsePrecise(tmpResultsObject.SolverDirectives.From, NaN);
+			let tmpTo = this.fable.Math.parsePrecise(tmpResultsObject.SolverDirectives.To, NaN);
+			let tmpStep = this.fable.Math.parsePrecise(tmpResultsObject.SolverDirectives.Step, NaN);
+
+			if (isNaN(tmpStep))
+			{
+				tmpStep = '1';
+			}
+
+			if (isNaN(tmpFrom) || isNaN(tmpTo))
+			{
+				tmpResultsObject.ExpressionParserLog.push(`ExpressionParser.solve detected invalid SERIES directive parameters.  FROM, TO must be numeric.`);
+				this.log.warn(tmpResultsObject.ExpressionParserLog[tmpResultsObject.ExpressionParserLog.length-1]);
+				return null;
+			}
+
+			// Make sure from/to are not equal
+			if (this.fable.Math.comparePrecise(tmpFrom, tmpTo) == 0)
+			{
+				tmpResultsObject.ExpressionParserLog.push(`ExpressionParser.solve detected invalid SERIES directive parameters.  FROM and TO cannot be equal.`);
+				this.log.warn(tmpResultsObject.ExpressionParserLog[tmpResultsObject.ExpressionParserLog.length-1]);
+				return null;
+			}
+
+			// Make sure that Step is the correct positive/negative based on From and To
+			if (this.fable.Math.comparePrecise(tmpStep, '0') == 0)
+			{
+				tmpResultsObject.ExpressionParserLog.push(`ExpressionParser.solve detected invalid SERIES directive parameters.  STEP cannot be zero.`);
+				this.log.warn(tmpResultsObject.ExpressionParserLog[tmpResultsObject.ExpressionParserLog.length-1]);
+				return null;
+			}
+			if (this.fable.Math.comparePrecise(tmpFrom, tmpTo) < 0)
+			{
+				// From < To so Step must be positive
+				if (this.fable.Math.comparePrecise(tmpStep, '0') < 0)
+				{
+					tmpResultsObject.ExpressionParserLog.push(`ExpressionParser.solve detected invalid SERIES directive parameters.  STEP must be positive when FROM < TO.`);
+					this.log.warn(tmpResultsObject.ExpressionParserLog[tmpResultsObject.ExpressionParserLog.length-1]);
+					return null;
+				}
+			}
+			else
+			{
+				// From >= To so Step must be negative
+				if (this.fable.Math.comparePrecise(tmpStep, '0') > 0)
+				{
+					tmpResultsObject.ExpressionParserLog.push(`ExpressionParser.solve detected invalid SERIES directive parameters.  STEP must be negative when FROM >= TO.`);
+					this.log.warn(tmpResultsObject.ExpressionParserLog[tmpResultsObject.ExpressionParserLog.length-1]);
+					return null;
+				}
+			}
+
+			// Get the number of iterations we need to perform
+			let tmpIterations = parseInt(this.fable.Math.floorPrecise(this.fable.Math.dividePrecise(this.fable.Math.subtractPrecise(tmpTo, tmpFrom), tmpStep)));
+
+			let tmpValueArray = [];
+
+			for (let i = 0; i <= tmpIterations; i++)
+			{
+				let tmpCurrentValueOfN = this.fable.Math.addPrecise(tmpFrom, this.fable.Math.multiplyPrecise(tmpStep, i.toString()));
+
+				// Jimmy up the data source with the current N value, stepIndex and all the other data from the source object
+				// This generates a data source object every time on purpose so we can remarshal in values that changed in the destination
+				let tmpSeriesStepDataSourceObject = Object.assign({}, tmpDataSourceObject);
+				tmpSeriesStepDataSourceObject.n = tmpCurrentValueOfN;
+				tmpSeriesStepDataSourceObject.stepIndex = i;
+
+				let tmpMutatedValues = this.substituteValuesInTokenizedObjects(tmpResultsObject.PostfixTokenObjects, tmpSeriesStepDataSourceObject, tmpResultsObject, pManifest);
+
+				tmpValueArray.push( this.solvePostfixedExpression( tmpResultsObject.PostfixSolveList, tmpDataDestinationObject, tmpResultsObject, pManifest) );
+
+				for (let j = 0; j < tmpMutatedValues.length; j++)
+				{
+					tmpMutatedValues[j].Resolved = false;
+				}
+			}
+
+			// Do the assignment
+			let tmpAssignmentManifestHash = tmpResultsObject.PostfixedAssignmentAddress;
+			if ((tmpResultsObject.OriginalRawTokens[1] === '=') && (typeof(tmpResultsObject.OriginalRawTokens[0]) === 'string') && (tmpResultsObject.OriginalRawTokens[0].length > 0))
+			{
+				tmpAssignmentManifestHash = tmpResultsObject.OriginalRawTokens[0];
+			}
+
+			let tmpManifest = (typeof(pManifest) === 'object') ? pManifest : this.fable.newManyfest();
+			tmpManifest.setValueByHash(tmpDataDestinationObject, tmpAssignmentManifestHash, tmpValueArray);
+
+			return tmpValueArray;
+		}
+		else // For 'SOLVE' or anything else that didn't work
+		{
+			// This is where the data from variables gets marshaled into their symbols (from AppData or the like)
+			this.substituteValuesInTokenizedObjects(tmpResultsObject.PostfixTokenObjects, tmpDataSourceObject, tmpResultsObject, pManifest);
+			// Finally this is the expr solving method, which returns a string and also marshals it into tmpDataDestinationObject
+			return this.solvePostfixedExpression(tmpResultsObject.PostfixSolveList, tmpDataDestinationObject, tmpResultsObject, pManifest);
+		}
 	}
 }
 
-module.exports = FableServiceExpressionParser;
+module.exports = FableServiceExpressionParser;

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

@@ -86,7 +86,7 @@ class FableServiceFilePersistence extends libFableServiceBase
 			{
 				this.fable.log.error(`CSV Read of ${pFilePath} Error: ${pError}`, pError);
 			};
-		
+
 		return this.lineReaderFactory(pFilePath,
 			(pLine) =>
 			{
@@ -265,4 +265,4 @@ class FableServiceFilePersistence extends libFableServiceBase
 	}
 }
 
-module.exports = FableServiceFilePersistence;
+module.exports = FableServiceFilePersistence;

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

@@ -9,7 +9,7 @@ class FableServiceLogic extends libFableServiceBase
 	 */
 	constructor(pFable, pOptions, pServiceHash)
 	{
-        super(pFable, pOptions, pServiceHash);
+		super(pFable, pOptions, pServiceHash);
 	}
 
 	/**