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

Add avg time of trip per district (Hour report)

Browse Source 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
This commit is contained in:
HeshamTB 2020-11-26 21:14:28 +03:00
parent 480d9ccb46
commit ff5c7753ff
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.idea/artifacts/Hajj_simulation_jar.xml
View File

@ -1,7 +1,10 @@
<component name="ArtifactManager"> <component name="ArtifactManager">
<artifact type="jar" build-on-make="true" name="Hajj-simulation:jar"> <artifact type="jar" build-on-make="true" name="Hajj-simulation:jar">
<output-path>$PROJECT_DIR$/out/artifacts/Hajj_simulation_jar</output-path> <output-path>$PROJECT_DIR$/out</output-path>
<root id="archive" name="Hajj-simulation.jar"> <root id="archive" name="Hajj-simulation.jar">
<element id="directory" name="META-INF">
<element id="file-copy" path="$PROJECT_DIR$/out/META-INF/MANIFEST.MF" />
</element>
<element id="module-output" name="Hajj-simulation" /> <element id="module-output" name="Hajj-simulation" />
</root> </root>
</artifact> </artifact>

29
src/MakkahCity.java
View File

@ -364,7 +364,7 @@ public class MakkahCity {
if (street.getName() == StreetNames.FOURTH_HIGHWAY1) numOfSUV = (int) (numOfSUV * 0.5); if (street.getName() == StreetNames.FOURTH_HIGHWAY1) numOfSUV = (int) (numOfSUV * 0.5);
if (street.getName() == StreetNames.FOURTH_HIGHWAY2) numOfSUV = (int) (numOfSUV * 0.5); if (street.getName() == StreetNames.FOURTH_HIGHWAY2) numOfSUV = (int) (numOfSUV * 0.5);
if (street.getName() == StreetNames.STREET3) numOfSUV = (int) (numOfSUV * 1.5); if (street.getName() == StreetNames.STREET3) numOfSUV = (int) (numOfSUV * 1.5);
if (street.getName() == StreetNames.IBRAHIM_ALKHALIL2) numOfSedan = (int) (numOfSedan * 1.5); if (street.getName() == StreetNames.IBRAHIM_ALKHALIL2) numOfSUV = (int) (numOfSedan * 1.5);
for (int x = 0; x < numOfSUV; x++) { for (int x = 0; x < numOfSUV; x++) {
SUV car = new SUV(getRandom(4, 5)); SUV car = new SUV(getRandom(4, 5));
double pointOfEntry = getRandom(0, street.getLength()); double pointOfEntry = getRandom(0, street.getLength());
@ -469,11 +469,11 @@ public class MakkahCity {
String headerFormat = "******Streets report*****\n" + String headerFormat = "******Streets report*****\n" +
"Time: %s%s\n" + "Time: %s%s\n" +
" Street name |Street Load| Total | Buses | Local Vehicles |" + " Street name |Street Load| Total | Buses | Local Vehicles |" +
"*********| District | Average Arrival\n"; "*********| District | Average Arrival | Avg. time\n";
StringBuilder report = new StringBuilder(); StringBuilder report = new StringBuilder();
report.append(String.format(headerFormat, currenttimeManager.getCurrentTime(), status)); report.append(String.format(headerFormat, currenttimeManager.getCurrentTime(), status));
String streetFormat = "%-18s | %%%-8s | %5d | %5d | %14d |"; String streetFormat = "%-18s | %%%-8s | %5d | %5d | %14d |";
String districtForamt = " | %-9s | %%%2d "; String districtForamt = " | %-9s | %%%-14d | %s";
for (int i = 0; i < stdStreet.length; i++) { for (int i = 0; i < stdStreet.length; i++) {
int cap = stdStreet[i].getPercentRemainingCapacity(); int cap = stdStreet[i].getPercentRemainingCapacity();
report.append(String.format(streetFormat, report.append(String.format(streetFormat,
@ -483,7 +483,7 @@ public class MakkahCity {
stdStreet[i].getNumberOfBuses(), stdStreet[i].getNumberOfBuses(),
stdStreet[i].getNumberOfLocalCars())); stdStreet[i].getNumberOfLocalCars()));
if (i < 3){ if (i < 3){
report.append(String.format(districtForamt, District.values()[i], getAvgOfDistrict(District.values()[i]))); report.append(String.format(districtForamt, District.values()[i], getPercentArrival(District.values()[i]),getAvgTimeOfTrip(District.values()[i])));
} }
report.append("\n"); report.append("\n");
} }
@ -535,7 +535,7 @@ public class MakkahCity {
return String.format("%2d:%02d", hours,minutes); return String.format("%2d:%02d", hours,minutes);
} }
private static int getAvgOfDistrict(District district) { private static int getPercentArrival(District district) {
int sum = 0; int sum = 0;
for (Campaign campaign : campPerDistrict[district.ordinal()]) { for (Campaign campaign : campPerDistrict[district.ordinal()]) {
sum += campaign.getPercentArrived(); sum += campaign.getPercentArrived();
@ -543,6 +543,25 @@ public class MakkahCity {
return sum/campPerDistrict[district.ordinal()].size(); return sum/campPerDistrict[district.ordinal()].size();
} }
private static String getAvgTimeOfTrip(District district){
int sum = 0;
int counter = 1;
for (Campaign campaign : campPerDistrict[district.ordinal()]) {
for (Vehicle vehicle : campaign.getVehicles()) {
if (vehicle.isArrivedToDest()) {
long minutes = (vehicle.getTimeOfArrival().getTime() - vehicle.getTimeStartedMoving().getTime())/60000;
sum+= minutes;
counter++;
}
}
}//Make the following a method since it is the same other method
sum = sum /counter;
int hours = sum / 60;
int minutes = sum % 60;
if (hours == 0 && minutes == 0) return "No arrivals yet";
return String.format("%2d:%02d", hours,minutes);
}
private static int getNumberOfArrivedBusses() { private static int getNumberOfArrivedBusses() {
int num = 0; int num = 0;
for (Campaign campaign : listOfCampaigns) { for (Campaign campaign : listOfCampaigns) {