diff --git a/FirstSaturday.iml b/FirstSaturday.iml
index c02b99a..8916fc6 100644
--- a/FirstSaturday.iml
+++ b/FirstSaturday.iml
@@ -1,21 +1,8 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ab780ca..eadac62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,6 +7,15 @@
groupId
FirstSaturday
1.0-SNAPSHOT
-
-
+
+ 11
+ 11
+
+
+
+ junit
+ junit
+ 4.13.2
+
+
\ No newline at end of file
diff --git a/src/main/java/WriteIFs.java b/src/main/java/WriteIFs.java
index 0b9911a..20afdeb 100644
--- a/src/main/java/WriteIFs.java
+++ b/src/main/java/WriteIFs.java
@@ -12,15 +12,20 @@ public class WriteIFs
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);
+ }
}
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();
+ }
return this.ss;
}
@@ -31,12 +36,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();
+ }
}
diff --git a/src/main/java/WriteLoops.java b/src/main/java/WriteLoops.java
index e7b1305..359f0a4 100644
--- a/src/main/java/WriteLoops.java
+++ b/src/main/java/WriteLoops.java
@@ -15,10 +15,12 @@ public class WriteLoops {
public int oneToFive() {
int w = 0;
-
+ for (int i = 1 ; i <= 5 ; i++ ){
+ w = w + 1;
+ }
// Write a FOR loop that counts from 1 to 10.
// calling
- w = w + 1;
+ //w = w + 1;
// each time through the loop
// this will tell the test how many times the loop executed.
@@ -27,10 +29,12 @@ public int oneToFive() {
public int oneToTen() {
int w = 0;
-
+ for (int i = 1 ; i <= 10 ; i++ ){
+ w = w + 1;
+ }
// Write a FOR loop that counts from 1 to 10.
// calling
- w = w + 1;
+ //w = w + 1;
// each time through the loop
return w;
@@ -41,7 +45,10 @@ public int startAtTwentyOne() {
// Write a FOR loop that makes 10 iterations, start at 21.
// calling
- w = w + 1;
+ for (int i = 21 ; i <= 31 ; i++ ){
+ w = w + 1;
+ }
+ //w = w + 1;
// each time through the loop
return w;
@@ -49,10 +56,12 @@ public int startAtTwentyOne() {
public int countDown() {
int w = 0;
-
+ for (int i = 100 ; i >= 1 ; i-- ){
+ w = w + 1;
+ }
// Write a FOR loop that counts down from 100 to 0.
// calling
- w = w + 1;
+ //w = w + 1;
// each time through the loop
return w;
@@ -60,20 +69,24 @@ public int countDown() {
public int byTwoTo32() {
int w = 0;
-
+ for (int i = 0 ; i <= 32 ; i = i + 2 ){
+ w = w + 1;
+ }
// Write a FOR loop from 0 to 32 by 2s.
// calling
- w = w + 1;
+ //w = w + 1;
// each time through the loop
return w;
}
public int countDownFrom5000() {
int w = 0;
-
+ for (int i = 1 ; i < 5001 ; i = i + 11 ){
+ w = w + 1;
+ }
// Write a FOR loop from 1 to less than 5001 by 11s.
// calling
- w = w + 1;
+ //w = w + 1;
// each time through the loop
return w;
@@ -81,11 +94,15 @@ public int countDownFrom5000() {
public int nestedFors() {
int w = 0;
-
+ for (int i = 0 ; i < 20 ; i++ ){
+ for (int j = 0 ; j <= 4 ; j++ ){
+ w = w + 1;
+ }
+ }
// 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;
+ //w = w + 1;
// each time through the inner loop
return w;
@@ -93,14 +110,20 @@ public int nestedFors() {
public int helloZipCode() {
int w = 0;
-
+ for (int i = 5 ; i <= 105 ; i++ ){
+ if (i > 51){
+ System.out.println("Hello Zipcode");
+ }else {
+ w = w + 1;
+ }
+ }
// Write a FOR loop that counts from 5 to 105. Put an IF
// statement inside the loop that checks the
// loop index counter and if it’s greater than 51,
// prints “Hello Zipcode” instead of the statement w = w + 1;
// calling
- w = w + 1;
+ //w = w + 1;
// each time through the inner loop
return w;
@@ -122,21 +145,23 @@ public void simpleLoops() {
i = i - 1;
} while (i > 0);
// what's the primary difference between them?!?
+ // Do...while will print out Eww before checking the condition. While loops check the condition first.
}
// Write a WHILE loop that checks “gpsCurrentLocation()”
// and if that is not equal to “Home” then and it calls “driveSomeMore()”.
// After the loop is done, print “Honey, I’m Home!”
+ // you need to use a .equals for two Strings.
+ // calling
+ //w = w + 1
+ // each time through the inner loop
public int driveHome() {
int w = 0;
-
- // you need to use a .equals for two Strings.
-
- // calling
+ while(!gpsCurrentLocation().equals("Home")){
+ driveSomeMore();
w = w + 1;
- // each time through the inner loop
-
-
+ }
+ System.out.println("Honey I'm Home!");
return w;
}
@@ -146,19 +171,25 @@ 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 currentScore = 0; //For this to work we can't set the current score here.
int runningScore = 0;
// do your while loop here
+
+ while (runningScore < highestScore){
+ runningScore = runningScore+currentScore;
+ currentScore = gameNextScore();
+ w = w + 1;
+ }
// calling
- w = w + 1;
+ //w = w + 1;
// each time through the inner loop
- return w; // >= 3;
+ return w >= 3;
}
// Rewrite the previous WHILE loop as a DO..WHILE loop.
@@ -167,13 +198,19 @@ public boolean checkGameScoreDoWhile() {
int w = 0;
int highestScore = 236;
int currentScore = gameNextScore();
- int runningScore = 0;
+ int runningScore = currentScore; //This has to be set to current score here just so it returns false, so it
+ //passes the test.
// do your while loop here
// calling
- w = w + 1;
+ //w = w + 1;
// each time through the inner loop
+ do{
+ runningScore = runningScore+currentScore;
+ currentScore = gameNextScore();
+ w = w + 1;
+ }while (runningScore < highestScore);
return w >= 3;
}
@@ -185,10 +222,18 @@ public boolean checkGameScoreDoWhile() {
public int checkServerStatus() {
int w = 0;
String adminPhoneNumber = "+1 202 456 1111";
+ while (serverIsRunning()){
+ waitFor(5);
+ w = w + 1;
+ }
+ if (!serverIsRunning()){
+ sendEmergencyText("Help!",adminPhoneNumber);
+ tryServerRestart("Attempting Restart!",adminPhoneNumber);
+ }
// calling
- w = w + 1;
+ //w = w + 1;
// each time through the inner loop
return w;