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

Remove camp field and better output

Browse Source
This commit is contained in:
HeshamTB 2020-11-15 11:48:48 +03:00
parent 124920787c
commit f6209c669d
Signed by: Hesham
GPG Key ID: 74876157D199B09E
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Campaign.java
View File

@ -16,8 +16,6 @@ public class Campaign {
private Date timeToLeaveToDest; private Date timeToLeaveToDest;
private Date timeToLeaveToHousing; private Date timeToLeaveToHousing;
private boolean startedMoving;
private static int numeberOfCampains; private static int numeberOfCampains;
public Campaign(District hotelDistrict, int numberofBusses) { public Campaign(District hotelDistrict, int numberofBusses) {
@ -90,10 +88,6 @@ public class Campaign {
this.vehicles = vehicles; this.vehicles = vehicles;
} }
public void setStartedMoving(){
this.startedMoving = true;
}
private void generateBusses(int number){ private void generateBusses(int number){
for (int i = 1; i <= number; i++) { for (int i = 1; i <= number; i++) {
vehicles.add(new Bus()); vehicles.add(new Bus());

10
src/MakkahCity.java
View File

@ -37,7 +37,7 @@ public class MakkahCity {
//Start of Every hour //Start of Every hour
if (timeManager.getCurrentCalendar().get(Calendar.MINUTE) == 0){ if (timeManager.getCurrentCalendar().get(Calendar.MINUTE) == 0){
if (isAllArrived()) { if (isAllArrived()) {
System.out.println("\nAll campaigns have arrived befor " + timeManager.getCurrentTime()); System.out.println("\nAll campaigns have arrived before " + timeManager.getCurrentTime());
break; break;
} }
} }
@ -65,7 +65,8 @@ public class MakkahCity {
vehicle.setCurrentStreet(route.getStreets()[0]); vehicle.setCurrentStreet(route.getStreets()[0]);
} }
if (vehicle.getCurrentStreet() != null && vehicle.getCurrentStreet().capcityPoint(currentLocation, if (vehicle.getCurrentStreet() != null && vehicle.getCurrentStreet().capcityPoint(currentLocation,
currentLocation+1000) < 1 ) { //May test diff values. 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
@ -331,10 +332,11 @@ public class MakkahCity {
private static String getStreetsReport() { private static String getStreetsReport() {
String headerFormat = "******Streets report*****\n" + String headerFormat = "******Streets report*****\n" +
"Time: %s\n"; "Time: %s\n" +
"Street name |remaining capacity| cars\n";
String report = ""; String report = "";
report = report + String.format(headerFormat, timeManager.getCurrentTime()); report = report + String.format(headerFormat, timeManager.getCurrentTime());
String entryFormat = "Street name:%-16s| remaining capacity: %%%-4s | cars: %d\n"; String entryFormat = "%-16s | %%%-15s | %d\n";
for (Street street : stdStreet) { for (Street street : stdStreet) {
int cap = street.getPercentRemainingCapacity(); int cap = street.getPercentRemainingCapacity();
report = report + String.format(entryFormat, report = report + String.format(entryFormat,