Explorar o código

changed default value in MoTif Positionable to an actual list

Simon Van Mierlo %!s(int64=8) %!d(string=hai) anos
pai
achega
f9638c9a78

BIN=BIN
doc/_build/doctrees/environment.pickle


BIN=BIN
doc/_build/doctrees/modelling_transformation.doctree


+ 2 - 1
doc/_build/html/_sources/modelling_transformation.txt

@@ -97,7 +97,7 @@ The MoTif Scheduling Language
 
 Rules are scheduled using a scheduling language. We use *MoTif*, which exposes a number of primitives, or *steps*. A schedule consists of a number of steps starting at the *Start* pseudostep and ending in either a *EndSuccess* or *EndFail* pseudostep. Each step is connected to two other steps with a *success* or a *fail* link. Depending on the type of step, the referenced rule(s) are executed in a particular way. The steps exposed by MoTif are:
 
-.. image: img/MoTif_toolbar.png
+.. image:: img/MoTif_toolbar.png
 
 #. **ARule**: Atomic rule. Executes the rule for one match found. If no matches are found, it fails.
 #. **QRule**: A query. Succeeds if the LHS matches and the NACs do not match. The RHS of the rule is ignored.
@@ -110,6 +110,7 @@ Rules are scheduled using a scheduling language. We use *MoTif*, which exposes a
 #. **EndFail**: The end of the schedule (indicating failure). Can occur more than once, but the schedule ends when one of them is reached.
 #. **Sequence**: Executes the referenced transformation until it fails.
 #. **BRule**: Allows for other steps to be nested. Executes (non-deterministically) one of the succeeding child steps.
+#. **CRule**: Nested transformation. The referenced transformation schedule is executed once.
 #. **BSRule**: Executes (non-deterministically) one of the succeeding child steps until none of them succeeds.
 #. Unused.
 #. Unused.

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2 - 0
doc/_build/html/modelling_transformation.html


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
doc/_build/html/searchindex.js


+ 2 - 1
doc/modelling_transformation.rst

@@ -97,7 +97,7 @@ The MoTif Scheduling Language
 
 Rules are scheduled using a scheduling language. We use *MoTif*, which exposes a number of primitives, or *steps*. A schedule consists of a number of steps starting at the *Start* pseudostep and ending in either a *EndSuccess* or *EndFail* pseudostep. Each step is connected to two other steps with a *success* or a *fail* link. Depending on the type of step, the referenced rule(s) are executed in a particular way. The steps exposed by MoTif are:
 
-.. image: img/MoTif_toolbar.png
+.. image:: img/MoTif_toolbar.png
 
 #. **ARule**: Atomic rule. Executes the rule for one match found. If no matches are found, it fails.
 #. **QRule**: A query. Succeeds if the LHS matches and the NACs do not match. The RHS of the rule is ignored.
@@ -110,6 +110,7 @@ Rules are scheduled using a scheduling language. We use *MoTif*, which exposes a
 #. **EndFail**: The end of the schedule (indicating failure). Can occur more than once, but the schedule ends when one of them is reached.
 #. **Sequence**: Executes the referenced transformation until it fails.
 #. **BRule**: Allows for other steps to be nested. Executes (non-deterministically) one of the succeeding child steps.
+#. **CRule**: Nested transformation. The referenced transformation schedule is executed once.
 #. **BSRule**: Executes (non-deterministically) one of the succeeding child steps until none of them succeeds.
 #. Unused.
 #. Unused.

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 467 - 395
users/(default)/Formalisms/__Transformations__/Transformation/MoTif.metamodel


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 298 - 298
users/(default)/Formalisms/__Transformations__/Transformation/MoTif.pattern.metamodel


+ 37 - 36
users/(default)/Formalisms/__Transformations__/Transformation/MoTifMM.model

@@ -8841,7 +8841,7 @@
 							"77": {
 								"textContent": {
 									"type": "string",
-									"value": "1..*"
+									"value": "*"
 								},
 								"style": {
 									"type": "map<string,string>",
@@ -9125,7 +9125,7 @@
 							"77": {
 								"textContent": {
 									"type": "string",
-									"value": "1..*"
+									"value": "*"
 								},
 								"style": {
 									"type": "map<string,string>",
@@ -13141,8 +13141,7 @@
 		},
 		"edges": [],
 		"metamodels": [
-			"/Formalisms/__LanguageSyntax__/SimpleClassDiagram/SimpleClassDiagram.umlIcons",
-			"/Formalisms/__Transformations__/Transformation/MoTif.defaultIcons"
+			"/Formalisms/__LanguageSyntax__/SimpleClassDiagram/SimpleClassDiagram.umlIcons"
 		]
 	},
 	"asm": {
@@ -13181,20 +13180,20 @@
 						{
 							"dir": "in",
 							"type": "initial",
-							"min": "",
-							"max": "1"
+							"min": 0,
+							"max": 1
 						},
 						{
 							"dir": "in",
 							"type": "branch",
-							"min": "",
-							"max": "1"
+							"min": 0,
+							"max": 1
 						},
 						{
 							"dir": "in",
 							"type": "loop",
-							"min": "",
-							"max": "1"
+							"min": 0,
+							"max": 1
 						}
 					]
 				},
@@ -13342,7 +13341,7 @@
 						{
 							"name": "maxIterations",
 							"type": "int",
-							"default": "1000"
+							"default": 1000
 						}
 					]
 				},
@@ -13375,7 +13374,7 @@
 						{
 							"name": "maxIterations",
 							"type": "int",
-							"default": "1000"
+							"default": 1000
 						}
 					]
 				},
@@ -13474,8 +13473,8 @@
 						{
 							"dir": "out",
 							"type": "branch",
-							"min": "2",
-							"max": "Infinity"
+							"min": 2,
+							"max": "*"
 						}
 					]
 				},
@@ -13496,7 +13495,7 @@
 						{
 							"name": "maxIterations",
 							"type": "int",
-							"default": "1000"
+							"default": 1000
 						}
 					]
 				},
@@ -13529,12 +13528,12 @@
 						{
 							"name": "maxIterations",
 							"type": "int",
-							"default": "1000"
+							"default": 1000
 						},
 						{
 							"name": "nested",
 							"type": "int",
-							"default": "1"
+							"default": 1
 						}
 					]
 				},
@@ -13552,14 +13551,14 @@
 						{
 							"dir": "out",
 							"type": "loop",
-							"min": "1",
-							"max": "1"
+							"min": 1,
+							"max": 1
 						},
 						{
 							"dir": "out",
 							"type": "base",
-							"min": "1",
-							"max": "1"
+							"min": 1,
+							"max": 1
 						}
 					]
 				},
@@ -13619,32 +13618,32 @@
 						{
 							"dir": "in",
 							"type": "success",
-							"min": "1",
-							"max": "Infinity"
+							"min": 0,
+							"max": "*"
 						},
 						{
 							"dir": "out",
 							"type": "success",
-							"min": "",
-							"max": "1"
+							"min": 0,
+							"max": 1
 						},
 						{
 							"dir": "in",
 							"type": "fail",
-							"min": "1",
-							"max": "Infinity"
+							"min": 0,
+							"max": "*"
 						},
 						{
 							"dir": "out",
 							"type": "fail",
-							"min": "",
-							"max": "1"
+							"min": 0,
+							"max": 1
 						},
 						{
 							"dir": "in",
 							"type": "sub-rule",
-							"min": "",
-							"max": "1"
+							"min": 0,
+							"max": 1
 						}
 					]
 				},
@@ -13801,8 +13800,8 @@
 						{
 							"dir": "out",
 							"type": "sub-rule",
-							"min": "",
-							"max": "Infinity"
+							"min": 0,
+							"max": "*"
 						}
 					]
 				},
@@ -14120,7 +14119,10 @@
 						{
 							"name": "position",
 							"type": "list<int>",
-							"default": "[0,0]"
+							"default": [
+								0,
+								0
+							]
 						}
 					]
 				},
@@ -14464,8 +14466,7 @@
 			}
 		],
 		"metamodels": [
-			"/Formalisms/__LanguageSyntax__/SimpleClassDiagram/SimpleClassDiagram",
-			"/Formalisms/__Transformations__/Transformation/MoTif"
+			"/Formalisms/__LanguageSyntax__/SimpleClassDiagram/SimpleClassDiagram"
 		]
 	}
 }