From 8bcc7582018d308e0af4aa08ac606a68817bd6ff Mon Sep 17 00:00:00 2001
From: kaofushwai <panhsuanjen@gmail.com>
Date: Fri, 30 Oct 2015 00:41:58 +0800
Subject: [PATCH 1/4] HW4

---
 calculator.js           | 10 ++++++++++
 index.html              |  4 +++-
 main.js                 |  6 ++++++
 test/test_calculator.js | 24 +++++++++++++++++++++++-
 4 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/calculator.js b/calculator.js
index caf34db..d0d13fc 100644
--- a/calculator.js
+++ b/calculator.js
@@ -11,5 +11,15 @@ function substract(num1, num2){
   return num1 - num2;
 }
 
+function multiply(num1 ,num2){
+return num1*num2;
+}
+
+function divide(num1 , num2){
+retuen num1/num2;
+}
 module.exports.add = add;
+module.exports.substract = substract;
+module.exports.multiply = multiply;
+module.exports.divide = divide;
 module.exports.isNumber = isNumber;
diff --git a/index.html b/index.html
index cc6a9d9..2928a6c 100644
--- a/index.html
+++ b/index.html
@@ -22,7 +22,9 @@ <h1>Silly Calculator</h1>
     <select id="operator" size="1">
       <option value="add">+</option>
       <option value="substract">-</option>
-    </select>
+	  <option value="multiply">*<<option>
+	  <option value="divide">/<option>
+	</select>
     <input type="text" id="num2" value="1" />
     <div>=</div>
     <input type="text" id="ans" value="2" />
diff --git a/main.js b/main.js
index 957a234..f119043 100644
--- a/main.js
+++ b/main.js
@@ -16,6 +16,12 @@ window.onload = function(){
     else if (operator == "substract"){
       document.getElementById('ans').value = substract(num1, num2);
     }
+	else if(operator=="multiply"){
+	  document.getElementById('ans').value = multiply(num1,num2);
+	}
+	else if(operator=="divide"){
+	  document.getElementById('ans').value = divide(num1,num2);
+	}
     else {
       alert("Bad operator!")
     }
diff --git a/test/test_calculator.js b/test/test_calculator.js
index 13f6205..8708956 100644
--- a/test/test_calculator.js
+++ b/test/test_calculator.js
@@ -4,7 +4,29 @@ var cal = require('../calculator.js')
 describe('Calculator', function(){
   describe('add', function(){
     it('add', function(){
-      assert.equal('2', cal.add(1, 1));
+      assert.equal('8', cal.add(3, 5));
     })
   })
+  describe('substract',function(){
+	it('substract',function(){
+		assert.equal('-2',cal.substract(3,5));
+	})
+  })
+  describe('multiply',function(){
+	it('multiply',function(){
+		assert.equal('15',cal.multiply(3,5));
+	})
+  })
+  describe('divide', function(){
+    it('divide', function(){
+      assert.equal('5', cal.divide(15, 3));
+    })
+  })
+  describe('isNumber', function(){
+    it('isNumber', function(){
+      assert.equal('1', cal.isNumber(-1));
+      assert.equal('0', cal.isNumber('ABC'));
+    })
+  })
+  s
 })

From 4064393befad125953e08eddc4c84bb17cbf4365 Mon Sep 17 00:00:00 2001
From: kaofushwai <panhsuanjen@gmail.com>
Date: Fri, 30 Oct 2015 17:49:07 +0800
Subject: [PATCH 2/4] hw4

---
 index.html              | 2 +-
 test/test_calculator.js | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 2928a6c..1f2db54 100644
--- a/index.html
+++ b/index.html
@@ -22,7 +22,7 @@ <h1>Silly Calculator</h1>
     <select id="operator" size="1">
       <option value="add">+</option>
       <option value="substract">-</option>
-	  <option value="multiply">*<<option>
+	  <option value="multiply">*<option>
 	  <option value="divide">/<option>
 	</select>
     <input type="text" id="num2" value="1" />
diff --git a/test/test_calculator.js b/test/test_calculator.js
index 8708956..0143e89 100644
--- a/test/test_calculator.js
+++ b/test/test_calculator.js
@@ -28,5 +28,4 @@ describe('Calculator', function(){
       assert.equal('0', cal.isNumber('ABC'));
     })
   })
-  s
 })

From 1381969d181fc6074cf09d2e7972f562232b5fd2 Mon Sep 17 00:00:00 2001
From: kaofushwai <panhsuanjen@gmail.com>
Date: Fri, 30 Oct 2015 18:41:24 +0800
Subject: [PATCH 3/4] Modify the negative num and test

---
 calculator.js           | 2 +-
 test/test_calculator.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/calculator.js b/calculator.js
index d0d13fc..9c49e4d 100644
--- a/calculator.js
+++ b/calculator.js
@@ -1,5 +1,5 @@
 function isNumber(numStr){
-  var re = /^[0-9\.]+$/; 
+  var re = /^[\-]?[0-9]+[\.]?[0-9]*$/; 
   return re.test(numStr);
 }
 
diff --git a/test/test_calculator.js b/test/test_calculator.js
index 0143e89..965c8ca 100644
--- a/test/test_calculator.js
+++ b/test/test_calculator.js
@@ -9,7 +9,7 @@ describe('Calculator', function(){
   })
   describe('substract',function(){
 	it('substract',function(){
-		assert.equal('-2',cal.substract(3,5));
+		assert.equal('1',cal.substract(2,1));
 	})
   })
   describe('multiply',function(){

From e5306d4dfc84794d35c0177c94d36bb81a155eba Mon Sep 17 00:00:00 2001
From: kaofushwai <panhsuanjen@gmail.com>
Date: Fri, 30 Oct 2015 18:57:06 +0800
Subject: [PATCH 4/4] modify the wring spell

---
 calculator.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/calculator.js b/calculator.js
index 9c49e4d..d6f35a1 100644
--- a/calculator.js
+++ b/calculator.js
@@ -1,5 +1,5 @@
 function isNumber(numStr){
-  var re = /^[\-]?[0-9]+[\.]?[0-9]*$/; 
+  var re = /^-?[0-9]+.?[0-9]*$/;
   return re.test(numStr);
 }
 
@@ -12,11 +12,11 @@ function substract(num1, num2){
 }
 
 function multiply(num1 ,num2){
-return num1*num2;
+  return num1*num2;
 }
 
 function divide(num1 , num2){
-retuen num1/num2;
+  return num1/num2;
 }
 module.exports.add = add;
 module.exports.substract = substract;