loops and ifs completed

WriteIFs.java

@@ -6,18 +6,39 @@
  * @version (a version number or a date)
  */
 public class WriteIFs
-{
+{  int x;
+   int tt_t;
+   int tt_s;
+   int oo1, oo2;
+   String ss;
+ public WriteIFs()
+  {
+      // initialise instance variables
+      x = 0;
+      tt_t = 0;
+      tt_s = 1;
+      String ss = "";
+      oo1 = 61;
+      oo2 = 49;
+ }
  
     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()”
+        if(tempurature(room)<70){
+            heatOn();
+        } else {
+            coolOn();
+        }
 
 
         
@@ -30,12 +51,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<0.08){
+            refuel();
+        }
 
     }
 
@@ -47,26 +73,13 @@ public class WriteIFs
      * 
      * instance variables
      * / 
-   int x;
-   int tt_t;
-   int tt_s;
-   int oo1, oo2;
-   String ss;
+   
 
 
   /**
    * Constructor for objects of class WriteIFs
    */
-  public WriteIFs()
-  {
-      // initialise instance variables
-      x = 0;
-      tt_t = 0;
-      tt_s = 1;
-      ss = "";
-      oo1 = 61;
-      oo2 = 49;
-  }
+  
 
     // associated routines
     public boolean isAlive(boolean p) {

WriteLoops.java

@@ -20,7 +20,9 @@ public class WriteLoops {
 
         // Write a FOR loop that counts from 1 to 10.
             // calling
+            for(int i=1;i<6;i++){
             w = w + 1;
+        }
             // each time through the loop
 
         // this will tell the test how many times the loop executed.
@@ -32,7 +34,9 @@ public class WriteLoops {
 
         // Write a FOR loop that counts from 1 to 10.
         // calling
+        for(int i=1;i<11;i++){
         w = w + 1;
+    }
         // each time through the loop
         
         return w;
@@ -43,7 +47,9 @@ public class WriteLoops {
 
         // Write a FOR loop that makes 10 iterations, start at 21.
         // calling
+        for(int i=21;i<32;i++){
         w = w + 1;
+    }
         // each time through the loop
         
         return w;
@@ -54,7 +60,9 @@ public class WriteLoops {
 
         // Write a FOR loop that counts down from 100 to 0.
         // calling
+        for(int i=100;i>0;i--){
         w = w + 1;
+    }
         // each time through the loop
         
         return w;
@@ -65,7 +73,10 @@ public class WriteLoops {
 
         // Write a FOR loop from 0 to 32 by 2s.
         // calling
-        w = w + 1;
+        for(int i=0;i<=32;i+=2){
+            w=w+1;
+    }
+    
         // each time through the loop
         return w;
     }
@@ -75,7 +86,9 @@ public class WriteLoops {
 
         // Write a FOR loop from 1 to less than 5001 by 11s.
         // calling
+        for(int i=1;i<5001;i+=11){
         w = w + 1;
+    }
         // each time through the loop
         
         return w;
@@ -87,7 +100,12 @@ 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
+                for(int y=0;y<20;y++){
+                for(int x=0;x<5;x++){
                 w = w + 1;
+            }
+        }
+    
                 // each time through the inner loop
 
         return w;
@@ -102,7 +120,13 @@ public class WriteLoops {
         // prints “Hello Zipcode” instead of the statement w = w + 1;
 
                 // calling
-                w = w + 1;
+                for(int i=5;i<106;i++){
+                    if (i<52){
+                       w = w + 1;
+                    } else {
+                        System.out.println("Hello Zipcode");
+                    }
+                }
             // each time through the inner loop
         
         return w;
@@ -135,12 +159,18 @@ public class WriteLoops {
         // you need to use a .equals for two Strings.
 
             // calling
-            w = w + 1;
+            while (!gpsCurrentLocation().equals("Home")){
+                driveSomeMore();
+                w = w + 1;
+            }
+            System.out.println("Honey, I'm Home!");
+        return w;
+        }
             // each time through the inner loop
         
 
-            return w;
-    }
+            
+    
 
     // Getting harder...
     // First declare and set “highestScore” to 236. Then set “currentScore” to
@@ -157,7 +187,12 @@ public class WriteLoops {
         // do your while loop here
  
             // calling
-            w = w + 1;
+            while (runningScore<highestScore){
+                runningScore+=currentScore;
+                currentScore=gameNextScore();
+                w = w + 1;
+        }
+            
             // each time through the inner loop
         
         return w; // >= 3;
@@ -172,12 +207,15 @@ public class WriteLoops {
         int runningScore = 0;
 
         // do your while loop here
+        do  { currentScore=gameNextScore();
+            runningScore+=currentScore;
+            w = w + 1;
+        } while (runningScore<=highestScore);
 
             // calling
-            w = w + 1;
+          
             // each time through the inner loop
-
-        return w >= 3;
+return w >= 3;
     }
 
     // Write a WHILE loop that checks “serverIsRunning()” and if true
@@ -188,9 +226,18 @@ public class WriteLoops {
         int w = 0;
         String adminPhoneNumber = "+1 202 456 1111";
         
+        while(serverIsRunning()) {
+            waitFor(5);
+            w = w + 1;
+        }
+        if (!serverIsRunning()){
+            sendEmergencyText("Help!",adminPhoneNumber);
+            tryServerRestart("Help!",adminPhoneNumber);
+        }
+            
 
         // calling
-        w = w + 1;
+        
         // each time through the inner loop
         
         return w;
@@ -201,8 +248,11 @@ public class WriteLoops {
     // and if it is, add 7 to “i”
     public int loop50by7() {
         int w = 0;
+        int i=7;
 
-
+while(i<50){
+    i+=7;
+}
             // calling
             w = w + 1;
             // each time through the inner loop

WriteLoopsTest.java

@@ -71,7 +71,7 @@ public class WriteLoopsTest
     public void Test2to32()
     {
         WriteLoops writeLoo1 = new WriteLoops();
-        assertEquals(0, writeLoo1.byTwoTo32());
+        assertEquals(17, writeLoo1.byTwoTo32());
     }
 
     @Test

package.bluej

@@ -1,23 +1,23 @@
 #BlueJ package file
-dependency1.from=WriteLoopsTest
-dependency1.to=WriteLoops
+dependency1.from=WriteIFsTest
+dependency1.to=WriteIFs
 dependency1.type=UsesDependency
-dependency2.from=WriteIFsTest
-dependency2.to=WriteIFs
+dependency2.from=WriteLoopsTest
+dependency2.to=WriteLoops
 dependency2.type=UsesDependency
-editor.fx.0.height=722
-editor.fx.0.width=800
-editor.fx.0.x=560
-editor.fx.0.y=118
-objectbench.height=101
-objectbench.width=740
+editor.fx.0.height=977
+editor.fx.0.width=1920
+editor.fx.0.x=0
+editor.fx.0.y=23
+objectbench.height=118
+objectbench.width=1241
 package.divider.horizontal=0.6
-package.divider.vertical=0.8625954198473282
-package.editor.height=671
+package.divider.vertical=0.8043818466353677
+package.editor.height=507
 package.editor.width=1139
-package.editor.x=112
-package.editor.y=89
-package.frame.height=844
+package.editor.x=0
+package.editor.y=23
+package.frame.height=697
 package.frame.width=1265
 package.numDependencies=2
 package.numTargets=4