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

126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
HeshamTB
5fde1eee7e
Route override toString() 
- Print length, names of streets
    Estimated time (Best case)
    and endpoints.
 2020-11-27 06:04:29 +03:00
HeshamTB
b214b279db
Add Buses per District in pre run report 2020-11-27 00:39:40 +03:00
HeshamTB
9d195a8864
artifact setup 2020-11-27 00:16:43 +03:00
HeshamTB
538c4a09a4
Average time for each street in report 2020-11-26 23:50:26 +03:00
HeshamTB
51534a5d2b
Keep track of time used on every street on route 2020-11-26 22:41:24 +03:00
HeshamTB
ff5c7753ff Add avg time of trip per district (Hour report) 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-26 21:14:28 +03:00
HeshamTB
480d9ccb46 Print dots as prog bar instead of date (minutes) 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-26 21:11:16 +03:00
HeshamTB
71c07b5bc1
Remove colored street name in report 2020-11-26 20:27:41 +03:00
HeshamTB
bba5441aee Pre-simulation report: 
- Make report with details per District
	(Still incomplete)
	- Use String builder for all reports.
 2020-11-26 03:30:36 +03:00
HeshamTB
946e4004ae Print msg for no arrival (avg) 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-26 03:29:08 +03:00
HeshamTB
4ab5b750b8
Remove printing of '\b' 
- Causes problems in some consoles.
 2020-11-23 01:29:23 +03:00
HeshamTB
ee94355f42
Method in route getFastestTimeOfTravel(Vehicle): 
- Every subclass of Vehicle needs to return
    the max of it self.

    - Calculate best case (empty streets) for
    a given vehcile using a Route.
 2020-11-23 01:20:48 +03:00
HeshamTB
6367b48746
Notes form 21-11-2020 meeting 2020-11-21 17:27:23 +03:00
HeshamTB
dfbd961eca addCivilVehileNoise(): 
- Found possible fix for the method. Not yet done
	The 'numOfSedan', 'numOfSUV' ... get smaller for
	every loop iteration.

Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-21 02:49:00 +03:00
HeshamTB
35cda81a46 Output: 
- Add label for current minute output
	- Use "\b" instead of " " when clearing line

Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-21 02:43:55 +03:00
HeshamTB
da001dc5cd Output Color with respect to capacity 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-21 00:25:43 +03:00
HeshamTB
1efd3e2dec Added new output and fixed street overflow 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-21 00:05:55 +03:00
HeshamTB
4b0e8800be
Reset num of arrived busses after setting new route 2020-11-20 20:15:13 +03:00
HeshamTB
012c8170f9 Two day simulation (buggy)? 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-19 17:06:12 +03:00
HeshamTB
d2eeac04ec Setup for new time managment 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-18 19:35:49 +03:00
HeshamTB
11a9269cb4 Street capacity used instead of remaining. 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-18 19:28:38 +03:00
HeshamTB
9ecbfe15ed updated todo tasks 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-18 19:28:17 +03:00
HeshamTB
e5c92c07b7
Merge pull request #11 from AsaadDadoush/master 
Edit Routes and Add Streets
 2020-11-18 18:38:26 +03:00
Asaad Dadoush
5030e7e5ac Edit Routes and Add Streets 2020-11-18 18:22:07 +03:00
HeshamTB
86a4ac509a Move counting methods to street 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-17 20:44:10 +03:00
HeshamTB
b06a15e303 rename counting methods 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-17 20:25:40 +03:00
HeshamTB
200acf9a98 Improved output 
Added Breakdown of car types on each street.

	Calculate avg trip time in last 10 min

Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-17 20:18:17 +03:00
HeshamTB
14272a6834
Merge pull request #10 from AsaadDadoush/master 
Edit
 2020-11-17 18:02:17 +03:00
Asaad Dadoush
5e612c2995 Edit 2020-11-17 17:45:21 +03:00
HeshamTB
d5891ad2d1 Add ref to Camp in Bus ... 
- Ref to Camp in Bus.
	- Override arrive() in bus to
	notify camp.
	- isAllArrived() changed to implement camp.isDone().
	Should be a bit faster

Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-15 17:02:56 +03:00