root
/
public
mirror of https://github.com/01-edu/public.git
14
27
Fork 0
Code Releases Wiki Activity
Browse Source

fixing some errors

pull/659/head
MSilva95 4 years ago
parent
67be16049b
commit
c43ffa63e1
2 changed files with 14 additions and 13 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. 17
      subjects/stock-exchange-sim/README.md
  2. 10
      subjects/stock-exchange-sim/audit/README.md

17
subjects/stock-exchange-sim/README.md
unescape_control_characters View File

@ -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_shelf | board: 1 | shelf:1 | 10 |
| do_cabinet | doorknobs: 2; background: 1; shelf: 3 | cabinet:1 | 30 | | 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: 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_doorknobs
0:do_background 0:do_background
20:do_cabinet 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. 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: - A description of the processes:
`<name>:(<need>:<quantity>;<need>:<quantity>[...]]):(<result>:<quantity>[;result>:<quantity>[...]]):<nb_cycle>` `<name>:(<need>:<quantity>;<need>:<quantity>[...]]):(<result>:<quantity>[<result>:<quantity>[...]]):<nb_cycle>`
- A single line to indicate the elements to optimize, possibly containing the `time` keyword : - A single line to indicate the elements to optimize, possibly containing the `time` keyword :
`optimize:(<stock_name>|time)` `optimize:(<stock_name>|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 ### 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 display must also produce an output usable by the verification program, in the following format:
`<cycle>: <process_name>` `<cycle>:<process_name>`
The generated schedule is then saved as a log in the example folder with the same name. 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 0:buy_materiel
10:build_product 10:build_product
40:delivery 40:delivery
# No more process doable at cycle 61 No more process doable at cycle 61
``` ```
----
### Checker ### Checker
We can then verify if the schedule is doable with the **checker** program: 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 name:quantity
euro:10 euro:10
# #
# process # process name:(need1:quantity1;need2:quantity2;[...]):(result1:quantity1;result2:quantity2;[...]):delay
name:(need1:quantity1;need2:quantity2;[...]):(result1:quantity1;result2:quantity2;[...]):delay
# #
buy_materiel:(euro:8):(material:1):10 buy_materiel:(euro:8):(material:1):10
build_product:(material:1):(product:1):30 build_product:(material:1):(product:1):30

10
subjects/stock-exchange-sim/audit/README.md
unescape_control_characters View File

@ -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? ###### 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? ###### 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. ##### 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? ###### 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 ```console
student$ ./checker examples/build/build examples/build/build.log 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? ###### 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 ```console
student$ ./checker examples/seller/seller examples/seller/seller.log 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)? ###### +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?

Write Preview
Loading…
Cancel
Save