escet merge requestshttps://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests2024-02-20T16:21:27Zhttps://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/815#716 develop to master for v3.0-M12024-02-20T11:09:41ZDennis Hendriks#716 develop to master for v3.0-M1Addresses #716Addresses #716v3.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/811#716 Updated release notes for v3.0-M1.2024-02-20T10:00:34ZDennis Hendriks#716 Updated release notes for v3.0-M1.Addresses #716Addresses #716v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/810#437 Various bugfixes for website version switching2024-02-19T20:56:58ZDennis Hendriks#437 Various bugfixes for website version switching* Best to review per commit.
* Changes:
* Fix `getVersions` function in `eclipse-escet.js`:
* No more empty items, solving crash on sorting.
* Prevent empty item in list on versions page.
* Fix JS import on Chi, CIF and ToolD...* Best to review per commit.
* Changes:
* Fix `getVersions` function in `eclipse-escet.js`:
* No more empty items, solving crash on sorting.
* Prevent empty item in list on versions page.
* Fix JS import on Chi, CIF and ToolDef pages, for version selection.
* Include `nightly` as preview version, also on `nightly` website.
* Fix regression in styling of Chi, CIF and ToolDef websites:
* Accidentally copied over too much when introducing version selection.
* Also made it consistent now on the about pages.
Addresses #437v3.0https://gitlab.eclipse.org/eclipse/escet/escet/-/merge_requests/809#437 Website deployment: fix updating the '.versions' file.2024-02-16T07:52:31ZDennis Hendriks#437 Website deployment: fix updating the '.versions' file.Addresses #437Addresses #437v3.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/807#437 Allow easy switching between website versions2024-02-15T10:49:06ZDennis Hendriks#437 Allow easy switching between website versions* Best to review per commit.
* Changes:
* Adds version switcher to the top-right of the 12 fixed website pages. Separated the version number and release notes links to make this possible. Only some versions are shown in the dropdown me...* Best to review per commit.
* Changes:
* Adds version switcher to the top-right of the 12 fixed website pages. Separated the version number and release notes links to make this possible. Only some versions are shown in the dropdown menu, to prevent a very long list.
* The list of versions is obtained through JavaScript, from a `.versions` file on the website. This file does not exist yet. It will be added once this merge request is approved, and before it is merged. After that, the file will be automatically updated when a new website version is added or removed.
* Improved styling of dropdown menus, also for existing ones.
* Added a `versions.html` fixed website page that lists all website versions.
* Added link from `download.html` to `versions.html`.
* Testing this is somewhat difficult. I'll explain that in a separate comment, with examples of what it looks like now.
Addresses #437v3.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/803#759 Improve clean_build_output.py script.2024-02-13T17:07:56ZDennis Hendriks#759 Improve clean_build_output.py script.- Improved detection of workspace name (in case of long branch names).
- Handle also 'nightly' versions.
- Hide differences in version postfixes.
- Handle modules being built in a different order.
- Handle non-sorted 'copy' plugin output...- Improved detection of workspace name (in case of long branch names).
- Handle also 'nightly' versions.
- Hide differences in version postfixes.
- Handle modules being built in a different order.
- Handle non-sorted 'copy' plugin output lines.
Closes #759v3.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/800#765 Upgrade to eclipse dash version 1.1.1.2024-02-09T10:52:58ZFerdie Reijnen#765 Upgrade to eclipse dash version 1.1.1.Addresses #760
Closes #765Addresses #760
Closes #765v3.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.0