From 139e3cc16174d630b18778259a8de005bb0e08ac Mon Sep 17 00:00:00 2001
From: miner <pterosauria@protonmail.com>
Date: Thu, 4 Jan 2024 18:12:06 -0500
Subject: [PATCH] 	modified:   README.md 	renamed:   
 dist/Ceres-v2.0.14.mjs -> dist/ceres.js 	modified:  
 docs/arrow_functions.html 	modified:   docs/json_syntax.html 
 modified:   docs/powell.html 	modified:   docs/quadratic.html 
 modified:   docs/rosenbrock.html 	modified:   docs/user1.html

---
 README.md                            | 16 +++++-----
 dist/{Ceres-v2.0.14.mjs => ceres.js} | 47 ++++++++++++++++++++++------
 docs/arrow_functions.html            |  2 +-
 docs/json_syntax.html                |  4 +--
 docs/powell.html                     |  2 +-
 docs/quadratic.html                  |  2 +-
 docs/rosenbrock.html                 |  2 +-
 docs/user1.html                      |  2 +-
 8 files changed, 51 insertions(+), 26 deletions(-)
 rename dist/{Ceres-v2.0.14.mjs => ceres.js} (99%)

diff --git a/README.md b/README.md
index bbcd0dc..39d3dd5 100644
--- a/README.md
+++ b/README.md
@@ -11,10 +11,11 @@ You can install Ceres.js by including the Ceres.js file in your HTML or js code.
 ```HTML
 <script>
 	async function ceresLoading() {
-		const {Ceres} = await import('https://cdn.jsdelivr.net/gh/Pterodactylus/Ceres.js@master/dist/Ceres-v2.0.2.mjs');
+		const {Ceres} = await import('https://cdn.jsdelivr.net/gh/Pterodactylus/Ceres.js@master/dist/ceres.js');
 
 		//Your Code Here
 	}
+	ceresLoading()
 </script>
 ```
 
@@ -27,25 +28,22 @@ Recently in 2024 we have introduced a new syntax for the Ceres js engine.
 	let jsonSystem = {
 		"variables": {
 			"a": {
-				"lowerbound": 1.6,
+				"lowerbound": -3,
 				"guess": 1,
 			}, 
 			"b": {
-				"upperbound": 1.7,
+				"upperbound": 5,
 				"guess": 2,
 			},
 		},
 		"functions": [
 			"a + 10 * b - 20",
-			"Math.sqrt(5) * a - b * b"
-		],
-		"callbacks": [
-			"console.log(x)"
+			"sqrt(5) * a - b * b"
 		]
 	};
 
 	async function ceresLoading() {
-		const {Ceres} = await import('https://cdn.jsdelivr.net/gh/Pterodactylus/Ceres.js@master/dist/Ceres-v2.0.2.mjs');
+		const {Ceres} = await import('https://cdn.jsdelivr.net/gh/Pterodactylus/Ceres.js@master/dist/ceres.js');
 		var solver = new Ceres();
 		solver.run(jsonSystem);
 	}
@@ -62,7 +60,7 @@ Ceres.js takes a vector of residual equations that are all equal to zero when th
 ```html
 <script>
 	async function ceresLoading() {
-		const {Ceres} = await import('https://cdn.jsdelivr.net/gh/Pterodactylus/Ceres.js@master/dist/Ceres-v2.0.2.mjs'); //Always imported via ES6 import
+		const {Ceres} = await import('https://cdn.jsdelivr.net/gh/Pterodactylus/Ceres.js@master/dist/ceres.js'); //Always imported via ES6 import
 
 		var fn1 = function f1(x){
 			return (x[0]+10*x[1]-20); //this equation is of the form f1(x) = 0 
diff --git a/dist/Ceres-v2.0.14.mjs b/dist/ceres.js
similarity index 99%
rename from dist/Ceres-v2.0.14.mjs
rename to dist/ceres.js
index 4c746bc..f92be1f 100644
--- a/dist/Ceres-v2.0.14.mjs
+++ b/dist/ceres.js
@@ -4454,9 +4454,6 @@ else if (typeof define === 'function' && define['amd'])
 else if (typeof exports === 'object')
   exports["CeresModule"] = CeresModule;
 
-
-import * as math from 'https://cdnjs.cloudflare.com/ajax/libs/mathjs/12.2.1/math.min.js';
-
 //Ceres Helper JS
 
 export class Ceres {
@@ -4576,7 +4573,7 @@ export class Ceres {
 		this.instance.delete();
 	}
 
-	parseFunctionFromJson(jsonFunction, variablesMapping) {
+	static parseFunctionFromJson(jsonFunction, variablesMapping) {
         let parsedFunction = jsonFunction;
 
         // Replace variables with their corresponding indexed representations
@@ -4585,19 +4582,49 @@ export class Ceres {
             parsedFunction = parsedFunction.replace(regex, `x[${index}]`);
         });
 
-        return new Function('x', `return math.evaluate(${parsedFunction})`);
+        return parsedFunction;
     }
 
-	sanitizeInput(input) {
-        // Return input without any potentially harmful JavaScript string
-        return input.replace(/[<>]/g, "");
+  static sanitizeInput(mathExpression) {
+    const validExpression = /^[0-9\s+\-/*()\[\]^sincoxetalaqrtPi.E]*$/;
+    const validStructure = /^[\d\s+\-/*()\[\]^]*$/;
+
+    if (!validExpression.test(mathExpression) || !validStructure.test(mathExpression.replace(/sin|cos|tan|cot|sec|csc|log|ln|sqrt|exp|abs|x|E|Pi/g,''))){
+        throw new Error(`Invalid mathematical expression: ${mathExpression}`);
     }
+    
+    mathExpression = mathExpression.replace('^', '**');
+
+    // Translation to Javascript functions
+    mathExpression = mathExpression
+      .replace(/sin/g, 'Math.sin')
+      .replace(/cos/g, 'Math.cos')
+      .replace(/tan/g, 'Math.tan')
+      .replace(/cot/g, 'Math.cot')
+      .replace(/sec/g, 'Math.sec')
+      .replace(/csc/g, 'Math.csc')
+      .replace(/log/g, 'Math.log10')
+      .replace(/ln/g, 'Math.log')
+      .replace(/sqrt/g, 'Math.sqrt')
+      .replace(/exp/g, 'Math.exp')
+      .replace(/abs/g, 'Math.abs')
+      .replace(/Pi/g, 'Math.PI')
+      .replace(/E/g, 'Math.E');
+
+    return mathExpression;
+  }
 
     setSystemFromJson(jsonSystem) {
+        
+        //console.log(jsonSystem.functions)
+        let variables = jsonSystem.variables
+        jsonSystem.functions = jsonSystem.functions.map(function(x) { return Ceres.parseFunctionFromJson(x, variables); });
+        
         // sanitize the input to prevent injection attacks
-        jsonSystem.functions = jsonSystem.functions.map(this.sanitizeInput);
+        jsonSystem.functions = jsonSystem.functions.map(Ceres.sanitizeInput);
+        //console.log(jsonSystem.functions)
     
-        jsonSystem.functions.forEach(jsonFunction => this.addFunction(this.parseFunctionFromJson(jsonFunction, jsonSystem.variables)));
+        jsonSystem.functions.forEach(jsonFunction => this.addFunction(new Function('x', `return ${jsonFunction}`)));
 
         Object.keys(jsonSystem.variables).forEach((varName, index) => {
             let variable = jsonSystem.variables[varName];
diff --git a/docs/arrow_functions.html b/docs/arrow_functions.html
index 7ab20a7..c244ed5 100644
--- a/docs/arrow_functions.html
+++ b/docs/arrow_functions.html
@@ -13,7 +13,7 @@ <h2>User Defined Function</h2>
 
 <script>
 	async function ceresLoading() {
-		const {Ceres} = await import('https://cdn.jsdelivr.net/gh/Pterodactylus/Ceres.js@master/dist/Ceres-v2.0.2.mjs');
+		const {Ceres} = await import('https://cdn.jsdelivr.net/gh/Pterodactylus/Ceres.js@master/dist/ceres.js');
 
 		let f = function (x, a, b, c){
 			return a*x[0]*x[0] + b*x[0] + c
diff --git a/docs/json_syntax.html b/docs/json_syntax.html
index efc7237..65e9ceb 100644
--- a/docs/json_syntax.html
+++ b/docs/json_syntax.html
@@ -27,12 +27,12 @@ <h2>JSON Syntax Demo Function</h2>
 		},
 		"functions": [
 			"a + 10 * b - 20",
-			"Math.sqrt(5) * a - b * b + 4"
+			"sqrt(5) * a - b^2 + 4"
 		]
 	};
 
 	async function ceresSolve() {
-		const {Ceres} = await import('https://cdn.jsdelivr.net/gh/Pterodactylus/Ceres.js@master/dist/Ceres-v2.0.13.mjs');
+		const {Ceres} = await import('https://cdn.jsdelivr.net/gh/Pterodactylus/Ceres.js@master/dist/ceres.js');
 		let solver = new Ceres();
 		let results = await solver.run(jsonSystem);
 		document.getElementById("demo").value = results.report //Print solver report
diff --git a/docs/powell.html b/docs/powell.html
index 3268ea8..cdf6711 100644
--- a/docs/powell.html
+++ b/docs/powell.html
@@ -15,7 +15,7 @@ <h2>Powell Function</h2>
 
 <script>
 	async function ceresLoading() {
-		const {Ceres} = await import('https://cdn.jsdelivr.net/gh/Pterodactylus/Ceres.js@master/dist/Ceres-v2.0.2.mjs');
+		const {Ceres} = await import('https://cdn.jsdelivr.net/gh/Pterodactylus/Ceres.js@master/dist/ceres.js');
 
 		var fn1 = function f1(x){
 			return (x[0]+10*x[1]);
diff --git a/docs/quadratic.html b/docs/quadratic.html
index aef3286..6efb8aa 100644
--- a/docs/quadratic.html
+++ b/docs/quadratic.html
@@ -24,7 +24,7 @@ <h2>Quadratic Function</h2>
 
 <script>
 	async function ceresLoading() {
-		const {Ceres} = await import('https://cdn.jsdelivr.net/gh/Pterodactylus/Ceres.js@master/dist/Ceres-v2.0.2.mjs');
+		const {Ceres} = await import('https://cdn.jsdelivr.net/gh/Pterodactylus/Ceres.js@master/dist/ceres.js');
 
 		var fn1 = function f1(x){
 			return (x[0]+10*x[1]-20); //this equation is of the for f1(x) = 0 
diff --git a/docs/rosenbrock.html b/docs/rosenbrock.html
index e7b2fa9..5fe57dc 100644
--- a/docs/rosenbrock.html
+++ b/docs/rosenbrock.html
@@ -13,7 +13,7 @@ <h2>Rosebrock Function</h2>
 
 <script>
 	async function ceresLoading() {
-		const {Ceres} = await import('https://cdn.jsdelivr.net/gh/Pterodactylus/Ceres.js@master/dist/Ceres-v2.0.2.mjs');
+		const {Ceres} = await import('https://cdn.jsdelivr.net/gh/Pterodactylus/Ceres.js@master/dist/ceres.js');
 	
 		var fn1 = function (x){
 			return (1.0 - x[0]) * (1.0 - x[0]) + 100.0 * (x[1] - x[0] * x[0]) * (x[1] - x[0] * x[0]);
diff --git a/docs/user1.html b/docs/user1.html
index 9e87cd8..73d1732 100644
--- a/docs/user1.html
+++ b/docs/user1.html
@@ -13,7 +13,7 @@ <h2>User Defined Function</h2>
 
 <script>
 	async function ceresLoading() {
-		const {Ceres} = await import('https://cdn.jsdelivr.net/gh/Pterodactylus/Ceres.js@master/dist/Ceres-v2.0.2.mjs');
+		const {Ceres} = await import('https://cdn.jsdelivr.net/gh/Pterodactylus/Ceres.js@master/dist/ceres.js');
 
 		var fn1 = function f1(x){
 			return x[0]/207000 + Math.pow((x[0]/1349),(1/0.282)) - Math.pow((260),2)/(207000*x[0]);