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

PDate: fix stepping method to not step over sim timeline

Browse Source 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
This commit is contained in:
HeshamTB 2020-11-09 23:57:28 +03:00
parent 0bc231222a
commit 6d0ea7654e
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/PDate.java
View File

@ -8,7 +8,7 @@ import java.util.GregorianCalendar;
public class PDate extends Calendar { public class PDate extends Calendar {
public static final Calendar startCalendar = new GregorianCalendar(2020,Calendar.JANUARY,15,13,0,0); public static final Calendar startCalendar = new GregorianCalendar(2020,Calendar.JANUARY,15,13,0,0);
public static final Calendar endCalendar= new GregorianCalendar(2020,Calendar.JANUARY,15,20,0,0); public static final Calendar endCalendar= new GregorianCalendar(2020,Calendar.JANUARY,16,20,0,0);
private static final Calendar currentCalendar = (GregorianCalendar)startCalendar.clone(); private static final Calendar currentCalendar = (GregorianCalendar)startCalendar.clone();
private static boolean ended; private static boolean ended;
@ -37,12 +37,13 @@ public class PDate extends Calendar {
} }
public static void step(int key, int value){ public static void step(int key, int value){
if (currentCalendar.before(endCalendar)){ ended = false;
Calendar dummy = (GregorianCalendar)currentCalendar.clone();
dummy.add(key, value);
if (dummy.before(endCalendar)){
currentCalendar.add(key, value); currentCalendar.add(key, value);
} }
else if (currentCalendar.after(endCalendar) || currentCalendar.equals(endCalendar)) { else ended = true;
ended = true;
}
} }
/** /**