Hesham/Hajj-simulation
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

menu:

Browse Source 
- Added street option in menu
    - Street length printed to second

Signed-off-by: HeshamTB <hishaminv@gmail.com>
This commit is contained in:
HeshamTB 2020-11-30 20:50:23 +03:00
parent 076cb510cf
commit 2edf82b28b
Signed by: Hesham
GPG Key ID: 74876157D199B09E
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/MakkahCity.java
View File

@ -178,8 +178,9 @@ public class MakkahCity {
"[4] View Routes\n" + "[4] View Routes\n" +
"[5] Continue\n" + "[5] Continue\n" +
"[6] Exit"); "[6] Exit");
String chose = in.next(); String choice = in.next();
if (chose.equals("1")){ //Split into methods?
if (choice.equals("1")){
System.out.printf("choose from 0 to %d\n", listOfVehicles.size()-1); System.out.printf("choose from 0 to %d\n", listOfVehicles.size()-1);
String c = in.next(); String c = in.next();
Vehicle v = listOfVehicles.get(Integer.parseInt(c)); Vehicle v = listOfVehicles.get(Integer.parseInt(c));
@ -189,14 +190,22 @@ public class MakkahCity {
v.toString(), ((Bus)v).getCampaign().getUID(),v.getCurrentStreet().getName().name(), v.toString(), ((Bus)v).getCampaign().getUID(),v.getCurrentStreet().getName().name(),
v.getCurrentLocation(),v.isArrivedToDest(),v.getTimeStartedMoving(),v.getTimeOfArrival()); v.getCurrentLocation(),v.isArrivedToDest(),v.getTimeStartedMoving(),v.getTimeOfArrival());
} }
if (chose.equals("4")){ if (choice.equals("2")){
for (int i = 0; i < stdStreet.length; i++) {
System.out.printf("[%d] %s\nm",i, stdStreet[i].getName().name());
}
String input = in.next();
int index = Integer.parseInt(input);//TODO: unhandled ex
System.out.print(stdStreet[index].toString());
}
if (choice.equals("4")){
for (int i = 0; i < stdRoutes.length; i++){ for (int i = 0; i < stdRoutes.length; i++){
System.out.printf("[%d] %s\n", i, stdRoutes[i]); System.out.printf("[%d] %s\n", i, stdRoutes[i]);
} }
String c = in.next(); String c = in.next();
} }
if (chose.equals("5")) return; if (choice.equals("5")) return;
if (chose.equals("6")) { if (choice.equals("6")) {
inputListener.stop(); inputListener.stop();
t.interrupt(); t.interrupt();
System.exit(0); System.exit(0);

3
src/Street.java
View File

@ -178,11 +178,12 @@ public class Street {
for (int i = 0; i < 32; i++){ for (int i = 0; i < 32; i++){
printedStreet.append("----"); printedStreet.append("----");
} }
return String.format("Street name: %s, Length: %f, Lanes: %d, Vehicles: %d\nDensity:\n%s\n", return String.format("Street name: %s, Length: %.2f, Lanes: %d, Vehicles: %d, Capacity: %%%s\nDensity:\n%s\n",
name.name(), name.name(),
length, length,
numberOfLanes, numberOfLanes,
vehicles.size(), vehicles.size(),
getPercentRemainingCapacity(),
printedStreet.toString()); printedStreet.toString());
} }
} }