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

updated todo tasks

Browse Source 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
This commit is contained in:
HeshamTB 2020-11-18 19:28:17 +03:00
parent e5c92c07b7
commit 9ecbfe15ed
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/MakkahCity.java
View File

@ -66,7 +66,6 @@ public class MakkahCity {
} }
if (vehicle.getCurrentStreet() != null && vehicle.getCurrentStreet().capcityPoint(currentLocation, if (vehicle.getCurrentStreet() != null && vehicle.getCurrentStreet().capcityPoint(currentLocation,
currentLocation+1000) < 1 ) { currentLocation+1000) < 1 ) {
//TODO: Possible bug. Checks 1Km ahead. Street may not be that long(checks as ok).
if (currentLocation >= vehicle.getCurrentStreet().getLength()) { if (currentLocation >= vehicle.getCurrentStreet().getLength()) {
//Move to next street //Move to next street
@ -163,7 +162,7 @@ public class MakkahCity {
stdStreet[StreetNames.IBRAHIM_ALKHALIL2.ordinal()], stdStreet[StreetNames.IBRAHIM_ALKHALIL2.ordinal()],
stdStreet[StreetNames.THIRD_HIGHWAY.ordinal()], stdStreet[StreetNames.THIRD_HIGHWAY.ordinal()],
stdStreet[StreetNames.STREET2.ordinal()], stdStreet[StreetNames.STREET2.ordinal()],
stdStreet[StreetNames.STREET1.ordinal()]//TODO: [8]is actually half of ibrahim khalil. stdStreet[StreetNames.STREET1.ordinal()]
},District.ALMANSOOR, Mashier.ARAFAT); },District.ALMANSOOR, Mashier.ARAFAT);
//Optimal for Almansoor //Optimal for Almansoor
@ -366,6 +365,7 @@ public class MakkahCity {
* @return "hh:mm" * @return "hh:mm"
*/ */
private static String avgTimeOfTrip() { private static String avgTimeOfTrip() {
//TODO: does output diff value even after all have arrived.
Calendar now = timeManager.getCurrentCalendar(); Calendar now = timeManager.getCurrentCalendar();
Calendar from = (GregorianCalendar)now.clone(); Calendar from = (GregorianCalendar)now.clone();
from.roll(Calendar.MINUTE, -10); from.roll(Calendar.MINUTE, -10);

1
src/Truck.java
View File

@ -3,7 +3,6 @@ public class Truck extends CivilVehicle {
private String UID; private String UID;
private static int numeberOfTruck; private static int numeberOfTruck;
private final int TIME_TO_FIX = 20; //in minutes private final int TIME_TO_FIX = 20; //in minutes
// public static final int MAX_FORWARD = ????; //TODO what is the speed here ??
public Truck(double vehicleSize){ public Truck(double vehicleSize){
super(vehicleSize); super(vehicleSize);
generateUID(); generateUID();