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

156 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
HeshamTB
9177281deb Java 11 2020-12-18 14:59:01 +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
HeshamTB
d4be36ebf8
Travelable interface 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-12-02 00:50:18 +03:00
HeshamTB
35ce9ca754
District report evey hour 2-12-2020 meeting 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-12-02 00:49:45 +03:00
HeshamTB
271395654c
Route used by 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-12-02 00:02:08 +03:00
HeshamTB
19291fbfe1
District report: 
- Add best time to dist

Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-12-01 22:33:24 +03:00
HeshamTB
ba02114562
Print time of finishing for both days 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-12-01 22:21:50 +03:00
HeshamTB
a376d91671
Clean up 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-12-01 21:10:00 +03:00
HeshamTB
4a87e08a74
busses arrived per hour fix 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-12-01 20:51:12 +03:00
HeshamTB
336106c7ed
Street toString() 
- Print street details and fields.
    - Print scaled street density.
 2020-12-01 20:22:59 +03:00
Asaad Dadoush
86651b3a91 method for the bus arrived per hour 2020-12-01 19:05:27 +03:00
HeshamTB
83261572fb
Merge branch 'master' into menu 2020-12-01 06:56:31 +03:00
HeshamTB
16195f44cc
Merge pull request #12 from EngOsamah/master 
CivilVehicleNoise is OK
 2020-12-01 06:34:45 +03:00
HeshamTB
3e1af27b6d
Print report option in menu 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-12-01 04:58:26 +03:00
EngOsamah
e8cdb4b51d CivilVehicleNoise is OK 2020-12-01 00:26:05 +03:00
HeshamTB
51bf50ec6d
menu split into methods: 
- Stack-like menu. Recurse until
    Return is selected.

Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-12-01 00:24:24 +03:00
HeshamTB
0b4e259495
Route toString() Exception fix: 
- toString() throws exception
   when invoked on 'noise' vehicles
   The routes made for them dont have
   District and Mashier set. Accessing
   name() from a null method throws
   null ptr ex.

Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-12-01 00:23:07 +03:00
HeshamTB
e28a593280
Print time with menu 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-30 22:42:09 +03:00
HeshamTB
fbd39f4081
Street history 
- Save time of entry for each vehicle

Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-30 22:36:37 +03:00
HeshamTB
3a91f2f0f1
Vehicle toString(): 
- Print route
    - Check if street is null before getting
        name.

Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-30 21:47:33 +03:00
HeshamTB
d7e3fd7a68
Vehicle toString() 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-30 21:05:01 +03:00
HeshamTB
2edf82b28b
menu: 
- Added street option in menu
    - Street length printed to second

Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-30 20:50:23 +03:00
HeshamTB
076cb510cf
Merge branch 'master' into menu 2020-11-30 20:28:42 +03:00
HeshamTB
680890b864
Street toString() 
- Print street details and fields.
    - Print scaled street density.
 2020-11-30 20:11:41 +03:00
HeshamTB
c3485f94d1
Merge branch 'master' into menu 2020-11-30 18:48:34 +03:00
HeshamTB
521b36a117
Fix output glitch 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-28 05:42:21 +03:00
HeshamTB
fc05264a46
Menu functions (Exit, Continue) 2020-11-27 20:04:23 +03:00
HeshamTB
4346b9348d
Menu functions: 
- View Vehicles
    - View Routes
 2020-11-27 19:18:44 +03:00
HeshamTB
b85a4040f2
Simple menu. Does nothing. 2020-11-27 18:42:17 +03:00
HeshamTB
6d3d3b5085
Add pause method in InputListener 
- Pause method and var to stop
    Scanner from 'taking' the input
    when in menue.
 2020-11-27 18:42:17 +03:00
HeshamTB
bd68322a75
Start a thread to listen for console input 
- Listen for 'commands' on stdin
    the thread is running alongside
    the simulation.
 2020-11-27 18:42:16 +03:00