From 28b88872851dbf2fcc18c87b292df340472be788 Mon Sep 17 00:00:00 2001
From: CJ Fulton <fulchr3356@gmail.com>
Date: Tue, 30 Jun 2020 00:05:10 -0400
Subject: [PATCH 1/3] Work in progress without eval

---
 assets/js/numbers.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/assets/js/numbers.js b/assets/js/numbers.js
index 5a925a6..6f858fd 100644
--- a/assets/js/numbers.js
+++ b/assets/js/numbers.js
@@ -1,3 +1,14 @@
 function compute(expression) {
     // TODO - write method definition here
-}
\ No newline at end of file
+     var operations = ["-","+","*", "/"];
+     var tempString = "";
+     for (var i = 0; i < expression.length;i++){
+        if (operations.includes(expression.charAt(i))){
+            tempString = "0";
+        }
+     }
+     return eval(expression);
+}
+
+
+

From d75b6ceafdefe188c058e3589475423321f60600 Mon Sep 17 00:00:00 2001
From: CJ Fulton <fulchr3356@gmail.com>
Date: Tue, 30 Jun 2020 23:10:54 -0400
Subject: [PATCH 2/3] Completed compute function

---
 assets/js/numbers.js | 71 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 64 insertions(+), 7 deletions(-)

diff --git a/assets/js/numbers.js b/assets/js/numbers.js
index 6f858fd..58acbd0 100644
--- a/assets/js/numbers.js
+++ b/assets/js/numbers.js
@@ -1,14 +1,71 @@
 function compute(expression) {
     // TODO - write method definition here
-     var operations = ["-","+","*", "/"];
-     var tempString = "";
-     for (var i = 0; i < expression.length;i++){
-        if (operations.includes(expression.charAt(i))){
-            tempString = "0";
+    var numbers = [];
+    var operators = [];
+    var ops = ["*","/","+","-"];
+    length = expression.length;
+    subIndex = 0;
+    var tempNum;
+    for (var i = 0; i<length; i++){
+            if (ops.includes(expression[i])){
+                numbers.push(expression.substring(subIndex,i));
+                operators.push(expression[i]);
+                subIndex = i+1;
+            }
+            else if(i == expression.length-1 ){
+                numbers.push(expression.substring(subIndex,expression.length));
+            }
         }
-     }
-     return eval(expression);
+        var i = 0;
+        while(operators.includes("*") || operators.includes("/")){
+            console.log(i);
+            if(operators[i] == "*"){
+                tempNum = (parseInt(numbers[i],10)) * (parseInt(numbers[i+1],10));
+                numbers = creatNewArray(numbers, i,i+1,tempNum);
+                operators.splice(i,1);
+                continue;
+            }
+            else if(operators[i] == "/"){
+                tempNum = (parseInt(numbers[i],10)) / (parseInt(numbers[i+1],10));
+                numbers = creatNewArray(numbers, i,i+1,tempNum);
+                operators.splice(i,1);
+                continue;
+            }
+            i++;
+        }
+        i = 0;
+        while(operators.includes("+") || operators.includes("-")){
+            if(operators[i] == "+"){
+                tempNum = (parseInt(numbers[i],10)) + (parseInt(numbers[i+1],10));
+                numbers = creatNewArray(numbers, i,i+1,tempNum);
+                operators.splice(i,1);
+                continue;
+            }
+            else if(operators[i] == "-"){
+                tempNum = (parseInt(numbers[i],10)) - (parseInt(numbers[i+1],10));
+                numbers = creatNewArray(numbers, i,i+1,tempNum);
+                operators.splice(i,1);
+                continue;
+            }
+            i++;
+
+    }
+     return parseInt(numbers);
+}
+function creatNewArray(numbers, left,right, newValue){
+    var numbers2 = [];
+    for (var i = 0; i< numbers.length;i++){
+        if (i == left)
+            numbers[i] = newValue;
+        if(i == right)
+            continue;
+        numbers2.push(numbers[i]);
+    }
+    return numbers2;
 }
 
 
 
+
+
+

From 223126ea1b2dc20301cd3ec3aff84481a387a84d Mon Sep 17 00:00:00 2001
From: CJ Fulton <fulchr3356@gmail.com>
Date: Wed, 1 Jul 2020 00:25:00 -0400
Subject: [PATCH 3/3] Cleaned up code

---
 assets/js/numbers.js | 37 ++++++++++++++-----------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/assets/js/numbers.js b/assets/js/numbers.js
index 58acbd0..5d228ee 100644
--- a/assets/js/numbers.js
+++ b/assets/js/numbers.js
@@ -17,17 +17,18 @@ function compute(expression) {
             }
         }
         var i = 0;
+        for (var k = 0; k<numbers.length;k++)
+            numbers[k] = Number(numbers[k]);
         while(operators.includes("*") || operators.includes("/")){
-            console.log(i);
             if(operators[i] == "*"){
-                tempNum = (parseInt(numbers[i],10)) * (parseInt(numbers[i+1],10));
-                numbers = creatNewArray(numbers, i,i+1,tempNum);
+                numbers[i] = (numbers[i]) * (numbers[i+1]);
+                numbers.splice(i+1,1);
                 operators.splice(i,1);
                 continue;
             }
             else if(operators[i] == "/"){
-                tempNum = (parseInt(numbers[i],10)) / (parseInt(numbers[i+1],10));
-                numbers = creatNewArray(numbers, i,i+1,tempNum);
+                numbers[i] = (numbers[i]) / (numbers[i+1]);
+                numbers.splice(i+1,1);
                 operators.splice(i,1);
                 continue;
             }
@@ -35,33 +36,22 @@ function compute(expression) {
         }
         i = 0;
         while(operators.includes("+") || operators.includes("-")){
-            if(operators[i] == "+"){
-                tempNum = (parseInt(numbers[i],10)) + (parseInt(numbers[i+1],10));
-                numbers = creatNewArray(numbers, i,i+1,tempNum);
+            if(operators[i] == "-"){
+                numbers[i] = parseFloat((numbers[i]) - (numbers[i+1]));
+                numbers.splice(i+1,1);
                 operators.splice(i,1);
                 continue;
             }
-            else if(operators[i] == "-"){
-                tempNum = (parseInt(numbers[i],10)) - (parseInt(numbers[i+1],10));
-                numbers = creatNewArray(numbers, i,i+1,tempNum);
+            else if(operators[i] == "+"){
+                numbers[i] = (numbers[i]) + (numbers[i+1]);
+                numbers.splice(i+1,1);
                 operators.splice(i,1);
                 continue;
             }
             i++;
 
     }
-     return parseInt(numbers);
-}
-function creatNewArray(numbers, left,right, newValue){
-    var numbers2 = [];
-    for (var i = 0; i< numbers.length;i++){
-        if (i == left)
-            numbers[i] = newValue;
-        if(i == right)
-            continue;
-        numbers2.push(numbers[i]);
-    }
-    return numbers2;
+     return parseFloat(numbers);
 }
 
 
@@ -69,3 +59,4 @@ function creatNewArray(numbers, left,right, newValue){
 
 
 
+