From cbc3cbc2b53cbc44fbc559a9d3f60d55b95889f3 Mon Sep 17 00:00:00 2001 From: miguel Date: Fri, 20 May 2022 12:17:25 +0100 Subject: [PATCH] fixing according to Davs review --- subjects/drawing/README.md | 4 ++-- subjects/road_intersection/README.md | 17 ++++++++--------- subjects/road_intersection/audit/README.md | 6 +++--- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/subjects/drawing/README.md b/subjects/drawing/README.md index bc82f78d..a7efabae 100644 --- a/subjects/drawing/README.md +++ b/subjects/drawing/README.md @@ -2,7 +2,7 @@ ### Instructions -The purpose of this exercise is to create an image in the example bellow: +The purpose of this exercise is to create an image like the example bellow: ![example](image.png) @@ -34,7 +34,7 @@ You are free to implement all the shapes with whatever internal structure you se - `Line`: a new line should be created from references to two different points. Also it will define an associated function called `random`: - `random`: receives two arguments, the first is the `maximum x` value a point can have and the second is the `maximum y` value that a point can have. - `Triangle`: a new triangle should be created from references to three different points. -- `Rectangle`: a new rectangle should be created from two references to different points. ?????????????????????????????? +- `Rectangle`: a new rectangle should be created from two references to different points. - `Circle`: a new circle should be created from a point representing the center and an `i32` value representing the radius for the circle. - The main function also requires a definition of an associated function called `random` for the types `Line`, `Point` and `Circle`. You should derive their signature from the usage. diff --git a/subjects/road_intersection/README.md b/subjects/road_intersection/README.md index 8418ac23..732f0c05 100644 --- a/subjects/road_intersection/README.md +++ b/subjects/road_intersection/README.md @@ -13,9 +13,11 @@ You must create an environment which contains all the objects described in this 1. Roads -There are various forms of intersections, let's focus on the widely seen four-lane intersection. For simplicity, each lane will have two directions. +There are various forms of intersections, let's focus on the widely seen four-lane crossroad. For simplicity, each road will have two lanes with two different directions for the total of two roads and four lanes. ```console + lane1 lane2 + | ↓ | ↑ | | ↓ | ↑ | | ↓ | ↑ | @@ -24,11 +26,11 @@ There are various forms of intersections, let's focus on the widely seen four-la | r s l | ↑ | _______________| ← ↓ → | ↑ |_____________ | ↑ r -← ← ← ← ← ← ← | ← s ← ← ← ← ← +← ← ← ← ← ← ← | ← s ← ← ← ← ← lane3 | ↓ l _________________________|_______________________ l ↑ | - → → → → → s → | → → → → → → + → → → → → s → | → → → → → → lane4 r ↓ | _______________ | _____________ | | ← ↑ → | @@ -53,7 +55,7 @@ it's usually green, red and amber, but for this project you will just use the co You will then have to create some kind of representation for the traffic lights and distribute them for each lane in the intersection. -You are free to decide what algorithm you want to implement to represent traffic light system, but keep in mind that traffic congestion should not be to high (8 or more vehicles). +You are free to decide what algorithm you want to implement to represent traffic light system, but keep in mind that traffic congestion should not be too high (8 or more vehicles). 3. Vehicles @@ -65,12 +67,9 @@ You are free to decide what algorithm you want to implement to represent traffic Vehicles must obey this rules: -- Vehicles must have a color depending on their route the colors are up to you to decide - -- Vehicles must have a color so that it's possible to identify which route it will follow (ex:`r`- purple, `s`- Blue and `l`- Yellow). This information about the colors must be given to the auditor of the raid. +- Vehicles must have a color so that it's possible to identify which route it will follow (ex:`r`- purple, `s`- Blue and `l`- Yellow). This information about the colors must be given to the auditor of the raid. The colors are up to you to decide. -- Autonomous vehicles driving on a lane with a **given route** must follow the direction of -that route, it's not possible for the driver to change lanes or routes. +- Autonomous vehicles driving on a lane with a **given route** must follow the direction of that route, it is not possible for the autonomous vehicle to change lanes or routes. - Each vehicle must have a fixed velocity. diff --git a/subjects/road_intersection/audit/README.md b/subjects/road_intersection/audit/README.md index 4820d00c..c5debbb5 100644 --- a/subjects/road_intersection/audit/README.md +++ b/subjects/road_intersection/audit/README.md @@ -26,9 +26,9 @@ ##### Try pressing the `"R"` key more than 5 times to generate multiple vehicles in different lines. -###### Can you confirm that the vehicles were created and maintain a safe distance one from another? +###### Can you confirm that the vehicles were created and maintain a safe distance from one another? -##### Try to generate tree vehicles in the same lane (do this on all lanes one at a time). +##### Try to generate three vehicles in the same lane (do this on all lanes one at a time). ###### Can you confirm that the vehicles were created with a safe distance one from another? @@ -68,7 +68,7 @@ ###### Did all the vehicles passed the intersection without any collision? -##### Try to generate multiple vehicles with lanes at your choice. +##### Try to generate multiple vehicles in lanes of your choice. ###### Did all the vehicles passed the intersection without any collision?