Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/maintenance/MPS-2021.1' into mai…
Browse files Browse the repository at this point in the history 
…ntenance/mps20213

# Conflicts:
#	code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.external_evidence/com.mbeddr.formal.safety.gsn.external_evidence.mpl
#	code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/com.mbeddr.formal.safety.gsn.mpl
#	code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.hara/com.mbeddr.formal.safety.hara.mpl
#	code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.stamp/com.mbeddr.formal.safety.stamp.mpl
  • Loading branch information
@danielratiu
danielratiu committed Jul 27, 2023
2 parents 84ccb62 + d0924f7 commit fc63597
Show file tree
Hide file tree
Showing 17 changed files with 4,608 additions and 895 deletions.
19 changes: 19 additions & 0 deletions ...beddr.formal.safety/languages/com.fasten.safety.ft/models/com.fasten.safety.ft.editor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -782,6 +782,9 @@
</node>
</node>
</node>
<node concept="xShMh" id="1o6a6fGj87y" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="PMmxH" id="3ZjKZgVHKNX" role="6VMZX">
<ref role="PMmxG" node="3ZjKZgVHKvX" resolve="EventBaseEditorComponent" />
Expand Down Expand Up @@ -1167,6 +1170,7 @@
<node concept="37jFXN" id="1GpuQyTexVv" role="3F10Kt">
<property role="37lx6p" value="hZ7kQ4a/CENTER" />
</node>
<node concept="VPM3Z" id="3BbeeDyWE5q" role="3F10Kt" />
<node concept="2YIFZM" id="3f8ZVRXT1CJ" role="2gOmqF">
<ref role="37wK5l" node="3f8ZVRXz6Ge" resolve="computeRequiredEventShapeHeight" />
<ref role="1Pybhc" node="4vIVwd7qvD5" resolve="LabelsDrawingUtils" />
Expand All @@ -1192,6 +1196,9 @@
</node>
</node>
</node>
<node concept="xShMh" id="1o6a6fGiCtf" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="PMmxH" id="3ZjKZgVHL2u" role="6VMZX">
<ref role="PMmxG" node="3ZjKZgVHKvX" resolve="EventBaseEditorComponent" />
Expand Down Expand Up @@ -1428,6 +1435,9 @@
<node concept="38c6YI" id="3EWkVoQ8xCp" role="3F10Kt">
<property role="Vb096" value="6cZGtrcKCoS/black" />
</node>
<node concept="xShMh" id="1o6a6fGj8Zx" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="2xQOud" id="1GpuQyTgNzt" role="2xQQDV">
<ref role="2xQOue" node="2lB3um7b17t" resolve="EmptyShape" />
</node>
Expand Down Expand Up @@ -1909,6 +1919,9 @@
<node concept="38c6YI" id="3EWkVoQ8xCd" role="3F10Kt">
<property role="Vb096" value="6cZGtrcKCoS/black" />
</node>
<node concept="xShMh" id="1o6a6fGj8Hh" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="3clFbT" id="1GpuQyT34vV" role="3RJMYJ">
<property role="3clFbU" value="true" />
</node>
Expand Down Expand Up @@ -6328,6 +6341,9 @@
</node>
</node>
</node>
<node concept="xShMh" id="1o6a6fGjNkE" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
</node>
<node concept="PMmxH" id="1SpkZ1UYFAI" role="6VMZX">
<ref role="PMmxG" node="3ZjKZgVHKvX" resolve="EventBaseEditorComponent" />
Expand All @@ -6338,6 +6354,9 @@
<ref role="1XX52x" to="spwl:1SpkZ1V6gPJ" resolve="IntermediateEvent" />
<node concept="2ZK4vF" id="1SpkZ1V83Ec" role="2wV5jI">
<ref role="1k5W1q" to="xnej:50UR0qsbFda" resolve="ShapeStyle_Dynamic" />
<node concept="xShMh" id="1o6a6fGj8nJ" role="3F10Kt">
<property role="VOm3f" value="true" />
</node>
<node concept="2316IU" id="1SpkZ1V83Ed" role="3DrZTU">
<node concept="10M0yZ" id="6csJveEVxyh" role="2316E2">
<ref role="3cqZAo" node="5N87GIKj87I" resolve="SINGLE_TARGET_PORT_LABEL" />
Expand Down
68 changes: 60 additions & 8 deletions ...ster_shafer/models/com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.intentions.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<import index="amuf" ref="r:b775b7e1-c824-441c-afe0-ed9eafc83544(com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.plugin)" />
<import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
<import index="py52" ref="r:14bd9e1a-63cf-4fde-816f-1d68e4acbfba(com.mbeddr.formal.safety.gsn.structure)" implicit="true" />
<import index="89jy" ref="r:b084f3b4-d6a1-4460-8222-b4a956bb5d23(com.mbeddr.formal.safety.gsn.behavior)" implicit="true" />
<import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />
<import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" implicit="true" />
<import index="89jy" ref="r:b084f3b4-d6a1-4460-8222-b4a956bb5d23(com.mbeddr.formal.safety.gsn.behavior)" implicit="true" />
<import index="6oah" ref="r:c3ace323-0a57-4f8d-b471-fad629604601(com.mbeddr.formal.safety.gsn.confidence.dempster_shafer.structure)" implicit="true" />
</imports>
<registry>
Expand All @@ -28,6 +28,7 @@
<child id="1068498886295" name="lValue" index="37vLTJ" />
</concept>
<concept id="1215695189714" name="jetbrains.mps.baseLanguage.structure.PlusAssignmentExpression" flags="nn" index="d57v9" />
<concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
<concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
<concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
<concept id="5279705229678483897" name="jetbrains.mps.baseLanguage.structure.FloatingPointFloatConstant" flags="nn" index="2$xPTn">
Expand Down Expand Up @@ -187,6 +188,12 @@
<reference id="1170346070688" name="classifier" index="1Y3XeK" />
</concept>
</language>
<language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
<concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
<child id="1199569906740" name="parameter" index="1bW2Oz" />
<child id="1199569916463" name="body" index="1bW5cS" />
</concept>
</language>
<language id="d7a92d38-f7db-40d0-8431-763b0c3c9f20" name="jetbrains.mps.lang.intentions">
<concept id="1192794744107" name="jetbrains.mps.lang.intentions.structure.IntentionDeclaration" flags="ig" index="2S6QgY" />
<concept id="1192794782375" name="jetbrains.mps.lang.intentions.structure.DescriptionBlock" flags="in" index="2S6ZIM" />
Expand Down Expand Up @@ -243,6 +250,9 @@
</concept>
</language>
<language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
<concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
<child id="1204796294226" name="closure" index="23t8la" />
</concept>
<concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
<child id="540871147943773366" name="argument" index="25WWJ7" />
</concept>
Expand All @@ -260,17 +270,19 @@
<concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
<child id="1237721435807" name="elementType" index="HW$YZ" />
</concept>
<concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
<concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
<concept id="1162935959151" name="jetbrains.mps.baseLanguage.collections.structure.GetSizeOperation" flags="nn" index="34oBXx" />
<concept id="1165525191778" name="jetbrains.mps.baseLanguage.collections.structure.GetFirstOperation" flags="nn" index="1uHKPH" />
<concept id="1165530316231" name="jetbrains.mps.baseLanguage.collections.structure.IsEmptyOperation" flags="nn" index="1v1jN8" />
<concept id="1202120902084" name="jetbrains.mps.baseLanguage.collections.structure.WhereOperation" flags="nn" index="3zZkjj" />
<concept id="1176501494711" name="jetbrains.mps.baseLanguage.collections.structure.IsNotEmptyOperation" flags="nn" index="3GX2aA" />
</language>
</registry>
<node concept="2S6QgY" id="sycHpjiRIg">
<property role="TrG5h" value="SensitivityAnalysis" />
<ref role="2ZfgGC" to="py52:3GRi4m$qNtH" resolve="Goal" />
<ref role="2ZfgGC" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
<node concept="2S6ZIM" id="sycHpjiRIh" role="2ZfVej">
<node concept="3clFbS" id="sycHpjiRIi" role="2VODD2">
<node concept="3clFbF" id="sycHpjiVQe" role="3cqZAp">
Expand Down Expand Up @@ -311,8 +323,48 @@
<node concept="3Tqbb2" id="7E7BxAjCU79" role="1tU5fm">
<ref role="ehGHo" to="py52:3GRi4m$qNtH" resolve="Goal" />
</node>
<node concept="37vLTw" id="7E7BxAjCUZa" role="33vP2m">
<ref role="3cqZAo" node="7E7BxAj$Sgq" resolve="n" />
<node concept="2OqwBi" id="1HYO_kn5Hkp" role="33vP2m">
<node concept="2OqwBi" id="1HYO_kn5NRk" role="2Oq$k0">
<node concept="2OqwBi" id="1HYO_kn5uyK" role="2Oq$k0">
<node concept="2OqwBi" id="1HYO_kn5p_s" role="2Oq$k0">
<node concept="37vLTw" id="7E7BxAjCUZa" role="2Oq$k0">
<ref role="3cqZAo" node="7E7BxAj$Sgq" resolve="ns" />
</node>
<node concept="3Tsc0h" id="1HYO_kn5roT" role="2OqNvi">
<ref role="3TtcxE" to="py52:3GRi4m$qPV0" resolve="content" />
</node>
</node>
<node concept="v3k3i" id="1HYO_kn5MJF" role="2OqNvi">
<node concept="chp4Y" id="1HYO_kn5NdK" role="v3oSu">
<ref role="cht4Q" to="py52:3GRi4m$qNtH" resolve="Goal" />
</node>
</node>
</node>
<node concept="3zZkjj" id="1HYO_kn5PBN" role="2OqNvi">
<node concept="1bVj0M" id="1HYO_kn5PBP" role="23t8la">
<node concept="3clFbS" id="1HYO_kn5PBQ" role="1bW5cS">
<node concept="3clFbF" id="1HYO_kn5R53" role="3cqZAp">
<node concept="2OqwBi" id="1HYO_kn5VEo" role="3clFbG">
<node concept="2OqwBi" id="1HYO_kn5Sfb" role="2Oq$k0">
<node concept="37vLTw" id="1HYO_kn5R52" role="2Oq$k0">
<ref role="3cqZAo" node="1HYO_kn5PBR" resolve="it" />
</node>
<node concept="2qgKlT" id="1HYO_kn5TaZ" role="2OqNvi">
<ref role="37wK5l" to="89jy:71GfFl7iCHN" resolve="getInboundConnections" />
</node>
</node>
<node concept="1v1jN8" id="1HYO_kn5YaM" role="2OqNvi" />
</node>
</node>
</node>
<node concept="Rh6nW" id="1HYO_kn5PBR" role="1bW2Oz">
<property role="TrG5h" value="it" />
<node concept="2jxLKc" id="1HYO_kn5PBS" role="1tU5fm" />
</node>
</node>
</node>
</node>
<node concept="1uHKPH" id="1HYO_kn5HYJ" role="2OqNvi" />
</node>
</node>
</node>
Expand Down Expand Up @@ -346,7 +398,7 @@
<node concept="3cpWs3" id="7E7BxAj$Tbe" role="37wK5m">
<node concept="2OqwBi" id="7E7BxAj$Tbf" role="3uHU7w">
<node concept="37vLTw" id="7E7BxAj$Tbg" role="2Oq$k0">
<ref role="3cqZAo" node="7E7BxAj$Sgq" resolve="n" />
<ref role="3cqZAo" node="7E7BxAj$Sgq" resolve="ns" />
</node>
<node concept="3TrcHB" id="7E7BxAj$Tbh" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
Expand Down Expand Up @@ -559,7 +611,7 @@
<node concept="1rXfSq" id="7E7BxAjBr8D" role="3clFbG">
<ref role="37wK5l" node="7E7BxAj_S37" resolve="getElementDetails" />
<node concept="37vLTw" id="7E7BxAjBro_" role="37wK5m">
<ref role="3cqZAo" node="7E7BxAj$Sgq" resolve="n" />
<ref role="3cqZAo" node="7E7BxAjCTRS" resolve="topGoal" />
</node>
<node concept="37vLTw" id="7E7BxAjBrPo" role="37wK5m">
<ref role="3cqZAo" node="7E7BxAj$TKV" resolve="model" />
Expand Down Expand Up @@ -779,9 +831,9 @@
</node>
</node>
<node concept="37vLTG" id="7E7BxAj$Sgq" role="3clF46">
<property role="TrG5h" value="n" />
<property role="TrG5h" value="ns" />
<node concept="3Tqbb2" id="7E7BxAj$Sgp" role="1tU5fm">
<ref role="ehGHo" to="py52:3GRi4m$qNtH" resolve="Goal" />
<ref role="ehGHo" to="py52:3GRi4m$qNsQ" resolve="GoalStructure" />
</node>
</node>
<node concept="3cqZAl" id="7E7BxAj$Scx" role="3clF45" />
Expand Down
57 changes: 0 additions & 57 deletions ...dr.formal.safety.gsn.external_evidence/com.mbeddr.formal.safety.gsn.external_evidence.mpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,63 +11,6 @@
</facet>
</facets>
<accessoryModels />
<generators>
<generator alias="main" namespace="com.mbeddr.formal.safety.gsn.external_evidence#01" uuid="87ebb3b1-4381-4afa-84d4-0b68cdc0b4c1">
<models>
<modelRoot contentPath="${module}/generator" type="default">
<sourceRoot location="templates" />
</modelRoot>
</models>
<facets>
<facet type="java">
<classes generated="true" path="${module}/generator/classes_gen" />
</facet>
</facets>
<external-templates />
<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="1" />
<language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
<language slang="l:a247e09e-2435-45ba-b8d2-07e93feba96a:jetbrains.mps.baseLanguage.tuples" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="4" />
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="2" />
<language slang="l:289fcc83-6543-41e8-a5ca-768235715ce4:jetbrains.mps.lang.generator.generationParameters" version="0" />
<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:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
<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="1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)" version="0" />
<module reference="498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)" version="0" />
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
<module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
<module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
<module reference="e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)" version="0" />
<module reference="5e7ffa70-8e23-49f4-8c13-a887bba14c36(com.mbeddr.formal.safety.gsn.external_evidence)" version="0" />
<module reference="87ebb3b1-4381-4afa-84d4-0b68cdc0b4c1(com.mbeddr.formal.safety.gsn.external_evidence#01)" version="0" />
<module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
<module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
<module reference="7b45fa94-2707-4a1a-9e6a-ce40c4aaf35a(de.itemis.mps.editor.collapsible.runtime)" version="0" />
<module reference="8ca79d43-eb45-4791-bdd4-0d6130ff895b(de.itemis.mps.editor.diagram.layout)" version="0" />
<module reference="1144260c-e9a5-49a2-9add-39a1a1a7077e(de.itemis.mps.editor.diagram.runtime)" version="0" />
<module reference="56c81845-acaf-48a7-bcd8-e29b36c98dd7(de.itemis.mps.editor.diagram.styles)" version="0" />
<module reference="5c13c612-0f7b-4f0a-ab8b-565186b418de(de.itemis.mps.mouselistener.runtime)" version="0" />
<module reference="0022e9df-2136-4ef8-81b2-08650aeb1dc7(de.itemis.mps.tooltips.runtime)" version="0" />
<module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
</dependencyVersions>
<mapping-priorities />
</generator>
</generators>
<sourcePath />
<dependencies>
<dependency reexport="false">e8a04d94-4307-4f88-95a2-25f7c4f39437(com.mbeddr.formal.safety.gsn)</dependency>
Expand Down
24 changes: 0 additions & 24 deletions ...ges/com.mbeddr.formal.safety.gsn.external_evidence/generator/templates/[email protected]
View file

This file was deleted.

Loading

0 comments on commit fc63597

Please sign in to comment.