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

Load history menu option:

Browse Source 
- Browse is still incomplete.
	- There is a bug when selecting a time before the hour 12.
	The time becomes 23:00 ?
This commit is contained in:
HeshamTB 2020-12-06 05:38:39 +03:00
parent 53dc294cf1
commit 414cf44dae
Signed by: Hesham
GPG Key ID: 74876157D199B09E
2 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/DataManeger.java
View File

@ -22,7 +22,7 @@ public class DataManeger {
} }
public boolean stateAvailable(Date time) { public boolean stateAvailable(Date time) {
File f = new File(workingDir.toString()+time.getTime()); File f = new File(String.format("0x%016X.bin", time.getTime()));
return f.exists(); return f.exists();
} }
@ -31,7 +31,7 @@ public class DataManeger {
if (stateAvailable(time)){ if (stateAvailable(time)){
try { try {
ObjectInputStream objectInputStream = new ObjectInputStream( ObjectInputStream objectInputStream = new ObjectInputStream(
new FileInputStream(String.format("%s%d",workingDir,time.getTime()))); new FileInputStream(String.format("0x%016X.bin", time.getTime())));
state = (State)objectInputStream.readObject(); state = (State)objectInputStream.readObject();
objectInputStream.close(); objectInputStream.close();
} catch (IOException | ClassNotFoundException e) { } catch (IOException | ClassNotFoundException e) {
@ -43,7 +43,7 @@ public class DataManeger {
public boolean saveState(State state, Date time){ public boolean saveState(State state, Date time){
try { try {
FileOutputStream fs = new FileOutputStream(String.format("%s%d",workingDir,time.getTime())); FileOutputStream fs = new FileOutputStream(String.format("0x%016X.bin", time.getTime()));
BufferedOutputStream bfs = new BufferedOutputStream(fs); BufferedOutputStream bfs = new BufferedOutputStream(fs);
ObjectOutputStream objectOutputStream = new ObjectOutputStream(bfs); ObjectOutputStream objectOutputStream = new ObjectOutputStream(bfs);
objectOutputStream.writeObject(state); objectOutputStream.writeObject(state);

50
src/MakkahCity.java
View File

@ -164,8 +164,9 @@ public class MakkahCity {
"[3] View Campaigns\n" + "[3] View Campaigns\n" +
"[4] View Routes\n" + "[4] View Routes\n" +
"[5] Print report\n" + "[5] Print report\n" +
"[6] Continue\n" + "[6] Browse History\n" +
"[7] Exit"); "[7] Continue\n" +
"[8] Exit");
String choice = in.next(); String choice = in.next();
//Split into methods? //Split into methods?
if (choice.equals("1")){ if (choice.equals("1")){
@ -198,8 +199,9 @@ public class MakkahCity {
} }
} }
if (choice.equals("5")) System.out.println(getStreetsReport()); if (choice.equals("5")) System.out.println(getStreetsReport());
if (choice.equals("6")) return; if (choice.equals("6")) browseHistory();
if (choice.equals("7")) { if (choice.equals("7")) return;
if (choice.equals("8")) {
inputListener.stop(); inputListener.stop();
t.interrupt(); t.interrupt();
System.exit(0); System.exit(0);
@ -276,6 +278,46 @@ public class MakkahCity {
System.out.println(route.toString()); System.out.println(route.toString());
} }
private static void browseHistory() {
Calendar dummyCal = new GregorianCalendar();
dummyCal.setTime(currenttimeManager.getCurrentTime());
//dummyCal.roll(Calendar.HOUR, -1);
dummyCal.set(Calendar.MINUTE, 0);//Go down to last hour.
Scanner in = new Scanner(System.in);
boolean selected = false;
while (!selected){
System.out.println(new HijriDate(dummyCal.getTimeInMillis()));
System.out.print("[1] Forward\n" +
"[2] Backward\n" +
"[3] Select\n" +
"[4] Return\n");
String choice = in.next();
if (choice.equals("1")) dummyCal.roll(Calendar.HOUR, 1);
if (choice.equals("2")) dummyCal.roll(Calendar.HOUR, -1);
if (choice.equals("3")) {
selected = true;
DataManeger dataManeger = new DataManeger();
if (dataManeger.stateAvailable(dummyCal.getTime())) {
State state = dataManeger.loadState(dummyCal.getTime());
System.out.print(dummyCal.getTime() + " (History)\n");
System.out.println("\n"+
"---------------------------\n" +
"[1] View Buses\n" +
"[2] View Streets\n" +
"[3] View Campaigns\n" +
"[4] View Routes\n");
choice = in.next();
if (choice.equals("1")){
System.out.print("0 - "+state.getListOfVehicles().size());
choice = in.next();
showVehicle(state.getListOfVehicles().get(Integer.parseInt(choice)));
}
} else System.out.print("Not saved");
}
}
}
private static void clearDoneCivilVehicles() { private static void clearDoneCivilVehicles() {
//Clear civil cars from list //Clear civil cars from list
for (int i = 0; i < listOfVehicles.size();){ for (int i = 0; i < listOfVehicles.size();){