Skip to content

Commit

Permalink
Added ODD to "New FASTEN Root Node" menu (#126)
Browse files Browse the repository at this point in the history
* fasten.base: initial support for sat4j

* safety: added ODD to fasten.requirements devkit
- added ODD to "New FASTEN Root Node"

* Added ontologies and a draft of odd specification example.

* req: improvements of the odd language, added tests for ODDs

* safety.build: added "test.com.fasten.req.odd" and "test.com.mbeddr.formal.req.tl_patterns" to the tests

* safety.build: added dependency from generic distribution to "mps::plugins/mps-ide"

* Update main.yml

avoid building multiple times

* rcp: fixed open-tutorial action

* safety.build: cleanup creation of Win RCP

* safety.build: import "mps::plugins/mps-rcp" + further cleanup for Windows RCP

* Added BSI 1883 taxonomy.

* Modified BSI 1883 taxonomy and made a first version of the ODD example.

* Added first draft of AVSC ODD Lexicon.

* Final touches BSI 1883 taxonomy and ODD example.

---------

Co-authored-by: Carmen Carlan <[email protected]>
  • Loading branch information
danielratiu and ccarlan authored Jan 5, 2025
1 parent e62da00 commit c296362
Show file tree
Hide file tree
Showing 44 changed files with 8,390 additions and 103 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
- name: Publish FASTEN-Linux RCPs to Github Packages
run: |
./gradlew publishFASTEN_LINUX_RCPPublicationToGitHubPackagesRepository \
./gradlew publishFASTEN_LINUX_RCPPublicationToGitHubPackagesRepository -x package_fasten_distribution_for_specific_platforms \
-Pgpr.user=${{ github.actor }} \
-Pgpr.token=${{ secrets.GITHUB_TOKEN }} \
2 changes: 2 additions & 0 deletions code/languages/com.mbeddr.formal.nusmv/.mps/modules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<modulePath path="$PROJECT_DIR$/languages/com.mbeddr.formal.ocra/sandbox/com.mbeddr.formal.ocra.sandbox.msd" folder="tests" />
<modulePath path="$PROJECT_DIR$/solutions/com.fasten.base.activity.sandbox/com.fasten.base.activity.sandbox.msd" folder="lang.base.activity" />
<modulePath path="$PROJECT_DIR$/solutions/com.fasten.base.msc.sandbox/com.fasten.base.msc.sandbox.msd" folder="lang.base.msc" />
<modulePath path="$PROJECT_DIR$/solutions/com.fasten.base.sat/com.fasten.base.sat.msd" folder="lang.base.sat" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.formal.base.operatorspanel.rt/com.mbeddr.formal.base.operatorspanel.rt.msd" folder="lang.base" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.formal.base.pluginSolution/com.mbeddr.formal.base.pluginSolution.msd" folder="lang.base" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.formal.base.tooling/com.mbeddr.formal.base.tooling.msd" folder="lang.base" />
Expand All @@ -43,6 +44,7 @@
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.formal.rcp.tips_and_tricks/com.mbeddr.formal.rcp.tips_and_tricks.msd" folder="rcp" />
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.formal.rcp.tutorialActions/com.mbeddr.formal.rcp.tutorialActions.msd" folder="rcp" />
<modulePath path="$PROJECT_DIR$/tests/com.mbeddr.formal.nusmv.sandbox/com.mbeddr.formal.nusmv.sandbox.msd" folder="tests" />
<modulePath path="$PROJECT_DIR$/tests/test.com.fasten.base.sat/test.com.fasten.base.sat.msd" folder="lang.base.sat" />
<modulePath path="$PROJECT_DIR$/tests/test.fasten.base/test.fasten.base.msd" folder="tests" />
<modulePath path="$PROJECT_DIR$/tests/test.mbeddr.formal.nusmv/test.mbeddr.formal.nusmv.msd" folder="tests" />
<modulePath path="$PROJECT_DIR$/tests/test.mbeddr.formal.nuxmv/test.mbeddr.formal.nuxmv.msd" folder="tests" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@
<property role="TrG5h" value="OrExpressionBase" />
<property role="R5$K7" value="true" />
<property role="R5$K2" value="false" />
<property role="34LRSv" value="|" />
<ref role="1TJDcQ" node="6NmtaR1YlpY" resolve="BinaryLogicalExpression" />
</node>
<node concept="1TIwiD" id="7mSH3WnvIDy">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<solution name="com.fasten.base.sat" uuid="e9038998-a640-4eb0-b13b-4b4970869bbd" moduleVersion="0">
<models>
<modelRoot type="default" contentPath="${module}">
<sourceRoot location="models" />
</modelRoot>
<modelRoot type="java_classes" contentPath="${module}/lib">
<sourceRoot location="org.sat4j.core-src.jar" />
<sourceRoot location="org.sat4j.core.jar" />
</modelRoot>
</models>
<facets>
<facet compile="mps" classes="mps" ext="no" type="java">
<classes generated="true" path="${module}/classes_gen" />
<library location="${module}/lib/org.sat4j.core-src.jar" />
<library location="${module}/lib/org.sat4j.core.jar" />
</facet>
</facets>
<dependencies>
<dependency reexport="false">b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
<language slang="l:73736c50-f124-433b-b789-2828a15a0adc:jetbrains.mps.baseLanguage.collections.trove" version="0" />
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="5" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
<dependencyVersions>
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />
<module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
<module reference="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)" version="0" />
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
<module reference="e9038998-a640-4eb0-b13b-4b4970869bbd(com.fasten.base.sat)" version="0" />
<module reference="b0b65429-cd22-4e2a-83e7-cd58bc6dd72f(com.mbeddr.formal.base.expressions)" version="0" />
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
</dependencyVersions>
</solution>

Binary file not shown.
Binary file not shown.
Loading

0 comments on commit c296362

Please sign in to comment.