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

Phase 1 with GUI:

Browse Source 
- Remove shuffle.
    - getShortestRout instead of best.
This commit is contained in:
HeshamTB 2021-01-01 00:33:26 +03:00
parent f4bc812f23
commit acff65eab3
Signed by: Hesham
GPG Key ID: 74876157D199B09E
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/MakkahCity.java
View File

@ -65,7 +65,7 @@ public class MakkahCity {
generateCamps(District.ALMANSOOR, (int)getRandom(1600, 1800)); generateCamps(District.ALMANSOOR, (int)getRandom(1600, 1800));
generateCamps(District.ALHIJRA, (int)getRandom(1400, 1600)); generateCamps(District.ALHIJRA, (int)getRandom(1400, 1600));
Collections.shuffle(listOfCampaigns); //Collections.shuffle(listOfCampaigns);
fillBusesToList(); fillBusesToList();
@ -727,7 +727,6 @@ public class MakkahCity {
if (!(vehicle instanceof Bus) && vehicle.isArrivedToDest()) if (!(vehicle instanceof Bus) && vehicle.isArrivedToDest())
listOfVehicles.remove(vehicle); listOfVehicles.remove(vehicle);
else i++; else i++;
} }
} }
@ -735,7 +734,7 @@ public class MakkahCity {
for (Campaign camp : listOfCampaigns){ for (Campaign camp : listOfCampaigns){
if(camp.getVehicles().get(0).getCurrentStreet() == null) { if(camp.getVehicles().get(0).getCurrentStreet() == null) {
isAllRoutSet = false; isAllRoutSet = false;
camp.setRoute(getBestRoute(camp, mashier)); camp.setRoute(getShortestRoute(camp, mashier));
} }
} }
} }