final

Calculator.java

@@ -1,12 +1,7 @@
+
 import java.util.*;
 
 
-/**
- * Write a description of class Calculator here.
- *
- * @author (your name)
- * @version (a version number or a date)
- */
 public class Calculator{
     public static double lastAns = 0;
 
@@ -17,13 +12,17 @@ public class Calculator{
         double num2 = 0;            //The user's second input
         double result = 0;          //The user's answer
         boolean off = false;        //The user typed quit, becomes true
+        double memory;
+
+ 
         boolean error = false;
         MathMethods calc = new MathMethods();
 
         while (off == false){
             Scanner input1 = new Scanner(System.in);
             System.out.println("What do you want to do?");
-            toDo = input1.next();
+
+            toDo = input1.nextLine();
 
             if (toDo.equalsIgnoreCase("quit")){
                 off = true;
@@ -223,13 +222,20 @@ public class Calculator{
                     Memory.printAns(String.valueOf(result));
                     break;
                     
+                    case "roundTo":
+                    memory = result;
+                    calc.roundTo(memory, (int)num1);
+                    break;
+                    
                     case "clear":
                     lastAns = 0;
                     break;
+                                     
+                    }
                 }
             }
         }
-    }
 
-}
+    }
 
+    

MathMethods.java

@@ -1,5 +1,7 @@
 import java.util.*;
+
 import java.lang.*;
+
 /**
  * Write a description of class Calculator here.
  *
@@ -9,8 +11,10 @@ import java.lang.*;
 public class MathMethods
 
 {
+
     private static int displayModeCounter=4;
 
+
     public static Double add(double n1, double n2){
         return (n1 + n2);
     }
@@ -69,14 +73,16 @@ 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);
+        int arrIndex = rand.nextInt(wiseWords.length);
         return wiseWords[arrIndex];
     }
 
@@ -136,7 +142,7 @@ public class MathMethods
     }
 
     public static void printAns(String printAnswer){
-        System.out.println("ANSWER: " + printAnswer + "\n \n");
+        System.out.println( "ANSWER: " + printAnswer + " \n \n");
     }
 
     public static double inverse(double n1) {
@@ -156,5 +162,11 @@ public class MathMethods
         return (display.lastAns);
     }
 
+    public static void roundTo(Double memory, int numPlaces){
+
+        System.out.printf("ANSWER: %." + (numPlaces)+ "f\n", memory);
+
+    }
 }
 
+

Memory.java

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

README-CheckItOut.txt.rtf

@@ -0,0 +1,18 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf600
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+{\*\expandedcolortbl;;}
+\margl1440\margr1440\vieww10800\viewh8400\viewkind0
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
+
+\f0\fs24 \cf0 Team: Calc Crew\
+	\
+	Seth Abrams\
+	Nathan Hall\
+	Maggie Pierce\
+	\
+\
+Additional Features:\
+- Fortune Cookie\
+- Random Number\
+- Rounding}

package.bluej

@@ -1,6 +1,13 @@
 #BlueJ package file
+<<<<<<< HEAD
 dependency1.from=MemoryTest
 dependency1.to=Memory
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+dependency1.from=Calculator
+dependency1.to=MathMethods
+>>>>>>> b807549eab014b3118ccfbb5b6e7d95cbb256af2
 dependency1.type=UsesDependency
 dependency2.from=MathMethodsTest
 dependency2.to=MathMethods
@@ -21,6 +28,7 @@ editor.fx.0.y=-1001
 objectbench.height=93
 objectbench.width=721
 package.divider.horizontal=0.5993322203672788
+<<<<<<< HEAD
 package.divider.vertical=0.8493975903614458
 package.editor.height=557
 package.editor.width=619
@@ -29,6 +37,34 @@ package.editor.y=-750
 package.frame.height=722
 package.frame.width=745
 package.numDependencies=5
+=======
+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
+=======
+dependency1.from=Calculator
+dependency1.to=MathMethods
+dependency1.type=UsesDependency
+editor.fx.0.height=722
+editor.fx.0.width=800
+editor.fx.0.x=0
+editor.fx.0.y=132
+objectbench.height=205
+objectbench.width=595
+package.divider.horizontal=0.6
+package.divider.vertical=0.6849925705794948
+package.editor.height=454
+package.editor.width=493
+package.editor.x=35
+package.editor.y=23
+package.frame.height=731
+>>>>>>> a0c06052a8de50df57cd0a41d73ffc3f9ce302c2
+package.frame.width=619
+package.numDependencies=4
+>>>>>>> b807549eab014b3118ccfbb5b6e7d95cbb256af2
 package.numTargets=5
 package.showExtends=true
 package.showUses=true
@@ -39,8 +75,37 @@ readme.width=47
 readme.x=10
 readme.y=10
 target1.height=50
+<<<<<<< HEAD
 target1.name=MemoryTest
+=======
+target1.name=Calculator
+>>>>>>> a0c06052a8de50df57cd0a41d73ffc3f9ce302c2
 target1.showInterface=false
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+target1.type=ClassTarget
+<<<<<<< HEAD
+target1.width=140
+target1.x=80
+target1.y=200
+target2.height=50
+target2.name=MathMethodsTest
+target2.showInterface=false
+target2.type=UnitTestTargetJunit4
+target2.width=110
+target2.x=270
+target2.y=310
+target3.association=MathMethodsTest
+target3.height=50
+target3.name=MathMethods
+target3.showInterface=false
+target3.type=ClassTarget
+target3.width=110
+target3.x=240
+target3.y=340
+=======
+>>>>>>> b807549eab014b3118ccfbb5b6e7d95cbb256af2
 target1.type=UnitTestTargetJunit4
 target1.width=80
 target1.x=400
@@ -75,3 +140,19 @@ target5.type=ClassTarget
 target5.width=110
 target5.x=60
 target5.y=280
+<<<<<<< HEAD
+=======
+>>>>>>> 2a9a289e4239250cd6e2f776f8cc64f1130c5a52
+=======
+target1.width=120
+target1.x=70
+target1.y=70
+target2.height=50
+target2.name=MathMethods
+target2.showInterface=false
+target2.type=ClassTarget
+target2.width=110
+target2.x=80
+target2.y=200
+>>>>>>> a0c06052a8de50df57cd0a41d73ffc3f9ce302c2
+>>>>>>> b807549eab014b3118ccfbb5b6e7d95cbb256af2