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

Print time of finishing for both days

Browse Source 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
This commit is contained in:
HeshamTB 2020-12-01 22:21:50 +03:00
parent a376d91671
commit ba02114562
Signed by: Hesham
GPG Key ID: 74876157D199B09E
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/MakkahCity.java
View File

@ -9,6 +9,8 @@ public class MakkahCity {
private static final ArrayList<Campaign>[] campPerDistrict = new ArrayList[District.values().length]; private static final ArrayList<Campaign>[] campPerDistrict = new ArrayList[District.values().length];
private static final Route[] stdRoutes = new Route[RouteName.values().length]; private static final Route[] stdRoutes = new Route[RouteName.values().length];
private static final Street[] stdStreet = new Street[StreetNames.values().length]; private static final Street[] stdStreet = new Street[StreetNames.values().length];
private static Date allArrivedToArafatTime;
private static Date allArrivedToHotelsTime;
private static final PDate firstDayTimeMan = new PDate( private static final PDate firstDayTimeMan = new PDate(
new GregorianCalendar(2020, Calendar.JANUARY, 1, 4, 0, 0), new GregorianCalendar(2020, Calendar.JANUARY, 1, 4, 0, 0),
@ -76,6 +78,7 @@ public class MakkahCity {
} }
} }
} }
if (isAllArrived()) allArrivedToArafatTime = (Date)currenttimeManager.getCurrentTime().clone();
firstDayTimeMan.step(Calendar.MINUTE, 1); firstDayTimeMan.step(Calendar.MINUTE, 1);
} }
//TODO make report //TODO make report
@ -119,6 +122,7 @@ public class MakkahCity {
} }
} }
} }
if (isAllArrived()) allArrivedToHotelsTime = (Date)currenttimeManager.getCurrentTime().clone();
lastDayTimeMan.step(Calendar.MINUTE, 1); lastDayTimeMan.step(Calendar.MINUTE, 1);
} }
//TODO: print final report //TODO: print final report
@ -423,6 +427,7 @@ public class MakkahCity {
} }
private static String getFinalRep() { private static String getFinalRep() {
StringBuilder s = new StringBuilder();
int numberOfBusses = 0; int numberOfBusses = 0;
int numberOfArrivedBuses = getNumberOfArrivedBusses(); int numberOfArrivedBuses = getNumberOfArrivedBusses();
//Redundant loops slow down execution. find better sol. //Redundant loops slow down execution. find better sol.
@ -430,10 +435,15 @@ public class MakkahCity {
numberOfBusses += campaign.getNumberOfBusses(); numberOfBusses += campaign.getNumberOfBusses();
} //TODO Add max min time, Estimated arrivel if taken street. } //TODO Add max min time, Estimated arrivel if taken street.
//TODO: And print all routes with their streets. //TODO: And print all routes with their streets.
//TODO: Print time when all have finished String fFormat = "All arrived to %s at: %s";
String s = String.format("Buses: %d, Buses done: %d\nBuses arrived in the last hour: %d, Average trip in last hour: %s\n", boolean arr = isAllArrived();//since it has looping. use once.
numberOfBusses, numberOfArrivedBuses, getNumberOfArrivedBussesPerHour(), avgTimeOfTrip()); if (arr && allArrivedToArafatTime != null)
return s; s.append(String.format(fFormat,"Arafat",allArrivedToArafatTime)).append("\n");
if (arr && allArrivedToHotelsTime != null)
s.append(String.format(fFormat,"Hotels",allArrivedToHotelsTime)).append("\n");
s.append(String.format("Buses: %d, Buses done: %d\nBuses arrived in the last hour: %d, Average trip in last hour: %s\n",
numberOfBusses, numberOfArrivedBuses, getNumberOfArrivedBussesPerHour(), avgTimeOfTrip()));
return s.toString();
} }
/** /**