modified loops

WriteLoops.java

@@ -14,7 +14,9 @@ import java.util.function.Supplier;
 public class WriteLoops {
 
     private static final int _3 = 3;
-
+    int serverStatus;
+    private int gps;
+    
     public int oneToFive() {
         int w=0;
         // Write a FOR loop that counts from 1 to 10.
@@ -75,9 +77,10 @@ public class WriteLoops {
 
         // Write a FOR loop from 0 to 32 by 2s.
         // calling
-        for(int i=0;i<=32;i=+2)
+        for(int i=0;i<32;i=i+2)
         {
-            w = w + 1;
+            System.out.println ("byTwoto32 i = " + i);
+            w++;
         }// each time through the loop
         return w;
     }
@@ -87,7 +90,7 @@ public class WriteLoops {
 
         // Write a FOR loop from 1 to less than 5001 by 11s.
         // calling
-        for(int i=1;i<5001;i=+11)
+        for(int i=1;i<5001;i=i+11)
             w = w + 1;
         // each time through the loop
 
@@ -155,10 +158,11 @@ public class WriteLoops {
     // After the loop is done, print “Honey, I’m Home!”
     public int driveHome() {
         int w = 0;
-        String current=gpsCurrentLocation();
-        while(!current.equals("home"))
+         
+        while(!gpsCurrentLocation().equals("Home"))
         {
             this.driveSomeMore();
+            w=w+1;
         } 
         System.out.println ("Honey, I'm Home!");
 
@@ -223,16 +227,17 @@ public class WriteLoops {
     public int checkServerStatus() {
         int w = 0;
         String adminPhoneNumber = "+1 202 456 1111";
-        boolean result=serverIsRunning();
-        while(result == true)
+        
+        while(this.serverIsRunning())
         {
             waitFor(5);
+            w=w+1;
         }
-        if(result==false)
+        if(!this.serverIsRunning())
         {
-            sendEmergencyText("Help","adminPhoneNumber");
-            tryServerRestart("","");
-            w=w+1;
+            sendEmergencyText("Help",adminPhoneNumber);
+            tryServerRestart("Help", adminPhoneNumber);
+            
         }
         // calling
         
@@ -252,10 +257,7 @@ public class WriteLoops {
             w = w + 1;
         }
         
-        // calling
         
-        // each time through the inner loop
-
         return w;
     }
 
@@ -283,7 +285,7 @@ public class WriteLoops {
         return w;
     }
 
-    // Ponder this: can all FOR loops be rewritten as WHILE loops?
+    // Ponder this: can all FOR loops be rewritten as WHILE loops? yes
     // rewrite the loop inside of "foo()" as a standard for loop
     // with 'i' as its index variable.
     public int rewriteFooAsFor() {
@@ -336,15 +338,16 @@ public class WriteLoops {
         int w = 0;
         boolean onTime = true;
         boolean yardNeedsMowed=true;
-        while(isSummer())
+        while(!isSummer())
         {
+            w = w + 1;
            if(yardNeedsMowed==true)
            {
                yellAtJuniorToMowLawn();
-               w = w + 1;
+               
             }else
             { 
-                sendJuniorBackToSchool("");
+                sendJuniorBackToSchool("First Day of School");
             }
         }
         
@@ -422,9 +425,11 @@ public class WriteLoops {
     public WriteLoops() {
         // initialise instance variables
         x = 0;
+        gps = 0;
+        serverStatus = 5;
     }
 
-    private int gps = 0;
+    
 
     private String gpsCurrentLocation() {
         if (this.gps > 5) {
@@ -474,14 +479,17 @@ public class WriteLoops {
     private void tryServerRestart(String mesg, String phone) {
     }
 
-    int serverStatus = 5;
+    
 
     private boolean serverIsRunning() {
-        return (serverStatus < 20);
+        //System.out.println ("ServerIsRunning - serverStatus - " + serverStatus );
+        return (this.serverStatus < 20);
     }
 
     private void waitFor(int interval) {
-        serverStatus += interval;
+        //System.out.println ("waitfor before serverStatus - " + this.serverStatus);
+        this.serverStatus += interval;
+        //System.out.println ("waitfor after serverStatus - " + this.serverStatus);
     }
 
 }

WriteLoopsTest.java

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

package.bluej

@@ -10,15 +10,15 @@ editor.fx.0.width=1280
 editor.fx.0.x=0
 editor.fx.0.y=23
 objectbench.height=83
-objectbench.width=740
-package.divider.horizontal=0.6
+objectbench.width=474
+package.divider.horizontal=0.6004993757802747
 package.divider.vertical=0.8617511520737328
 package.editor.height=554
-package.editor.width=1139
-package.editor.x=15
+package.editor.width=695
+package.editor.x=390
 package.editor.y=23
 package.frame.height=709
-package.frame.width=1265
+package.frame.width=821
 package.numDependencies=2
 package.numTargets=4
 package.showExtends=true