checkpointing my work

WriteIFs.java

@@ -5,12 +5,26 @@
  * @author (your name)
  * @version (a version number or a date)
  */
+
 public class WriteIFs
 {
+   int x;
+   int tt_t;
+   int tt_s;
+   int oo1, oo2;
+   String ss;
  
     public void playerDied(boolean player1) {
         // Write an IF statement that checks “player1.isAlive()” 
         // and if that’s false, calls “displayGameOver(player1)”
+        if(isAlive(true))
+        {
+           System.out.println(player1);
+        } 
+            else 
+                {
+                    displayGameOver(player1);
+                }
      
     }
     
@@ -18,9 +32,14 @@ public class WriteIFs
         // Write an IF statement that checks the 
         // “temperature(room)” and if that check is less than 70, 
         // calls “heatOn()” else calls “coolOn()”
+        if(temperature(room)<70)
+        {
+            heatOn();
+        }
+        else {
+            coolOn();
+        }
 
-
-        
         return this.ss;
     }
 
@@ -30,30 +49,25 @@ 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();
+        }
 
     }
 
 
-    
-    /**
-     *  Pay no attention to the code below this point.
-     * 
-     * 
-     * instance variables
-     * / 
-   int x;
-   int tt_t;
-   int tt_s;
-   int oo1, oo2;
-   String ss;
-
-
   /**
    * Constructor for objects of class WriteIFs
    */
@@ -70,9 +84,10 @@ public class WriteIFs
 
     // associated routines
     public boolean isAlive(boolean p) {
+    
         return !p;
     }
-    private int tempurature(int t) {
+    private int temperature(int t) {
         return t+2;
     }
     private void heatOn() {

WriteIFsTest.java

@@ -13,6 +13,12 @@ import org.junit.Test;
  */
 public class WriteIFsTest
 {
+   int x;
+   int tt_t;
+   int tt_s;
+   int oo1, oo2;
+   String ss;
+   
     private static final double _0_5 = 0.5;
     private static final double _0_04 = 0.04;
 

WriteLoops.java

@@ -18,9 +18,13 @@ public class WriteLoops {
     public int oneToFive() {
         int w = 0;
 
-        // Write a FOR loop that counts from 1 to 10.
+        // Write a FOR loop that counts from 5 to 10.
             // calling
-            w = w + 1;
+            for(int i =5; i < 10; i++)
+            {
+                w = w +1;
+            }
+            
             // each time through the loop
 
         // this will tell the test how many times the loop executed.
@@ -32,7 +36,10 @@ public class WriteLoops {
 
         // Write a FOR loop that counts from 1 to 10.
         // calling
-        w = w + 1;
+                   for(int i =0; i < 10; i++)
+            {
+                w = w +1;
+            }
         // each time through the loop
         
         return w;
@@ -43,7 +50,10 @@ public class WriteLoops {
 
         // Write a FOR loop that makes 10 iterations, start at 21.
         // calling
-        w = w + 1;
+            for(int i =21; i < 32; i++)
+            {
+                w = w +1;
+            }
         // each time through the loop
         
         return w;
@@ -54,7 +64,10 @@ public class WriteLoops {
 
         // Write a FOR loop that counts down from 100 to 0.
         // calling
-        w = w + 1;
+            for(int i =100; i > 0; i--)
+            {
+                w = w +1;
+            }
         // each time through the loop
         
         return w;
@@ -65,7 +78,10 @@ public class WriteLoops {
 
         // Write a FOR loop from 0 to 32 by 2s.
         // calling
-        w = w + 1;
+        for(int i = 1; i <= 32; i+=2)
+        {
+            w = w + 1;
+        }
         // each time through the loop
         return w;
     }