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

Two day simulation (buggy)?

Browse Source 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
This commit is contained in:
HeshamTB 2020-11-19 17:06:12 +03:00
parent d2eeac04ec
commit 012c8170f9
6 changed files with 190 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Campaign.java
View File

@ -9,8 +9,7 @@ public class Campaign {
//private String name; //private String name;
private District hotelDistrict; private District hotelDistrict;
private Route housingToDestRoute; private Route route;
private Route destToHousingRoute;
private ArrayList<Vehicle> vehicles = new ArrayList<>(); private ArrayList<Vehicle> vehicles = new ArrayList<>();
@ -41,22 +40,14 @@ public class Campaign {
return numberOfAriivedBuses == vehicles.size(); return numberOfAriivedBuses == vehicles.size();
} }
public Route getHousingToDestRoute() { public Route getRoute() {
return housingToDestRoute; return route;
} }
public void setHousingToDestRoute(Route housingToDestRoute) { public void setRoute(Route route) {
this.housingToDestRoute = housingToDestRoute; this.route = route;
} for (Vehicle vehicle : vehicles) {
vehicle.setRoute(route);
public Route getDestToHousingRoute() {
return destToHousingRoute;
}
public void setDestToHousingRoute(Route destToHousingRoute) {
this.destToHousingRoute = destToHousingRoute;
for(Vehicle vehicle : this.getVehicles()){
vehicle.setRoute(destToHousingRoute);
} }
} }
@ -67,7 +58,7 @@ public class Campaign {
} }
public void setTimeToLeaveToDest(Date timeToLeaveToDest) throws OutOfSimulationTimeException { public void setTimeToLeaveToDest(Date timeToLeaveToDest) throws OutOfSimulationTimeException {
if(PDate.isWithInTimeline(timeToLeaveToDest, MakkahCity.getTimeManager())) if(PDate.isWithInTimeline(timeToLeaveToDest, MakkahCity.getTimeMan()))
this.timeToLeaveToDest = timeToLeaveToDest; this.timeToLeaveToDest = timeToLeaveToDest;
else throw new OutOfSimulationTimeException(); else throw new OutOfSimulationTimeException();
} }
@ -77,7 +68,7 @@ public class Campaign {
} }
public void setTimeToLeaveToHousing(Date timeToLeaveToHousing) throws OutOfSimulationTimeException { public void setTimeToLeaveToHousing(Date timeToLeaveToHousing) throws OutOfSimulationTimeException {
if(PDate.isWithInTimeline(timeToLeaveToHousing, MakkahCity.getTimeManager())) if(PDate.isWithInTimeline(timeToLeaveToHousing, MakkahCity.getTimeMan()))
this.timeToLeaveToHousing = timeToLeaveToHousing; this.timeToLeaveToHousing = timeToLeaveToHousing;
else throw new OutOfSimulationTimeException(); else throw new OutOfSimulationTimeException();
} }

201
src/MakkahCity.java
View File

@ -4,14 +4,21 @@ public class MakkahCity {
private static final ArrayList<Campaign> listOfCampaigns = new ArrayList<>(); private static final ArrayList<Campaign> listOfCampaigns = new ArrayList<>();
private static final ArrayList<Vehicle> listOfVehicles = new ArrayList<>(); private static final ArrayList<Vehicle> listOfVehicles = new ArrayList<>();
private static final Route[] stdRoutes = new Route[6]; private static final Route[] stdRoutes = new Route[RouteName.values().length];
private static final Street[] stdStreet = new Street[10]; private static final Street[] stdStreet = new Street[StreetNames.values().length];
private static final PDate timeManager = new PDate( private static final PDate firstDayTimeMan = new PDate(
new GregorianCalendar(2020, Calendar.JANUARY, 1, 4, 0, 0), new GregorianCalendar(2020, Calendar.JANUARY, 1, 4, 0, 0),
new GregorianCalendar(2020, Calendar.JANUARY, 2, 17, 0, 0) new GregorianCalendar(2020, Calendar.JANUARY, 1, 18, 0, 0)
); );
private static final PDate lastDayTimeMan = new PDate(
new GregorianCalendar(2020, Calendar.JANUARY, 4, 12, 0, 0),
new GregorianCalendar(2020, Calendar.JANUARY, 4, 20, 0, 0)
);
private static PDate currenttimeManager = firstDayTimeMan;
public static void main(String[] args) { public static void main(String[] args) {
//Gen Camp //Gen Camp
@ -30,26 +37,25 @@ public class MakkahCity {
makeRoutes(); makeRoutes();
//Set Routes for Campaigns //Set Routes for Campaigns
setRoutesForCampaigns(); setRoutesForCampaigns(Mashier.ARAFAT);
//TODO: use Queues or Wating area for each street? //TODO: use Queues or Wating area for each street?
while(!timeManager.isEnded()) { while(!firstDayTimeMan.isEnded()) {
//Start of Every hour //Start of Every hour
if (timeManager.getCurrentCalendar().get(Calendar.MINUTE) == 0){ if (firstDayTimeMan.getCurrentCalendar().get(Calendar.MINUTE) == 0){
//TODO: removed break here. now should schedule. //TODO: removed break here. now should schedule.
} }
//Start of Every half-hour //Start of Every half-hour
if (timeManager.getCurrentCalendar().get(Calendar.MINUTE) % 30 == 0){ if (firstDayTimeMan.getCurrentCalendar().get(Calendar.MINUTE) % 30 == 0){
} }
//Start of every 10min //Start of every 10min
if (timeManager.getCurrentCalendar().get(Calendar.MINUTE) % 10 == 0){ if (firstDayTimeMan.getCurrentCalendar().get(Calendar.MINUTE) % 10 == 0){
addCivilVehicleNoise(); addCivilVehicleNoise();
System.out.println("\n\n" + getStreetsReport()); System.out.println("\n\n" + getStreetsReport());
} }
if (timeManager.getCurrentCalendar().get(Calendar.MINUTE) == getRandom(0,59) if (firstDayTimeMan.getCurrentCalendar().get(Calendar.MINUTE) == getRandom(0,59)
&& timeManager.getCurrentCalendar().get(Calendar.SECOND) == getRandom(0,59)){ && firstDayTimeMan.getCurrentCalendar().get(Calendar.SECOND) == getRandom(0,59)){
} }
@ -77,31 +83,72 @@ public class MakkahCity {
} }
} }
} }
// Vehicle v = listOfVehicles.get(150);
// if (v.getCurrentStreet() != null) {
// System.out.printf("St: %s distance: %f total: %f %s\n",
// v.getCurrentStreet().getName(),
// v.getCurrentLocation(),
// v.getTotalDistanceTraveled(),
// timeManager.getCurrentTime());
//}
//noise based on time of day (From PDate) //noise based on time of day (From PDate)
firstDayTimeMan.step(Calendar.MINUTE, 1);
}
//TODO make report
currenttimeManager = lastDayTimeMan;
System.out.println("*************FINSHIED FIRST DAY*********************");
setRoutesForCampaigns(Mashier.MINA);
for (Vehicle vehicle : listOfVehicles) {
vehicle.setCurrentStreet(null);
}
//TODO make all camps not arrived
//TODO: check 5000% capacity bug.
/* while(!lastDayTimeMan.isEnded()) {
Output: //Start of Every hour
Street stats if (lastDayTimeMan.getCurrentCalendar().get(Calendar.MINUTE) == 0){
Campaigns avg (at end) //TODO: removed break here. now should schedule.
*/ }
timeManager.step(Calendar.MINUTE, 1); //Start of Every half-hour
if (lastDayTimeMan.getCurrentCalendar().get(Calendar.MINUTE) % 30 == 0){
}
//Start of every 10min
if (lastDayTimeMan.getCurrentCalendar().get(Calendar.MINUTE) % 10 == 0){
addCivilVehicleNoise();
System.out.println("\n\n" + getStreetsReport());
}
if (lastDayTimeMan.getCurrentCalendar().get(Calendar.MINUTE) == getRandom(0,59)
&& lastDayTimeMan.getCurrentCalendar().get(Calendar.SECOND) == getRandom(0,59)){
}
for (Vehicle vehicle : listOfVehicles) {
Route route = vehicle.getRoute();
double currentLocation = vehicle.getCurrentLocation();
if (vehicle.getCurrentStreet() == null &&
route.getStreets()[0].capcityPoint(0,1000) < 1) {
vehicle.setCurrentStreet(route.getStreets()[0]);
}
if (vehicle.getCurrentStreet() != null && vehicle.getCurrentStreet().capcityPoint(currentLocation,
currentLocation+1000) < 1 ) {
if (currentLocation >= vehicle.getCurrentStreet().getLength()) {
//Move to next street
vehicle.moveToNextStreet();
}
if (!vehicle.isArrivedToDest()) {
double factor = 1-(vehicle.getCurrentStreet().capcityPoint(vehicle.getCurrentLocation(),
vehicle.getCurrentLocation()+1000,vehicle)) ;
if (vehicle instanceof Bus) vehicle.move(Bus.MAX_FORWARD * factor );
else if (vehicle instanceof Sedan) vehicle.move(Sedan.MAX_FORWARD * factor );
else if (vehicle instanceof SUV) vehicle.move(SUV.MAX_FORWARD * factor );
else if (vehicle instanceof Truck) vehicle.move(Bus.MAX_FORWARD * factor );
}
}
}
//noise based on time of day (From PDate)
lastDayTimeMan.step(Calendar.MINUTE, 1);
} }
//TODO: print final report //TODO: print final report
} }
private static void setRoutesForCampaigns() { private static void setRoutesForCampaigns(Mashier mashier) {
for (Campaign camp : listOfCampaigns){ for (Campaign camp : listOfCampaigns){
camp.setDestToHousingRoute(getShortestRoute(camp)); camp.setRoute(getShortestRoute(camp, mashier));
} }
} }
@ -110,9 +157,9 @@ public class MakkahCity {
* Arafat day range ends 01/01/2020 05:00PM * Arafat day range ends 01/01/2020 05:00PM
*/ */
private static boolean isArafatDayRange() { private static boolean isArafatDayRange() {
Calendar arafatDayStart = (GregorianCalendar)timeManager.getStartCalendar().clone(); Calendar arafatDayStart = (GregorianCalendar) firstDayTimeMan.getStartCalendar().clone();
Calendar arafatDayEnd = new GregorianCalendar(2020, Calendar.JANUARY, 1, 17, 0, 0); Calendar arafatDayEnd = new GregorianCalendar(2020, Calendar.JANUARY, 1, 17, 0, 0);
Calendar now = timeManager.getCurrentCalendar(); Calendar now = firstDayTimeMan.getCurrentCalendar();
return now.after(arafatDayStart) && now.before(arafatDayEnd); return now.after(arafatDayStart) && now.before(arafatDayEnd);
} }
@ -131,17 +178,21 @@ public class MakkahCity {
stdStreet[StreetNames.KA_STREET.ordinal()] = new Street(4700,3, StreetNames.KA_STREET); stdStreet[StreetNames.KA_STREET.ordinal()] = new Street(4700,3, StreetNames.KA_STREET);
stdStreet[StreetNames.FOURTH_HIGHWAY1.ordinal()] = new Street(4850,4, StreetNames.FOURTH_HIGHWAY1); stdStreet[StreetNames.FOURTH_HIGHWAY1.ordinal()] = new Street(4850,4, StreetNames.FOURTH_HIGHWAY1);
stdStreet[StreetNames.FOURTH_HIGHWAY2.ordinal()] = new Street(4850,4, StreetNames.FOURTH_HIGHWAY2); stdStreet[StreetNames.FOURTH_HIGHWAY2.ordinal()] = new Street(4850,4, StreetNames.FOURTH_HIGHWAY2);
stdStreet[StreetNames.FOURTH_HIGHWAY3.ordinal()] = new Street(4500,4, StreetNames.FOURTH_HIGHWAY3);
stdStreet[StreetNames.THIRD_HIGHWAY.ordinal()] = new Street(8200,3, StreetNames.THIRD_HIGHWAY); stdStreet[StreetNames.THIRD_HIGHWAY.ordinal()] = new Street(8200,3, StreetNames.THIRD_HIGHWAY);
stdStreet[StreetNames.STREET1.ordinal()] = new Street(7800,3, StreetNames.STREET1); stdStreet[StreetNames.STREET1.ordinal()] = new Street(7800,3, StreetNames.STREET1);
stdStreet[StreetNames.STREET2.ordinal()] = new Street(2400,3,StreetNames.STREET2); stdStreet[StreetNames.STREET2.ordinal()] = new Street(2400,3,StreetNames.STREET2);
stdStreet[StreetNames.STREET3.ordinal()] = new Street(4800,2, StreetNames.STREET3); stdStreet[StreetNames.STREET3.ordinal()] = new Street(4800,2, StreetNames.STREET3);
stdStreet[StreetNames.STREET4.ordinal()] = new Street(3800,3,StreetNames.STREET4); stdStreet[StreetNames.JABAL_THAWR_STREET.ordinal()] = new Street(3800,3,StreetNames.JABAL_THAWR_STREET);
stdStreet[StreetNames.IBRAHIM_ALKHALIL2.ordinal()] = new Street(3200,2, StreetNames.IBRAHIM_ALKHALIL2); stdStreet[StreetNames.IBRAHIM_ALKHALIL2.ordinal()] = new Street(3200,2, StreetNames.IBRAHIM_ALKHALIL2);
stdStreet[StreetNames.IBRAHIM_ALKHALIL1.ordinal()] = new Street(4500,3, StreetNames.IBRAHIM_ALKHALIL1); stdStreet[StreetNames.IBRAHIM_ALKHALIL1.ordinal()] = new Street(4500,3, StreetNames.IBRAHIM_ALKHALIL1);
stdStreet[StreetNames.KKH_STREET.ordinal()] = new Street(3300,3, StreetNames.KKH_STREET);
} }
private static void makeRoutes() { private static void makeRoutes() {
//******Arafat day
stdRoutes[RouteName.AlHijraToArafat1.ordinal()] = new Route( stdRoutes[RouteName.AlHijraToArafat1.ordinal()] = new Route(
new Street[]{ new Street[]{
stdStreet[StreetNames.THIRD_HIGHWAY.ordinal()], stdStreet[StreetNames.THIRD_HIGHWAY.ordinal()],
@ -150,7 +201,7 @@ public class MakkahCity {
District.ALHIJRA, Mashier.ARAFAT); District.ALHIJRA, Mashier.ARAFAT);
stdRoutes[RouteName.AlHijraToArafat2.ordinal()] = new Route(new Street[]{ stdRoutes[RouteName.AlHijraToArafat2.ordinal()] = new Route(new Street[]{
stdStreet[StreetNames.STREET4.ordinal()], stdStreet[StreetNames.JABAL_THAWR_STREET.ordinal()],
stdStreet[StreetNames.FOURTH_HIGHWAY2.ordinal()], stdStreet[StreetNames.FOURTH_HIGHWAY2.ordinal()],
stdStreet[StreetNames.STREET1.ordinal()] stdStreet[StreetNames.STREET1.ordinal()]
},District.ALHIJRA, Mashier.ARAFAT); },District.ALHIJRA, Mashier.ARAFAT);
@ -187,8 +238,67 @@ public class MakkahCity {
stdStreet[StreetNames.STREET2.ordinal()], stdStreet[StreetNames.STREET2.ordinal()],
stdStreet[StreetNames.STREET1.ordinal()] stdStreet[StreetNames.STREET1.ordinal()]
},District.ALAZIZIYA, Mashier.ARAFAT); },District.ALAZIZIYA, Mashier.ARAFAT);
//******Arafat day end
//******Mina Leave
stdRoutes[RouteName.MinaToAlMansoor1.ordinal()] = new Route(
new Street[]{
stdStreet[StreetNames.KKH_STREET.ordinal()],
stdStreet[StreetNames.KA_STREET.ordinal()],
stdStreet[StreetNames.STREET3.ordinal()]
},District.ALMANSOOR, Mashier.MINA);
stdRoutes[RouteName.MinaToAlMansoor2.ordinal()] = new Route(
new Street[]{
stdStreet[StreetNames.FOURTH_HIGHWAY3.ordinal()],
stdStreet[StreetNames.STREET2.ordinal()],
stdStreet[StreetNames.THIRD_HIGHWAY.ordinal()],
stdStreet[StreetNames.IBRAHIM_ALKHALIL2.ordinal()]
},District.ALMANSOOR, Mashier.MINA);
stdRoutes[RouteName.MinaToAlMansoor3.ordinal()] = new Route(
new Street[]{
stdStreet[StreetNames.FOURTH_HIGHWAY3.ordinal()],
stdStreet[StreetNames.FOURTH_HIGHWAY2.ordinal()],
stdStreet[StreetNames.FOURTH_HIGHWAY1.ordinal()],
stdStreet[StreetNames.IBRAHIM_ALKHALIL1.ordinal()],
stdStreet[StreetNames.IBRAHIM_ALKHALIL2.ordinal()]
},District.ALMANSOOR, Mashier.MINA);
stdRoutes[RouteName.MinaToAlhijra1.ordinal()] = new Route(
new Street[]{
stdStreet[StreetNames.FOURTH_HIGHWAY3.ordinal()],
stdStreet[StreetNames.STREET2.ordinal()],
stdStreet[StreetNames.THIRD_HIGHWAY.ordinal()]
},District.ALHIJRA, Mashier.MINA);
stdRoutes[RouteName.MinaToAlhijra2.ordinal()] = new Route(
new Street[]{
stdStreet[StreetNames.FOURTH_HIGHWAY3.ordinal()],
stdStreet[StreetNames.FOURTH_HIGHWAY2.ordinal()],
stdStreet[StreetNames.JABAL_THAWR_STREET.ordinal()]
},District.ALHIJRA, Mashier.MINA);
stdRoutes[RouteName.MinaToAlhijra3.ordinal()] = new Route(
new Street[]{
stdStreet[StreetNames.KKH_STREET.ordinal()],
stdStreet[StreetNames.THIRD_HIGHWAY.ordinal()]
},District.ALHIJRA, Mashier.MINA);
stdRoutes[RouteName.MinaToAlaziziya1.ordinal()] = new Route(
new Street[]{
stdStreet[StreetNames.KKH_STREET.ordinal()],
stdStreet[StreetNames.KA_STREET.ordinal()],
},District.ALAZIZIYA, Mashier.MINA);
stdRoutes[RouteName.MinaToAlaziziya2.ordinal()] = new Route(
new Street[]{
stdStreet[StreetNames.FOURTH_HIGHWAY3.ordinal()],
stdStreet[StreetNames.STREET2.ordinal()],
stdStreet[StreetNames.KA_STREET.ordinal()],
},District.ALAZIZIYA, Mashier.MINA);
//******Mina Leave end
} }
@ -280,8 +390,8 @@ public class MakkahCity {
return cars; return cars;
} }
public static PDate getTimeManager() { public static PDate getTimeMan() {
return timeManager; return currenttimeManager;
} }
/** /**
@ -289,14 +399,16 @@ public class MakkahCity {
* @param campaign * @param campaign
* @return * @return
*/ */
private static Route getShortestRoute(Campaign campaign) { private static Route getShortestRoute(Campaign campaign, Mashier mashier) {
Route[] routes = getRoutesToDistrict(campaign.getHotelDistrict()); Route[] routes = getRoutesToDistrict(campaign.getHotelDistrict());
Route route = null; Route route = null;
double min = Double.MAX_VALUE; double min = Double.MAX_VALUE;
for (Route r : routes) { for (Route r : routes) {
if (r.getTotalLength() < min) { if (r.getMashier() == mashier){
min = r.getTotalLength(); if (r.getTotalLength() < min) {
route = r; min = r.getTotalLength();
route = r;
}
} }
} }
return route; return route;
@ -336,11 +448,12 @@ public class MakkahCity {
private static String getStreetsReport() { private static String getStreetsReport() {
//TODO fix layout
String headerFormat = "******Streets report*****\n" + String headerFormat = "******Streets report*****\n" +
"Time: %s\n" + "Time: %s\n" +
" Street name |Street Load| Total | Buses | Local Vehicles |\n"; " Street name |Street Load| Total | Buses | Local Vehicles |\n";
String report = ""; String report = "";
report = report + String.format(headerFormat, timeManager.getCurrentTime()); report = report + String.format(headerFormat, firstDayTimeMan.getCurrentTime());
String entryFormat = "%-17s | %%%-8s | %5d | %5d | %14d |\n"; String entryFormat = "%-17s | %%%-8s | %5d | %5d | %14d |\n";
for (Street street : stdStreet) { for (Street street : stdStreet) {
int cap = street.getPercentRemainingCapacity(); int cap = street.getPercentRemainingCapacity();
@ -374,7 +487,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 = timeManager.getCurrentCalendar(); Calendar now = firstDayTimeMan.getCurrentCalendar();
Calendar from = (GregorianCalendar)now.clone(); Calendar from = (GregorianCalendar)now.clone();
from.roll(Calendar.MINUTE, -10); from.roll(Calendar.MINUTE, -10);
int counter = 1; int counter = 1;

2
src/Mashier.java
View File

@ -1,6 +1,6 @@
public enum Mashier { public enum Mashier {
ARAFAT, ARAFAT,
MENA, MINA,
ALHARAM, ALHARAM,
MOZDALIFA MOZDALIFA
} }

25
src/RouteName.java
View File

@ -1,14 +1,19 @@
public enum RouteName { public enum RouteName {
AlMansoorToArafat1, AlMansoorToArafat1,
AlMansoorToArafat2, AlMansoorToArafat2,
AlMansoorToArafat3, AlMansoorToArafat3,
AlHijraToArafat1, AlHijraToArafat1,
AlHijraToArafat2, AlHijraToArafat2,
AlAziziToArafat1, AlAziziToArafat1,
MinaToAlaziziya1,
MinaToAlaziziya2,
MinaToAlMansoor1,
MinaToAlMansoor2,
MinaToAlMansoor3,
MinaToAlhijra1,
MinaToAlhijra2,
MinaToAlhijra3
} }

8
src/StreetNames.java
View File

@ -7,14 +7,12 @@ public enum StreetNames {
THIRD_HIGHWAY, THIRD_HIGHWAY,
FOURTH_HIGHWAY1, FOURTH_HIGHWAY1,
FOURTH_HIGHWAY2, FOURTH_HIGHWAY2,
FOURTH_HIGHWAY3,
STREET1, STREET1,
STREET2, STREET2,
STREET3, STREET3,
STREET4, JABAL_THAWR_STREET,
IBRAHIM_ALKHALIL2, IBRAHIM_ALKHALIL2,
IBRAHIM_ALKHALIL1, IBRAHIM_ALKHALIL1,
KKH_STREET
} }

11
src/Vehicle.java
View File

@ -27,14 +27,14 @@ public abstract class Vehicle {
public void arrive() { public void arrive() {
setArrivedToDest(true); setArrivedToDest(true);
setMoving(false); setMoving(false);
setTimeOfArrival(MakkahCity.getTimeManager().getCurrentTime()); setTimeOfArrival(MakkahCity.getTimeMan().getCurrentTime());
getCurrentStreet().getVehicles().remove(this); getCurrentStreet().getVehicles().remove(this);
} }
public void move(double distance) { public void move(double distance) {
if (!isMoving()) { if (!isMoving()) {
setMoving(true); setMoving(true);
setTimeStartedMoving(MakkahCity.getTimeManager().getCurrentTime()); setTimeStartedMoving(MakkahCity.getTimeMan().getCurrentTime());
} }
setCurrentLocation(getCurrentLocation() + distance); setCurrentLocation(getCurrentLocation() + distance);
setTotalDistanceTraveled(getTotalDistanceTraveled() + distance); setTotalDistanceTraveled(getTotalDistanceTraveled() + distance);
@ -42,8 +42,7 @@ public abstract class Vehicle {
public void setRoute(Route route) { public void setRoute(Route route) {
this.route = route; this.route = route;
//this.currentStreet = route.getStreets()[0]; this.arrivedToDest = false;
//this.route.getStreets()[0].addVehicle(this);
} }
private void setVehicleSize(double vehicleSize) { private void setVehicleSize(double vehicleSize) {
@ -80,7 +79,8 @@ public abstract class Vehicle {
this.currentStreet.getVehicles().remove(this); this.currentStreet.getVehicles().remove(this);
} }
this.currentStreet = currentStreet; this.currentStreet = currentStreet;
this.currentStreet.addVehicle(this); if (this.currentStreet != null)
this.currentStreet.addVehicle(this);
} }
public void setCurrentLocation(double currentLocation) { public void setCurrentLocation(double currentLocation) {
@ -128,7 +128,6 @@ public abstract class Vehicle {
} }
public void moveToNextStreet() { public void moveToNextStreet() {
int nxtIndex = route.indexOf(this.getCurrentStreet()) + 1; int nxtIndex = route.indexOf(this.getCurrentStreet()) + 1;
if (nxtIndex <= route.getStreets().length - 1) { if (nxtIndex <= route.getStreets().length - 1) {
if (this.getRoute().getStreets()[nxtIndex].capcityPoint(0, 1000) < 1) { if (this.getRoute().getStreets()[nxtIndex].capcityPoint(0, 1000) < 1) {