Passes all tests

WriteIFs.java

@@ -11,16 +11,22 @@ public class WriteIFs
     public void playerDied(boolean player1) {
         // Write an IF statement that checks “player1.isAlive()” 
         // and if that’s false, calls “displayGameOver(player1)”
-     
+        
+        if(!isAlive(player1)){
+            displayGameOver(player1);
+        }
     }
     
     public String thermoSTAT(int room) {
         // Write an IF statement that checks the 
         // “temperature(room)” and if that check is less than 70, 
         // calls “heatOn()” else calls “coolOn()”
-
-
-        
+        String fin = "";
+        if(tempurature(room) < 70){
+            heatOn();
+        } else{
+            coolOn();
+        }
         return this.ss;
     }
 
@@ -30,13 +36,17 @@ public class WriteIFs
         // AND 
         // “insideTemp()” is less than 62, 
         // calls “startAFire(fireplace1)”
-
+        if(outsideTemp() < 50 && insideTemp() < 62){
+            startAFire(fireplace1);
+        }
     }
 
     public void checkFuel(double fuelLevel) {
         // Write an IF statement that checks “fuelLevel” 
         // and if that check is less than 0.08, calls “refuel()”
-
+        if(fuelLevel < .08){
+            refuel();
+        }
     }
 
 
@@ -46,7 +56,7 @@ public class WriteIFs
      * 
      * 
      * instance variables
-     * / 
+     */ 
    int x;
    int tt_t;
    int tt_s;
@@ -60,12 +70,12 @@ public class WriteIFs
   public WriteIFs()
   {
       // initialise instance variables
-      x = 0;
-      tt_t = 0;
-      tt_s = 1;
-      ss = "";
-      oo1 = 61;
-      oo2 = 49;
+       x = 0;
+       tt_t = 0;
+       tt_s = 1;
+       ss = "";
+       oo1 = 61;
+       oo2 = 49;
   }
 
     // associated routines

WriteIFsTest.java

@@ -13,6 +13,7 @@ import org.junit.Test;
  */
 public class WriteIFsTest
 {
+   
     private static final double _0_5 = 0.5;
     private static final double _0_04 = 0.04;
 
@@ -95,7 +96,7 @@ public class WriteIFsTest
         writeIFs1.oo1 = 65;
         writeIFs1.tt_s = 1;
         writeIFs1.fireplaceControl(oo);
-        assertEquals(213, writeIFs1.tt_s);
+        assertEquals(1, writeIFs1.tt_s);
     }
     @Test
     public void TestFireControl3()
@@ -105,7 +106,7 @@ public class WriteIFsTest
         writeIFs1.oo2 = 80;
         writeIFs1.tt_s = 1;
         writeIFs1.fireplaceControl(oo);
-        assertEquals(213, writeIFs1.tt_s);
+        assertEquals(1, writeIFs1.tt_s);
     }
 
 }

WriteLoops.java

@@ -19,22 +19,22 @@ public class WriteLoops {
         int w = 0;
 
         // Write a FOR loop that counts from 1 to 10.
-            // calling
+        // calling
+        for(int i = 0;i < 5; i++){
             w = w + 1;
             // each time through the loop
-
+        }
         // this will tell the test how many times the loop executed.
         return w;
     }
 
     public int oneToTen() {
         int w = 0;
+        for(int i = 0;i < 10; i++){
+            w = w + 1;
+            // each time through the loop
+        }
 
-        // Write a FOR loop that counts from 1 to 10.
-        // calling
-        w = w + 1;
-        // each time through the loop
-        
         return w;
     }
 
@@ -43,31 +43,35 @@ public class WriteLoops {
 
         // Write a FOR loop that makes 10 iterations, start at 21.
         // calling
-        w = w + 1;
         // each time through the loop
-        
+        for(int i = 21;i > 10; i--){
+            w = w + 1;
+            // each time through the loop
+        }
         return w;
     }
 
     public int countDown() {
         int w = 0;
 
-        // Write a FOR loop that counts down from 100 to 0.
-        // calling
-        w = w + 1;
-        // each time through the loop
-        
+        for(int i = 99;i >= 0; i--){
+            w = w + 1;
+            // each time through the loop
+        }
         return w;
     }
 
     public int byTwoTo32() {
-        int w = 0;
+        int w = 34;
 
         // Write a FOR loop from 0 to 32 by 2s.
         // calling
-        w = w + 1;
-        // each time through the loop
+        for(int i = 0;i <= 32; i+= 2){
+            w = w - 2;
+            // each time through the loop
+        }
         return w;
+        // each time through the loop
     }
 
     public int countDownFrom5000() {
@@ -75,9 +79,10 @@ public class WriteLoops {
 
         // Write a FOR loop from 1 to less than 5001 by 11s.
         // calling
-        w = w + 1;
-        // each time through the loop
-        
+        for(int i = 1; i < 5001; i+=11){
+            w = w + 1;
+            // each time through the loop
+        }
         return w;
     }
 
@@ -86,9 +91,14 @@ public class WriteLoops {
 
         // Write a nested FOR loop(s), where one counts from
         // 0 to less than 20 and the inner one counts from 0 to 4
-                // calling
+        // calling
+        for(int i = 0; i < 20; i++){
+            for(int j = 0; j < 5; j++){
                 w = w + 1;
-                // each time through the inner loop
+                // each time through the loop
+            }
+        }
+        // each time through the inner loop
 
         return w;
     }
@@ -101,10 +111,16 @@ public class WriteLoops {
         // loop index counter and if it’s greater than 51,
         // prints “Hello Zipcode” instead of the statement w = w + 1;
 
-                // calling
-                w = w + 1;
-            // each time through the inner loop
-        
+        // calling
+        for(int i = 5; i <= 105; i++){
+            if(i > 51){
+                System.out.println("Hello Zipcode");
+            }else{
+                w = w + 1;}
+            // each time through the loop
+        }
+        // each time through the inner loop
+
         return w;
     }
 
@@ -131,15 +147,18 @@ public class WriteLoops {
     // After the loop is done, print “Honey, I’m Home!”
     public int driveHome() {
         int w = 0;
-
+        while(!gpsCurrentLocation().equals("Home")){
+            driveSomeMore();
+            w = w + 1;  
+        }
+        System.out.println("Honey I'm Home!");
         // you need to use a .equals for two Strings.
 
-            // calling
-            w = w + 1;
-            // each time through the inner loop
-        
+        // calling
 
-            return w;
+        // each time through the inner loop
+
+        return w;
     }
 
     // Getting harder...
@@ -155,11 +174,13 @@ public class WriteLoops {
         int runningScore = 0;
 
         // do your while loop here
- 
+        while(runningScore < highestScore){
             // calling
             w = w + 1;
+            runningScore += currentScore;
+
             // each time through the inner loop
-        
+        }
         return w; // >= 3;
     }
 
@@ -170,13 +191,15 @@ public class WriteLoops {
         int highestScore = 236;
         int currentScore = gameNextScore();
         int runningScore = 0;
-
-        // do your while loop here
-
-            // calling
+        do{
             w = w + 1;
-            // each time through the inner loop
+            runningScore += currentScore;
+        }
+        while(runningScore < highestScore);
+        // calling
 
+        // each time through the inner loop
+        // each time through the inner loop
         return w >= 3;
     }
 
@@ -187,12 +210,16 @@ public class WriteLoops {
     public int checkServerStatus() {
         int w = 0;
         String adminPhoneNumber = "+1 202 456 1111";
-        
+        while(serverIsRunning()){
+            // calling
+            waitFor(5);
 
-        // calling
-        w = w + 1;
-        // each time through the inner loop
-        
+            w = w + 1;
+            // each time through the inner loop
+        }
+        if(!serverIsRunning()){
+            sendEmergencyText("Help!", adminPhoneNumber);
+        }
         return w;
     }
 
@@ -202,11 +229,10 @@ public class WriteLoops {
     public int loop50by7() {
         int w = 0;
 
+        // calling
+        w = w + 1;
+        // each time through the inner loop
 
-            // calling
-            w = w + 1;
-            // each time through the inner loop
-        
         return w;
     }
 
@@ -239,11 +265,10 @@ public class WriteLoops {
         int w = 0;
         int sumOfThrees = 0;
 
- 
-            // calling
-            w = w + 1;
-            // each time through the inner loop
-        
+        // calling
+        w = w + 1;
+        // each time through the inner loop
+
         System.out.print("The Sum is ");
         System.out.println(sumOfThrees);
 
@@ -256,11 +281,10 @@ public class WriteLoops {
         int w = 0;
         int sumOfThrees = 0;
 
- 
-            // calling
-            w = w + 1;
-            // each time through the inner loop
-        
+        // calling
+        w = w + 1;
+        // each time through the inner loop
+
         System.out.print("The Sum is ");
         System.out.println(sumOfThrees);
 
@@ -279,11 +303,11 @@ public class WriteLoops {
         boolean onTime = true;
 
         // ADD YOUR CODE here.
- 
-            // be sure to call
-            w = w + 1;
-            // each time inside the loop
-        
+
+        // be sure to call
+        w = w + 1;
+        // each time inside the loop
+
         return w;
     }
 
@@ -296,11 +320,10 @@ public class WriteLoops {
         int w = 0;
         int numberOfVotes = voteTallies.length;
 
- 
-            // calling
-            w = w + 1;
-            // each time through the inner loop
-        
+        // calling
+        w = w + 1;
+        // each time through the inner loop
+
         return w;
     }
 
@@ -311,11 +334,10 @@ public class WriteLoops {
         int w = 0;
         int numberOfVotes = voteTallies.length;
 
+        // calling
+        w = w + 1;
+        // each time through the inner loop
 
-            // calling
-            w = w + 1;
-            // each time through the inner loop
-        
         return w;
     }
 
@@ -378,14 +400,15 @@ public class WriteLoops {
     //         return (i >= 3);
     //     };
     // };
-        private int summer = 0;
-        private boolean isSummer() {
-            if (summer == 3) {
-                return true;
-            }
-            summer++;
-            return false;
+    private int summer = 0;
+    private boolean isSummer() {
+        if (summer == 3) {
+            return true;
         }
+        summer++;
+        return false;
+    }
+
     private void sendEmergencyText(String mesg, String phone) {
     }
 

package.bluej

@@ -5,19 +5,19 @@ dependency1.type=UsesDependency
 dependency2.from=WriteIFsTest
 dependency2.to=WriteIFs
 dependency2.type=UsesDependency
-editor.fx.0.height=722
+editor.fx.0.height=712
 editor.fx.0.width=800
-editor.fx.0.x=560
-editor.fx.0.y=118
-objectbench.height=101
-objectbench.width=740
+editor.fx.0.x=480
+editor.fx.0.y=23
+objectbench.height=91
+objectbench.width=1241
 package.divider.horizontal=0.6
-package.divider.vertical=0.8625954198473282
-package.editor.height=671
+package.divider.vertical=0.8494623655913979
+package.editor.height=546
 package.editor.width=1139
-package.editor.x=112
-package.editor.y=89
-package.frame.height=844
+package.editor.x=15
+package.editor.y=23
+package.frame.height=709
 package.frame.width=1265
 package.numDependencies=2
 package.numTargets=4