nathanwoodburn/comp1110-ass2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

BlueLagoon: Cleaned up isStateStringWellFormed

Browse Source
This commit is contained in:
Nathan Woodburn
2023-03-24 14:42:27 +11:00
parent 9239293a26
commit 4ba76d14f8
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/comp1110/ass2/BlueLagoon.java
View File

@@ -32,7 +32,6 @@ public class BlueLagoon {
public static boolean isStateStringWellFormed(String stateString){ public static boolean isStateStringWellFormed(String stateString){
// Create an array of regex strings to match the state string // Create an array of regex strings to match the state string
// The state string contains 5 parts, each of which is matched by a regex string // The state string contains 5 parts, each of which is matched by a regex string
String[] matchArray = new String[6]; String[] matchArray = new String[6];
@@ -54,13 +53,11 @@ public class BlueLagoon {
// Combine the regex strings into one string to match the state string // Combine the regex strings into one string to match the state string
String matchString = ""; String matchString = "";
for (String match:matchArray){ for (String match:matchArray) {
matchString += match; matchString += match;
} }
// Check if the state string matches the regex string // Check if the state string matches the regex string
if (!stateString.matches(matchString)) { if (!stateString.matches(matchString)) return false;
return false;
}
return true; return true;
} }
@@ -109,7 +106,7 @@ public class BlueLagoon {
// For testing purposes // For testing purposes
// System.out.println(stateString); // System.out.println(stateString);
// Check if the stateString is well formed // Check if the stateString is well-formed
if (!isStateStringWellFormed(stateString)) return stateString; if (!isStateStringWellFormed(stateString)) return stateString;
// Grab the stone circles from the stateString // Grab the stone circles from the stateString