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

144 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
HeshamTB
f6209c669d
Remove camp field and better output 2020-11-15 11:48:48 +03:00
HeshamTB
124920787c
Better street report 2020-11-15 01:42:17 +03:00
HeshamTB
92bbb0c099
Merge pull request #9 from EngOsamah/master 2020-11-15 01:31:34 +03:00
EngOsamah
0458ff143e maybe this is going to be phase one 2020-11-15 01:21:15 +03:00
Asaad Dadoush
bb46419ed3 Report 2020-11-14 21:27:32 +03:00
Asaad Dadoush
3e1b1f162c Add UID for Sedan / SUV / Truck 2020-11-14 16:31:43 +03:00
HeshamTB
52ac0c702a
Merge branch 'movement2' 2020-11-14 02:43:43 +03:00
HeshamTB
2eb6a96a23
Better movement. 
- Move Vehicles from list
   in Makkah.
 2020-11-14 02:37:57 +03:00
HeshamTB
fe781f43b6
Better movement. 
- Move Vehicles from list
   in Makkah.
 2020-11-14 01:30:20 +03:00
HeshamTB
392993a008
Cars move on top of each other 2020-11-13 22:35:52 +03:00
HeshamTB
fac5ed0089 Major update 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-12 00:13:05 +03:00
HeshamTB
62c8fb22fa Major update 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-12 00:12:59 +03:00
HeshamTB
cc64faf912
Merge pull request #6 from AsaadDadoush/master 
add enum
 2020-11-11 21:42:09 +03:00
Asaad Dadoush
6aabadd1f0 add enum 2020-11-11 21:35:18 +03:00
HeshamTB
16ff81a44c update Vehicle and Campaign 
- Added movment in vehicle.
   - Now Campaign sets Routes for
   it's Vehicles.
   - Fixed Array size of stdRoutes
   - Added getShortestRoute(Campaign)
   and getRoutesToDistrict(District)
   in MakkahCity

Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-11 21:02:59 +03:00
HeshamTB
f4bb5e6099
Prevent IndexOutOFBoundEx: 
In genCivilVehicles(), the
    casting might step over
    the number of cars size
    of the array. So, use try
    catch blocks and skip in that
    case.
 2020-11-11 14:26:41 +03:00
HeshamTB
9fb653397f Make PDate refrence type rather then static members 2020-11-11 12:04:50 +03:00
HeshamTB
be05e7f848
Method to make noise cars 2020-11-10 20:48:32 +03:00
HeshamTB
b491eaf4ab Vehicle: calc distance to next 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-10 20:16:36 +03:00
HeshamTB
92661695b1 Meeting work 
Signed-off-by: HeshamTB <hishaminv@gmail.com>

Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-10 20:16:11 +03:00
HeshamTB
83fddd5724
Merge pull request #4 from EngOsamah/master 
Update
 2020-11-10 17:18:27 +03:00
HeshamTB
f3258355fe
Merge branch 'master' into master 2020-11-10 17:06:28 +03:00
EngOsamah
2b037e40e8 Update 2020-11-10 16:45:35 +03:00
HeshamTB
3fb2291b85
Note to review 2020-11-10 08:02:55 +03:00
HeshamTB
fc6b93697c
Street: Add get remaining percent capacity() 2020-11-10 00:54:31 +03:00
HeshamTB
96a1254ce3 Makkah: add all busses from camps to list 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-10 00:43:16 +03:00
HeshamTB
0fb689a3a0 MakkahCity: Main simulation begins 
- Defined static lists and arrays holding
	All object references.

	- Generate campaigns with random number range
	based on Area. This is based on estimate of
	real values and density of the Districts in
	Makkah.

	- Main loop is made and limited by
	PDate.isEnded() which is static variable
	indicates the end of the timeline.
	The incrementor is PDate.step(key,value)

	Simulation begins...

	- H.B.

Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-10 00:10:31 +03:00
HeshamTB
d242489985 Campaign and Bus: 
- Buses now have fixed vehicle length
	stored in STD_BUS_SIZE and are constructed
	without parameters.

	- Fixed generateBuses() in Campaign
	to not be public and used one in practice

Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-10 00:05:58 +03:00
HeshamTB
1bf7290dbf Street: 
- Added getCombinedLength(). Returns
	sum of the length of each lane on street

	- Fixed addVehicle() condition to be relative
	to the provided vehicle plus padding

Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-10 00:03:29 +03:00
HeshamTB
7c9fd44070 Clean up TrafficPoliceCar and Changed CanBeGovtCar 
Signed-off-by: HeshamTB <hishaminv@gmail.com>

Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-10 00:02:08 +03:00
HeshamTB
713e902e05 Route: 
- Changed constructor to take
	Enums of District and Mashier
	as endpoint (start, end)

Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-10 00:00:20 +03:00
HeshamTB
6d0ea7654e PDate: fix stepping method to not step over sim timeline 
Signed-off-by: HeshamTB <hishaminv@gmail.com>
 2020-11-09 23:57:28 +03:00