From 098504521e51e9c3adc5c964bc7046811ebb4536 Mon Sep 17 00:00:00 2001
From: Jose Cruz <josec300@live.com>
Date: Wed, 1 Jul 2020 08:10:05 -0400
Subject: [PATCH 1/2] A lot of work to do pushing just in case
---
assets/js/numbers.js | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/assets/js/numbers.js b/assets/js/numbers.js
index 5a925a6..17399ef 100644
--- a/assets/js/numbers.js
+++ b/assets/js/numbers.js
@@ -1,3 +1,10 @@
function compute(expression) {
// TODO - write method definition here
+ var final=0;
+ var q=expression;
+ var p=new Array;
+
+ // this function seperates the expression into arrays
+
+
}
\ No newline at end of file
From 0e73563dfc49b4aa146d280b5679fb9f0bdc559c Mon Sep 17 00:00:00 2001
From: Jose Cruz <josec300@live.com>
Date: Mon, 6 Jul 2020 06:50:56 -0400
Subject: [PATCH 2/2] add some functions to parse the string test.
---
assets/js/numbers.js | 109 ++++++++++++++++++++++++++++++++++++++++---
1 file changed, 103 insertions(+), 6 deletions(-)
diff --git a/assets/js/numbers.js b/assets/js/numbers.js
index 17399ef..65bbe6c 100644
--- a/assets/js/numbers.js
+++ b/assets/js/numbers.js
@@ -1,10 +1,107 @@
-function compute(expression) {
+function compute(expression) {
// TODO - write method definition here
- var final=0;
- var q=expression;
- var p=new Array;
+ var total=0;
+ var newArray=[];
+ var number1=0;
+ var number2=0;
// this function seperates the expression into arrays
-
+
+ function formatArray(expression)
+ newArray(x)
-}
\ No newline at end of file
+function formatArray(ex) //creates a new array and pops new numbers into it
+{
+var number;
+var arr=ex.split("");
+var counter=1;
+
+for(var i=0;i<arr.length;i++)
+{
+ if(testNumber(arr[i]==true))
+ {
+ number+=arr[i]
+ counter++
+
+ }
+ else{
+ number=parseInt(number)
+ newArray.push(number);
+ if(counter>arr.length)
+ {
+ newArray.push(arr[i]);
+ }
+ arr.splice(i,counter)
+ }
+
+}
+
+
+}
+function testNumber(x) //test whole numbers
+{
+ var i=true;
+ if(i==/\d/.test(x)) //test for whole number using regex
+ {
+ return i;
+ }
+ else{
+ return false
+ }
+}
+
+newArray(x)
+{
+
+
+ for(var i=0;i<x.length;i++)
+ {
+ if(x[i]=="+")
+ {
+ var place=0;
+ number1=parseInt(x[i-1])
+ number2=parseInt(x[i+1])
+ total= number1+number2
+ place=--i
+ x.splice(place,3)
+ x.splice(place,0,total);
+ }
+ else if(arr[i]=="-")
+ {
+ var place=0;
+ number1=parseInt(x[i-1])
+ number2=parseInt(x[i+1])
+ total= number1-number2
+ place=--i
+ x.splice(place,3)
+ x.splice(place,0,total);
+
+ }
+ }
+
+ return total;
+}
+
+}
+
+
+// function testArray(x)
+// {
+// switch(x){
+// case "*":
+
+// break;
+
+// case"/":
+// break;
+
+// case "+":
+// break;
+
+// case "-":
+// break;
+
+// default:
+// break;
+// }
+// }
\ No newline at end of file