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

Notes form 21-11-2020 meeting

Browse Source
This commit is contained in:
HeshamTB 2020-11-21 17:27:23 +03:00
parent dfbd961eca
commit 6367b48746
Signed by: Hesham
GPG Key ID: 74876157D199B09E
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/MakkahCity.java
View File

@ -326,10 +326,11 @@ public class MakkahCity {
private static void addCivilVehicleNoise() { private static void addCivilVehicleNoise() {
//TODO: rewrite to avoid factoring (deviding) the values down to zero. //TODO: rewrite to avoid factoring (deviding) the values down to zero.
int numOfSedan = (int)getRandom(40,50);
int numOfSUV = (int)getRandom(20,30);
int numOfTruck = (int)getRandom(10,12);
for (Street street: stdStreet) { for (Street street: stdStreet) {
int numOfSedan = (int)getRandom(40,50);
int numOfSUV = (int)getRandom(20,30);
int numOfTruck = (int)getRandom(10,12);
if (street.getName() == StreetNames.FOURTH_HIGHWAY1) numOfSedan = (int) (numOfSedan * 0.5); if (street.getName() == StreetNames.FOURTH_HIGHWAY1) numOfSedan = (int) (numOfSedan * 0.5);
if (street.getName() == StreetNames.FOURTH_HIGHWAY2) numOfSedan = (int) (numOfSedan * 0.5); if (street.getName() == StreetNames.FOURTH_HIGHWAY2) numOfSedan = (int) (numOfSedan * 0.5);
if (street.getName() == StreetNames.STREET3) numOfSedan = (int) (numOfSedan * 1.5); if (street.getName() == StreetNames.STREET3) numOfSedan = (int) (numOfSedan * 1.5);
@ -498,7 +499,9 @@ public class MakkahCity {
//Redundant loops slow down execution. find better sol. //Redundant loops slow down execution. find better sol.
for (Campaign campaign : listOfCampaigns) { for (Campaign campaign : listOfCampaigns) {
numberOfBusses += campaign.getNumberOfBusses(); numberOfBusses += campaign.getNumberOfBusses();
} } //TODO Add max min time, Add how many arrived. Estimated arrivel if taken street.
//TODO: And print all routes with their streets.
//TODO: Print time when all have finished
String s = String.format("Buses: %d Buses done: %d Average trip in last hour: %s\n", String s = String.format("Buses: %d Buses done: %d Average trip in last hour: %s\n",
numberOfBusses, numberOfArrivedBuses, avgTimeOfTrip()); numberOfBusses, numberOfArrivedBuses, avgTimeOfTrip());
return s; return s;
@ -515,6 +518,7 @@ public class MakkahCity {
from.roll(Calendar.HOUR, -1); from.roll(Calendar.HOUR, -1);
int counter = 1; int counter = 1;
int sum = 0; int sum = 0;
//TODO check last day avg
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())