vcaw
/
public
forked from root/public
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

correction from feedback given

content-update
lee 3 years ago
parent
37e11c2033
commit
21622093b5
2 changed files with 30 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      subjects/road_intersection/README.md
  2. 24
      subjects/road_intersection/audit/README.md

34
subjects/road_intersection/README.md
unescape_control_characters View File

@ -21,18 +21,18 @@ There exists various shapes of intersections, we will focus on the widely seen f
| ↓ | ↑ | | ↓ | ↑ |
| ↓ | ↑ | | ↓ | ↑ |
| ↓ | ↑ | | ↓ | ↑ |
|r0 r1 r2 | ↑ | | r s l | ↑ |
_______________| ← ↓ → | ↑ |_____________ _______________| ← ↓ → | ↑ |_____________
| ↑ r0 | ↑ r
← ← ← ← ← ← ← | ← r1 ← ← ← ← ← ← ← ← ← ← ← ← | ← s ← ← ← ← ←
| ↓ r2 | ↓ l
_________________________|_______________________ _________________________|_______________________
r2 ↑ | l ↑ |
→ → → → → r1 → | → → → → → → → → → → → s → | → → → → → →
r0 ↓ | r ↓ |
_______________ | _____________ _______________ | _____________
| | ← ↑ → | | | ← ↑ → |
| ↓ |r2 r1 r0 | | ↓ | r s l |
| ↓ | ↑ | | ↓ | ↑ |
| ↓ | ↑ | | ↓ | ↑ |
| ↓ | ↑ | | ↓ | ↑ |
@ -42,9 +42,9 @@ _______________ | _____________
For clarification reasons we will assume that a lane can have three different routes (consider you are in the vehicle position): For clarification reasons we will assume that a lane can have three different routes (consider you are in the vehicle position):
- `r0`, turning right - `r`, turning right
- `r1`, straight ahead - `s`, straight ahead
- `r2`, turning left - `l`, turning left
2. Traffic lights 2. Traffic lights
@ -65,17 +65,19 @@ You are free to decide what algorithm you want to implement for the traffic ligh
Vehicles must obey this rules: Vehicles must obey this rules:
- Autonomous, vehicles driving on a lane with a **given route** must - Vehicles must have a color depending on their route the colors are up to you to decide(ex:`r`- purple, `s`- Blue and `l`- Yellow). This must then be given during the audit
follow the direction of that route, its not possible for the driver to change lanes or route.
- Autonomous, vehicles driving on a lane with a **given route** must follow the direction of
that route, its not possible for the driver to change lanes or route.
- Each vehicle must have a fixed velocity. - Each vehicle must have a fixed velocity.
- It must be kept a safety distance from other vehicles, if one vehicle stops the other vehicle thats - It must be kept a safety distance from other vehicles, if one vehicle stops the other vehicle thats
behind him must stop and keep its distance. behind him must stop and keep its distance.
- Vehicles must stop if the traffic light is red and proceed otherwise. - Vehicles must stop if the traffic light is red and proceed otherwise.
- Vehicles must have different routes, either `r0`, `r1` or `r2`. - Vehicles must have different routes, either `r`, `s` or `l`.
- Other vehicles such as emergency vehicles are not considered. - Other vehicles such as emergency vehicles are not considered.
@ -88,7 +90,7 @@ vehicles in different lanes and with different routes.
For this it must be possible to do the following: For this it must be possible to do the following:
- The `Arrow` keys must generate one vehicle in a specific direction and with a random route ( `r0`, `r1` and `r2`): - The `Arrow` keys must generate one vehicle in a specific direction and with a random route ( `r`, `s` and `l`):
- `Up` south to north. - `Up` south to north.
- `Down` north to south. - `Down` north to south.
- `Right` west to east. - `Right` west to east.

24
subjects/road_intersection/audit/README.md
unescape_control_characters View File

@ -22,55 +22,55 @@
##### Try to generate tree vehicles in the same lane (do this to all lanes). ##### Try to generate tree vehicles in the same lane (do this to all lanes).
###### Did all vehicles passed the intersection safely? ###### Did all vehicles passed the intersection without any collision?
##### Try to generate two vehicles at the same time, one using the `"Up"` key and the other using the `"Down"` key (to this at least 3 times). ##### Try to generate two vehicles at the same time, one using the `"Up"` key and the other using the `"Down"` key (to this at least 3 times).
###### Did all vehicles passed the intersection safely? ###### Did all vehicles passed the intersection without any collision?
##### Try to generate two vehicles at the same time, one using the `"Right"` key and the other using the `"Left"` key (to this at least 3 times). ##### Try to generate two vehicles at the same time, one using the `"Right"` key and the other using the `"Left"` key (to this at least 3 times).
###### Did all vehicles passed the intersection safely? ###### Did all vehicles passed the intersection without any collision?
##### Try to generate two vehicles at the same time, one using the `"Up"` key and the other using the `"Left"` key (to this at least 3 times). ##### Try to generate two vehicles at the same time, one using the `"Up"` key and the other using the `"Left"` key (to this at least 3 times).
###### Did all vehicles passed the intersection safely? ###### Did all vehicles passed the intersection without any collision?
##### Try to generate two vehicles at the same time, one using the `"Up"` key and the other using the `"Right"` key (to this at least 3 times). ##### Try to generate two vehicles at the same time, one using the `"Up"` key and the other using the `"Right"` key (to this at least 3 times).
###### Did all vehicles passed the intersection safely? ###### Did all vehicles passed the intersection without any collision?
##### Try to generate two vehicles at the same time, one using the `"Down"` key and the other using the `"Left"` key (to this at least 3 times). ##### Try to generate two vehicles at the same time, one using the `"Down"` key and the other using the `"Left"` key (to this at least 3 times).
###### Did all vehicles passed the intersection safely? ###### Did all vehicles passed the intersection without any collision?
##### Try to generate two vehicles at the same time, one using the `"Down"` key and the other using the `"Right"` key (to this at least 3 times). ##### Try to generate two vehicles at the same time, one using the `"Down"` key and the other using the `"Right"` key (to this at least 3 times).
###### Did all vehicles passed the intersection safely? ###### Did all vehicles passed the intersection without any collision?
##### Try to generate five vehicles using the `"Up"` key, at the same time generate two vehicles using the key `"Right"`. ##### Try to generate five vehicles using the `"Up"` key, at the same time generate two vehicles using the key `"Right"`.
###### Did all vehicles passed the intersection safely? ###### Did all vehicles passed the intersection without any collision?
##### Try to generate one vehicle for all the lanes (to this at least 3 times). ##### Try to generate one vehicle for all the lanes (to this at least 3 times).
###### Did all vehicles passed the intersection safely? ###### Did all vehicles passed the intersection without any collision?
##### Try to generate vehicles randomly using the `"R"` key. Then wait for at least 1 min. ##### Try to generate vehicles randomly using the `"R"` key. Then wait for at least 1 min.
###### Did all vehicles passed the intersection safely? ###### Did all vehicles passed the intersection without any collision?
###### Was there a low traffic congestion while running the application? (ex: high traffic congestion can be 8 or more vehicles in the same lane without proceeding)? ###### Was there a low traffic congestion while running the application? (ex: high traffic congestion can be 8 or more vehicles in the same lane without proceeding)?
##### Try to generate vehicles with lanes at your choice. ##### Try to generate vehicles with lanes at your choice.
###### Did all vehicles passed the intersection safely? ###### Did all vehicles passed the intersection without any collision?
#### General #### General
###### Is it not possible to spam the creation of vehicles(by pressing the arrow keys to many times)? ###### Is it not possible to spam the creation of vehicles(by pressing the arrow keys to many times)?
###### Are vehicles assigned to their own route, and if so do they obey that route? (ex: r0 must turn left, r2 must turn right) ###### Are vehicles assigned to their own route, and if so do they obey that route? (you can use the colors for each route to see this)
###### Are vehicles kept in a safe distance(do not collide when ever one stops)? ###### Are vehicles kept in a safe distance(do not collide when ever one stops)?

Write Preview
Loading…
Cancel
Save