escet merge requestshttps://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests2024-03-18T13:21:38Zhttps://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/825#227 CIF simulator does not yet support SVG input mappings with updates2024-03-18T13:21:38ZFerdie Reijnen#227 CIF simulator does not yet support SVG input mappings with updatesAddresses #227Addresses #227v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/824#787 Assignments on edges / SVG input mappings crash on wrapping expressions2024-03-18T21:13:57ZFerdie Reijnen#787 Assignments on edges / SVG input mappings crash on wrapping expressionsCloses #787
Addresses #227
I moved some tests around. Because if we have failing during 'normal' type checking, the post checking will not happen.Closes #787
Addresses #227
I moved some tests around. Because if we have failing during 'normal' type checking, the post checking will not happen.v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/823#782 PLCgen: Improve documentation in the transition code2024-03-26T11:11:39ZAlbert Hofkamp#782 PLCgen: Improve documentation in the transition codeReadable by commit, the last 2 are big as they update resp add a test.
A unit test evolves with the commits to see what gets changed in the output.
Adds
- A header with involved automata in an event.
- List of edges being considered fo...Readable by commit, the last 2 are big as they update resp add a test.
A unit test evolves with the commits to see what gets changed in the output.
Adds
- A header with involved automata in an event.
- List of edges being considered for the various steps in the process.
- Single line comments what the next code is doing or what conclusions can be drawn.
- `channel.cif` test with senders, receivers, syncers and monitors.
Closes #782v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/821#593 Allow annotations on algebraic variables2024-03-12T14:12:45ZDennis Hendriks#593 Allow annotations on algebraic variables* Best to review per commit.
* Some additional changes for the CIF code generator:
* C89/C99/Simulink code generation: algebraic variable JavaDocs now end with `.`, not `;`.
* C89/C99/Simulink code generation: algebraic variable Java...* Best to review per commit.
* Some additional changes for the CIF code generator:
* C89/C99/Simulink code generation: algebraic variable JavaDocs now end with `.`, not `;`.
* C89/C99/Simulink code generation: algebraic variable JavaDocs had a newline too many.
* C89/C99 code generation: algebraic variable JavaDocs are now on a single line if the algebraic variable has no documentation annotations.
Addresses #593v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/820#781 PLCgen: Reduce some test duplication.2024-03-24T21:03:37ZAlbert Hofkamp#781 PLCgen: Reduce some test duplication.- Introduces a way to specify a subset of targets for a test.
- Limits testing on "prechecker.cif", "options.cif" and "option_max_iter_inf.cif"
- Drops old "--convert-enums" override, as the targets have this information instead.
Fixes ...- Introduces a way to specify a subset of targets for a test.
- Limits testing on "prechecker.cif", "options.cif" and "option_max_iter_inf.cif"
- Drops old "--convert-enums" override, as the targets have this information instead.
Fixes #781v3.0Albert HofkampAlbert Hofkamphttps://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/819#681 PLCgen: Improve prechecking error reports (addon)2024-03-14T13:51:02ZDennis Hendriks#681 PLCgen: Improve prechecking error reports (addon)* Best to review per commit.
* Attempt to get a solution for !798. This targets the branch of that merge request.
* Made the messages as specific as I can think of.
* Extended the test model, to cover all cases I can think of.
Addresses...* Best to review per commit.
* Attempt to get a solution for !798. This targets the branch of that merge request.
* Made the messages as specific as I can think of.
* Extended the test model, to cover all cases I can think of.
Addresses #681v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/816#269 Make UnsupportedPredicateException public.2024-02-20T16:21:27ZDennis Hendriks#269 Make UnsupportedPredicateException public.* Very small follow-up to !814. I forgot to make `UnsupportedPredicateException` public, and it is a checked exception thrown by some of the methods I made public in `CifToBddConverter`. When calling them, this exception must be caught. ...* Very small follow-up to !814. I forgot to make `UnsupportedPredicateException` public, and it is a checked exception thrown by some of the methods I made public in `CifToBddConverter`. When calling them, this exception must be caught. But since it is private, that code won't compile. So, make this public as well.
Addresses #269v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/814#269 Allow converting more/extra updates/predicates/expressions.2024-02-20T14:35:46ZDennis Hendriks#269 Allow converting more/extra updates/predicates/expressions.* Small changes needed for our research.
* Made a few methods public in the conversion class, to allow converting more updates/predicates/expressions/etc after the regular conversion.
* Needed to make a few methods static as well, to all...* Small changes needed for our research.
* Made a few methods public in the conversion class, to allow converting more updates/predicates/expressions/etc after the regular conversion.
* Needed to make a few methods static as well, to allow invoking them outside/after the regular conversion.
* The `problems` become parameters then. This should change to a proper precondition checker using our new checker framework later on, but that is out-of-scope here.
Addresses #269v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/813#593 Allow annotations on continuous variables.2024-02-19T19:18:32ZDennis Hendriks#593 Allow annotations on continuous variables.* Best to review per commit.
* Allow annotations on continuous variables.
Addresses #593* Best to review per commit.
* Allow annotations on continuous variables.
Addresses #593v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/812#757 Test models produced by CIF tools in integration tests for being valid (...2024-02-19T19:18:55ZDennis Hendriks#757 Test models produced by CIF tools in integration tests for being valid (part 3, event-based toolset)* I applied the same changes as for other scripts here as well. All in the same way.
* Best to review per commit.
Addresses #757* I applied the same changes as for other scripts here as well. All in the same way.
* Best to review per commit.
Addresses #757v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/808#757 Test models produced by CIF tools in integration tests for being valid (...2024-02-15T10:46:57ZDennis Hendriks#757 Test models produced by CIF tools in integration tests for being valid (2nd part)* Best to review per commit.
* This is the 2nd round. More to follow later, see #757.
Addresses #757* Best to review per commit.
* This is the 2nd round. More to follow later, see #757.
Addresses #757v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/806#679 PLCgen: Avoid getting double underscore characters in generated names.2024-02-16T06:40:33ZAlbert Hofkamp#679 PLCgen: Avoid getting double underscore characters in generated names.Rewrote sanitizing names in the name generator, as doing things one character at a time is difficult to understand.
Name generator kept the same kind of generated names, except that `_[0-9]` now cannot happen while sanitizing a name, wh...Rewrote sanitizing names in the name generator, as doing things one character at a time is difficult to understand.
Name generator kept the same kind of generated names, except that `_[0-9]` now cannot happen while sanitizing a name, which means the `_[0-9]+` suffix for making names unique still works.
Cleaned up the keyword list, and extended it with functions and function blocks. Reading that by individual commits is recommended.
Addresses #679v3.0Albert HofkampAlbert Hofkamphttps://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/805#679 PLCgen: Introduce edge selection variables by automaton in event transit...2024-02-19T06:07:32ZAlbert Hofkamp#679 PLCgen: Introduce edge selection variables by automaton in event transition codeIn transition code, the selected edge is remembered between edge selection and taking the edge.
Currently, each event creates new variables to remember the selected edge. Besides using many variables, mapping selected edges back to an a...In transition code, the selected edge is remembered between edge selection and taking the edge.
Currently, each event creates new variables to remember the selected edge. Besides using many variables, mapping selected edges back to an automaton can be complicated.
This patch creates one edge variable for each automaton that need to have the edge remembered, and uses that variable for all events.
This reduces the number of created variables, and keeps a 1-1 mapping between edge variable and the associated automaton, simplifying mapping selected edges back to an automaton.
Addresses #679v3.0Albert HofkampAlbert Hofkamphttps://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/804#757 Test models produced by CIF to CIF integration tests are checked for bei...2024-02-13T15:12:47ZDennis Hendriks#757 Test models produced by CIF to CIF integration tests are checked for being valid* Best to review per commit.
* I started with only CIF to CIF tests. If we agree this is good, I'll do the other ones as well, in the same way.
* Changes are inspired by CIF data-based synthesis tests, which already are multi-step tests....* Best to review per commit.
* I started with only CIF to CIF tests. If we agree this is good, I'll do the other ones as well, in the same way.
* Changes are inspired by CIF data-based synthesis tests, which already are multi-step tests.
Addresses #757v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/802#364 Add 'mri_event' and 'mri_state' CIF benchmarks.2024-02-14T11:48:46ZDennis Hendriks#364 Add 'mri_event' and 'mri_state' CIF benchmarks.* I used two separate commits.
Addresses #364* I used two separate commits.
Addresses #364v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/801#772 #773 CIF examples: fix indentation and execution of 'button_lamp_timer_g...2024-02-09T13:09:39ZDennis Hendriks#772 #773 CIF examples: fix indentation and execution of 'button_lamp_timer_genplc.tooldef'* I used two commits, one for #772 and one for #773:
* #772 CIF examples: fix button_lamp_timer_genplc.tooldef.
* #773 CIF examples: fix indentation in button_lamp_timer_genplc.tooldef.
* Also added commas after last arguments.
...* I used two commits, one for #772 and one for #773:
* #772 CIF examples: fix button_lamp_timer_genplc.tooldef.
* #773 CIF examples: fix indentation in button_lamp_timer_genplc.tooldef.
* Also added commas after last arguments.
* Make it easier to adapt the script if extra options are needed.
Closes #772, #773v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/799#768 CIF pretty printer produces comment if specification is empty.2024-02-07T11:02:54ZDennis Hendriks#768 CIF pretty printer produces comment if specification is empty.Closes #768Closes #768v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/798#681 PLCgen: Improve prechecking error reports.2024-03-11T10:25:57ZAlbert Hofkamp#681 PLCgen: Improve prechecking error reports.This patch has more precise error messages if possible, rather than the very generic "you didn't do one of the following 4 things".
Also, it's better at indicating the point of the error (at the operator rather than the non-continuous si...This patch has more precise error messages if possible, rather than the very generic "you didn't do one of the following 4 things".
Also, it's better at indicating the point of the error (at the operator rather than the non-continuous side of the binary expression).
Other changes:
- Only one 'tau' event violation.
- Have both `cont OP value` and `value OP cont` comparisons, since now the error message is matching the code pattern.
It looks much less confusing to me now.
Closes #681v3.0Albert HofkampAlbert Hofkamphttps://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/796#767 Product cell benchmark model comment fix: it has a 'feed belt'.2024-02-05T18:41:44ZDennis Hendriks#767 Product cell benchmark model comment fix: it has a 'feed belt'.Closes #767Closes #767v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/794#38 Website: generated JS file now has a license header2024-02-06T19:16:11ZDennis Hendriks#38 Website: generated JS file now has a license header* Best to review per commit.
* Also switched to a resource file for the JS file content, rather than a multiline Java string.
Addresses #38* Best to review per commit.
* Also switched to a resource file for the JS file content, rather than a multiline Java string.
Addresses #38v3.0