From c43ffa63e1fe7485e7d60359d6f42a23a259cc85 Mon Sep 17 00:00:00 2001 From: MSilva95 Date: Tue, 21 Jul 2020 17:21:36 +0100 Subject: [PATCH] fixing some errors --- subjects/stock-exchange-sim/README.md | 17 +++++++++-------- subjects/stock-exchange-sim/audit/README.md | 10 +++++----- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/subjects/stock-exchange-sim/README.md b/subjects/stock-exchange-sim/README.md index 7430292eb..571a44045 100644 --- a/subjects/stock-exchange-sim/README.md +++ b/subjects/stock-exchange-sim/README.md @@ -26,7 +26,7 @@ Imagine a project with different tasks in witch we have to achieve a final goal. | do_shelf | board: 1 | shelf:1 | 10 | | do_cabinet | doorknobs: 2; background: 1; shelf: 3 | cabinet:1 | 30 | -Your purpose in this example is to optimise time and cabinet, basically the cabinet is the last product to achieve in the project and time is to be prioritized so that the building of your cabinet is done the fastest way possible. +The purpose of this example is to optimise time and cabinet, basically the cabinet is the last product to achieve in the project and time is to be prioritized so that the building of your cabinet is done the fastest way possible. The tasks should be done in this order to achieve a maximum optimization regarding time and cabinet: @@ -38,7 +38,7 @@ The tasks should be done in this order to achieve a maximum optimization regardi 0:do_doorknobs 0:do_background 20:do_cabinet -# No more process doable at cycle 51 +No more process doable at cycle 51 ``` So the number before the task represents the cycle when the task starts. The tasks can run separately or at the same time depending on the stocks that are used. @@ -66,13 +66,13 @@ First we need a configuration file that contains the processes and must obey the - A description of the processes: - `:(:;:[...]]):(:[;result>:[...]]):` + `:(:;:[...]]):(:[:[...]]):` - A single line to indicate the elements to optimize, possibly containing the `time` keyword : `optimize:(|time)` -So, as we said above, you must create at least two configuration file of your own. One file that ends when the resources are consumed, and the other which can rotate indefinitely. +So, as we said above, you must create at least two configuration file of your own. One file that ends when the resources are consumed, and the other which can rotate indefinitely.(will be explained in the next topic) ### Stock exchange program @@ -112,7 +112,7 @@ Stock : - The display must also produce an output usable by the verification program, in the following format: - `: ` + `:` The generated schedule is then saved as a log in the example folder with the same name. @@ -129,9 +129,11 @@ student$ cat examples/simple.log 0:buy_materiel 10:build_product 40:delivery -# No more process doable at cycle 61 +No more process doable at cycle 61 ``` +---- + ### Checker We can then verify if the schedule is doable with the **checker** program: @@ -156,8 +158,7 @@ We can then verify if the schedule is doable with the **checker** program: name:quantity euro:10 # -# process -name:(need1:quantity1;need2:quantity2;[...]):(result1:quantity1;result2:quantity2;[...]):delay +# process name:(need1:quantity1;need2:quantity2;[...]):(result1:quantity1;result2:quantity2;[...]):delay # buy_materiel:(euro:8):(material:1):10 build_product:(material:1):(product:1):30 diff --git a/subjects/stock-exchange-sim/audit/README.md b/subjects/stock-exchange-sim/audit/README.md index fdec0c4f3..b87705914 100644 --- a/subjects/stock-exchange-sim/audit/README.md +++ b/subjects/stock-exchange-sim/audit/README.md @@ -1,4 +1,4 @@ -### General +#### General ###### Can you confirm that the program reads a file that describes the processes, analyze the entire file and propose a valid solution? @@ -12,7 +12,7 @@ ###### Can you confirm that those files obey the given file format? -### Functional +#### Functional ##### Try to run the stock exchange program with the files created by the owner of the project. @@ -163,7 +163,7 @@ student$ ###### Does the display presents a result similar to the one above, were it shows the error? -##### Try to run the checker program with the [build](https://public.01-edu.org/subjects/stock-exchange-sim/examples/build/build) example, `"./checker examples/build/build examples/build/build.log"`. +##### Try to run the checker program with the [build](https://public.01-edu.org/subjects/stock-exchange-sim/examples/build/build) and the [build.log](https://public.01-edu.org/subjects/stock-exchange-sim/examples/build/build.log) example, `"./checker examples/build/build examples/build/build.log"`. ```console student$ ./checker examples/build/build examples/build/build.log @@ -180,7 +180,7 @@ student$ ###### Does the display presents a result similar to the one above, were it shows the last cycle and the proof that the sequence is correct? -##### Try to run the checker program with the [seller](https://public.01-edu.org/subjects/stock-exchange-sim/examples/seller/seller) example, `"./checker examples/seller/seller examples/seller/seller.log"`. +##### Try to run the checker program with the [seller](https://public.01-edu.org/subjects/stock-exchange-sim/examples/seller/seller) and the [seller.log](https://public.01-edu.org/subjects/stock-exchange-sim/examples/seller/seller.log)example, `"./checker examples/seller/seller examples/seller/seller.log"`. ```console student$ ./checker examples/seller/seller examples/seller/seller.log @@ -230,4 +230,4 @@ student$ ###### +Does the code obey the [good practices](https://public.01-edu.org/subjects/good-practices/README.md)? -###### +Can the users create their own files to run in the program? +###### +Create your own file and run the stock exchange program with it. Does the program work like it should?