second merge

Calculator.java

@@ -1,5 +1,6 @@
 import java.util.*;
 
+
 /**
  * Write a description of class Calculator here.
  *
@@ -8,8 +9,9 @@ import java.util.*;
  */
 public class Calculator{
     public static double lastAns = 0;
-    public static void main(String args[]){
 
+
+    public static void main(String args[]){
         String toDo;                //what the user wants to do
         double num1 = 0;                //The user's first input
         double num2 = 0;            //The user's second input
@@ -25,11 +27,14 @@ public class Calculator{
 
             if (toDo.equalsIgnoreCase("quit")){
                 off = true;
-                System.out.println("Goodbye!!");
+                System.out.println("Goodbye!! \n \n");
+
+            } 
+                                         
+            else {                                     
+                switch (toDo) {
+                    //System.out.println("toDO is: " + toDo);
 
-            }                              
-            else {
-                switch(toDo){
                     case "add":
                     case "subtract":
                     case "multiply":
@@ -46,15 +51,20 @@ public class Calculator{
                     case "tangent" :
                     case "inverse tangent" :
                     case "square" :                 
-                    case "M+" :
                    
 
                     //System.out.println("toDO is: " + toDo);
                     System.out.println(toDo + " -- Enter first number:");
                     num1 = input1.nextDouble();
                     //System.out.println("num1 is: " + num1);
-                }   
+                }                  
+
                 switch (toDo){
+                    // case "previous":
+                    // num1 = lastAns;
+                    // System.out.println(toDo + " -- Enter second number:");
+                    // num2 = input1.nextDouble();
+                    // break;
                     case "add":
                     case "subtract":
                     case "multiply":
@@ -144,6 +154,35 @@ public class Calculator{
                     lastAns = result;
                     calc.printAns(String.valueOf(result));
                     break;
+                    
+                    case "fortune cookie":
+                    calc.printAns(calc.fortuneCookie());
+                    break;
+
+                    case "display mode decimal":
+                    calc.printAns(String.valueOf(lastAns));
+                    break;
+
+                    case "display mode hexadecimal":
+                    calc.printAns(calc.switchDisplayMode("hexadecimal"));
+
+                    case "display mode octal":
+                    calc.printAns(calc.switchDisplayMode("octal"));
+                    break;
+
+                    case "display mode binary":
+                    calc.printAns(calc.switchDisplayMode("binary"));
+                    break;
+
+                    case "display mode" :
+                    calc.printAns(calc.switchDisplayMode());
+                    break;
+
+                    case "random number":
+                    result = calc.randomNumber();
+                    lastAns = result;
+                    calc.printAns(String.valueOf(result));
+                    break;      
 
                     case "square":
                     result = calc.square(num1);
@@ -175,7 +214,6 @@ public class Calculator{
                     break;
 
                     case "M+" :
-                    System.out.println("Enter number:");               
                     result = Memory.memUpdate(lastAns);
                     Memory.printAns(String.valueOf(result));
                     break;
@@ -184,9 +222,14 @@ public class Calculator{
                     result = Memory.memClear();
                     Memory.printAns(String.valueOf(result));
                     break;
-
+                    
+                    case "clear":
+                    lastAns = 0;
+                    break;
                 }
             }
         }
     }
+
 }
+

MathMethods.java

@@ -1,4 +1,5 @@
 import java.util.*;
+import java.lang.*;
 /**
  * Write a description of class Calculator here.
  *
@@ -8,6 +9,7 @@ import java.util.*;
 public class MathMethods
 
 {
+    private static int displayModeCounter=4;
 
     public static Double add(double n1, double n2){
         return (n1 + n2);
@@ -67,9 +69,74 @@ public class MathMethods
 
     }
 
+    public static String fortuneCookie() {
+        Random rand = new Random();
+        String[] wiseWords = new String[] {"You're a hard worker and you will do great on all the labs!", 
+                "Look how much java you learned this week! That's awesome!", 
+                "Keep up the good work!" ,
+                "You're cushing it!", "You're a coding rockstar!", 
+                "Keep coding!"};  
+        int arrIndex = rand.nextInt(6);
+        return wiseWords[arrIndex];
+    }
+
     public static double square(double n1) {
         return Math.pow(n1, 2);
+    }
+
+    public static String switchDisplayMode(String mode){
+
+        Calculator display = new Calculator();
+        String answer = "";
+        switch (mode) {
+            case "binary":
+            answer = "0b " + Integer.toBinaryString((int)display.lastAns);
+            break;
 
+            case "octal":
+            answer = "0 " + Integer.toOctalString((int)display.lastAns);
+            break;
+
+            case "decimal":
+            answer = String.valueOf(display.lastAns);
+            break;
+
+            case "hexadecimal":
+            answer = "0x " + Integer.toHexString((int)display.lastAns);
+            break;
+
+        }
+        return answer;
+    }
+
+    public String switchDisplayMode(){
+        String answer = "";
+        if (displayModeCounter%4 == 0){ 
+            answer = switchDisplayMode("binary");
+            displayModeCounter++;
+        } 
+        else if (displayModeCounter%4 == 1){
+            answer = switchDisplayMode("octal");
+            displayModeCounter++;
+        } 
+        else if (displayModeCounter%4 == 2) {
+            answer = switchDisplayMode("hexadecimal");
+            displayModeCounter++;
+        } else {
+            answer = switchDisplayMode("decimal");
+            displayModeCounter++;
+        }
+        return answer;
+    }
+
+    public static double randomNumber() {
+        Random rand = new Random();
+        return rand.nextDouble()*101;
+
+    }
+
+    public static void printAns(String printAnswer){
+        System.out.println("ANSWER: " + printAnswer + "\n \n");
     }
 
     public static double inverse(double n1) {
@@ -84,8 +151,9 @@ public class MathMethods
         return Math.atan(n1);
     }
 
-    public static void printAns(String printAnswer){
-        System.out.println("ANSWER: " + printAnswer);
+    public static double state() {
+        Calculator display = new Calculator();
+        return (display.lastAns);
     }
 
 }

MathMethodsTest.java

@@ -1,5 +1,4 @@
 
-
 import static org.junit.Assert.*;
 import org.junit.After;
 import org.junit.Before;
@@ -41,12 +40,62 @@ public class MathMethodsTest
     }
 
     @Test
+
+    public void testSquareRoot()
+    {
+        assertEquals(16.0, MathMethods.squareRoot(256), 0.1);
+    }
+
+    @Test
+    public void testInvertPositive()
+    {
+        assertEquals(-5.0, MathMethods.invert(5), 0.1);
+    }
+
+    @Test
+    public void testInvertNegative()
+    {
+        assertEquals(11.0, MathMethods.invert(-11), 0.1);
+    }
+
+    @Test
+    public void testSin()
+    {
+        assertEquals(-0.26237485370392877, MathMethods.sin(50), 0.1);
+    }
+
+    @Test
+    public void testDegToRad()
+    {
+        assertEquals(0.3490658503988659, MathMethods.degToRad(20), 0.1);
+    }
+
+    @Test
+    public void testRadToDeg()
+    {
+        assertEquals(57.2957791308232, MathMethods.radToDeg(1), 0.1);
+    }
+
+    // @Test
+    // public void testOctalDisplay()
+    // {
+    // MathMethods mathMethods1 = new MathMethods();
+    // mathMethods1.memory = 20;
+
+    // assertEquals("0 24", MathMethods.switchDisplayMode("octal"));
+    // }
+
+    @Test
+    public void testInverseSine()
+    {
+        assertEquals(1.5707963267948966, MathMethods.iSin(1), 0.1);
+    }
+
     public void squareTest()
     {
         assertEquals(16, MathMethods.square(4), 0.1);
     }
 
-
     @Test
     public void tangentTest()
     {
@@ -63,10 +112,8 @@ public class MathMethodsTest
     public void inverseTest()
     {
         assertEquals(.1, MathMethods.inverse(10), 0.1);
+
     }
 }
 
 
-
-
-

Memory.java

@@ -22,7 +22,9 @@ public class Memory
     
     public static double memUpdate(double lastAns) 
     {
+
         return mem = lastAns;
+
     }
     
     public static double memClear()

package.bluej

@@ -1,9 +1,9 @@
 #BlueJ package file
-dependency1.from=MathMethodsTest
-dependency1.to=MathMethods
+dependency1.from=MemoryTest
+dependency1.to=Memory
 dependency1.type=UsesDependency
-dependency2.from=MemoryTest
-dependency2.to=Memory
+dependency2.from=MathMethodsTest
+dependency2.to=MathMethods
 dependency2.type=UsesDependency
 dependency3.from=Calculator
 dependency3.to=MathMethods
@@ -11,21 +11,24 @@ dependency3.type=UsesDependency
 dependency4.from=Calculator
 dependency4.to=Memory
 dependency4.type=UsesDependency
-editor.fx.0.height=814
-editor.fx.0.width=1191
-editor.fx.0.x=201
-editor.fx.0.y=-974
-objectbench.height=80
-objectbench.width=595
+dependency5.from=MathMethods
+dependency5.to=Calculator
+dependency5.type=UsesDependency
+editor.fx.0.height=811
+editor.fx.0.width=900
+editor.fx.0.x=399
+editor.fx.0.y=-1001
+objectbench.height=93
+objectbench.width=721
 package.divider.horizontal=0.5993322203672788
-package.divider.vertical=0.8465608465608465
-package.editor.height=473
-package.editor.width=493
-package.editor.x=-188
-package.editor.y=-610
-package.frame.height=625
-package.frame.width=619
-package.numDependencies=4
+package.divider.vertical=0.8493975903614458
+package.editor.height=557
+package.editor.width=619
+package.editor.x=119
+package.editor.y=-750
+package.frame.height=722
+package.frame.width=745
+package.numDependencies=5
 package.numTargets=5
 package.showExtends=true
 package.showUses=true