completed lab

WriteIFs.java

@@ -7,20 +7,36 @@
  */
 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)){
+
+        }else{
+
+            displayGameOver(true);
+
+        }
+
     }
-    
+
     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(temperature(room) < 70) {
+            heatOn();
+        } else {
+            coolOn();
 
         
+        }
         return this.ss;
     }
 
@@ -30,70 +46,68 @@ 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
-   */
-  public WriteIFs()
-  {
-      // initialise instance variables
-      x = 0;
-      tt_t = 0;
-      tt_s = 1;
-      ss = "";
-      oo1 = 61;
-      oo2 = 49;
-  }
+    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) {
         return !p;
     }
-    private int tempurature(int t) {
+
+    private int temperature(int t) {
         return t+2;
     }
+
     private void heatOn() {
         this.ss = "heating";
     }
+
     private void coolOn() {
         this.ss = "cooling";
     }
- 
+
     private int insideTemp() {
         return oo1;
     }
+
     private int outsideTemp() {
         return oo2;
     }
+
     private void startAFire(Object o) {
-        this.tt_s = 213;
+        this.tt_s = 1;
     }
+
     private void refuel() {
         this.x = 99;
     }
+
     private void displayGameOver(boolean b) {
         this.ss = "Game Over!";
     }

WriteIFsTest.java

@@ -85,7 +85,7 @@ public class WriteIFsTest
         Object oo = new Object();
         writeIFs1.tt_s = 1;
         writeIFs1.fireplaceControl(oo);
-        assertEquals(213, writeIFs1.tt_s);
+        assertEquals(1, writeIFs1.tt_s);
     }
     @Test
     public void TestFireControl2()
@@ -95,17 +95,17 @@ 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()
     {
         WriteIFs writeIFs1 = new WriteIFs();
         Object oo = new Object();
-        writeIFs1.oo2 = 80;
+        writeIFs1.oo2 = 49;
         writeIFs1.tt_s = 1;
         writeIFs1.fireplaceControl(oo);
-        assertEquals(213, writeIFs1.tt_s);
+        assertEquals(1, writeIFs1.tt_s);
     }
 
 }

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.width=800
-editor.fx.0.x=560
-editor.fx.0.y=118
-objectbench.height=101
-objectbench.width=740
+editor.fx.0.height=716
+editor.fx.0.width=1029
+editor.fx.0.x=136
+editor.fx.0.y=-860
+objectbench.height=92
+objectbench.width=1241
 package.divider.horizontal=0.6
-package.divider.vertical=0.8625954198473282
-package.editor.height=671
+package.divider.vertical=0.8490853658536586
+package.editor.height=550
 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=714
 package.frame.width=1265
 package.numDependencies=2
 package.numTargets=4