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

busses arrived per hour fix

Browse Source 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
This commit is contained in:
HeshamTB 2020-12-01 20:42:03 +03:00
parent 336106c7ed
commit 4a87e08a74
Signed by: Hesham
GPG Key ID: 74876157D199B09E
1 changed files with 13 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/MakkahCity.java
View File

@ -169,17 +169,6 @@ public class MakkahCity {
} }
} }
/**
* Checks if 'now' is within range of coming to arafat and leaving mena.
* Arafat day range ends 01/01/2020 05:00PM
*/
private static boolean isArafatDayRange() {
Calendar arafatDayStart = (GregorianCalendar) firstDayTimeMan.getStartCalendar().clone();
Calendar arafatDayEnd = new GregorianCalendar(2020, Calendar.JANUARY, 1, 17, 0, 0);
Calendar now = firstDayTimeMan.getCurrentCalendar();
return now.after(arafatDayStart) && now.before(arafatDayEnd);
}
private static double getRandom(double min, double max) { private static double getRandom(double min, double max) {
return (Math.random() * (max - min) + min); return (Math.random() * (max - min) + min);
} }
@ -524,7 +513,7 @@ public class MakkahCity {
*/ */
private static String avgTimeOfTrip() { private static String avgTimeOfTrip() {
//TODO: does output diff value even after all have arrived. //TODO: does output diff value even after all have arrived.
Calendar now = firstDayTimeMan.getCurrentCalendar(); Calendar now = currenttimeManager.getCurrentCalendar();
Calendar from = (GregorianCalendar)now.clone(); Calendar from = (GregorianCalendar)now.clone();
from.roll(Calendar.HOUR, -1); from.roll(Calendar.HOUR, -1);
int counter = 1; int counter = 1;
@ -585,29 +574,19 @@ public class MakkahCity {
return num; return num;
} }
private static int getNumberOfArrivedBussesPerHour() { private static int getNumberOfArrivedBussesPerHour() {
Calendar now = firstDayTimeMan.getCurrentCalendar(); Calendar now = currenttimeManager.getCurrentCalendar();
Calendar from = (GregorianCalendar)now.clone(); Calendar from = (GregorianCalendar)now.clone();
from.roll(Calendar.HOUR, -1); from.roll(Calendar.HOUR, -1);
int counter = 1;
int sum = 0;
int num = 0; int num = 0;
for (Campaign campaign : listOfCampaigns){ for (Campaign campaign : listOfCampaigns){
for (Vehicle bus : campaign.getVehicles()){ for (Vehicle bus : campaign.getVehicles()){
if (bus.isArrivedToDest() && bus.getTimeOfArrival().before(now.getTime()) if (bus.isArrivedToDest() && bus.getTimeOfArrival().before(now.getTime())
&& bus.getTimeOfArrival().after(from.getTime())) { && bus.getTimeOfArrival().after(from.getTime())) {
counter++;
num++; num++;
} }
} }
} }
sum = sum /counter;
int hours = sum / 60;
int minutes = sum % 60;
if (hours == 0 && minutes == 0) return num;
return num; return num;
} }
private static boolean isAllArrived() { private static boolean isAllArrived() {