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

final patch before P1

Browse Source 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
This commit is contained in:
HeshamTB 2020-12-02 19:22:18 +03:00
parent c7313cd3df
commit 810820283f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/MakkahCity.java
View File

@ -624,7 +624,7 @@ public class MakkahCity {
sum = sum /counter; sum = sum /counter;
int hours = sum / 60; int hours = sum / 60;
int minutes = sum % 60; int minutes = sum % 60;
if (hours == 0 && minutes == 0) return "No arrivals yet"; if (hours == 0 && minutes == 0) return " n/a";
return String.format("%2d:%02d", hours,minutes); return String.format("%2d:%02d", hours,minutes);
} }
@ -666,14 +666,15 @@ public class MakkahCity {
private static String preSimulationReport() { private static String preSimulationReport() {
StringBuilder report = new StringBuilder(); StringBuilder report = new StringBuilder();
report.append("******************************District details******************************\n"); report.append("******************************District details******************************\n");
report.append(" District | Campaigns | Busses | Avg arrival | Best time to Arafat | Best time to District |\n"); report.append(" District | Campaigns | Busses | Arrival | Avg Time | Best time to Arafat | Best time to District |\n");
for (int i = 0; i < campPerDistrict.length; i++) { for (int i = 0; i < campPerDistrict.length; i++) {
//Per District, i denotes district index //Per District, i denotes district index
report.append(String.format("%-10s|",campPerDistrict[i].get(0).getHotelDistrict().name())); report.append(String.format("%-10s|",campPerDistrict[i].get(0).getHotelDistrict().name()));
report.append(String.format(" %-10d|",campPerDistrict[i].size())); report.append(String.format(" %-10d|",campPerDistrict[i].size()));
report.append(String.format(" %-7d|", busesInDistrict(District.values()[i]))); report.append(String.format(" %-7d|", busesInDistrict(District.values()[i])));
report.append(String.format(" %%%-11d|", getPercentArrival(District.values()[i]))); report.append(String.format(" %%%-7d|", getPercentArrival(District.values()[i])));
report.append(String.format(" %-9s|", getAvgTimeOfTrip(District.values()[i])));
report.append(String.format(" %-20s|", getShortestRoute(campPerDistrict[i].get(0), Mashier.ARAFAT).getFastestTimeOfTravel(new Bus()))); report.append(String.format(" %-20s|", getShortestRoute(campPerDistrict[i].get(0), Mashier.ARAFAT).getFastestTimeOfTravel(new Bus())));
report.append(String.format(" %-22s|", getShortestRoute(campPerDistrict[i].get(0), Mashier.MINA).getFastestTimeOfTravel(new Bus()))); report.append(String.format(" %-22s|", getShortestRoute(campPerDistrict[i].get(0), Mashier.MINA).getFastestTimeOfTravel(new Bus())));
//Calc values per dist here. //Calc values per dist here.