Hesham/Hajj-simulation
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
185 Commits 15 Branches 3 Tags 830 KiB
47e6ffb30f
Commit Graph

185 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Asaad Dadoush
47e6ffb30f Null Exception why ???? check TODO list in line 1142 2020-12-09 04:45:13 +03:00
Asaad Dadoush
36e44ceab6 add lbl for number of buses + edit district table 2020-12-09 04:05:47 +03:00
Asaad Dadoush
6b7f7eee11 Add Action for ViewRoutes 2020-12-09 01:26:32 +03:00
IMXHERO
4a5b9cf964
Merge pull request #21 from HeshamTB/history-bin 
History bin
 2020-12-09 01:00:52 +03:00
IMXHERO
89f7946f98
Merge branch 'master' into history-bin 2020-12-09 01:00:28 +03:00
Asaad Dadoush
c5c89e30e8 phase2 sol + frame Color + update the table 2020-12-09 00:56:13 +03:00
Asaad Dadoush
afb8f0982c Add new Table for district 2020-12-08 11:46:58 +03:00
HeshamTB
e14ed99d42
Exit Button 2020-12-07 22:33:27 +03:00
HeshamTB
54421ee9e6
StreetsFrame/Table (Live updating): 
- Move code to GUI inter class.
    - The table updates every minute
 2020-12-07 22:18:39 +03:00
HeshamTB
5ab60978dc
Merge pull request #20 from HeshamTB/swing-test 
Swing test
 2020-12-07 21:50:40 +03:00
HeshamTB
add1264e01
Merge branch 'master' into swing-test 2020-12-07 21:50:25 +03:00
Asaad Dadoush
bb17d9180e edit some swing 2020-12-07 11:13:37 +03:00
Asaad Dadoush
192a482bb4 edit some swing 2020-12-07 11:12:23 +03:00
Asaad Dadoush
7d5f3452ad GUI Woring heeeeeeeee :D 2020-12-07 11:01:20 +03:00
HeshamTB
6648832d50
Prevent overwrite of arrival times 2020-12-07 05:15:36 +03:00
HeshamTB
72eba421db
Typo 2020-12-07 04:49:32 +03:00
HeshamTB
13f46c84dc
GUI nested class to setup for swing GUI 2020-12-07 04:46:51 +03:00
HeshamTB
f06614c390
Merge pull request #18 from EngOsamah/master 
Distribute the Buses
 2020-12-07 04:46:35 +03:00
HeshamTB
da959a5cd3
simple Street table 2020-12-07 03:24:46 +03:00
EngOsamah
b88a33a749 Distribute the Buses 2020-12-07 02:05:51 +03:00
HeshamTB
6720b412e6
Typo 2020-12-06 23:03:06 +03:00
HeshamTB
20296571fc
Merge pull request #16 from AsaadDadoush/master 
First GUI test
 2020-12-06 22:33:38 +03:00
HeshamTB
50e348de8d
Merge pull request #15 from EngOsamah/master 
shuffle
 2020-12-06 22:31:56 +03:00
Asaad Dadoush
4b9c5a8544 First GUI test 2020-12-06 22:21:50 +03:00
HeshamTB
414cf44dae
Load history menu option: 
- Browse is still incomplete.
	- There is a bug when selecting a time before the hour 12.
	The time becomes 23:00 ?
 2020-12-06 05:38:39 +03:00
HeshamTB
53dc294cf1
ignore bin extention 2020-12-06 05:37:54 +03:00
HeshamTB
147d45e4fe
DataMan and State: 
- Save state of given time.

    Still not tested with recovering saved
    states.
 2020-12-06 04:07:49 +03:00
EngOsamah
ee1cb4852c Tasks 2020-12-05 23:54:01 +03:00
EngOsamah
4d736bc21c Shuffle Campaigns 2020-12-05 23:03:09 +03:00
HeshamTB
cebf2a272b
ignore 2020-12-05 10:50:14 +03:00
HeshamTB
709fa9bdac
show capacity next to street name (menu) 2020-12-04 09:10:43 +03:00
HeshamTB
a106c5fc2f
Campaign menu option 2020-12-04 08:59:08 +03:00
HeshamTB
5f3488c4d0
improved Vehicle output 2020-12-04 08:34:55 +03:00
HeshamTB
0e4f871770
Pause inputListner at end of sim: 
- This prevents displaying a menu and
	all the input is taken by the input
	thread. In such case, the user can't
	use the menu or exit normally.
 2020-12-03 03:36:59 +03:00
HeshamTB
787d2a7fd7
Revert capacity() 2020-12-03 03:19:25 +03:00
HeshamTB
8bb64bea64
Reset all time members of vehicle: 
- Reset (nullify) all times
   when a new route is set.

   Fixes a bug where there is a trip
   time when in second day and still
   has not arrived.
 2020-12-03 02:58:54 +03:00
HeshamTB
024babaf3f
Extend second day to allow for all buses to arrive 2020-12-03 02:43:13 +03:00
HeshamTB
3932f8758c Add Trip time and progress to vehicle output 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-12-02 20:32:40 +03:00
HeshamTB
f4007d7007 Terminate thread when done 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-12-02 19:24:56 +03:00
HeshamTB
810820283f final patch before P1 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-12-02 19:22:18 +03:00
HeshamTB
c7313cd3df Improved output 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-12-02 19:06:37 +03:00
HeshamTB
22ee69be52 Fixed cast error 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-12-02 18:29:24 +03:00
HeshamTB
b6003cc3e8
Add distance to Vehicle toString() 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-12-02 17:43:05 +03:00
HeshamTB
af92fb96e0
Merge pull request #14 from EngOsamah/master 
Phase 1
 2020-12-02 17:37:37 +03:00
EngOsamah
2f14faa2eb Phase 1 2020-12-02 13:52:11 +03:00
HeshamTB
6dbe6a331f
Update menu: 
- View buses instead of vehicles.
    - showVehicle option menu.

Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-12-02 03:01:01 +03:00
HeshamTB
afb2b85643
Clean up 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-12-02 02:17:07 +03:00
HeshamTB
177e22ef13
Merge branch 'menu' 2020-12-02 02:03:29 +03:00
HeshamTB
de91dd6cc4
Merge branch 'menu' of https://github.com/HeshamTB/Hajj-simulation into menu 2020-12-02 01:51:00 +03:00
HeshamTB
a0d4fdf9f6
Hijri representation (HijriDate): 
- Override Date toString()
    to replace 'Jan' with Dhu'l-Hijja
    and other values.
    - PDate returns instances of HijriDate
    that return Hijri Strings.

Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-12-02 01:46:56 +03:00