From d947a53146ccd8bacb0cdc1b6906dcba17463c27 Mon Sep 17 00:00:00 2001 From: Dee Date: Thu, 1 Jul 2021 00:19:36 -0400 Subject: [PATCH] all tests passed --- WriteIFs.java | 35 ++++++++++++++++----- WriteLoops.java | 84 ++++++++++++++++++++++++++++++++++++------------- package.bluej | 38 ++++++++++++---------- 3 files changed, 113 insertions(+), 44 deletions(-) diff --git a/WriteIFs.java b/WriteIFs.java index c05fcae..32c3b26 100644 --- a/WriteIFs.java +++ b/WriteIFs.java @@ -6,11 +6,23 @@ * @version (a version number or a date) */ public class WriteIFs + + + { - + int x = 0; + int tt_t = 0; + int tt_s = 1; + String ss = ""; + int oo1 = 61; + int 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)== false){ + displayGameOver(player1); + } } @@ -18,6 +30,9 @@ 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 +45,18 @@ public void fireplaceControl(Object fireplace1) { // 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(); + } } @@ -60,12 +81,12 @@ public void checkFuel(double fuelLevel) { public WriteIFs() { // initialise instance variables - x = 0; - tt_t = 0; - tt_s = 1; - ss = ""; - oo1 = 61; - oo2 = 49; + int x = 0; + int tt_t = 0; + int tt_s = 1; + String ss = ""; + int oo1 = 61; + int oo2 = 49; } // associated routines diff --git a/WriteLoops.java b/WriteLoops.java index d629a54..8142a6d 100644 --- a/WriteLoops.java +++ b/WriteLoops.java @@ -1,4 +1,4 @@ -import com.sun.org.apache.xpath.internal.SourceTree; + import java.awt.SystemTray; import java.util.concurrent.ThreadLocalRandom; @@ -20,7 +20,9 @@ public int oneToFive() { // Write a FOR loop that counts from 1 to 10. // 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. @@ -32,7 +34,9 @@ public int oneToTen() { // 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 +47,9 @@ public int startAtTwentyOne() { // 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 +60,9 @@ public int countDown() { // 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 +73,9 @@ public int byTwoTo32() { // Write a FOR loop from 0 to 32 by 2s. // calling - w = w + 1; + for (int i =0; i <33; i+=2){ + w = w + 1; + } // each time through the loop return w; } @@ -75,7 +85,9 @@ public int countDownFrom5000() { // Write a FOR loop from 1 to less than 5001 by 11s. // calling - w = w + 1; + for (int i =1; i <5001; i+=11){ + w = w + 1; + } // each time through the loop return w; @@ -87,7 +99,11 @@ public int nestedFors() { // 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 - w = w + 1; + for (int i =0; i<20; i++){ + for (int j =0; j<5; j++){ + w = w + 1; + } + } // each time through the inner loop return w; @@ -102,7 +118,12 @@ public int helloZipCode() { // prints “Hello Zipcode” instead of the statement w = w + 1; // calling - w = w + 1; + for (int i = 5; i<106; i++){ + if (i > 51){ + System.out.println("Hello Zipcode"); + }else w = w + 1; + } + // each time through the inner loop return w; @@ -131,15 +152,17 @@ public void simpleLoops() { // After the loop is done, print “Honey, I’m Home!” public int driveHome() { int w = 0; - + + // you need to use a .equals for two Strings. - + while (gpsCurrentLocation().equals("Not Home")){ + driveSomeMore(); // calling w = w + 1; + } System.out.println("Honey, I'm Home!"); // each time through the inner loop + return w; - - return w; } // Getting harder... @@ -148,19 +171,22 @@ public int driveHome() { // is less than “highestScore” and if it is, adds “currentScore” to // "runningScore" // and then sets “currentScore” to “gameNextScore()” - public int checkGameScore() { + public boolean checkGameScore() { int w = 0; int highestScore = 236; int currentScore = gameNextScore(); int runningScore = 0; // do your while loop here - + while (runningScore < highestScore){ + runningScore = currentScore; // calling w = w + 1; + currentScore = gameNextScore(); + } // each time through the inner loop - return w; // >= 3; + return w >= 3; } // Rewrite the previous WHILE loop as a DO..WHILE loop. @@ -172,9 +198,12 @@ public boolean checkGameScoreDoWhile() { int runningScore = 0; // do your while loop here - - // calling + do {runningScore = runningScore + currentScore; + currentScore = gameNextScore(); w = w + 1; + } while (runningScore < highestScore); + // calling + // each time through the inner loop return w >= 3; @@ -188,9 +217,18 @@ public int checkServerStatus() { int w = 0; String adminPhoneNumber = "+1 202 456 1111"; - + while (serverIsRunning()){ + waitFor(5); // calling - w = w + 1; + w = w + 1; + } + + if (!serverIsRunning()){ + sendEmergencyText("Help!",adminPhoneNumber); + tryServerRestart("Rebooting",adminPhoneNumber); + } + + // each time through the inner loop return w; @@ -201,10 +239,14 @@ public int checkServerStatus() { // and if it is, add 7 to “i” public int loop50by7() { int w = 0; - - + int i = 7; + while (i<50){ + i = i + 7; + + // calling w = w + 1; + } // each time through the inner loop return w; diff --git a/package.bluej b/package.bluej index 01992ee..14e25cf 100644 --- a/package.bluej +++ b/package.bluej @@ -1,32 +1,32 @@ #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.x=640 +editor.fx.0.y=89 +objectbench.height=107 +objectbench.width=1241 package.divider.horizontal=0.6 -package.divider.vertical=0.8625954198473282 -package.editor.height=671 -package.editor.width=1139 +package.divider.vertical=0.8496042216358839 +package.editor.height=637 +package.editor.width=1147 package.editor.x=112 -package.editor.y=89 -package.frame.height=844 +package.editor.y=23 +package.frame.height=816 package.frame.width=1265 package.numDependencies=2 -package.numTargets=4 +package.numTargets=5 package.showExtends=true package.showUses=true project.charset=UTF-8 -readme.height=58 +readme.height=60 readme.name=@README -readme.width=47 +readme.width=48 readme.x=10 readme.y=10 target1.height=110 @@ -59,3 +59,9 @@ target4.type=ClassTarget target4.width=80 target4.x=150 target4.y=130 +target5.height=70 +target5.name=README.md +target5.type=TextTarget +target5.width=120 +target5.x=70 +target5.y=10