diff options
author | Kristóf Marussy <kristof@marussy.com> | 2024-05-17 17:13:21 +0200 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2024-05-26 17:22:31 +0200 |
commit | 378d97f41ab9bf1a3dc2136f340bb57d263ea474 (patch) | |
tree | 55e4002d0bfb00392f4ab9538f804ee241c9d84e /subprojects | |
parent | chore(deps): bump dependencies (diff) | |
download | refinery-378d97f41ab9bf1a3dc2136f340bb57d263ea474.tar.gz refinery-378d97f41ab9bf1a3dc2136f340bb57d263ea474.tar.zst refinery-378d97f41ab9bf1a3dc2136f340bb57d263ea474.zip |
feat: rule parsing
Diffstat (limited to 'subprojects')
13 files changed, 793 insertions, 529 deletions
diff --git a/subprojects/frontend/src/language/folding.ts b/subprojects/frontend/src/language/folding.ts index b4d4ca22..0afabfa0 100644 --- a/subprojects/frontend/src/language/folding.ts +++ b/subprojects/frontend/src/language/folding.ts | |||
@@ -109,7 +109,7 @@ function foldWithSibling(node: SyntaxNode): FoldRange | null { | |||
109 | return null; | 109 | return null; |
110 | } | 110 | } |
111 | 111 | ||
112 | function foldWholeNode(node: SyntaxNode): FoldRange { | 112 | export function foldWholeNode(node: SyntaxNode): FoldRange { |
113 | return { | 113 | return { |
114 | from: node.from, | 114 | from: node.from, |
115 | to: node.to, | 115 | to: node.to, |
diff --git a/subprojects/frontend/src/language/problem.grammar b/subprojects/frontend/src/language/problem.grammar index 7949f90c..0d3f0e3a 100644 --- a/subprojects/frontend/src/language/problem.grammar +++ b/subprojects/frontend/src/language/problem.grammar | |||
@@ -63,11 +63,11 @@ statement { | |||
63 | // kw<"fn"> RelationName RelationName ParameterList<Parameter>? | 63 | // kw<"fn"> RelationName RelationName ParameterList<Parameter>? |
64 | // FunctionBody { ("=" sep<OrOp, Case>)? "." } | 64 | // FunctionBody { ("=" sep<OrOp, Case>)? "." } |
65 | // } | | 65 | // } | |
66 | //RuleDefinition { | 66 | RuleDefinition { |
67 | // kw<"rule"> | 67 | (ckw<"decision"> | ckw<"propagation">)? kw<"rule"> |
68 | // RuleName ParameterList<Parameter>? | 68 | RuleName ParameterList<Parameter>? |
69 | // RuleBody { ":" sep<OrOp, Conjunction> "==>" sep<OrOp, Consequent> "." } | 69 | RuleBody { ":" sep<OrOp, Conjunction> "==>" sep<OrOp, Consequent> "." } |
70 | //} | | 70 | } | |
71 | AtomDeclaration { | 71 | AtomDeclaration { |
72 | kw<"declare">? ckw<"atom"> sep<",", AtomNodeName> "." | 72 | kw<"declare">? ckw<"atom"> sep<",", AtomNodeName> "." |
73 | } | | 73 | } | |
@@ -96,7 +96,12 @@ FeatureDeclaration { | |||
96 | ";"? | 96 | ";"? |
97 | } | 97 | } |
98 | 98 | ||
99 | Parameter { RelationName? VariableName } | 99 | Parameter { |
100 | kw<"candidate">? (kw<"may"> | kw<"must">)? | ||
101 | RelationName? | ||
102 | (AndBinding | StarBinding)? | ||
103 | VariableName | ||
104 | } | ||
100 | 105 | ||
101 | // Use @dynamicPrecedence to prevent a(b) from being parsed as Expr { a } Expr { b } | 106 | // Use @dynamicPrecedence to prevent a(b) from being parsed as Expr { a } Expr { b } |
102 | // instead of Atom { a(b) } | 107 | // instead of Atom { a(b) } |
@@ -125,7 +130,12 @@ BinaryExpr { | |||
125 | } | 130 | } |
126 | 131 | ||
127 | UnaryExpr { | 132 | UnaryExpr { |
128 | !prefix ("+" | "-" | "!" | kw<"count">) Expr | 133 | !prefix |
134 | ( | ||
135 | "+" | "-" | "!" | kw<"count"> | | ||
136 | kw<"candidate"> | kw<"may"> | kw<"must"> | ||
137 | ) | ||
138 | Expr | ||
129 | } | 139 | } |
130 | 140 | ||
131 | CastExpr { !cast Expr kw<"as"> DatatypeName } | 141 | CastExpr { !cast Expr kw<"as"> DatatypeName } |
@@ -136,16 +146,18 @@ Aggregation { | |||
136 | 146 | ||
137 | Atom { RelationName "+"? ParameterList<Expr> } | 147 | Atom { RelationName "+"? ParameterList<Expr> } |
138 | 148 | ||
139 | //Consequent { ("," | Action)+ } | 149 | Consequent { ("," | Action)+ } |
140 | 150 | ||
141 | //Action { | 151 | Action { |
142 | // ckw<"new"> VariableName ("<:" VariableName)? | | 152 | (NotOp | UnknownOp)? RelationName |
143 | // kw<"delete"> VariableName | | 153 | ParameterList<AssertionActionArgument> |
144 | // Literal | 154 | (":" Expr)? |
145 | //} | 155 | } |
146 | 156 | ||
147 | AssertionArgument { NodeName | StarArgument } | 157 | AssertionArgument { NodeName | StarArgument } |
148 | 158 | ||
159 | AssertionActionArgument { VariableName | StarArgument } | ||
160 | |||
149 | Constant { Real | String | StarMult | LogicValue } | 161 | Constant { Real | String | StarMult | LogicValue } |
150 | 162 | ||
151 | ReferenceKind { | 163 | ReferenceKind { |
@@ -170,7 +182,7 @@ RelationName { QualifiedName ~name } | |||
170 | 182 | ||
171 | DatatypeName { QualifiedName } | 183 | DatatypeName { QualifiedName } |
172 | 184 | ||
173 | //RuleName { QualifiedName } | 185 | RuleName { QualifiedName } |
174 | 186 | ||
175 | AtomNodeName { QualifiedName } | 187 | AtomNodeName { QualifiedName } |
176 | 188 | ||
@@ -247,5 +259,9 @@ sep1<separator, content> { content (separator content)* } | |||
247 | 259 | ||
248 | StarArgument { "*" } | 260 | StarArgument { "*" } |
249 | 261 | ||
262 | StarBinding { "*" } | ||
263 | |||
264 | AndBinding { "&" } | ||
265 | |||
250 | "{" "}" "(" ")" "[" "]" "." ".." "," ":" "->" "<->" "+" "-" "**" "=" "+=" | 266 | "{" "}" "(" ")" "[" "]" "." ".." "," ":" "->" "<->" "+" "-" "**" "=" "+=" |
251 | } | 267 | } |
diff --git a/subprojects/frontend/src/language/problemLanguageSupport.ts b/subprojects/frontend/src/language/problemLanguageSupport.ts index dd5d6347..ae998d20 100644 --- a/subprojects/frontend/src/language/problemLanguageSupport.ts +++ b/subprojects/frontend/src/language/problemLanguageSupport.ts | |||
@@ -14,7 +14,12 @@ import { | |||
14 | } from '@codemirror/language'; | 14 | } from '@codemirror/language'; |
15 | import { styleTags, tags as t } from '@lezer/highlight'; | 15 | import { styleTags, tags as t } from '@lezer/highlight'; |
16 | 16 | ||
17 | import { foldBlockComment, foldConjunction, foldDeclaration } from './folding'; | 17 | import { |
18 | foldBlockComment, | ||
19 | foldConjunction, | ||
20 | foldDeclaration, | ||
21 | foldWholeNode, | ||
22 | } from './folding'; | ||
18 | import { | 23 | import { |
19 | indentBlockComment, | 24 | indentBlockComment, |
20 | indentDeclaration, | 25 | indentDeclaration, |
@@ -30,11 +35,13 @@ const parserWithMetadata = parser.configure({ | |||
30 | 'module problem class enum pred fn scope': t.definitionKeyword, | 35 | 'module problem class enum pred fn scope': t.definitionKeyword, |
31 | 'import as declare atom multi': t.definitionKeyword, | 36 | 'import as declare atom multi': t.definitionKeyword, |
32 | 'extern datatype aggregator': t.definitionKeyword, | 37 | 'extern datatype aggregator': t.definitionKeyword, |
38 | rule: t.definitionKeyword, | ||
33 | 'abstract extends refers contains container opposite': t.modifier, | 39 | 'abstract extends refers contains container opposite': t.modifier, |
34 | default: t.modifier, | 40 | default: t.modifier, |
41 | 'propagation decision': t.modifier, | ||
35 | 'true false unknown error': t.keyword, | 42 | 'true false unknown error': t.keyword, |
43 | 'candidate may must': t.operatorKeyword, | ||
36 | 'count in is': t.operatorKeyword, | 44 | 'count in is': t.operatorKeyword, |
37 | // 'new delete': t.keyword, | ||
38 | NotOp: t.operator, | 45 | NotOp: t.operator, |
39 | UnknownOp: t.operator, | 46 | UnknownOp: t.operator, |
40 | OrOp: t.separator, | 47 | OrOp: t.separator, |
@@ -45,7 +52,7 @@ const parserWithMetadata = parser.configure({ | |||
45 | 'RelationName/QualifiedName': t.typeName, | 52 | 'RelationName/QualifiedName': t.typeName, |
46 | 'DatatypeName/QualifiedName': t.keyword, | 53 | 'DatatypeName/QualifiedName': t.keyword, |
47 | 'AggregatorName/QualifiedName': t.operatorKeyword, | 54 | 'AggregatorName/QualifiedName': t.operatorKeyword, |
48 | // 'RuleName/QualifiedName': t.typeName, | 55 | 'RuleName/QualifiedName': t.typeName, |
49 | 'AtomNodeName/QualifiedName': t.atom, | 56 | 'AtomNodeName/QualifiedName': t.atom, |
50 | 'VariableName/QualifiedName': t.variableName, | 57 | 'VariableName/QualifiedName': t.variableName, |
51 | 'ModuleName/QualifiedName': t.typeName, | 58 | 'ModuleName/QualifiedName': t.typeName, |
@@ -62,7 +69,7 @@ const parserWithMetadata = parser.configure({ | |||
62 | ScopeDeclaration: indentDeclaration, | 69 | ScopeDeclaration: indentDeclaration, |
63 | PredicateBody: indentPredicateOrRule, | 70 | PredicateBody: indentPredicateOrRule, |
64 | // FunctionBody: indentPredicateOrRule, | 71 | // FunctionBody: indentPredicateOrRule, |
65 | // RuleBody: indentPredicateOrRule, | 72 | RuleBody: indentPredicateOrRule, |
66 | BlockComment: indentBlockComment, | 73 | BlockComment: indentBlockComment, |
67 | }), | 74 | }), |
68 | foldNodeProp.add({ | 75 | foldNodeProp.add({ |
@@ -71,9 +78,9 @@ const parserWithMetadata = parser.configure({ | |||
71 | ParameterList: foldInside, | 78 | ParameterList: foldInside, |
72 | PredicateBody: foldInside, | 79 | PredicateBody: foldInside, |
73 | // FunctionBody: foldInside, | 80 | // FunctionBody: foldInside, |
74 | // RuleBody: foldInside, | 81 | RuleBody: foldInside, |
75 | Conjunction: foldConjunction, | 82 | Conjunction: foldConjunction, |
76 | // Consequent: foldWholeNode, | 83 | Consequent: foldWholeNode, |
77 | AtomDeclaration: foldDeclaration, | 84 | AtomDeclaration: foldDeclaration, |
78 | NodeDeclaration: foldDeclaration, | 85 | NodeDeclaration: foldDeclaration, |
79 | ScopeDeclaration: foldDeclaration, | 86 | ScopeDeclaration: foldDeclaration, |
@@ -92,7 +99,7 @@ const problemLanguage = LRLanguage.define({ | |||
92 | }, | 99 | }, |
93 | line: '%', | 100 | line: '%', |
94 | }, | 101 | }, |
95 | indentOnInput: /^\s*(?:\{|\}|\(|\)|->|;|\.)$/, | 102 | indentOnInput: /^\s*(?:\{|\}|\(|\)|->|==>|;|\.)$/, |
96 | }, | 103 | }, |
97 | }); | 104 | }); |
98 | 105 | ||
diff --git a/subprojects/language-model/problem.aird b/subprojects/language-model/problem.aird index f8a50a76..61ccd75d 100644 --- a/subprojects/language-model/problem.aird +++ b/subprojects/language-model/problem.aird | |||
@@ -7,19 +7,19 @@ | |||
7 | <semanticResources>build/resources/main/model/problem.genmodel</semanticResources> | 7 | <semanticResources>build/resources/main/model/problem.genmodel</semanticResources> |
8 | <ownedViews xmi:type="viewpoint:DView" uid="_CsAAYKA4EeuqkpDnuik1sg"> | 8 | <ownedViews xmi:type="viewpoint:DView" uid="_CsAAYKA4EeuqkpDnuik1sg"> |
9 | <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/> | 9 | <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/> |
10 | <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_CsYa4KA4EeuqkpDnuik1sg" name="declarations" repPath="#_CsUwgKA4EeuqkpDnuik1sg" changeId="1709659837733"> | 10 | <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_CsYa4KA4EeuqkpDnuik1sg" name="declarations" repPath="#_CsUwgKA4EeuqkpDnuik1sg" changeId="1715895091128"> |
11 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> | 11 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> |
12 | <target xmi:type="ecore:EPackage" href="src/main/resources/model/problem.ecore#/"/> | 12 | <target xmi:type="ecore:EPackage" href="src/main/resources/model/problem.ecore#/"/> |
13 | </ownedRepresentationDescriptors> | 13 | </ownedRepresentationDescriptors> |
14 | <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_z1bOYF3lEe2LuOZzJ_LhLg" name="expressions" repPath="#_z1YyIF3lEe2LuOZzJ_LhLg" changeId="1709659698980"> | 14 | <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_z1bOYF3lEe2LuOZzJ_LhLg" name="expressions" repPath="#_z1YyIF3lEe2LuOZzJ_LhLg" changeId="1715884068732"> |
15 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> | 15 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> |
16 | <target xmi:type="ecore:EPackage" href="src/main/resources/model/problem.ecore#/"/> | 16 | <target xmi:type="ecore:EPackage" href="src/main/resources/model/problem.ecore#/"/> |
17 | </ownedRepresentationDescriptors> | 17 | </ownedRepresentationDescriptors> |
18 | <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_xj9yMF4eEe2rXNsIDUvqhw" name="assertions" repPath="#_xj6H0F4eEe2rXNsIDUvqhw" changeId="1706657349781"> | 18 | <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_xj9yMF4eEe2rXNsIDUvqhw" name="assertions" repPath="#_xj6H0F4eEe2rXNsIDUvqhw" changeId="1715958425538"> |
19 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> | 19 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> |
20 | <target xmi:type="ecore:EPackage" href="src/main/resources/model/problem.ecore#/"/> | 20 | <target xmi:type="ecore:EPackage" href="src/main/resources/model/problem.ecore#/"/> |
21 | </ownedRepresentationDescriptors> | 21 | </ownedRepresentationDescriptors> |
22 | <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_sCFokF4fEe2rXNsIDUvqhw" name="actions" repPath="#_sCFBgF4fEe2rXNsIDUvqhw" changeId="1706657349781"> | 22 | <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_sCFokF4fEe2rXNsIDUvqhw" name="actions" repPath="#_sCFBgF4fEe2rXNsIDUvqhw" changeId="1715954805155"> |
23 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> | 23 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> |
24 | <target xmi:type="ecore:EPackage" href="src/main/resources/model/problem.ecore#/"/> | 24 | <target xmi:type="ecore:EPackage" href="src/main/resources/model/problem.ecore#/"/> |
25 | </ownedRepresentationDescriptors> | 25 | </ownedRepresentationDescriptors> |
@@ -100,11 +100,23 @@ | |||
100 | <children xmi:type="notation:Node" xmi:id="_QKLK0KA6EeuqkpDnuik1sg" type="2003" element="_QKD2EKA6EeuqkpDnuik1sg"> | 100 | <children xmi:type="notation:Node" xmi:id="_QKLK0KA6EeuqkpDnuik1sg" type="2003" element="_QKD2EKA6EeuqkpDnuik1sg"> |
101 | <children xmi:type="notation:Node" xmi:id="_QKLK06A6EeuqkpDnuik1sg" type="5007"/> | 101 | <children xmi:type="notation:Node" xmi:id="_QKLK06A6EeuqkpDnuik1sg" type="5007"/> |
102 | <children xmi:type="notation:Node" xmi:id="_QKLK1KA6EeuqkpDnuik1sg" type="7004"> | 102 | <children xmi:type="notation:Node" xmi:id="_QKLK1KA6EeuqkpDnuik1sg" type="7004"> |
103 | <children xmi:type="notation:Node" xmi:id="_JR-dPBOyEe-4k7CzzL6IsA" type="3010" element="_JRfVABOyEe-4k7CzzL6IsA"> | ||
104 | <styles xmi:type="notation:FontStyle" xmi:id="_JR-dPROyEe-4k7CzzL6IsA" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/> | ||
105 | <layoutConstraint xmi:type="notation:Location" xmi:id="_JR-dPhOyEe-4k7CzzL6IsA"/> | ||
106 | </children> | ||
107 | <children xmi:type="notation:Node" xmi:id="_LJy6eROyEe-4k7CzzL6IsA" type="3010" element="_LJG98BOyEe-4k7CzzL6IsA"> | ||
108 | <styles xmi:type="notation:FontStyle" xmi:id="_LJy6ehOyEe-4k7CzzL6IsA" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/> | ||
109 | <layoutConstraint xmi:type="notation:Location" xmi:id="_LJy6exOyEe-4k7CzzL6IsA"/> | ||
110 | </children> | ||
111 | <children xmi:type="notation:Node" xmi:id="_he4bMBO0Ee-4k7CzzL6IsA" type="3010" element="_heTzcBO0Ee-4k7CzzL6IsA"> | ||
112 | <styles xmi:type="notation:FontStyle" xmi:id="_he4bMRO0Ee-4k7CzzL6IsA" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/> | ||
113 | <layoutConstraint xmi:type="notation:Location" xmi:id="_he4bMhO0Ee-4k7CzzL6IsA"/> | ||
114 | </children> | ||
103 | <styles xmi:type="notation:SortingStyle" xmi:id="_QKLK1aA6EeuqkpDnuik1sg"/> | 115 | <styles xmi:type="notation:SortingStyle" xmi:id="_QKLK1aA6EeuqkpDnuik1sg"/> |
104 | <styles xmi:type="notation:FilteringStyle" xmi:id="_QKLK1qA6EeuqkpDnuik1sg"/> | 116 | <styles xmi:type="notation:FilteringStyle" xmi:id="_QKLK1qA6EeuqkpDnuik1sg"/> |
105 | </children> | 117 | </children> |
106 | <styles xmi:type="notation:ShapeStyle" xmi:id="_QKLK0aA6EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/> | 118 | <styles xmi:type="notation:ShapeStyle" xmi:id="_QKLK0aA6EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/> |
107 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QKLK0qA6EeuqkpDnuik1sg" x="1687" y="530" width="120" height="100"/> | 119 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QKLK0qA6EeuqkpDnuik1sg" x="1656" y="516" width="174" height="114"/> |
108 | </children> | 120 | </children> |
109 | <children xmi:type="notation:Node" xmi:id="_jP6FkKA6EeuqkpDnuik1sg" type="2003" element="_jPpm4KA6EeuqkpDnuik1sg"> | 121 | <children xmi:type="notation:Node" xmi:id="_jP6FkKA6EeuqkpDnuik1sg" type="2003" element="_jPpm4KA6EeuqkpDnuik1sg"> |
110 | <children xmi:type="notation:Node" xmi:id="_jP6soKA6EeuqkpDnuik1sg" type="5007"/> | 122 | <children xmi:type="notation:Node" xmi:id="_jP6soKA6EeuqkpDnuik1sg" type="5007"/> |
@@ -246,6 +258,10 @@ | |||
246 | <children xmi:type="notation:Node" xmi:id="_N0FQ4CrZEeyyC-O0_LlY9w" type="2003" element="_NzpMACrZEeyyC-O0_LlY9w"> | 258 | <children xmi:type="notation:Node" xmi:id="_N0FQ4CrZEeyyC-O0_LlY9w" type="2003" element="_NzpMACrZEeyyC-O0_LlY9w"> |
247 | <children xmi:type="notation:Node" xmi:id="_N0F38CrZEeyyC-O0_LlY9w" type="5007"/> | 259 | <children xmi:type="notation:Node" xmi:id="_N0F38CrZEeyyC-O0_LlY9w" type="5007"/> |
248 | <children xmi:type="notation:Node" xmi:id="_N0F38SrZEeyyC-O0_LlY9w" type="7004"> | 260 | <children xmi:type="notation:Node" xmi:id="_N0F38SrZEeyyC-O0_LlY9w" type="7004"> |
261 | <children xmi:type="notation:Node" xmi:id="_-wphkBOzEe-4k7CzzL6IsA" type="3010" element="_-wOq0BOzEe-4k7CzzL6IsA"> | ||
262 | <styles xmi:type="notation:FontStyle" xmi:id="_-wphkROzEe-4k7CzzL6IsA" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/> | ||
263 | <layoutConstraint xmi:type="notation:Location" xmi:id="_-wphkhOzEe-4k7CzzL6IsA"/> | ||
264 | </children> | ||
249 | <styles xmi:type="notation:SortingStyle" xmi:id="_N0F38irZEeyyC-O0_LlY9w"/> | 265 | <styles xmi:type="notation:SortingStyle" xmi:id="_N0F38irZEeyyC-O0_LlY9w"/> |
250 | <styles xmi:type="notation:FilteringStyle" xmi:id="_N0F38yrZEeyyC-O0_LlY9w"/> | 266 | <styles xmi:type="notation:FilteringStyle" xmi:id="_N0F38yrZEeyyC-O0_LlY9w"/> |
251 | </children> | 267 | </children> |
@@ -436,6 +452,48 @@ | |||
436 | <styles xmi:type="notation:ShapeStyle" xmi:id="_jlSckdsVEe6c9ehqpe3s7A" fontName="Noto Sans" fontHeight="8"/> | 452 | <styles xmi:type="notation:ShapeStyle" xmi:id="_jlSckdsVEe6c9ehqpe3s7A" fontName="Noto Sans" fontHeight="8"/> |
437 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jlScktsVEe6c9ehqpe3s7A" x="1128" y="716" width="147" height="100"/> | 453 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jlScktsVEe6c9ehqpe3s7A" x="1128" y="716" width="147" height="100"/> |
438 | </children> | 454 | </children> |
455 | <children xmi:type="notation:Node" xmi:id="_3c-frBOzEe-4k7CzzL6IsA" type="2003" element="_3cdiQBOzEe-4k7CzzL6IsA"> | ||
456 | <children xmi:type="notation:Node" xmi:id="_3c-frxOzEe-4k7CzzL6IsA" type="5007"/> | ||
457 | <children xmi:type="notation:Node" xmi:id="_3c-fsBOzEe-4k7CzzL6IsA" type="7004"> | ||
458 | <children xmi:type="notation:Node" xmi:id="_5DOEsBOzEe-4k7CzzL6IsA" type="3010" element="_5Cz1ABOzEe-4k7CzzL6IsA"> | ||
459 | <styles xmi:type="notation:FontStyle" xmi:id="_5DOEsROzEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/> | ||
460 | <layoutConstraint xmi:type="notation:Location" xmi:id="_5DOEshOzEe-4k7CzzL6IsA"/> | ||
461 | </children> | ||
462 | <children xmi:type="notation:Node" xmi:id="_7IGGgBOzEe-4k7CzzL6IsA" type="3010" element="_7Hb_MBOzEe-4k7CzzL6IsA"> | ||
463 | <styles xmi:type="notation:FontStyle" xmi:id="_7IGGgROzEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/> | ||
464 | <layoutConstraint xmi:type="notation:Location" xmi:id="_7IGGghOzEe-4k7CzzL6IsA"/> | ||
465 | </children> | ||
466 | <children xmi:type="notation:Node" xmi:id="_8KIyUBOzEe-4k7CzzL6IsA" type="3010" element="_8JiVYBOzEe-4k7CzzL6IsA"> | ||
467 | <styles xmi:type="notation:FontStyle" xmi:id="_8KIyUROzEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/> | ||
468 | <layoutConstraint xmi:type="notation:Location" xmi:id="_8KIyUhOzEe-4k7CzzL6IsA"/> | ||
469 | </children> | ||
470 | <styles xmi:type="notation:SortingStyle" xmi:id="_3c-fsROzEe-4k7CzzL6IsA"/> | ||
471 | <styles xmi:type="notation:FilteringStyle" xmi:id="_3c-fshOzEe-4k7CzzL6IsA"/> | ||
472 | </children> | ||
473 | <styles xmi:type="notation:ShapeStyle" xmi:id="_3c-frROzEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/> | ||
474 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3c-frhOzEe-4k7CzzL6IsA" x="2298" y="1280" width="120" height="100"/> | ||
475 | </children> | ||
476 | <children xmi:type="notation:Node" xmi:id="_Z2K9bBO0Ee-4k7CzzL6IsA" type="2003" element="_Z12NQBO0Ee-4k7CzzL6IsA"> | ||
477 | <children xmi:type="notation:Node" xmi:id="_Z2K9bxO0Ee-4k7CzzL6IsA" type="5007"/> | ||
478 | <children xmi:type="notation:Node" xmi:id="_Z2K9cBO0Ee-4k7CzzL6IsA" type="7004"> | ||
479 | <children xmi:type="notation:Node" xmi:id="_eBUvNhO0Ee-4k7CzzL6IsA" type="3010" element="_eBCbUBO0Ee-4k7CzzL6IsA"> | ||
480 | <styles xmi:type="notation:FontStyle" xmi:id="_eBUvNxO0Ee-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/> | ||
481 | <layoutConstraint xmi:type="notation:Location" xmi:id="_eBUvOBO0Ee-4k7CzzL6IsA"/> | ||
482 | </children> | ||
483 | <children xmi:type="notation:Node" xmi:id="_eoD_HBO0Ee-4k7CzzL6IsA" type="3010" element="_enuA0BO0Ee-4k7CzzL6IsA"> | ||
484 | <styles xmi:type="notation:FontStyle" xmi:id="_eoD_HRO0Ee-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/> | ||
485 | <layoutConstraint xmi:type="notation:Location" xmi:id="_eoD_HhO0Ee-4k7CzzL6IsA"/> | ||
486 | </children> | ||
487 | <children xmi:type="notation:Node" xmi:id="_fGm8QBO0Ee-4k7CzzL6IsA" type="3010" element="_fGJCMBO0Ee-4k7CzzL6IsA"> | ||
488 | <styles xmi:type="notation:FontStyle" xmi:id="_fGm8QRO0Ee-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/> | ||
489 | <layoutConstraint xmi:type="notation:Location" xmi:id="_fGm8QhO0Ee-4k7CzzL6IsA"/> | ||
490 | </children> | ||
491 | <styles xmi:type="notation:SortingStyle" xmi:id="_Z2K9cRO0Ee-4k7CzzL6IsA"/> | ||
492 | <styles xmi:type="notation:FilteringStyle" xmi:id="_Z2K9chO0Ee-4k7CzzL6IsA"/> | ||
493 | </children> | ||
494 | <styles xmi:type="notation:ShapeStyle" xmi:id="_Z2K9bRO0Ee-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/> | ||
495 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z2K9bhO0Ee-4k7CzzL6IsA" x="2039" y="332" width="120" height="100"/> | ||
496 | </children> | ||
439 | <styles xmi:type="notation:DiagramStyle" xmi:id="_CsZB8qA4EeuqkpDnuik1sg"/> | 497 | <styles xmi:type="notation:DiagramStyle" xmi:id="_CsZB8qA4EeuqkpDnuik1sg"/> |
440 | <edges xmi:type="notation:Edge" xmi:id="_4eaYwKA8EeuqkpDnuik1sg" type="4001" element="_4eU5TqA8EeuqkpDnuik1sg" source="_D1D6MKA4EeuqkpDnuik1sg" target="_xsq_MKA8EeuqkpDnuik1sg"> | 498 | <edges xmi:type="notation:Edge" xmi:id="_4eaYwKA8EeuqkpDnuik1sg" type="4001" element="_4eU5TqA8EeuqkpDnuik1sg" source="_D1D6MKA4EeuqkpDnuik1sg" target="_xsq_MKA8EeuqkpDnuik1sg"> |
441 | <children xmi:type="notation:Node" xmi:id="_4ea_06A8EeuqkpDnuik1sg" type="6001"> | 499 | <children xmi:type="notation:Node" xmi:id="_4ea_06A8EeuqkpDnuik1sg" type="6001"> |
@@ -610,7 +668,7 @@ | |||
610 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_onzXUaA6EeuqkpDnuik1sg" routing="Tree"/> | 668 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_onzXUaA6EeuqkpDnuik1sg" routing="Tree"/> |
611 | <styles xmi:type="notation:FontStyle" xmi:id="_onzXUqA6EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/> | 669 | <styles xmi:type="notation:FontStyle" xmi:id="_onzXUqA6EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/> |
612 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_onzXU6A6EeuqkpDnuik1sg" points="[0, 0, 61, 191]$[0, -72, 61, 119]$[-60, -72, 1, 119]$[-60, -142, 1, 49]"/> | 670 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_onzXU6A6EeuqkpDnuik1sg" points="[0, 0, 61, 191]$[0, -72, 61, 119]$[-60, -72, 1, 119]$[-60, -142, 1, 49]"/> |
613 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_on1MgKA6EeuqkpDnuik1sg" id="(0.2033898305084746,0.0)"/> | 671 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_on1MgKA6EeuqkpDnuik1sg" id="(0.31976744186046513,0.125)"/> |
614 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_on1MgaA6EeuqkpDnuik1sg" id="(0.5,0.5)"/> | 672 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_on1MgaA6EeuqkpDnuik1sg" id="(0.5,0.5)"/> |
615 | </edges> | 673 | </edges> |
616 | <edges xmi:type="notation:Edge" xmi:id="_vndkcCrcEeyyC-O0_LlY9w" type="4001" element="_Uy4bWaA6EeuqkpDnuik1sg" source="_A9YrQCrZEeyyC-O0_LlY9w" target="_QKLK0KA6EeuqkpDnuik1sg"> | 674 | <edges xmi:type="notation:Edge" xmi:id="_vndkcCrcEeyyC-O0_LlY9w" type="4001" element="_Uy4bWaA6EeuqkpDnuik1sg" source="_A9YrQCrZEeyyC-O0_LlY9w" target="_QKLK0KA6EeuqkpDnuik1sg"> |
@@ -627,7 +685,7 @@ | |||
627 | <styles xmi:type="notation:FontStyle" xmi:id="_vndkcircEeyyC-O0_LlY9w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/> | 685 | <styles xmi:type="notation:FontStyle" xmi:id="_vndkcircEeyyC-O0_LlY9w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/> |
628 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vndkcyrcEeyyC-O0_LlY9w" points="[-38, -41, 287, 48]$[-258, -41, 67, 48]"/> | 686 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vndkcyrcEeyyC-O0_LlY9w" points="[-38, -41, 287, 48]$[-258, -41, 67, 48]"/> |
629 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vndkeircEeyyC-O0_LlY9w" id="(0.2602739726027397,0.9081632653061225)"/> | 687 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vndkeircEeyyC-O0_LlY9w" id="(0.2602739726027397,0.9081632653061225)"/> |
630 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vneLgCrcEeyyC-O0_LlY9w" id="(0.4322033898305085,0.0)"/> | 688 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vneLgCrcEeyyC-O0_LlY9w" id="(0.47674418604651164,0.125)"/> |
631 | </edges> | 689 | </edges> |
632 | <edges xmi:type="notation:Edge" xmi:id="_TuLToNbNEeuymriYTNxK2g" type="4001" element="_Tt9RRtbNEeuymriYTNxK2g" source="_jP6FkKA6EeuqkpDnuik1sg" target="_Kw-vINbNEeuymriYTNxK2g"> | 690 | <edges xmi:type="notation:Edge" xmi:id="_TuLToNbNEeuymriYTNxK2g" type="4001" element="_Tt9RRtbNEeuymriYTNxK2g" source="_jP6FkKA6EeuqkpDnuik1sg" target="_Kw-vINbNEeuymriYTNxK2g"> |
633 | <children xmi:type="notation:Node" xmi:id="_TuLTpNbNEeuymriYTNxK2g" type="6001"> | 691 | <children xmi:type="notation:Node" xmi:id="_TuLTpNbNEeuymriYTNxK2g" type="6001"> |
@@ -1202,7 +1260,7 @@ | |||
1202 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_iXIY4WTzEe2qdtyPWAtoxA" routing="Rectilinear"/> | 1260 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_iXIY4WTzEe2qdtyPWAtoxA" routing="Rectilinear"/> |
1203 | <styles xmi:type="notation:FontStyle" xmi:id="_iXIY4mTzEe2qdtyPWAtoxA" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> | 1261 | <styles xmi:type="notation:FontStyle" xmi:id="_iXIY4mTzEe2qdtyPWAtoxA" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> |
1204 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iXIY42TzEe2qdtyPWAtoxA" points="[-72, 48, 1131, 5]$[-1144, 48, 59, 5]"/> | 1262 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iXIY42TzEe2qdtyPWAtoxA" points="[-72, 48, 1131, 5]$[-1144, 48, 59, 5]"/> |
1205 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iXIY6mTzEe2qdtyPWAtoxA" id="(0.6101694915254238,0.0)"/> | 1263 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iXIY6mTzEe2qdtyPWAtoxA" id="(0.5988372093023255,0.125)"/> |
1206 | </edges> | 1264 | </edges> |
1207 | <edges xmi:type="notation:Edge" xmi:id="_q7DhwGTzEe2qdtyPWAtoxA" type="4001" element="_q604amTzEe2qdtyPWAtoxA" source="_zaq8oKA9EeuqkpDnuik1sg" target="_dzfLYGTvEe2qdtyPWAtoxA"> | 1265 | <edges xmi:type="notation:Edge" xmi:id="_q7DhwGTzEe2qdtyPWAtoxA" type="4001" element="_q604amTzEe2qdtyPWAtoxA" source="_zaq8oKA9EeuqkpDnuik1sg" target="_dzfLYGTvEe2qdtyPWAtoxA"> |
1208 | <children xmi:type="notation:Node" xmi:id="_q7EI0GTzEe2qdtyPWAtoxA" type="6001"> | 1266 | <children xmi:type="notation:Node" xmi:id="_q7EI0GTzEe2qdtyPWAtoxA" type="6001"> |
@@ -1532,10 +1590,34 @@ | |||
1532 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | 1590 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> |
1533 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> | 1591 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> |
1534 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> | 1592 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> |
1535 | <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_Cr-9nBjHEe2_erjsEmF9GQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> | 1593 | <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_iG6EixO0Ee-4k7CzzL6IsA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> |
1536 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> | 1594 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> |
1537 | </ownedStyle> | 1595 | </ownedStyle> |
1538 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> | 1596 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> |
1597 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_JRfVABOyEe-4k7CzzL6IsA" name="concreteness : Concreteness = PARTIAL" tooltipText=""> | ||
1598 | <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//Parameter/concreteness"/> | ||
1599 | <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//Parameter/concreteness"/> | ||
1600 | <ownedStyle xmi:type="diagram:BundledImage" uid="_KAVYBROyEe-4k7CzzL6IsA" labelAlignment="LEFT"> | ||
1601 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/> | ||
1602 | </ownedStyle> | ||
1603 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> | ||
1604 | </ownedElements> | ||
1605 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_LJG98BOyEe-4k7CzzL6IsA" name="modality : Modality = NONE" tooltipText=""> | ||
1606 | <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//Parameter/modality"/> | ||
1607 | <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//Parameter/modality"/> | ||
1608 | <ownedStyle xmi:type="diagram:BundledImage" uid="_LwmbwxOyEe-4k7CzzL6IsA" labelAlignment="LEFT"> | ||
1609 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/> | ||
1610 | </ownedStyle> | ||
1611 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> | ||
1612 | </ownedElements> | ||
1613 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_heTzcBO0Ee-4k7CzzL6IsA" name="binding : ParameterBinding = SINGLE" tooltipText=""> | ||
1614 | <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//Parameter/binding"/> | ||
1615 | <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//Parameter/binding"/> | ||
1616 | <ownedStyle xmi:type="diagram:BundledImage" uid="_iG75tRO0Ee-4k7CzzL6IsA" labelAlignment="LEFT"> | ||
1617 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/> | ||
1618 | </ownedStyle> | ||
1619 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> | ||
1620 | </ownedElements> | ||
1539 | </ownedDiagramElements> | 1621 | </ownedDiagramElements> |
1540 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_Uy4bWaA6EeuqkpDnuik1sg" name="[0..*] parameters" sourceNode="_A8hIkCrZEeyyC-O0_LlY9w" targetNode="_QKD2EKA6EeuqkpDnuik1sg"> | 1622 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_Uy4bWaA6EeuqkpDnuik1sg" name="[0..*] parameters" sourceNode="_A8hIkCrZEeyyC-O0_LlY9w" targetNode="_QKD2EKA6EeuqkpDnuik1sg"> |
1541 | <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ParametricDefinition/parameters"/> | 1623 | <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ParametricDefinition/parameters"/> |
@@ -1565,12 +1647,12 @@ | |||
1565 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_oni4rKA6EeuqkpDnuik1sg" sourceNode="_QKD2EKA6EeuqkpDnuik1sg" targetNode="_jPpm4KA6EeuqkpDnuik1sg"> | 1647 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_oni4rKA6EeuqkpDnuik1sg" sourceNode="_QKD2EKA6EeuqkpDnuik1sg" targetNode="_jPpm4KA6EeuqkpDnuik1sg"> |
1566 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Parameter"/> | 1648 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Parameter"/> |
1567 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Parameter"/> | 1649 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Parameter"/> |
1568 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_CsIunBjHEe2_erjsEmF9GQ" targetArrow="InputClosedArrow" routingStyle="tree"> | 1650 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_iHDOfBO0Ee-4k7CzzL6IsA" targetArrow="InputClosedArrow" routingStyle="tree"> |
1569 | <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/> | 1651 | <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/> |
1570 | <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_CsIunRjHEe2_erjsEmF9GQ" showIcon="false"> | 1652 | <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_iHDOfRO0Ee-4k7CzzL6IsA" showIcon="false"> |
1571 | <labelFormat>italic</labelFormat> | 1653 | <labelFormat>italic</labelFormat> |
1572 | </beginLabelStyle> | 1654 | </beginLabelStyle> |
1573 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_CsIunhjHEe2_erjsEmF9GQ" showIcon="false"/> | 1655 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_iHDOfhO0Ee-4k7CzzL6IsA" showIcon="false"/> |
1574 | </ownedStyle> | 1656 | </ownedStyle> |
1575 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/> | 1657 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/> |
1576 | </ownedDiagramElements> | 1658 | </ownedDiagramElements> |
@@ -2004,10 +2086,18 @@ | |||
2004 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | 2086 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> |
2005 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> | 2087 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> |
2006 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> | 2088 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> |
2007 | <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_OVFKZhEJEe2AArBmfNpEZA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> | 2089 | <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="__y9TRxOzEe-4k7CzzL6IsA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> |
2008 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> | 2090 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> |
2009 | </ownedStyle> | 2091 | </ownedStyle> |
2010 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> | 2092 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> |
2093 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_-wOq0BOzEe-4k7CzzL6IsA" name="kind : RuleKind = REFINEMENT" tooltipText=""> | ||
2094 | <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//RuleDefinition/kind"/> | ||
2095 | <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//RuleDefinition/kind"/> | ||
2096 | <ownedStyle xmi:type="diagram:BundledImage" uid="__y-hRhOzEe-4k7CzzL6IsA" labelAlignment="LEFT"> | ||
2097 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/> | ||
2098 | </ownedStyle> | ||
2099 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> | ||
2100 | </ownedElements> | ||
2011 | </ownedDiagramElements> | 2101 | </ownedDiagramElements> |
2012 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_ddmjcCrZEeyyC-O0_LlY9w" sourceNode="_fihqUKA5EeuqkpDnuik1sg" targetNode="_A8hIkCrZEeyyC-O0_LlY9w"> | 2102 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_ddmjcCrZEeyyC-O0_LlY9w" sourceNode="_fihqUKA5EeuqkpDnuik1sg" targetNode="_A8hIkCrZEeyyC-O0_LlY9w"> |
2013 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//PredicateDefinition"/> | 2103 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//PredicateDefinition"/> |
@@ -2024,12 +2114,12 @@ | |||
2024 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_eGZo7irZEeyyC-O0_LlY9w" sourceNode="_NzpMACrZEeyyC-O0_LlY9w" targetNode="_A8hIkCrZEeyyC-O0_LlY9w"> | 2114 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_eGZo7irZEeyyC-O0_LlY9w" sourceNode="_NzpMACrZEeyyC-O0_LlY9w" targetNode="_A8hIkCrZEeyyC-O0_LlY9w"> |
2025 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RuleDefinition"/> | 2115 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RuleDefinition"/> |
2026 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RuleDefinition"/> | 2116 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RuleDefinition"/> |
2027 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OVL4VhEJEe2AArBmfNpEZA" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree"> | 2117 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="__zCMAxOzEe-4k7CzzL6IsA" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree"> |
2028 | <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/> | 2118 | <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/> |
2029 | <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_OVL4VxEJEe2AArBmfNpEZA" showIcon="false"> | 2119 | <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="__zCMBBOzEe-4k7CzzL6IsA" showIcon="false"> |
2030 | <labelFormat>italic</labelFormat> | 2120 | <labelFormat>italic</labelFormat> |
2031 | </beginLabelStyle> | 2121 | </beginLabelStyle> |
2032 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OVL4WBEJEe2AArBmfNpEZA" showIcon="false"/> | 2122 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="__zCMBROzEe-4k7CzzL6IsA" showIcon="false"/> |
2033 | </ownedStyle> | 2123 | </ownedStyle> |
2034 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/> | 2124 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/> |
2035 | </ownedDiagramElements> | 2125 | </ownedDiagramElements> |
@@ -2072,12 +2162,12 @@ | |||
2072 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_WUsgHCrcEeyyC-O0_LlY9w" sourceNode="_NzpMACrZEeyyC-O0_LlY9w" targetNode="_RzK-YKA5EeuqkpDnuik1sg"> | 2162 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_WUsgHCrcEeyyC-O0_LlY9w" sourceNode="_NzpMACrZEeyyC-O0_LlY9w" targetNode="_RzK-YKA5EeuqkpDnuik1sg"> |
2073 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RuleDefinition"/> | 2163 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RuleDefinition"/> |
2074 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RuleDefinition"/> | 2164 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RuleDefinition"/> |
2075 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_OVMfAxEJEe2AArBmfNpEZA" targetArrow="InputClosedArrow" routingStyle="tree"> | 2165 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="__zCMCROzEe-4k7CzzL6IsA" targetArrow="InputClosedArrow" routingStyle="tree"> |
2076 | <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/> | 2166 | <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/> |
2077 | <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_OVMfBBEJEe2AArBmfNpEZA" showIcon="false"> | 2167 | <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="__zCMChOzEe-4k7CzzL6IsA" showIcon="false"> |
2078 | <labelFormat>italic</labelFormat> | 2168 | <labelFormat>italic</labelFormat> |
2079 | </beginLabelStyle> | 2169 | </beginLabelStyle> |
2080 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_OVMfBREJEe2AArBmfNpEZA" showIcon="false"/> | 2170 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="__zCMCxOzEe-4k7CzzL6IsA" showIcon="false"/> |
2081 | </ownedStyle> | 2171 | </ownedStyle> |
2082 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/> | 2172 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/> |
2083 | </ownedDiagramElements> | 2173 | </ownedDiagramElements> |
@@ -2680,6 +2770,76 @@ | |||
2680 | </ownedStyle> | 2770 | </ownedStyle> |
2681 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/> | 2771 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/> |
2682 | </ownedDiagramElements> | 2772 | </ownedDiagramElements> |
2773 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_3cdiQBOzEe-4k7CzzL6IsA" name="RuleKind" tooltipText="" width="12" height="10"> | ||
2774 | <target xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//RuleKind"/> | ||
2775 | <semanticElements xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//RuleKind"/> | ||
2776 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | ||
2777 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> | ||
2778 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> | ||
2779 | <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_3cdiQROzEe-4k7CzzL6IsA" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202"> | ||
2780 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/> | ||
2781 | </ownedStyle> | ||
2782 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"/> | ||
2783 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_5Cz1ABOzEe-4k7CzzL6IsA" name="REFINEMENT" tooltipText=""> | ||
2784 | <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//RuleKind/REFINEMENT"/> | ||
2785 | <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//RuleKind/REFINEMENT"/> | ||
2786 | <ownedStyle xmi:type="diagram:BundledImage" uid="_5Cz1AROzEe-4k7CzzL6IsA" labelAlignment="LEFT"> | ||
2787 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/> | ||
2788 | </ownedStyle> | ||
2789 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> | ||
2790 | </ownedElements> | ||
2791 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_7Hb_MBOzEe-4k7CzzL6IsA" name="PROPAGATION" tooltipText=""> | ||
2792 | <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//RuleKind/PROPAGATION"/> | ||
2793 | <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//RuleKind/PROPAGATION"/> | ||
2794 | <ownedStyle xmi:type="diagram:BundledImage" uid="_7Hb_MROzEe-4k7CzzL6IsA" labelAlignment="LEFT"> | ||
2795 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/> | ||
2796 | </ownedStyle> | ||
2797 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> | ||
2798 | </ownedElements> | ||
2799 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_8JiVYBOzEe-4k7CzzL6IsA" name="DECISION" tooltipText=""> | ||
2800 | <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//RuleKind/DECISION"/> | ||
2801 | <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//RuleKind/DECISION"/> | ||
2802 | <ownedStyle xmi:type="diagram:BundledImage" uid="_8JiVYROzEe-4k7CzzL6IsA" labelAlignment="LEFT"> | ||
2803 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/> | ||
2804 | </ownedStyle> | ||
2805 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> | ||
2806 | </ownedElements> | ||
2807 | </ownedDiagramElements> | ||
2808 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_Z12NQBO0Ee-4k7CzzL6IsA" name="ParameterBinding" tooltipText="" width="12" height="10"> | ||
2809 | <target xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//ParameterBinding"/> | ||
2810 | <semanticElements xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//ParameterBinding"/> | ||
2811 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | ||
2812 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> | ||
2813 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> | ||
2814 | <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_Z12NQRO0Ee-4k7CzzL6IsA" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202"> | ||
2815 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/> | ||
2816 | </ownedStyle> | ||
2817 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"/> | ||
2818 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_eBCbUBO0Ee-4k7CzzL6IsA" name="SINGLE" tooltipText=""> | ||
2819 | <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//ParameterBinding/SINGLE"/> | ||
2820 | <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//ParameterBinding/SINGLE"/> | ||
2821 | <ownedStyle xmi:type="diagram:BundledImage" uid="_eBCbURO0Ee-4k7CzzL6IsA" labelAlignment="LEFT"> | ||
2822 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/> | ||
2823 | </ownedStyle> | ||
2824 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> | ||
2825 | </ownedElements> | ||
2826 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_enuA0BO0Ee-4k7CzzL6IsA" name="FOCUS" tooltipText=""> | ||
2827 | <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//ParameterBinding/FOCUS"/> | ||
2828 | <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//ParameterBinding/FOCUS"/> | ||
2829 | <ownedStyle xmi:type="diagram:BundledImage" uid="_enun4BO0Ee-4k7CzzL6IsA" labelAlignment="LEFT"> | ||
2830 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/> | ||
2831 | </ownedStyle> | ||
2832 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> | ||
2833 | </ownedElements> | ||
2834 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_fGJCMBO0Ee-4k7CzzL6IsA" name="MULTI" tooltipText=""> | ||
2835 | <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//ParameterBinding/MULTI"/> | ||
2836 | <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//ParameterBinding/MULTI"/> | ||
2837 | <ownedStyle xmi:type="diagram:BundledImage" uid="_fGJCMRO0Ee-4k7CzzL6IsA" labelAlignment="LEFT"> | ||
2838 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/> | ||
2839 | </ownedStyle> | ||
2840 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> | ||
2841 | </ownedElements> | ||
2842 | </ownedDiagramElements> | ||
2683 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> | 2843 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> |
2684 | <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_CsWlsKA4EeuqkpDnuik1sg"/> | 2844 | <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_CsWlsKA4EeuqkpDnuik1sg"/> |
2685 | <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/> | 2845 | <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/> |
@@ -2724,7 +2884,7 @@ | |||
2724 | <styles xmi:type="notation:FilteringStyle" xmi:id="_bTgeLF3tEe2LuOZzJ_LhLg"/> | 2884 | <styles xmi:type="notation:FilteringStyle" xmi:id="_bTgeLF3tEe2LuOZzJ_LhLg"/> |
2725 | </children> | 2885 | </children> |
2726 | <styles xmi:type="notation:ShapeStyle" xmi:id="_bTgeJ13tEe2LuOZzJ_LhLg" fontName="Noto Sans" fontHeight="8"/> | 2886 | <styles xmi:type="notation:ShapeStyle" xmi:id="_bTgeJ13tEe2LuOZzJ_LhLg" fontName="Noto Sans" fontHeight="8"/> |
2727 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bTgeKF3tEe2LuOZzJ_LhLg" x="1955" y="168" width="120" height="100"/> | 2887 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bTgeKF3tEe2LuOZzJ_LhLg" x="2123" y="168" width="120" height="100"/> |
2728 | </children> | 2888 | </children> |
2729 | <children xmi:type="notation:Node" xmi:id="_meWJcF3uEe2LuOZzJ_LhLg" type="2003" element="_mdrbEF3uEe2LuOZzJ_LhLg"> | 2889 | <children xmi:type="notation:Node" xmi:id="_meWJcF3uEe2LuOZzJ_LhLg" type="2003" element="_mdrbEF3uEe2LuOZzJ_LhLg"> |
2730 | <children xmi:type="notation:Node" xmi:id="_meWwgF3uEe2LuOZzJ_LhLg" type="5007"/> | 2890 | <children xmi:type="notation:Node" xmi:id="_meWwgF3uEe2LuOZzJ_LhLg" type="5007"/> |
@@ -2791,7 +2951,7 @@ | |||
2791 | <styles xmi:type="notation:FilteringStyle" xmi:id="_ccRVpl3wEe2LuOZzJ_LhLg"/> | 2951 | <styles xmi:type="notation:FilteringStyle" xmi:id="_ccRVpl3wEe2LuOZzJ_LhLg"/> |
2792 | </children> | 2952 | </children> |
2793 | <styles xmi:type="notation:ShapeStyle" xmi:id="_ccRVoV3wEe2LuOZzJ_LhLg" fontName="Noto Sans" fontHeight="8"/> | 2953 | <styles xmi:type="notation:ShapeStyle" xmi:id="_ccRVoV3wEe2LuOZzJ_LhLg" fontName="Noto Sans" fontHeight="8"/> |
2794 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ccRVol3wEe2LuOZzJ_LhLg" x="1616" y="450" width="120" height="165"/> | 2954 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ccRVol3wEe2LuOZzJ_LhLg" x="1784" y="450" width="120" height="165"/> |
2795 | </children> | 2955 | </children> |
2796 | <children xmi:type="notation:Node" xmi:id="_R7b9sF38Ee2LuOZzJ_LhLg" type="2003" element="_R7XFMF38Ee2LuOZzJ_LhLg"> | 2956 | <children xmi:type="notation:Node" xmi:id="_R7b9sF38Ee2LuOZzJ_LhLg" type="2003" element="_R7XFMF38Ee2LuOZzJ_LhLg"> |
2797 | <children xmi:type="notation:Node" xmi:id="_R7b9s138Ee2LuOZzJ_LhLg" type="5007"/> | 2957 | <children xmi:type="notation:Node" xmi:id="_R7b9s138Ee2LuOZzJ_LhLg" type="5007"/> |
@@ -2840,7 +3000,7 @@ | |||
2840 | <styles xmi:type="notation:FilteringStyle" xmi:id="_87Ju5l4IEe2LuOZzJ_LhLg"/> | 3000 | <styles xmi:type="notation:FilteringStyle" xmi:id="_87Ju5l4IEe2LuOZzJ_LhLg"/> |
2841 | </children> | 3001 | </children> |
2842 | <styles xmi:type="notation:ShapeStyle" xmi:id="_87Ju4V4IEe2LuOZzJ_LhLg" fontName="Noto Sans" fontHeight="8" italic="true"/> | 3002 | <styles xmi:type="notation:ShapeStyle" xmi:id="_87Ju4V4IEe2LuOZzJ_LhLg" fontName="Noto Sans" fontHeight="8" italic="true"/> |
2843 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_87Ju4l4IEe2LuOZzJ_LhLg" x="2820" y="168"/> | 3003 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_87Ju4l4IEe2LuOZzJ_LhLg" x="2988" y="168"/> |
2844 | </children> | 3004 | </children> |
2845 | <children xmi:type="notation:Node" xmi:id="_JYXdgF4JEe2LuOZzJ_LhLg" type="2003" element="_JYQIwF4JEe2LuOZzJ_LhLg"> | 3005 | <children xmi:type="notation:Node" xmi:id="_JYXdgF4JEe2LuOZzJ_LhLg" type="2003" element="_JYQIwF4JEe2LuOZzJ_LhLg"> |
2846 | <children xmi:type="notation:Node" xmi:id="_JYXdg14JEe2LuOZzJ_LhLg" type="5007"/> | 3006 | <children xmi:type="notation:Node" xmi:id="_JYXdg14JEe2LuOZzJ_LhLg" type="5007"/> |
@@ -2853,7 +3013,7 @@ | |||
2853 | <styles xmi:type="notation:FilteringStyle" xmi:id="_JYXdhl4JEe2LuOZzJ_LhLg"/> | 3013 | <styles xmi:type="notation:FilteringStyle" xmi:id="_JYXdhl4JEe2LuOZzJ_LhLg"/> |
2854 | </children> | 3014 | </children> |
2855 | <styles xmi:type="notation:ShapeStyle" xmi:id="_JYXdgV4JEe2LuOZzJ_LhLg" fontName="Noto Sans" fontHeight="8"/> | 3015 | <styles xmi:type="notation:ShapeStyle" xmi:id="_JYXdgV4JEe2LuOZzJ_LhLg" fontName="Noto Sans" fontHeight="8"/> |
2856 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JYXdgl4JEe2LuOZzJ_LhLg" x="2456" y="312"/> | 3016 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JYXdgl4JEe2LuOZzJ_LhLg" x="2624" y="312"/> |
2857 | </children> | 3017 | </children> |
2858 | <children xmi:type="notation:Node" xmi:id="_JYYEkF4JEe2LuOZzJ_LhLg" type="2003" element="_JYQIw14JEe2LuOZzJ_LhLg"> | 3018 | <children xmi:type="notation:Node" xmi:id="_JYYEkF4JEe2LuOZzJ_LhLg" type="2003" element="_JYQIw14JEe2LuOZzJ_LhLg"> |
2859 | <children xmi:type="notation:Node" xmi:id="_JYYEk14JEe2LuOZzJ_LhLg" type="5007"/> | 3019 | <children xmi:type="notation:Node" xmi:id="_JYYEk14JEe2LuOZzJ_LhLg" type="5007"/> |
@@ -2866,7 +3026,7 @@ | |||
2866 | <styles xmi:type="notation:FilteringStyle" xmi:id="_JYYEll4JEe2LuOZzJ_LhLg"/> | 3026 | <styles xmi:type="notation:FilteringStyle" xmi:id="_JYYEll4JEe2LuOZzJ_LhLg"/> |
2867 | </children> | 3027 | </children> |
2868 | <styles xmi:type="notation:ShapeStyle" xmi:id="_JYYEkV4JEe2LuOZzJ_LhLg" fontName="Noto Sans" fontHeight="8"/> | 3028 | <styles xmi:type="notation:ShapeStyle" xmi:id="_JYYEkV4JEe2LuOZzJ_LhLg" fontName="Noto Sans" fontHeight="8"/> |
2869 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JYYEkl4JEe2LuOZzJ_LhLg" x="2605" y="312"/> | 3029 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JYYEkl4JEe2LuOZzJ_LhLg" x="2773" y="312"/> |
2870 | </children> | 3030 | </children> |
2871 | <children xmi:type="notation:Node" xmi:id="_JYYEl14JEe2LuOZzJ_LhLg" type="2003" element="_JYQv0l4JEe2LuOZzJ_LhLg"> | 3031 | <children xmi:type="notation:Node" xmi:id="_JYYEl14JEe2LuOZzJ_LhLg" type="2003" element="_JYQv0l4JEe2LuOZzJ_LhLg"> |
2872 | <children xmi:type="notation:Node" xmi:id="_JYYEml4JEe2LuOZzJ_LhLg" type="5007"/> | 3032 | <children xmi:type="notation:Node" xmi:id="_JYYEml4JEe2LuOZzJ_LhLg" type="5007"/> |
@@ -2879,7 +3039,7 @@ | |||
2879 | <styles xmi:type="notation:FilteringStyle" xmi:id="_JYYEnV4JEe2LuOZzJ_LhLg"/> | 3039 | <styles xmi:type="notation:FilteringStyle" xmi:id="_JYYEnV4JEe2LuOZzJ_LhLg"/> |
2880 | </children> | 3040 | </children> |
2881 | <styles xmi:type="notation:ShapeStyle" xmi:id="_JYYEmF4JEe2LuOZzJ_LhLg" fontName="Noto Sans" fontHeight="8"/> | 3041 | <styles xmi:type="notation:ShapeStyle" xmi:id="_JYYEmF4JEe2LuOZzJ_LhLg" fontName="Noto Sans" fontHeight="8"/> |
2882 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JYYEmV4JEe2LuOZzJ_LhLg" x="2792" y="312"/> | 3042 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JYYEmV4JEe2LuOZzJ_LhLg" x="2960" y="312"/> |
2883 | </children> | 3043 | </children> |
2884 | <children xmi:type="notation:Node" xmi:id="_9AqPEF4KEe2m7IaHDkh2Xg" type="2003" element="_9AeB0F4KEe2m7IaHDkh2Xg"> | 3044 | <children xmi:type="notation:Node" xmi:id="_9AqPEF4KEe2m7IaHDkh2Xg" type="2003" element="_9AeB0F4KEe2m7IaHDkh2Xg"> |
2885 | <children xmi:type="notation:Node" xmi:id="_9ArdMF4KEe2m7IaHDkh2Xg" type="5007"/> | 3045 | <children xmi:type="notation:Node" xmi:id="_9ArdMF4KEe2m7IaHDkh2Xg" type="5007"/> |
@@ -2910,7 +3070,7 @@ | |||
2910 | <styles xmi:type="notation:FilteringStyle" xmi:id="_GNwrhmTUEe2qdtyPWAtoxA"/> | 3070 | <styles xmi:type="notation:FilteringStyle" xmi:id="_GNwrhmTUEe2qdtyPWAtoxA"/> |
2911 | </children> | 3071 | </children> |
2912 | <styles xmi:type="notation:ShapeStyle" xmi:id="_GNwrgWTUEe2qdtyPWAtoxA" fontName="Noto Sans" fontHeight="8"/> | 3072 | <styles xmi:type="notation:ShapeStyle" xmi:id="_GNwrgWTUEe2qdtyPWAtoxA" fontName="Noto Sans" fontHeight="8"/> |
2913 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GNwrgmTUEe2qdtyPWAtoxA" x="1952" y="312" width="123"/> | 3073 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GNwrgmTUEe2qdtyPWAtoxA" x="2120" y="312" width="123"/> |
2914 | </children> | 3074 | </children> |
2915 | <children xmi:type="notation:Node" xmi:id="_M-upAGTUEe2qdtyPWAtoxA" type="2003" element="_M-ZR0GTUEe2qdtyPWAtoxA"> | 3075 | <children xmi:type="notation:Node" xmi:id="_M-upAGTUEe2qdtyPWAtoxA" type="2003" element="_M-ZR0GTUEe2qdtyPWAtoxA"> |
2916 | <children xmi:type="notation:Node" xmi:id="_M-upA2TUEe2qdtyPWAtoxA" type="5007"/> | 3076 | <children xmi:type="notation:Node" xmi:id="_M-upA2TUEe2qdtyPWAtoxA" type="5007"/> |
@@ -2923,7 +3083,7 @@ | |||
2923 | <styles xmi:type="notation:FilteringStyle" xmi:id="_M-upBmTUEe2qdtyPWAtoxA"/> | 3083 | <styles xmi:type="notation:FilteringStyle" xmi:id="_M-upBmTUEe2qdtyPWAtoxA"/> |
2924 | </children> | 3084 | </children> |
2925 | <styles xmi:type="notation:ShapeStyle" xmi:id="_M-upAWTUEe2qdtyPWAtoxA" fontName="Noto Sans" fontHeight="8"/> | 3085 | <styles xmi:type="notation:ShapeStyle" xmi:id="_M-upAWTUEe2qdtyPWAtoxA" fontName="Noto Sans" fontHeight="8"/> |
2926 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M-upAmTUEe2qdtyPWAtoxA" x="1608" y="312" width="135" height="100"/> | 3086 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M-upAmTUEe2qdtyPWAtoxA" x="1776" y="312" width="135" height="100"/> |
2927 | </children> | 3087 | </children> |
2928 | <children xmi:type="notation:Node" xmi:id="_QkXS8GTUEe2qdtyPWAtoxA" type="2003" element="_QkP-MGTUEe2qdtyPWAtoxA"> | 3088 | <children xmi:type="notation:Node" xmi:id="_QkXS8GTUEe2qdtyPWAtoxA" type="2003" element="_QkP-MGTUEe2qdtyPWAtoxA"> |
2929 | <children xmi:type="notation:Node" xmi:id="_QkXS82TUEe2qdtyPWAtoxA" type="5007"/> | 3089 | <children xmi:type="notation:Node" xmi:id="_QkXS82TUEe2qdtyPWAtoxA" type="5007"/> |
@@ -2968,7 +3128,7 @@ | |||
2968 | <styles xmi:type="notation:FilteringStyle" xmi:id="_QkXS9mTUEe2qdtyPWAtoxA"/> | 3128 | <styles xmi:type="notation:FilteringStyle" xmi:id="_QkXS9mTUEe2qdtyPWAtoxA"/> |
2969 | </children> | 3129 | </children> |
2970 | <styles xmi:type="notation:ShapeStyle" xmi:id="_QkXS8WTUEe2qdtyPWAtoxA" fontName="Noto Sans" fontHeight="8"/> | 3130 | <styles xmi:type="notation:ShapeStyle" xmi:id="_QkXS8WTUEe2qdtyPWAtoxA" fontName="Noto Sans" fontHeight="8"/> |
2971 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QkXS8mTUEe2qdtyPWAtoxA" x="1954" y="448" height="179"/> | 3131 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QkXS8mTUEe2qdtyPWAtoxA" x="2122" y="448" height="179"/> |
2972 | </children> | 3132 | </children> |
2973 | <children xmi:type="notation:Node" xmi:id="_36XqIGTuEe2qdtyPWAtoxA" type="2003" element="_36CS8GTuEe2qdtyPWAtoxA"> | 3133 | <children xmi:type="notation:Node" xmi:id="_36XqIGTuEe2qdtyPWAtoxA" type="2003" element="_36CS8GTuEe2qdtyPWAtoxA"> |
2974 | <children xmi:type="notation:Node" xmi:id="_36YRMGTuEe2qdtyPWAtoxA" type="5007"/> | 3134 | <children xmi:type="notation:Node" xmi:id="_36YRMGTuEe2qdtyPWAtoxA" type="5007"/> |
@@ -3017,7 +3177,7 @@ | |||
3017 | <styles xmi:type="notation:FilteringStyle" xmi:id="_3ahdpmgpEe24RpwpWgpkFQ"/> | 3177 | <styles xmi:type="notation:FilteringStyle" xmi:id="_3ahdpmgpEe24RpwpWgpkFQ"/> |
3018 | </children> | 3178 | </children> |
3019 | <styles xmi:type="notation:ShapeStyle" xmi:id="_3ahdoWgpEe24RpwpWgpkFQ" fontName="Noto Sans" fontHeight="8"/> | 3179 | <styles xmi:type="notation:ShapeStyle" xmi:id="_3ahdoWgpEe24RpwpWgpkFQ" fontName="Noto Sans" fontHeight="8"/> |
3020 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3ahdomgpEe24RpwpWgpkFQ" x="2120" y="312" width="120" height="100"/> | 3180 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3ahdomgpEe24RpwpWgpkFQ" x="2288" y="312" width="120" height="100"/> |
3021 | </children> | 3181 | </children> |
3022 | <children xmi:type="notation:Node" xmi:id="_ZjfaEGkGEe24rIYSlCjKHA" type="2003" element="_Zi8AcGkGEe24rIYSlCjKHA"> | 3182 | <children xmi:type="notation:Node" xmi:id="_ZjfaEGkGEe24rIYSlCjKHA" type="2003" element="_Zi8AcGkGEe24rIYSlCjKHA"> |
3023 | <children xmi:type="notation:Node" xmi:id="_ZjkSkGkGEe24rIYSlCjKHA" type="5007"/> | 3183 | <children xmi:type="notation:Node" xmi:id="_ZjkSkGkGEe24rIYSlCjKHA" type="5007"/> |
@@ -3030,7 +3190,7 @@ | |||
3030 | <styles xmi:type="notation:FilteringStyle" xmi:id="_ZjkSk2kGEe24rIYSlCjKHA"/> | 3190 | <styles xmi:type="notation:FilteringStyle" xmi:id="_ZjkSk2kGEe24rIYSlCjKHA"/> |
3031 | </children> | 3191 | </children> |
3032 | <styles xmi:type="notation:ShapeStyle" xmi:id="_ZjfaEWkGEe24rIYSlCjKHA" fontName="Noto Sans" fontHeight="8"/> | 3192 | <styles xmi:type="notation:ShapeStyle" xmi:id="_ZjfaEWkGEe24rIYSlCjKHA" fontName="Noto Sans" fontHeight="8"/> |
3033 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZjfaEmkGEe24rIYSlCjKHA" x="3120" y="312" width="120" height="100"/> | 3193 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZjfaEmkGEe24rIYSlCjKHA" x="3288" y="312" width="120" height="100"/> |
3034 | </children> | 3194 | </children> |
3035 | <children xmi:type="notation:Node" xmi:id="_fdU7QGkGEe24rIYSlCjKHA" type="2003" element="_fdLKQGkGEe24rIYSlCjKHA"> | 3195 | <children xmi:type="notation:Node" xmi:id="_fdU7QGkGEe24rIYSlCjKHA" type="2003" element="_fdLKQGkGEe24rIYSlCjKHA"> |
3036 | <children xmi:type="notation:Node" xmi:id="_fdViUGkGEe24rIYSlCjKHA" type="5007"/> | 3196 | <children xmi:type="notation:Node" xmi:id="_fdViUGkGEe24rIYSlCjKHA" type="5007"/> |
@@ -3055,7 +3215,7 @@ | |||
3055 | <styles xmi:type="notation:FilteringStyle" xmi:id="_fdViU2kGEe24rIYSlCjKHA"/> | 3215 | <styles xmi:type="notation:FilteringStyle" xmi:id="_fdViU2kGEe24rIYSlCjKHA"/> |
3056 | </children> | 3216 | </children> |
3057 | <styles xmi:type="notation:ShapeStyle" xmi:id="_fdU7QWkGEe24rIYSlCjKHA" fontName="Noto Sans" fontHeight="8"/> | 3217 | <styles xmi:type="notation:ShapeStyle" xmi:id="_fdU7QWkGEe24rIYSlCjKHA" fontName="Noto Sans" fontHeight="8"/> |
3058 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fdU7QmkGEe24rIYSlCjKHA" x="3120" y="449"/> | 3218 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fdU7QmkGEe24rIYSlCjKHA" x="3288" y="449"/> |
3059 | </children> | 3219 | </children> |
3060 | <children xmi:type="notation:Node" xmi:id="_IYGPgNZUEe69IbObpvsypA" type="2003" element="_IXrYwNZUEe69IbObpvsypA"> | 3220 | <children xmi:type="notation:Node" xmi:id="_IYGPgNZUEe69IbObpvsypA" type="2003" element="_IXrYwNZUEe69IbObpvsypA"> |
3061 | <children xmi:type="notation:Node" xmi:id="_IYGPg9ZUEe69IbObpvsypA" type="5007"/> | 3221 | <children xmi:type="notation:Node" xmi:id="_IYGPg9ZUEe69IbObpvsypA" type="5007"/> |
@@ -3068,7 +3228,7 @@ | |||
3068 | <styles xmi:type="notation:FilteringStyle" xmi:id="_IYGPhtZUEe69IbObpvsypA"/> | 3228 | <styles xmi:type="notation:FilteringStyle" xmi:id="_IYGPhtZUEe69IbObpvsypA"/> |
3069 | </children> | 3229 | </children> |
3070 | <styles xmi:type="notation:ShapeStyle" xmi:id="_IYGPgdZUEe69IbObpvsypA" fontName="Noto Sans" fontHeight="8"/> | 3230 | <styles xmi:type="notation:ShapeStyle" xmi:id="_IYGPgdZUEe69IbObpvsypA" fontName="Noto Sans" fontHeight="8"/> |
3071 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IYGPgtZUEe69IbObpvsypA" x="1784" y="312" width="120" height="100"/> | 3231 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IYGPgtZUEe69IbObpvsypA" x="1952" y="312" width="120" height="100"/> |
3072 | </children> | 3232 | </children> |
3073 | <children xmi:type="notation:Node" xmi:id="_Nm2zYNZUEe69IbObpvsypA" type="2003" element="_Nmg1INZUEe69IbObpvsypA"> | 3233 | <children xmi:type="notation:Node" xmi:id="_Nm2zYNZUEe69IbObpvsypA" type="2003" element="_Nmg1INZUEe69IbObpvsypA"> |
3074 | <children xmi:type="notation:Node" xmi:id="_Nm2zY9ZUEe69IbObpvsypA" type="5007"/> | 3234 | <children xmi:type="notation:Node" xmi:id="_Nm2zY9ZUEe69IbObpvsypA" type="5007"/> |
@@ -3085,7 +3245,7 @@ | |||
3085 | <styles xmi:type="notation:FilteringStyle" xmi:id="_Nm3actZUEe69IbObpvsypA"/> | 3245 | <styles xmi:type="notation:FilteringStyle" xmi:id="_Nm3actZUEe69IbObpvsypA"/> |
3086 | </children> | 3246 | </children> |
3087 | <styles xmi:type="notation:ShapeStyle" xmi:id="_Nm2zYdZUEe69IbObpvsypA" fontName="Noto Sans" fontHeight="8"/> | 3247 | <styles xmi:type="notation:ShapeStyle" xmi:id="_Nm2zYdZUEe69IbObpvsypA" fontName="Noto Sans" fontHeight="8"/> |
3088 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nm2zYtZUEe69IbObpvsypA" x="1784" y="449" width="120" height="100"/> | 3248 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Nm2zYtZUEe69IbObpvsypA" x="1952" y="449" width="120" height="100"/> |
3089 | </children> | 3249 | </children> |
3090 | <children xmi:type="notation:Node" xmi:id="_FTa2MNZXEe69IbObpvsypA" type="2003" element="_FTH7QNZXEe69IbObpvsypA"> | 3250 | <children xmi:type="notation:Node" xmi:id="_FTa2MNZXEe69IbObpvsypA" type="2003" element="_FTH7QNZXEe69IbObpvsypA"> |
3091 | <children xmi:type="notation:Node" xmi:id="_FTbdQNZXEe69IbObpvsypA" type="5007"/> | 3251 | <children xmi:type="notation:Node" xmi:id="_FTbdQNZXEe69IbObpvsypA" type="5007"/> |
@@ -3103,7 +3263,7 @@ | |||
3103 | <styles xmi:type="notation:FilteringStyle" xmi:id="_c0zXctcIEe6pjNxdSs0E0Q"/> | 3263 | <styles xmi:type="notation:FilteringStyle" xmi:id="_c0zXctcIEe6pjNxdSs0E0Q"/> |
3104 | </children> | 3264 | </children> |
3105 | <styles xmi:type="notation:ShapeStyle" xmi:id="_c0ue8NcIEe6pjNxdSs0E0Q" fontName="Noto Sans" fontHeight="8"/> | 3265 | <styles xmi:type="notation:ShapeStyle" xmi:id="_c0ue8NcIEe6pjNxdSs0E0Q" fontName="Noto Sans" fontHeight="8"/> |
3106 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c0ue8dcIEe6pjNxdSs0E0Q" x="2288" y="312" width="120" height="100"/> | 3266 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c0ue8dcIEe6pjNxdSs0E0Q" x="2456" y="312" width="120" height="100"/> |
3107 | </children> | 3267 | </children> |
3108 | <children xmi:type="notation:Node" xmi:id="_hOS68NjvEe66mJJuF_pPGg" type="2003" element="_hNitANjvEe66mJJuF_pPGg"> | 3268 | <children xmi:type="notation:Node" xmi:id="_hOS68NjvEe66mJJuF_pPGg" type="2003" element="_hNitANjvEe66mJJuF_pPGg"> |
3109 | <children xmi:type="notation:Node" xmi:id="_hOYagNjvEe66mJJuF_pPGg" type="5007"/> | 3269 | <children xmi:type="notation:Node" xmi:id="_hOYagNjvEe66mJJuF_pPGg" type="5007"/> |
@@ -3112,7 +3272,7 @@ | |||
3112 | <styles xmi:type="notation:FilteringStyle" xmi:id="_hOZBktjvEe66mJJuF_pPGg"/> | 3272 | <styles xmi:type="notation:FilteringStyle" xmi:id="_hOZBktjvEe66mJJuF_pPGg"/> |
3113 | </children> | 3273 | </children> |
3114 | <styles xmi:type="notation:ShapeStyle" xmi:id="_hOS68djvEe66mJJuF_pPGg" fontName="Noto Sans" fontHeight="8"/> | 3274 | <styles xmi:type="notation:ShapeStyle" xmi:id="_hOS68djvEe66mJJuF_pPGg" fontName="Noto Sans" fontHeight="8"/> |
3115 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hOS68tjvEe66mJJuF_pPGg" x="2964" y="312" width="120" height="100"/> | 3275 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hOS68tjvEe66mJJuF_pPGg" x="3132" y="312" width="120" height="100"/> |
3116 | </children> | 3276 | </children> |
3117 | <children xmi:type="notation:Node" xmi:id="_tkOK4NsVEe6c9ehqpe3s7A" type="2003" element="_tkAvgNsVEe6c9ehqpe3s7A"> | 3277 | <children xmi:type="notation:Node" xmi:id="_tkOK4NsVEe6c9ehqpe3s7A" type="2003" element="_tkAvgNsVEe6c9ehqpe3s7A"> |
3118 | <children xmi:type="notation:Node" xmi:id="_tkOK49sVEe6c9ehqpe3s7A" type="5007"/> | 3278 | <children xmi:type="notation:Node" xmi:id="_tkOK49sVEe6c9ehqpe3s7A" type="5007"/> |
@@ -3123,6 +3283,61 @@ | |||
3123 | <styles xmi:type="notation:ShapeStyle" xmi:id="_tkOK4dsVEe6c9ehqpe3s7A" fontName="Noto Sans" fontHeight="8"/> | 3283 | <styles xmi:type="notation:ShapeStyle" xmi:id="_tkOK4dsVEe6c9ehqpe3s7A" fontName="Noto Sans" fontHeight="8"/> |
3124 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tkOK4tsVEe6c9ehqpe3s7A" x="919" y="448" width="147"/> | 3284 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tkOK4tsVEe6c9ehqpe3s7A" x="919" y="448" width="147"/> |
3125 | </children> | 3285 | </children> |
3286 | <children xmi:type="notation:Node" xmi:id="_c_yWgBOwEe-4k7CzzL6IsA" type="2003" element="_c_NHsBOwEe-4k7CzzL6IsA"> | ||
3287 | <children xmi:type="notation:Node" xmi:id="_c_3PABOwEe-4k7CzzL6IsA" type="5007"/> | ||
3288 | <children xmi:type="notation:Node" xmi:id="_c_32EBOwEe-4k7CzzL6IsA" type="7004"> | ||
3289 | <children xmi:type="notation:Node" xmi:id="_npv-0BOwEe-4k7CzzL6IsA" type="3010" element="_npF3gBOwEe-4k7CzzL6IsA"> | ||
3290 | <styles xmi:type="notation:FontStyle" xmi:id="_npv-0ROwEe-4k7CzzL6IsA" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/> | ||
3291 | <layoutConstraint xmi:type="notation:Location" xmi:id="_npv-0hOwEe-4k7CzzL6IsA"/> | ||
3292 | </children> | ||
3293 | <children xmi:type="notation:Node" xmi:id="_96Pv8BOxEe-4k7CzzL6IsA" type="3010" element="_95pTABOxEe-4k7CzzL6IsA"> | ||
3294 | <styles xmi:type="notation:FontStyle" xmi:id="_96Pv8ROxEe-4k7CzzL6IsA" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/> | ||
3295 | <layoutConstraint xmi:type="notation:Location" xmi:id="_96Pv8hOxEe-4k7CzzL6IsA"/> | ||
3296 | </children> | ||
3297 | <styles xmi:type="notation:SortingStyle" xmi:id="_c_32EROwEe-4k7CzzL6IsA"/> | ||
3298 | <styles xmi:type="notation:FilteringStyle" xmi:id="_c_32EhOwEe-4k7CzzL6IsA"/> | ||
3299 | </children> | ||
3300 | <styles xmi:type="notation:ShapeStyle" xmi:id="_c_yWgROwEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/> | ||
3301 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c_yWghOwEe-4k7CzzL6IsA" x="1608" y="312" width="120" height="123"/> | ||
3302 | </children> | ||
3303 | <children xmi:type="notation:Node" xmi:id="_gNr14BOwEe-4k7CzzL6IsA" type="2003" element="_gNJqYBOwEe-4k7CzzL6IsA"> | ||
3304 | <children xmi:type="notation:Node" xmi:id="_gNr14xOwEe-4k7CzzL6IsA" type="5007"/> | ||
3305 | <children xmi:type="notation:Node" xmi:id="_gNr15BOwEe-4k7CzzL6IsA" type="7004"> | ||
3306 | <children xmi:type="notation:Node" xmi:id="_huzqYBOwEe-4k7CzzL6IsA" type="3010" element="_huUiMBOwEe-4k7CzzL6IsA"> | ||
3307 | <styles xmi:type="notation:FontStyle" xmi:id="_huzqYROwEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/> | ||
3308 | <layoutConstraint xmi:type="notation:Location" xmi:id="_huzqYhOwEe-4k7CzzL6IsA"/> | ||
3309 | </children> | ||
3310 | <children xmi:type="notation:Node" xmi:id="_iW6zQBOwEe-4k7CzzL6IsA" type="3010" element="_iWYAsBOwEe-4k7CzzL6IsA"> | ||
3311 | <styles xmi:type="notation:FontStyle" xmi:id="_iW6zQROwEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/> | ||
3312 | <layoutConstraint xmi:type="notation:Location" xmi:id="_iW6zQhOwEe-4k7CzzL6IsA"/> | ||
3313 | </children> | ||
3314 | <children xmi:type="notation:Node" xmi:id="_nKNtsBOxEe-4k7CzzL6IsA" type="3010" element="_nJq7IBOxEe-4k7CzzL6IsA"> | ||
3315 | <styles xmi:type="notation:FontStyle" xmi:id="_nKNtsROxEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/> | ||
3316 | <layoutConstraint xmi:type="notation:Location" xmi:id="_nKNtshOxEe-4k7CzzL6IsA"/> | ||
3317 | </children> | ||
3318 | <styles xmi:type="notation:SortingStyle" xmi:id="_gNr15ROwEe-4k7CzzL6IsA"/> | ||
3319 | <styles xmi:type="notation:FilteringStyle" xmi:id="_gNr15hOwEe-4k7CzzL6IsA"/> | ||
3320 | </children> | ||
3321 | <styles xmi:type="notation:ShapeStyle" xmi:id="_gNr14ROwEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/> | ||
3322 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gNr14hOwEe-4k7CzzL6IsA" x="1608" y="600" width="120" height="100"/> | ||
3323 | </children> | ||
3324 | <children xmi:type="notation:Node" xmi:id="_4aF6EBOxEe-4k7CzzL6IsA" type="2003" element="_4ZutsBOxEe-4k7CzzL6IsA"> | ||
3325 | <children xmi:type="notation:Node" xmi:id="_4aF6ExOxEe-4k7CzzL6IsA" type="5007"/> | ||
3326 | <children xmi:type="notation:Node" xmi:id="_4aF6FBOxEe-4k7CzzL6IsA" type="7004"> | ||
3327 | <children xmi:type="notation:Node" xmi:id="_50fbgBOxEe-4k7CzzL6IsA" type="3010" element="_50L5gBOxEe-4k7CzzL6IsA"> | ||
3328 | <styles xmi:type="notation:FontStyle" xmi:id="_50fbgROxEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/> | ||
3329 | <layoutConstraint xmi:type="notation:Location" xmi:id="_50fbghOxEe-4k7CzzL6IsA"/> | ||
3330 | </children> | ||
3331 | <children xmi:type="notation:Node" xmi:id="_6dbDxhOxEe-4k7CzzL6IsA" type="3010" element="_6c108BOxEe-4k7CzzL6IsA"> | ||
3332 | <styles xmi:type="notation:FontStyle" xmi:id="_6dbDxxOxEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/> | ||
3333 | <layoutConstraint xmi:type="notation:Location" xmi:id="_6dbDyBOxEe-4k7CzzL6IsA"/> | ||
3334 | </children> | ||
3335 | <styles xmi:type="notation:SortingStyle" xmi:id="_4aF6FROxEe-4k7CzzL6IsA"/> | ||
3336 | <styles xmi:type="notation:FilteringStyle" xmi:id="_4aF6FhOxEe-4k7CzzL6IsA"/> | ||
3337 | </children> | ||
3338 | <styles xmi:type="notation:ShapeStyle" xmi:id="_4aF6EROxEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/> | ||
3339 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4aF6EhOxEe-4k7CzzL6IsA" x="1608" y="468" width="120" height="100"/> | ||
3340 | </children> | ||
3126 | <styles xmi:type="notation:DiagramStyle" xmi:id="_z1ff0l3lEe2LuOZzJ_LhLg"/> | 3341 | <styles xmi:type="notation:DiagramStyle" xmi:id="_z1ff0l3lEe2LuOZzJ_LhLg"/> |
3127 | <edges xmi:type="notation:Edge" xmi:id="_C-b04F3mEe2LuOZzJ_LhLg" type="4001" element="_C9_I8F3mEe2LuOZzJ_LhLg" source="_9ZUmgF3lEe2LuOZzJ_LhLg" target="_8bUtMF3lEe2LuOZzJ_LhLg"> | 3342 | <edges xmi:type="notation:Edge" xmi:id="_C-b04F3mEe2LuOZzJ_LhLg" type="4001" element="_C9_I8F3mEe2LuOZzJ_LhLg" source="_9ZUmgF3lEe2LuOZzJ_LhLg" target="_8bUtMF3lEe2LuOZzJ_LhLg"> |
3128 | <children xmi:type="notation:Node" xmi:id="_C-cb8F3mEe2LuOZzJ_LhLg" type="6001"> | 3343 | <children xmi:type="notation:Node" xmi:id="_C-cb8F3mEe2LuOZzJ_LhLg" type="6001"> |
@@ -3158,33 +3373,33 @@ | |||
3158 | </edges> | 3373 | </edges> |
3159 | <edges xmi:type="notation:Edge" xmi:id="_oAifgF3vEe2LuOZzJ_LhLg" type="4001" element="_oARZ0l3vEe2LuOZzJ_LhLg" source="_bTgeJl3tEe2LuOZzJ_LhLg" target="_3xZUsF3lEe2LuOZzJ_LhLg"> | 3374 | <edges xmi:type="notation:Edge" xmi:id="_oAifgF3vEe2LuOZzJ_LhLg" type="4001" element="_oARZ0l3vEe2LuOZzJ_LhLg" source="_bTgeJl3tEe2LuOZzJ_LhLg" target="_3xZUsF3lEe2LuOZzJ_LhLg"> |
3160 | <children xmi:type="notation:Node" xmi:id="_oAifhF3vEe2LuOZzJ_LhLg" type="6001"> | 3375 | <children xmi:type="notation:Node" xmi:id="_oAifhF3vEe2LuOZzJ_LhLg" type="6001"> |
3161 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAifhV3vEe2LuOZzJ_LhLg" x="-281" y="-38"/> | 3376 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAifhV3vEe2LuOZzJ_LhLg" x="-365" y="-38"/> |
3162 | </children> | 3377 | </children> |
3163 | <children xmi:type="notation:Node" xmi:id="_oAifhl3vEe2LuOZzJ_LhLg" type="6002"> | 3378 | <children xmi:type="notation:Node" xmi:id="_oAifhl3vEe2LuOZzJ_LhLg" type="6002"> |
3164 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAifh13vEe2LuOZzJ_LhLg" x="-26" y="-68"/> | 3379 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAifh13vEe2LuOZzJ_LhLg" x="-51" y="-68"/> |
3165 | </children> | 3380 | </children> |
3166 | <children xmi:type="notation:Node" xmi:id="_oAifiF3vEe2LuOZzJ_LhLg" type="6003"> | 3381 | <children xmi:type="notation:Node" xmi:id="_oAifiF3vEe2LuOZzJ_LhLg" type="6003"> |
3167 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAifiV3vEe2LuOZzJ_LhLg" x="-324" y="-10"/> | 3382 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oAifiV3vEe2LuOZzJ_LhLg" x="-299" y="-10"/> |
3168 | </children> | 3383 | </children> |
3169 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_oAifgV3vEe2LuOZzJ_LhLg" routing="Rectilinear"/> | 3384 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_oAifgV3vEe2LuOZzJ_LhLg" routing="Rectilinear"/> |
3170 | <styles xmi:type="notation:FontStyle" xmi:id="_oAifgl3vEe2LuOZzJ_LhLg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> | 3385 | <styles xmi:type="notation:FontStyle" xmi:id="_oAifgl3vEe2LuOZzJ_LhLg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> |
3171 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oAifg13vEe2LuOZzJ_LhLg" points="[6, 0, 802, 50]$[6, -96, 802, -46]$[-714, -96, 82, -46]"/> | 3386 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_oAifg13vEe2LuOZzJ_LhLg" points="[6, 0, 970, 50]$[6, -96, 970, -46]$[-882, -96, 82, -46]"/> |
3172 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oAifil3vEe2LuOZzJ_LhLg" id="(0.3050847457627119,0.0)"/> | 3387 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oAifil3vEe2LuOZzJ_LhLg" id="(0.3050847457627119,0.0)"/> |
3173 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oAifi13vEe2LuOZzJ_LhLg" id="(0.3050847457627119,1.0)"/> | 3388 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oAifi13vEe2LuOZzJ_LhLg" id="(0.3050847457627119,1.0)"/> |
3174 | </edges> | 3389 | </edges> |
3175 | <edges xmi:type="notation:Edge" xmi:id="_qyMHwF3vEe2LuOZzJ_LhLg" type="4001" element="_qx9eWF3vEe2LuOZzJ_LhLg" source="_bTgeJl3tEe2LuOZzJ_LhLg" target="_3xZUsF3lEe2LuOZzJ_LhLg"> | 3390 | <edges xmi:type="notation:Edge" xmi:id="_qyMHwF3vEe2LuOZzJ_LhLg" type="4001" element="_qx9eWF3vEe2LuOZzJ_LhLg" source="_bTgeJl3tEe2LuOZzJ_LhLg" target="_3xZUsF3lEe2LuOZzJ_LhLg"> |
3176 | <children xmi:type="notation:Node" xmi:id="_qyMHxF3vEe2LuOZzJ_LhLg" type="6001"> | 3391 | <children xmi:type="notation:Node" xmi:id="_qyMHxF3vEe2LuOZzJ_LhLg" type="6001"> |
3177 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qyMHxV3vEe2LuOZzJ_LhLg" x="-354" y="-62"/> | 3392 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qyMHxV3vEe2LuOZzJ_LhLg" x="-438" y="-62"/> |
3178 | </children> | 3393 | </children> |
3179 | <children xmi:type="notation:Node" xmi:id="_qyMHxl3vEe2LuOZzJ_LhLg" type="6002"> | 3394 | <children xmi:type="notation:Node" xmi:id="_qyMHxl3vEe2LuOZzJ_LhLg" type="6002"> |
3180 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qyMHx13vEe2LuOZzJ_LhLg" x="-10" y="-83"/> | 3395 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qyMHx13vEe2LuOZzJ_LhLg" x="-35" y="-83"/> |
3181 | </children> | 3396 | </children> |
3182 | <children xmi:type="notation:Node" xmi:id="_qyMHyF3vEe2LuOZzJ_LhLg" type="6003"> | 3397 | <children xmi:type="notation:Node" xmi:id="_qyMHyF3vEe2LuOZzJ_LhLg" type="6003"> |
3183 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qyMHyV3vEe2LuOZzJ_LhLg" x="-330" y="-10"/> | 3398 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qyMHyV3vEe2LuOZzJ_LhLg" x="-305" y="-10"/> |
3184 | </children> | 3399 | </children> |
3185 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_qyMHwV3vEe2LuOZzJ_LhLg" routing="Rectilinear"/> | 3400 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_qyMHwV3vEe2LuOZzJ_LhLg" routing="Rectilinear"/> |
3186 | <styles xmi:type="notation:FontStyle" xmi:id="_qyMHwl3vEe2LuOZzJ_LhLg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> | 3401 | <styles xmi:type="notation:FontStyle" xmi:id="_qyMHwl3vEe2LuOZzJ_LhLg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> |
3187 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qyMHw13vEe2LuOZzJ_LhLg" points="[0, 0, 796, 50]$[0, -120, 796, -70]$[-750, -120, 46, -70]"/> | 3402 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qyMHw13vEe2LuOZzJ_LhLg" points="[0, 0, 964, 50]$[0, -120, 964, -70]$[-918, -120, 46, -70]"/> |
3188 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qyMHyl3vEe2LuOZzJ_LhLg" id="(0.6101694915254238,0.0)"/> | 3403 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qyMHyl3vEe2LuOZzJ_LhLg" id="(0.6101694915254238,0.0)"/> |
3189 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qyMHy13vEe2LuOZzJ_LhLg" id="(0.6101694915254238,1.0)"/> | 3404 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_qyMHy13vEe2LuOZzJ_LhLg" id="(0.6101694915254238,1.0)"/> |
3190 | </edges> | 3405 | </edges> |
@@ -3732,6 +3947,22 @@ | |||
3732 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vaGudtsVEe6c9ehqpe3s7A" id="(0.503448275862069,1.0)"/> | 3947 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vaGudtsVEe6c9ehqpe3s7A" id="(0.503448275862069,1.0)"/> |
3733 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vaGud9sVEe6c9ehqpe3s7A" id="(0.503448275862069,0.0)"/> | 3948 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vaGud9sVEe6c9ehqpe3s7A" id="(0.503448275862069,0.0)"/> |
3734 | </edges> | 3949 | </edges> |
3950 | <edges xmi:type="notation:Edge" xmi:id="_nOVOIBOwEe-4k7CzzL6IsA" type="4001" element="_nN6XfhOwEe-4k7CzzL6IsA" source="_c_yWgBOwEe-4k7CzzL6IsA" target="_meWJcF3uEe2LuOZzJ_LhLg"> | ||
3951 | <children xmi:type="notation:Node" xmi:id="_nOZfkBOwEe-4k7CzzL6IsA" type="6001"> | ||
3952 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nOZfkROwEe-4k7CzzL6IsA" y="-10"/> | ||
3953 | </children> | ||
3954 | <children xmi:type="notation:Node" xmi:id="_nOaGoBOwEe-4k7CzzL6IsA" type="6002"> | ||
3955 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nOaGoROwEe-4k7CzzL6IsA" y="10"/> | ||
3956 | </children> | ||
3957 | <children xmi:type="notation:Node" xmi:id="_nOaGohOwEe-4k7CzzL6IsA" type="6003"> | ||
3958 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nOaGoxOwEe-4k7CzzL6IsA" y="10"/> | ||
3959 | </children> | ||
3960 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_nOVOIROwEe-4k7CzzL6IsA" routing="Tree"/> | ||
3961 | <styles xmi:type="notation:FontStyle" xmi:id="_nOVOIhOwEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/> | ||
3962 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nOVOIxOwEe-4k7CzzL6IsA" points="[0, 0, 199, 72]$[-199, -72, 0, 0]"/> | ||
3963 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nOb70BOwEe-4k7CzzL6IsA" id="(0.5084745762711864,0.0)"/> | ||
3964 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nOb70ROwEe-4k7CzzL6IsA" id="(0.5,0.5)"/> | ||
3965 | </edges> | ||
3735 | </data> | 3966 | </data> |
3736 | </ownedAnnotationEntries> | 3967 | </ownedAnnotationEntries> |
3737 | <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_z1k_YV3lEe2LuOZzJ_LhLg" source="DANNOTATION_CUSTOMIZATION_KEY"> | 3968 | <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_z1k_YV3lEe2LuOZzJ_LhLg" source="DANNOTATION_CUSTOMIZATION_KEY"> |
@@ -3808,7 +4039,7 @@ | |||
3808 | </ownedStyle> | 4039 | </ownedStyle> |
3809 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> | 4040 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> |
3810 | </ownedDiagramElements> | 4041 | </ownedDiagramElements> |
3811 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_mdrbEF3uEe2LuOZzJ_LhLg" name="UnaryExpr" tooltipText="" outgoingEdges="_FMB-xl3vEe2LuOZzJ_LhLg _uSiCAF3vEe2LuOZzJ_LhLg" incomingEdges="_vB8OTF4GEe2LuOZzJ_LhLg _EUlvyF4LEe2m7IaHDkh2Xg" width="12" height="10"> | 4042 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_mdrbEF3uEe2LuOZzJ_LhLg" name="UnaryExpr" tooltipText="" outgoingEdges="_FMB-xl3vEe2LuOZzJ_LhLg _uSiCAF3vEe2LuOZzJ_LhLg" incomingEdges="_vB8OTF4GEe2LuOZzJ_LhLg _EUlvyF4LEe2m7IaHDkh2Xg _nN6XfhOwEe-4k7CzzL6IsA" width="12" height="10"> |
3812 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//UnaryExpr"/> | 4043 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//UnaryExpr"/> |
3813 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//UnaryExpr"/> | 4044 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//UnaryExpr"/> |
3814 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | 4045 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> |
@@ -4852,6 +5083,107 @@ | |||
4852 | </ownedStyle> | 5083 | </ownedStyle> |
4853 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> | 5084 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> |
4854 | </ownedDiagramElements> | 5085 | </ownedDiagramElements> |
5086 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_c_NHsBOwEe-4k7CzzL6IsA" name="ModalExpr" tooltipText="" outgoingEdges="_nN6XfhOwEe-4k7CzzL6IsA" width="12" height="10"> | ||
5087 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ModalExpr"/> | ||
5088 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ModalExpr"/> | ||
5089 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | ||
5090 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> | ||
5091 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> | ||
5092 | <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_-VI8ShOxEe-4k7CzzL6IsA" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> | ||
5093 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> | ||
5094 | </ownedStyle> | ||
5095 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> | ||
5096 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_npF3gBOwEe-4k7CzzL6IsA" name="concreteness : Concreteness = PARTIAL" tooltipText=""> | ||
5097 | <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//ModalExpr/concreteness"/> | ||
5098 | <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//ModalExpr/concreteness"/> | ||
5099 | <ownedStyle xmi:type="diagram:BundledImage" uid="_oXtRAROwEe-4k7CzzL6IsA" labelAlignment="LEFT"> | ||
5100 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/> | ||
5101 | </ownedStyle> | ||
5102 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> | ||
5103 | </ownedElements> | ||
5104 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_95pTABOxEe-4k7CzzL6IsA" name="modality : Modality = NONE" tooltipText=""> | ||
5105 | <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//ModalExpr/modality"/> | ||
5106 | <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//ModalExpr/modality"/> | ||
5107 | <ownedStyle xmi:type="diagram:BundledImage" uid="_-VKxYROxEe-4k7CzzL6IsA" labelAlignment="LEFT"> | ||
5108 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/> | ||
5109 | </ownedStyle> | ||
5110 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> | ||
5111 | </ownedElements> | ||
5112 | </ownedDiagramElements> | ||
5113 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_gNJqYBOwEe-4k7CzzL6IsA" name="Modality" tooltipText="" width="12" height="10"> | ||
5114 | <target xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//Modality"/> | ||
5115 | <semanticElements xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//Modality"/> | ||
5116 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | ||
5117 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> | ||
5118 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> | ||
5119 | <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_gNJqYROwEe-4k7CzzL6IsA" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202"> | ||
5120 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/> | ||
5121 | </ownedStyle> | ||
5122 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"/> | ||
5123 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_huUiMBOwEe-4k7CzzL6IsA" name="NONE" tooltipText=""> | ||
5124 | <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//Modality/NONE"/> | ||
5125 | <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//Modality/NONE"/> | ||
5126 | <ownedStyle xmi:type="diagram:BundledImage" uid="_huUiMROwEe-4k7CzzL6IsA" labelAlignment="LEFT"> | ||
5127 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/> | ||
5128 | </ownedStyle> | ||
5129 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> | ||
5130 | </ownedElements> | ||
5131 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_iWYAsBOwEe-4k7CzzL6IsA" name="MUST" tooltipText=""> | ||
5132 | <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//Modality/MUST"/> | ||
5133 | <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//Modality/MUST"/> | ||
5134 | <ownedStyle xmi:type="diagram:BundledImage" uid="_iWYAsROwEe-4k7CzzL6IsA" labelAlignment="LEFT"> | ||
5135 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/> | ||
5136 | </ownedStyle> | ||
5137 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> | ||
5138 | </ownedElements> | ||
5139 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_nJq7IBOxEe-4k7CzzL6IsA" name="MAY" tooltipText=""> | ||
5140 | <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//Modality/MAY"/> | ||
5141 | <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//Modality/MAY"/> | ||
5142 | <ownedStyle xmi:type="diagram:BundledImage" uid="_nJq7IROxEe-4k7CzzL6IsA" labelAlignment="LEFT"> | ||
5143 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/> | ||
5144 | </ownedStyle> | ||
5145 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> | ||
5146 | </ownedElements> | ||
5147 | </ownedDiagramElements> | ||
5148 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_nN6XfhOwEe-4k7CzzL6IsA" sourceNode="_c_NHsBOwEe-4k7CzzL6IsA" targetNode="_mdrbEF3uEe2LuOZzJ_LhLg"> | ||
5149 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ModalExpr"/> | ||
5150 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ModalExpr"/> | ||
5151 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_-VPp5hOxEe-4k7CzzL6IsA" targetArrow="InputClosedArrow" routingStyle="tree"> | ||
5152 | <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/> | ||
5153 | <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_-VPp5xOxEe-4k7CzzL6IsA" showIcon="false"> | ||
5154 | <labelFormat>italic</labelFormat> | ||
5155 | </beginLabelStyle> | ||
5156 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_-VPp6BOxEe-4k7CzzL6IsA" showIcon="false"/> | ||
5157 | </ownedStyle> | ||
5158 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/> | ||
5159 | </ownedDiagramElements> | ||
5160 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_4ZutsBOxEe-4k7CzzL6IsA" name="Concreteness" tooltipText="" width="12" height="10"> | ||
5161 | <target xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//Concreteness"/> | ||
5162 | <semanticElements xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//Concreteness"/> | ||
5163 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | ||
5164 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> | ||
5165 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> | ||
5166 | <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_4ZutsROxEe-4k7CzzL6IsA" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202"> | ||
5167 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/> | ||
5168 | </ownedStyle> | ||
5169 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"/> | ||
5170 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_50L5gBOxEe-4k7CzzL6IsA" name="PARTIAL" tooltipText=""> | ||
5171 | <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//Concreteness/PARTIAL"/> | ||
5172 | <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//Concreteness/PARTIAL"/> | ||
5173 | <ownedStyle xmi:type="diagram:BundledImage" uid="_50L5gROxEe-4k7CzzL6IsA" labelAlignment="LEFT"> | ||
5174 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/> | ||
5175 | </ownedStyle> | ||
5176 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> | ||
5177 | </ownedElements> | ||
5178 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_6c108BOxEe-4k7CzzL6IsA" name="CANDIDATE" tooltipText=""> | ||
5179 | <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//Concreteness/CANDIDATE"/> | ||
5180 | <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//Concreteness/CANDIDATE"/> | ||
5181 | <ownedStyle xmi:type="diagram:BundledImage" uid="_6c108ROxEe-4k7CzzL6IsA" labelAlignment="LEFT"> | ||
5182 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/> | ||
5183 | </ownedStyle> | ||
5184 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> | ||
5185 | </ownedElements> | ||
5186 | </ownedDiagramElements> | ||
4855 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> | 5187 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> |
4856 | <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_z1aAQF3lEe2LuOZzJ_LhLg"/> | 5188 | <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_z1aAQF3lEe2LuOZzJ_LhLg"/> |
4857 | <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/> | 5189 | <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/> |
@@ -4893,7 +5225,7 @@ | |||
4893 | <styles xmi:type="notation:ShapeStyle" xmi:id="_z9sCoV4eEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8" italic="true"/> | 5225 | <styles xmi:type="notation:ShapeStyle" xmi:id="_z9sCoV4eEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8" italic="true"/> |
4894 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z9sCol4eEe2rXNsIDUvqhw" x="166" y="356"/> | 5226 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_z9sCol4eEe2rXNsIDUvqhw" x="166" y="356"/> |
4895 | </children> | 5227 | </children> |
4896 | <children xmi:type="notation:Node" xmi:id="_A-j38F4fEe2rXNsIDUvqhw" type="2003" element="_A-fmgF4fEe2rXNsIDUvqhw"> | 5228 | <children xmi:type="notation:Node" xmi:id="_A-j38F4fEe2rXNsIDUvqhw" visible="false" type="2003" element="_A-fmgF4fEe2rXNsIDUvqhw"> |
4897 | <children xmi:type="notation:Node" xmi:id="_A-j3814fEe2rXNsIDUvqhw" type="5007"/> | 5229 | <children xmi:type="notation:Node" xmi:id="_A-j3814fEe2rXNsIDUvqhw" type="5007"/> |
4898 | <children xmi:type="notation:Node" xmi:id="_A-j39F4fEe2rXNsIDUvqhw" type="7004"> | 5230 | <children xmi:type="notation:Node" xmi:id="_A-j39F4fEe2rXNsIDUvqhw" type="7004"> |
4899 | <styles xmi:type="notation:SortingStyle" xmi:id="_A-j39V4fEe2rXNsIDUvqhw"/> | 5231 | <styles xmi:type="notation:SortingStyle" xmi:id="_A-j39V4fEe2rXNsIDUvqhw"/> |
@@ -4938,6 +5270,15 @@ | |||
4938 | <styles xmi:type="notation:ShapeStyle" xmi:id="_IhNHMWgpEe24RpwpWgpkFQ" fontName="Noto Sans" fontHeight="8" italic="true"/> | 5270 | <styles xmi:type="notation:ShapeStyle" xmi:id="_IhNHMWgpEe24RpwpWgpkFQ" fontName="Noto Sans" fontHeight="8" italic="true"/> |
4939 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IhNHMmgpEe24RpwpWgpkFQ" x="636" y="356"/> | 5271 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IhNHMmgpEe24RpwpWgpkFQ" x="636" y="356"/> |
4940 | </children> | 5272 | </children> |
5273 | <children xmi:type="notation:Node" xmi:id="_dZ_BIBReEe-4k7CzzL6IsA" type="2003" element="_dZ46gBReEe-4k7CzzL6IsA"> | ||
5274 | <children xmi:type="notation:Node" xmi:id="_dZ_BIxReEe-4k7CzzL6IsA" type="5007"/> | ||
5275 | <children xmi:type="notation:Node" xmi:id="_dZ_BJBReEe-4k7CzzL6IsA" type="7004"> | ||
5276 | <styles xmi:type="notation:SortingStyle" xmi:id="_dZ_BJRReEe-4k7CzzL6IsA"/> | ||
5277 | <styles xmi:type="notation:FilteringStyle" xmi:id="_dZ_BJhReEe-4k7CzzL6IsA"/> | ||
5278 | </children> | ||
5279 | <styles xmi:type="notation:ShapeStyle" xmi:id="_dZ_BIRReEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8" italic="true"/> | ||
5280 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZ_BIhReEe-4k7CzzL6IsA" x="260" y="708"/> | ||
5281 | </children> | ||
4941 | <styles xmi:type="notation:DiagramStyle" xmi:id="_xkD40l4eEe2rXNsIDUvqhw"/> | 5282 | <styles xmi:type="notation:DiagramStyle" xmi:id="_xkD40l4eEe2rXNsIDUvqhw"/> |
4942 | <edges xmi:type="notation:Edge" xmi:id="_z9sps14eEe2rXNsIDUvqhw" type="4001" element="_z9q0gF4eEe2rXNsIDUvqhw" source="_z9rbk14eEe2rXNsIDUvqhw" target="_z9sCoF4eEe2rXNsIDUvqhw"> | 5283 | <edges xmi:type="notation:Edge" xmi:id="_z9sps14eEe2rXNsIDUvqhw" type="4001" element="_z9q0gF4eEe2rXNsIDUvqhw" source="_z9rbk14eEe2rXNsIDUvqhw" target="_z9sCoF4eEe2rXNsIDUvqhw"> |
4943 | <children xmi:type="notation:Node" xmi:id="_z9spt14eEe2rXNsIDUvqhw" type="6001"> | 5284 | <children xmi:type="notation:Node" xmi:id="_z9spt14eEe2rXNsIDUvqhw" type="6001"> |
@@ -4971,22 +5312,6 @@ | |||
4971 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z9tQxF4eEe2rXNsIDUvqhw" id="(0.3522012578616352,0.05102040816326531)"/> | 5312 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z9tQxF4eEe2rXNsIDUvqhw" id="(0.3522012578616352,0.05102040816326531)"/> |
4972 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z9tQxV4eEe2rXNsIDUvqhw" id="(0.5,0.5)"/> | 5313 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z9tQxV4eEe2rXNsIDUvqhw" id="(0.5,0.5)"/> |
4973 | </edges> | 5314 | </edges> |
4974 | <edges xmi:type="notation:Edge" xmi:id="_ChbY4l4fEe2rXNsIDUvqhw" type="4001" element="_ChYVqV4fEe2rXNsIDUvqhw" source="_ChaKx14fEe2rXNsIDUvqhw" target="_A-j38F4fEe2rXNsIDUvqhw"> | ||
4975 | <children xmi:type="notation:Node" xmi:id="_ChbY5l4fEe2rXNsIDUvqhw" type="6001"> | ||
4976 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ChbY514fEe2rXNsIDUvqhw" x="-5" y="34"/> | ||
4977 | </children> | ||
4978 | <children xmi:type="notation:Node" xmi:id="_ChbY6F4fEe2rXNsIDUvqhw" type="6002"> | ||
4979 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ChbY6V4fEe2rXNsIDUvqhw" x="25" y="-4"/> | ||
4980 | </children> | ||
4981 | <children xmi:type="notation:Node" xmi:id="_ChbY6l4fEe2rXNsIDUvqhw" type="6003"> | ||
4982 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ChbY614fEe2rXNsIDUvqhw" x="-19" y="-10"/> | ||
4983 | </children> | ||
4984 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_ChbY414fEe2rXNsIDUvqhw" routing="Rectilinear"/> | ||
4985 | <styles xmi:type="notation:FontStyle" xmi:id="_ChbY5F4fEe2rXNsIDUvqhw" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> | ||
4986 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ChbY5V4fEe2rXNsIDUvqhw" points="[5, 49, 24, -74]$[5, 119, 24, -4]"/> | ||
4987 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ChbY7F4fEe2rXNsIDUvqhw" id="(0.4681528662420382,0.5)"/> | ||
4988 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ChbY7V4fEe2rXNsIDUvqhw" id="(0.288135593220339,0.04081632653061224)"/> | ||
4989 | </edges> | ||
4990 | <edges xmi:type="notation:Edge" xmi:id="_ChcnBF4fEe2rXNsIDUvqhw" type="4001" element="_ChY8uV4fEe2rXNsIDUvqhw" source="_ChaKx14fEe2rXNsIDUvqhw" target="_z9sCoF4eEe2rXNsIDUvqhw"> | 5315 | <edges xmi:type="notation:Edge" xmi:id="_ChcnBF4fEe2rXNsIDUvqhw" type="4001" element="_ChY8uV4fEe2rXNsIDUvqhw" source="_ChaKx14fEe2rXNsIDUvqhw" target="_z9sCoF4eEe2rXNsIDUvqhw"> |
4991 | <children xmi:type="notation:Node" xmi:id="_ChcnCF4fEe2rXNsIDUvqhw" type="6001"> | 5316 | <children xmi:type="notation:Node" xmi:id="_ChcnCF4fEe2rXNsIDUvqhw" type="6001"> |
4992 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ChcnCV4fEe2rXNsIDUvqhw" y="-10"/> | 5317 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ChcnCV4fEe2rXNsIDUvqhw" y="-10"/> |
@@ -5051,6 +5376,37 @@ | |||
5051 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jkchoGkGEe24rIYSlCjKHA" id="(0.6792452830188679,1.0)"/> | 5376 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jkchoGkGEe24rIYSlCjKHA" id="(0.6792452830188679,1.0)"/> |
5052 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jkchoWkGEe24rIYSlCjKHA" id="(0.3813559322033898,0.1326530612244898)"/> | 5377 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jkchoWkGEe24rIYSlCjKHA" id="(0.3813559322033898,0.1326530612244898)"/> |
5053 | </edges> | 5378 | </edges> |
5379 | <edges xmi:type="notation:Edge" xmi:id="_dZ_BJxReEe-4k7CzzL6IsA" visible="false" type="4001" element="_dZ9zEhReEe-4k7CzzL6IsA" source="_A-j38F4fEe2rXNsIDUvqhw" target="_dZ_BIBReEe-4k7CzzL6IsA"> | ||
5380 | <children xmi:type="notation:Node" xmi:id="_dZ_oMBReEe-4k7CzzL6IsA" type="6001"> | ||
5381 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZ_oMRReEe-4k7CzzL6IsA" y="-10"/> | ||
5382 | </children> | ||
5383 | <children xmi:type="notation:Node" xmi:id="_dZ_oMhReEe-4k7CzzL6IsA" type="6002"> | ||
5384 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZ_oMxReEe-4k7CzzL6IsA" y="10"/> | ||
5385 | </children> | ||
5386 | <children xmi:type="notation:Node" xmi:id="_dZ_oNBReEe-4k7CzzL6IsA" type="6003"> | ||
5387 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZ_oNRReEe-4k7CzzL6IsA" y="10"/> | ||
5388 | </children> | ||
5389 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_dZ_BKBReEe-4k7CzzL6IsA" routing="Tree"/> | ||
5390 | <styles xmi:type="notation:FontStyle" xmi:id="_dZ_BKRReEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8"/> | ||
5391 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dZ_BKhReEe-4k7CzzL6IsA" points="[3, 1, -806, -254]$[749, 236, -60, -19]"/> | ||
5392 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_daFu0BReEe-4k7CzzL6IsA" id="(0.5,0.5)"/> | ||
5393 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_daFu0RReEe-4k7CzzL6IsA" id="(0.5,0.5)"/> | ||
5394 | </edges> | ||
5395 | <edges xmi:type="notation:Edge" xmi:id="_eIo27BReEe-4k7CzzL6IsA" type="4001" element="_ChYVqV4fEe2rXNsIDUvqhw" source="_ChaKx14fEe2rXNsIDUvqhw" target="_dZ_BIBReEe-4k7CzzL6IsA"> | ||
5396 | <children xmi:type="notation:Node" xmi:id="_eIo28BReEe-4k7CzzL6IsA" type="6001"> | ||
5397 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eIo28RReEe-4k7CzzL6IsA" x="7" y="1"/> | ||
5398 | </children> | ||
5399 | <children xmi:type="notation:Node" xmi:id="_eIpd8BReEe-4k7CzzL6IsA" type="6002"> | ||
5400 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eIpd8RReEe-4k7CzzL6IsA" x="17"/> | ||
5401 | </children> | ||
5402 | <children xmi:type="notation:Node" xmi:id="_eIpd8hReEe-4k7CzzL6IsA" type="6003"> | ||
5403 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eIpd8xReEe-4k7CzzL6IsA" x="5" y="10"/> | ||
5404 | </children> | ||
5405 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_eIo27RReEe-4k7CzzL6IsA" routing="Rectilinear"/> | ||
5406 | <styles xmi:type="notation:FontStyle" xmi:id="_eIo27hReEe-4k7CzzL6IsA" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> | ||
5407 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_eIo27xReEe-4k7CzzL6IsA" points="[6, 49, 0, -143]$[6, 143, 0, -49]"/> | ||
5408 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eIpd9BReEe-4k7CzzL6IsA" id="(0.4681528662420382,0.5)"/> | ||
5409 | </edges> | ||
5054 | </data> | 5410 | </data> |
5055 | </ownedAnnotationEntries> | 5411 | </ownedAnnotationEntries> |
5056 | <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_xkO38F4eEe2rXNsIDUvqhw" source="DANNOTATION_CUSTOMIZATION_KEY"> | 5412 | <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_xkO38F4eEe2rXNsIDUvqhw" source="DANNOTATION_CUSTOMIZATION_KEY"> |
@@ -5134,9 +5490,10 @@ | |||
5134 | </ownedStyle> | 5490 | </ownedStyle> |
5135 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/> | 5491 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/> |
5136 | </ownedDiagramElements> | 5492 | </ownedDiagramElements> |
5137 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_A-fmgF4fEe2rXNsIDUvqhw" name="Node" tooltipText="" incomingEdges="_ChYVqV4fEe2rXNsIDUvqhw" width="12" height="10"> | 5493 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_A-fmgF4fEe2rXNsIDUvqhw" name="Node" visible="false" tooltipText="" outgoingEdges="_dZ9zEhReEe-4k7CzzL6IsA" width="12" height="10"> |
5138 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Node"/> | 5494 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Node"/> |
5139 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Node"/> | 5495 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Node"/> |
5496 | <graphicalFilters xmi:type="diagram:HideFilter" uid="_GLUFoBRfEe-4k7CzzL6IsA"/> | ||
5140 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | 5497 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> |
5141 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> | 5498 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> |
5142 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> | 5499 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> |
@@ -5167,7 +5524,7 @@ | |||
5167 | </ownedStyle> | 5524 | </ownedStyle> |
5168 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> | 5525 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> |
5169 | </ownedDiagramElements> | 5526 | </ownedDiagramElements> |
5170 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_ChYVqV4fEe2rXNsIDUvqhw" name="[0..1] node" sourceNode="_ChUrMl4fEe2rXNsIDUvqhw" targetNode="_A-fmgF4fEe2rXNsIDUvqhw"> | 5527 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_ChYVqV4fEe2rXNsIDUvqhw" name="[0..1] node" sourceNode="_ChUrMl4fEe2rXNsIDUvqhw" targetNode="_dZ46gBReEe-4k7CzzL6IsA"> |
5171 | <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//NodeAssertionArgument/node"/> | 5528 | <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//NodeAssertionArgument/node"/> |
5172 | <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//NodeAssertionArgument/node"/> | 5529 | <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//NodeAssertionArgument/node"/> |
5173 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_ChY8oF4fEe2rXNsIDUvqhw" routingStyle="manhattan" strokeColor="0,0,0"> | 5530 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_ChY8oF4fEe2rXNsIDUvqhw" routingStyle="manhattan" strokeColor="0,0,0"> |
@@ -5256,6 +5613,30 @@ | |||
5256 | </ownedStyle> | 5613 | </ownedStyle> |
5257 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> | 5614 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> |
5258 | </ownedDiagramElements> | 5615 | </ownedDiagramElements> |
5616 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_dZ46gBReEe-4k7CzzL6IsA" name="VariableOrNode" tooltipText="" incomingEdges="_dZ9zEhReEe-4k7CzzL6IsA _ChYVqV4fEe2rXNsIDUvqhw" width="12" height="10"> | ||
5617 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//VariableOrNode"/> | ||
5618 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//VariableOrNode"/> | ||
5619 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | ||
5620 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> | ||
5621 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> | ||
5622 | <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_dZ5hkBReEe-4k7CzzL6IsA" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228"> | ||
5623 | <labelFormat>italic</labelFormat> | ||
5624 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/> | ||
5625 | </ownedStyle> | ||
5626 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> | ||
5627 | </ownedDiagramElements> | ||
5628 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_dZ9zEhReEe-4k7CzzL6IsA" visible="false" sourceNode="_A-fmgF4fEe2rXNsIDUvqhw" targetNode="_dZ46gBReEe-4k7CzzL6IsA"> | ||
5629 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Node"/> | ||
5630 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Node"/> | ||
5631 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_dZ9zExReEe-4k7CzzL6IsA" targetArrow="InputClosedArrow" routingStyle="tree"> | ||
5632 | <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/> | ||
5633 | <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_dZ9zFBReEe-4k7CzzL6IsA" showIcon="false"> | ||
5634 | <labelFormat>italic</labelFormat> | ||
5635 | </beginLabelStyle> | ||
5636 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_dZ9zFRReEe-4k7CzzL6IsA" showIcon="false"/> | ||
5637 | </ownedStyle> | ||
5638 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/> | ||
5639 | </ownedDiagramElements> | ||
5259 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> | 5640 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> |
5260 | <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_xj8kEF4eEe2rXNsIDUvqhw"/> | 5641 | <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_xj8kEF4eEe2rXNsIDUvqhw"/> |
5261 | <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/> | 5642 | <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/> |
@@ -5273,94 +5654,55 @@ | |||
5273 | <styles xmi:type="notation:FilteringStyle" xmi:id="_x-y3k14fEe2rXNsIDUvqhw"/> | 5654 | <styles xmi:type="notation:FilteringStyle" xmi:id="_x-y3k14fEe2rXNsIDUvqhw"/> |
5274 | </children> | 5655 | </children> |
5275 | <styles xmi:type="notation:ShapeStyle" xmi:id="_x-yQi14fEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8" italic="true"/> | 5656 | <styles xmi:type="notation:ShapeStyle" xmi:id="_x-yQi14fEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8" italic="true"/> |
5276 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x-yQjF4fEe2rXNsIDUvqhw" x="356" y="20"/> | 5657 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x-yQjF4fEe2rXNsIDUvqhw" x="212" y="24"/> |
5277 | </children> | 5658 | </children> |
5278 | <children xmi:type="notation:Node" xmi:id="_x-y3lF4fEe2rXNsIDUvqhw" type="2003" element="_x-t_EF4fEe2rXNsIDUvqhw"> | 5659 | <children xmi:type="notation:Node" xmi:id="_x-y3lF4fEe2rXNsIDUvqhw" type="2003" element="_x-t_EF4fEe2rXNsIDUvqhw"> |
5279 | <children xmi:type="notation:Node" xmi:id="_x-y3l14fEe2rXNsIDUvqhw" type="5007"/> | 5660 | <children xmi:type="notation:Node" xmi:id="_x-y3l14fEe2rXNsIDUvqhw" type="5007"/> |
5280 | <children xmi:type="notation:Node" xmi:id="_x-y3mF4fEe2rXNsIDUvqhw" type="7004"> | 5661 | <children xmi:type="notation:Node" xmi:id="_x-y3mF4fEe2rXNsIDUvqhw" type="7004"> |
5281 | <children xmi:type="notation:Node" xmi:id="_x-0FtF4fEe2rXNsIDUvqhw" type="3010" element="_x-wbWF4fEe2rXNsIDUvqhw"> | ||
5282 | <styles xmi:type="notation:FontStyle" xmi:id="_x-0FtV4fEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> | ||
5283 | <layoutConstraint xmi:type="notation:Location" xmi:id="_x-0Ftl4fEe2rXNsIDUvqhw"/> | ||
5284 | </children> | ||
5285 | <children xmi:type="notation:Node" xmi:id="_x-0Ft14fEe2rXNsIDUvqhw" type="3010" element="_x-wbWl4fEe2rXNsIDUvqhw"> | ||
5286 | <styles xmi:type="notation:FontStyle" xmi:id="_x-0FuF4fEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> | ||
5287 | <layoutConstraint xmi:type="notation:Location" xmi:id="_x-0FuV4fEe2rXNsIDUvqhw"/> | ||
5288 | </children> | ||
5289 | <styles xmi:type="notation:SortingStyle" xmi:id="_x-y3mV4fEe2rXNsIDUvqhw"/> | 5662 | <styles xmi:type="notation:SortingStyle" xmi:id="_x-y3mV4fEe2rXNsIDUvqhw"/> |
5290 | <styles xmi:type="notation:FilteringStyle" xmi:id="_x-y3ml4fEe2rXNsIDUvqhw"/> | 5663 | <styles xmi:type="notation:FilteringStyle" xmi:id="_x-y3ml4fEe2rXNsIDUvqhw"/> |
5291 | </children> | 5664 | </children> |
5292 | <styles xmi:type="notation:ShapeStyle" xmi:id="_x-y3lV4fEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> | 5665 | <styles xmi:type="notation:ShapeStyle" xmi:id="_x-y3lV4fEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> |
5293 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x-y3ll4fEe2rXNsIDUvqhw" x="116" y="176"/> | 5666 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x-y3ll4fEe2rXNsIDUvqhw" x="212" y="180"/> |
5294 | </children> | ||
5295 | <children xmi:type="notation:Node" xmi:id="_x-y3m14fEe2rXNsIDUvqhw" type="2003" element="_x-t_E14fEe2rXNsIDUvqhw"> | ||
5296 | <children xmi:type="notation:Node" xmi:id="_x-zeoF4fEe2rXNsIDUvqhw" type="5007"/> | ||
5297 | <children xmi:type="notation:Node" xmi:id="_x-zeoV4fEe2rXNsIDUvqhw" type="7004"> | ||
5298 | <styles xmi:type="notation:SortingStyle" xmi:id="_x-zeol4fEe2rXNsIDUvqhw"/> | ||
5299 | <styles xmi:type="notation:FilteringStyle" xmi:id="_x-zeo14fEe2rXNsIDUvqhw"/> | ||
5300 | </children> | ||
5301 | <styles xmi:type="notation:ShapeStyle" xmi:id="_x-y3nF4fEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> | ||
5302 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x-y3nV4fEe2rXNsIDUvqhw" x="608" y="176"/> | ||
5303 | </children> | 5667 | </children> |
5304 | <children xmi:type="notation:Node" xmi:id="_x-zepF4fEe2rXNsIDUvqhw" type="2003" element="_x-umIF4fEe2rXNsIDUvqhw"> | 5668 | <children xmi:type="notation:Node" xmi:id="_mjEJMF4hEe2rXNsIDUvqhw" visible="false" type="2003" element="_mi_QsF4hEe2rXNsIDUvqhw"> |
5305 | <children xmi:type="notation:Node" xmi:id="_x-0FsF4fEe2rXNsIDUvqhw" type="5007"/> | ||
5306 | <children xmi:type="notation:Node" xmi:id="_x-0FsV4fEe2rXNsIDUvqhw" type="7004"> | ||
5307 | <styles xmi:type="notation:SortingStyle" xmi:id="_x-0Fsl4fEe2rXNsIDUvqhw"/> | ||
5308 | <styles xmi:type="notation:FilteringStyle" xmi:id="_x-0Fs14fEe2rXNsIDUvqhw"/> | ||
5309 | </children> | ||
5310 | <styles xmi:type="notation:ShapeStyle" xmi:id="_x-zepV4fEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> | ||
5311 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x-zepl4fEe2rXNsIDUvqhw" x="356" y="176"/> | ||
5312 | </children> | ||
5313 | <children xmi:type="notation:Node" xmi:id="_1WZFgF4fEe2rXNsIDUvqhw" type="2003" element="_1WVbIF4fEe2rXNsIDUvqhw"> | ||
5314 | <children xmi:type="notation:Node" xmi:id="_1WZFg14fEe2rXNsIDUvqhw" type="5007"/> | ||
5315 | <children xmi:type="notation:Node" xmi:id="_1WZFhF4fEe2rXNsIDUvqhw" type="7004"> | ||
5316 | <styles xmi:type="notation:SortingStyle" xmi:id="_1WZFhV4fEe2rXNsIDUvqhw"/> | ||
5317 | <styles xmi:type="notation:FilteringStyle" xmi:id="_1WZFhl4fEe2rXNsIDUvqhw"/> | ||
5318 | </children> | ||
5319 | <styles xmi:type="notation:ShapeStyle" xmi:id="_1WZFgV4fEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> | ||
5320 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1WZFgl4fEe2rXNsIDUvqhw" x="404" y="584"/> | ||
5321 | </children> | ||
5322 | <children xmi:type="notation:Node" xmi:id="_mjEJMF4hEe2rXNsIDUvqhw" type="2003" element="_mi_QsF4hEe2rXNsIDUvqhw"> | ||
5323 | <children xmi:type="notation:Node" xmi:id="_mjEJM14hEe2rXNsIDUvqhw" type="5007"/> | 5669 | <children xmi:type="notation:Node" xmi:id="_mjEJM14hEe2rXNsIDUvqhw" type="5007"/> |
5324 | <children xmi:type="notation:Node" xmi:id="_mjEJNF4hEe2rXNsIDUvqhw" type="7004"> | 5670 | <children xmi:type="notation:Node" xmi:id="_mjEJNF4hEe2rXNsIDUvqhw" type="7004"> |
5325 | <styles xmi:type="notation:SortingStyle" xmi:id="_mjEJNV4hEe2rXNsIDUvqhw"/> | 5671 | <styles xmi:type="notation:SortingStyle" xmi:id="_mjEJNV4hEe2rXNsIDUvqhw"/> |
5326 | <styles xmi:type="notation:FilteringStyle" xmi:id="_mjEJNl4hEe2rXNsIDUvqhw"/> | 5672 | <styles xmi:type="notation:FilteringStyle" xmi:id="_mjEJNl4hEe2rXNsIDUvqhw"/> |
5327 | </children> | 5673 | </children> |
5328 | <styles xmi:type="notation:ShapeStyle" xmi:id="_mjEJMV4hEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8" italic="true"/> | 5674 | <styles xmi:type="notation:ShapeStyle" xmi:id="_mjEJMV4hEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8" italic="true"/> |
5329 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mjEJMl4hEe2rXNsIDUvqhw" x="608" y="368"/> | 5675 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mjEJMl4hEe2rXNsIDUvqhw" x="684" y="372"/> |
5330 | </children> | 5676 | </children> |
5331 | <children xmi:type="notation:Node" xmi:id="_vYOzEF4hEe2rXNsIDUvqhw" type="2003" element="_vYLvwF4hEe2rXNsIDUvqhw"> | 5677 | <children xmi:type="notation:Node" xmi:id="_vYOzEF4hEe2rXNsIDUvqhw" visible="false" type="2003" element="_vYLvwF4hEe2rXNsIDUvqhw"> |
5332 | <children xmi:type="notation:Node" xmi:id="_vYOzE14hEe2rXNsIDUvqhw" type="5007"/> | 5678 | <children xmi:type="notation:Node" xmi:id="_vYOzE14hEe2rXNsIDUvqhw" type="5007"/> |
5333 | <children xmi:type="notation:Node" xmi:id="_vYOzFF4hEe2rXNsIDUvqhw" type="7004"> | 5679 | <children xmi:type="notation:Node" xmi:id="_vYOzFF4hEe2rXNsIDUvqhw" type="7004"> |
5334 | <children xmi:type="notation:Node" xmi:id="_vYOzF14hEe2rXNsIDUvqhw" type="3010" element="_vYM9414hEe2rXNsIDUvqhw"> | 5680 | <children xmi:type="notation:Node" xmi:id="_vYOzF14hEe2rXNsIDUvqhw" visible="false" type="3010" element="_vYM9414hEe2rXNsIDUvqhw"> |
5335 | <styles xmi:type="notation:FontStyle" xmi:id="_vYOzGF4hEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> | 5681 | <styles xmi:type="notation:FontStyle" xmi:id="_vYOzGF4hEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> |
5336 | <layoutConstraint xmi:type="notation:Location" xmi:id="_vYOzGV4hEe2rXNsIDUvqhw"/> | 5682 | <layoutConstraint xmi:type="notation:Location" xmi:id="_vYOzGV4hEe2rXNsIDUvqhw"/> |
5337 | </children> | 5683 | </children> |
5338 | <children xmi:type="notation:Node" xmi:id="_3vtKMF63Ee2rXNsIDUvqhw" type="3010" element="_3vrVA163Ee2rXNsIDUvqhw"> | ||
5339 | <styles xmi:type="notation:FontStyle" xmi:id="_3vtKMV63Ee2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> | ||
5340 | <layoutConstraint xmi:type="notation:Location" xmi:id="_3vtKMl63Ee2rXNsIDUvqhw"/> | ||
5341 | </children> | ||
5342 | <styles xmi:type="notation:SortingStyle" xmi:id="_vYOzFV4hEe2rXNsIDUvqhw"/> | 5684 | <styles xmi:type="notation:SortingStyle" xmi:id="_vYOzFV4hEe2rXNsIDUvqhw"/> |
5343 | <styles xmi:type="notation:FilteringStyle" xmi:id="_vYOzFl4hEe2rXNsIDUvqhw"/> | 5685 | <styles xmi:type="notation:FilteringStyle" xmi:id="_vYOzFl4hEe2rXNsIDUvqhw"/> |
5344 | </children> | 5686 | </children> |
5345 | <styles xmi:type="notation:ShapeStyle" xmi:id="_vYOzEV4hEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> | 5687 | <styles xmi:type="notation:ShapeStyle" xmi:id="_vYOzEV4hEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> |
5346 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vYOzEl4hEe2rXNsIDUvqhw" x="92" y="380"/> | 5688 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vYOzEl4hEe2rXNsIDUvqhw" x="168" y="384"/> |
5347 | </children> | 5689 | </children> |
5348 | <children xmi:type="notation:Node" xmi:id="_4xYTwF4hEe2rXNsIDUvqhw" type="2003" element="_4xTbQF4hEe2rXNsIDUvqhw"> | 5690 | <children xmi:type="notation:Node" xmi:id="_4xYTwF4hEe2rXNsIDUvqhw" visible="false" type="2003" element="_4xTbQF4hEe2rXNsIDUvqhw"> |
5349 | <children xmi:type="notation:Node" xmi:id="_4xYTw14hEe2rXNsIDUvqhw" type="5007"/> | 5691 | <children xmi:type="notation:Node" xmi:id="_4xYTw14hEe2rXNsIDUvqhw" type="5007"/> |
5350 | <children xmi:type="notation:Node" xmi:id="_4xYTxF4hEe2rXNsIDUvqhw" type="7004"> | 5692 | <children xmi:type="notation:Node" xmi:id="_4xYTxF4hEe2rXNsIDUvqhw" type="7004"> |
5351 | <children xmi:type="notation:Node" xmi:id="_4xYTx14hEe2rXNsIDUvqhw" type="3010" element="_4xV3g14hEe2rXNsIDUvqhw"> | 5693 | <children xmi:type="notation:Node" xmi:id="_4xYTx14hEe2rXNsIDUvqhw" visible="false" type="3010" element="_4xV3g14hEe2rXNsIDUvqhw"> |
5352 | <styles xmi:type="notation:FontStyle" xmi:id="_4xYTyF4hEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> | 5694 | <styles xmi:type="notation:FontStyle" xmi:id="_4xYTyF4hEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> |
5353 | <layoutConstraint xmi:type="notation:Location" xmi:id="_4xYTyV4hEe2rXNsIDUvqhw"/> | 5695 | <layoutConstraint xmi:type="notation:Location" xmi:id="_4xYTyV4hEe2rXNsIDUvqhw"/> |
5354 | </children> | 5696 | </children> |
5355 | <children xmi:type="notation:Node" xmi:id="_4xYTyl4hEe2rXNsIDUvqhw" type="3010" element="_4xV3hV4hEe2rXNsIDUvqhw"> | 5697 | <children xmi:type="notation:Node" xmi:id="_4xYTyl4hEe2rXNsIDUvqhw" visible="false" type="3010" element="_4xV3hV4hEe2rXNsIDUvqhw"> |
5356 | <styles xmi:type="notation:FontStyle" xmi:id="_4xYTy14hEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> | 5698 | <styles xmi:type="notation:FontStyle" xmi:id="_4xYTy14hEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> |
5357 | <layoutConstraint xmi:type="notation:Location" xmi:id="_4xYTzF4hEe2rXNsIDUvqhw"/> | 5699 | <layoutConstraint xmi:type="notation:Location" xmi:id="_4xYTzF4hEe2rXNsIDUvqhw"/> |
5358 | </children> | 5700 | </children> |
5359 | <children xmi:type="notation:Node" xmi:id="_4xY60F4hEe2rXNsIDUvqhw" type="3010" element="_4xWekF4hEe2rXNsIDUvqhw"> | 5701 | <children xmi:type="notation:Node" xmi:id="_4xY60F4hEe2rXNsIDUvqhw" visible="false" type="3010" element="_4xWekF4hEe2rXNsIDUvqhw"> |
5360 | <styles xmi:type="notation:FontStyle" xmi:id="_4xY60V4hEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> | 5702 | <styles xmi:type="notation:FontStyle" xmi:id="_4xY60V4hEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> |
5361 | <layoutConstraint xmi:type="notation:Location" xmi:id="_4xY60l4hEe2rXNsIDUvqhw"/> | 5703 | <layoutConstraint xmi:type="notation:Location" xmi:id="_4xY60l4hEe2rXNsIDUvqhw"/> |
5362 | </children> | 5704 | </children> |
5363 | <children xmi:type="notation:Node" xmi:id="_4xY6014hEe2rXNsIDUvqhw" type="3010" element="_4xWekl4hEe2rXNsIDUvqhw"> | 5705 | <children xmi:type="notation:Node" xmi:id="_4xY6014hEe2rXNsIDUvqhw" visible="false" type="3010" element="_4xWekl4hEe2rXNsIDUvqhw"> |
5364 | <styles xmi:type="notation:FontStyle" xmi:id="_4xY61F4hEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> | 5706 | <styles xmi:type="notation:FontStyle" xmi:id="_4xY61F4hEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> |
5365 | <layoutConstraint xmi:type="notation:Location" xmi:id="_4xY61V4hEe2rXNsIDUvqhw"/> | 5707 | <layoutConstraint xmi:type="notation:Location" xmi:id="_4xY61V4hEe2rXNsIDUvqhw"/> |
5366 | </children> | 5708 | </children> |
@@ -5368,7 +5710,34 @@ | |||
5368 | <styles xmi:type="notation:FilteringStyle" xmi:id="_4xYTxl4hEe2rXNsIDUvqhw"/> | 5710 | <styles xmi:type="notation:FilteringStyle" xmi:id="_4xYTxl4hEe2rXNsIDUvqhw"/> |
5369 | </children> | 5711 | </children> |
5370 | <styles xmi:type="notation:ShapeStyle" xmi:id="_4xYTwV4hEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> | 5712 | <styles xmi:type="notation:ShapeStyle" xmi:id="_4xYTwV4hEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> |
5371 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4xYTwl4hEe2rXNsIDUvqhw" x="144" y="20"/> | 5713 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4xYTwl4hEe2rXNsIDUvqhw" x="360" y="24"/> |
5714 | </children> | ||
5715 | <children xmi:type="notation:Node" xmi:id="_nWw4wBOtEe-xzrPFjBSxRw" type="2003" element="_nWhBIBOtEe-xzrPFjBSxRw"> | ||
5716 | <children xmi:type="notation:Node" xmi:id="_nWxf0BOtEe-xzrPFjBSxRw" type="5007"/> | ||
5717 | <children xmi:type="notation:Node" xmi:id="_nWyG4BOtEe-xzrPFjBSxRw" type="7004"> | ||
5718 | <styles xmi:type="notation:SortingStyle" xmi:id="_nWyG4ROtEe-xzrPFjBSxRw"/> | ||
5719 | <styles xmi:type="notation:FilteringStyle" xmi:id="_nWyG4hOtEe-xzrPFjBSxRw"/> | ||
5720 | </children> | ||
5721 | <styles xmi:type="notation:ShapeStyle" xmi:id="_nWw4wROtEe-xzrPFjBSxRw" fontName="Noto Sans" fontHeight="8" italic="true"/> | ||
5722 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nWw4whOtEe-xzrPFjBSxRw" x="360" y="480"/> | ||
5723 | </children> | ||
5724 | <children xmi:type="notation:Node" xmi:id="_e75ZcBRWEe-4k7CzzL6IsA" type="2003" element="_e7zS0BRWEe-4k7CzzL6IsA"> | ||
5725 | <children xmi:type="notation:Node" xmi:id="_e75ZcxRWEe-4k7CzzL6IsA" type="5007"/> | ||
5726 | <children xmi:type="notation:Node" xmi:id="_e75ZdBRWEe-4k7CzzL6IsA" type="7004"> | ||
5727 | <styles xmi:type="notation:SortingStyle" xmi:id="_e75ZdRRWEe-4k7CzzL6IsA"/> | ||
5728 | <styles xmi:type="notation:FilteringStyle" xmi:id="_e75ZdhRWEe-4k7CzzL6IsA"/> | ||
5729 | </children> | ||
5730 | <styles xmi:type="notation:ShapeStyle" xmi:id="_e75ZcRRWEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8" italic="true"/> | ||
5731 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e75ZchRWEe-4k7CzzL6IsA" x="492" y="180"/> | ||
5732 | </children> | ||
5733 | <children xmi:type="notation:Node" xmi:id="_mJXFsBRWEe-4k7CzzL6IsA" type="2003" element="_mJSNMBRWEe-4k7CzzL6IsA"> | ||
5734 | <children xmi:type="notation:Node" xmi:id="_mJXFsxRWEe-4k7CzzL6IsA" type="5007"/> | ||
5735 | <children xmi:type="notation:Node" xmi:id="_mJXFtBRWEe-4k7CzzL6IsA" type="7004"> | ||
5736 | <styles xmi:type="notation:SortingStyle" xmi:id="_mJXFtRRWEe-4k7CzzL6IsA"/> | ||
5737 | <styles xmi:type="notation:FilteringStyle" xmi:id="_mJXFthRWEe-4k7CzzL6IsA"/> | ||
5738 | </children> | ||
5739 | <styles xmi:type="notation:ShapeStyle" xmi:id="_mJXFsRRWEe-4k7CzzL6IsA" fontName="Noto Sans" fontHeight="8" italic="true"/> | ||
5740 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mJXFshRWEe-4k7CzzL6IsA" x="95" y="480"/> | ||
5372 | </children> | 5741 | </children> |
5373 | <styles xmi:type="notation:DiagramStyle" xmi:id="_sCFolF4fEe2rXNsIDUvqhw"/> | 5742 | <styles xmi:type="notation:DiagramStyle" xmi:id="_sCFolF4fEe2rXNsIDUvqhw"/> |
5374 | <edges xmi:type="notation:Edge" xmi:id="_x-0sw14fEe2rXNsIDUvqhw" type="4001" element="_x-xpcV4fEe2rXNsIDUvqhw" source="_x-y3lF4fEe2rXNsIDUvqhw" target="_x-yQil4fEe2rXNsIDUvqhw"> | 5743 | <edges xmi:type="notation:Edge" xmi:id="_x-0sw14fEe2rXNsIDUvqhw" type="4001" element="_x-xpcV4fEe2rXNsIDUvqhw" source="_x-y3lF4fEe2rXNsIDUvqhw" target="_x-yQil4fEe2rXNsIDUvqhw"> |
@@ -5384,120 +5753,72 @@ | |||
5384 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_x-0sxF4fEe2rXNsIDUvqhw" routing="Tree"/> | 5753 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_x-0sxF4fEe2rXNsIDUvqhw" routing="Tree"/> |
5385 | <styles xmi:type="notation:FontStyle" xmi:id="_x-0sxV4fEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> | 5754 | <styles xmi:type="notation:FontStyle" xmi:id="_x-0sxV4fEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> |
5386 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_x-0sxl4fEe2rXNsIDUvqhw" points="[0, 0, 12, 12]$[-12, -12, 0, 0]"/> | 5755 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_x-0sxl4fEe2rXNsIDUvqhw" points="[0, 0, 12, 12]$[-12, -12, 0, 0]"/> |
5387 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_x-0szV4fEe2rXNsIDUvqhw" id="(0.5,0.5)"/> | 5756 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_STXQEBOwEe-4k7CzzL6IsA" id="(0.2627118644067797,0.10204081632653061)"/> |
5388 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_x-0szl4fEe2rXNsIDUvqhw" id="(0.5,0.5)"/> | 5757 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_x-0szl4fEe2rXNsIDUvqhw" id="(0.5,0.5)"/> |
5389 | </edges> | 5758 | </edges> |
5390 | <edges xmi:type="notation:Edge" xmi:id="_x-0sz14fEe2rXNsIDUvqhw" type="4001" element="_x-xpeF4fEe2rXNsIDUvqhw" source="_x-y3m14fEe2rXNsIDUvqhw" target="_x-yQil4fEe2rXNsIDUvqhw"> | 5759 | <edges xmi:type="notation:Edge" xmi:id="_nW3mchOtEe-xzrPFjBSxRw" visible="false" type="4001" element="_nWqyLBOtEe-xzrPFjBSxRw" source="_vYOzEF4hEe2rXNsIDUvqhw" target="_nWw4wBOtEe-xzrPFjBSxRw"> |
5391 | <children xmi:type="notation:Node" xmi:id="_x-0s014fEe2rXNsIDUvqhw" type="6001"> | 5760 | <children xmi:type="notation:Node" xmi:id="_nW4NgBOtEe-xzrPFjBSxRw" type="6001"> |
5392 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x-0s1F4fEe2rXNsIDUvqhw" y="-10"/> | 5761 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nW4NgROtEe-xzrPFjBSxRw" x="-20" y="-10"/> |
5393 | </children> | ||
5394 | <children xmi:type="notation:Node" xmi:id="_x-0s1V4fEe2rXNsIDUvqhw" type="6002"> | ||
5395 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x-0s1l4fEe2rXNsIDUvqhw" y="10"/> | ||
5396 | </children> | ||
5397 | <children xmi:type="notation:Node" xmi:id="_x-0s114fEe2rXNsIDUvqhw" type="6003"> | ||
5398 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x-0s2F4fEe2rXNsIDUvqhw" y="10"/> | ||
5399 | </children> | ||
5400 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_x-0s0F4fEe2rXNsIDUvqhw" routing="Tree"/> | ||
5401 | <styles xmi:type="notation:FontStyle" xmi:id="_x-0s0V4fEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> | ||
5402 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_x-0s0l4fEe2rXNsIDUvqhw" points="[0, 0, 24, 24]$[-24, -24, 0, 0]"/> | ||
5403 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_x-1T0F4fEe2rXNsIDUvqhw" id="(0.5,0.5)"/> | ||
5404 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_x-1T0V4fEe2rXNsIDUvqhw" id="(0.5,0.5)"/> | ||
5405 | </edges> | ||
5406 | <edges xmi:type="notation:Edge" xmi:id="_x-1T0l4fEe2rXNsIDUvqhw" type="4001" element="_x-yQg14fEe2rXNsIDUvqhw" source="_x-zepF4fEe2rXNsIDUvqhw" target="_x-yQil4fEe2rXNsIDUvqhw"> | ||
5407 | <children xmi:type="notation:Node" xmi:id="_x-1T1l4fEe2rXNsIDUvqhw" type="6001"> | ||
5408 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x-1T114fEe2rXNsIDUvqhw" y="-10"/> | ||
5409 | </children> | ||
5410 | <children xmi:type="notation:Node" xmi:id="_x-1T2F4fEe2rXNsIDUvqhw" type="6002"> | ||
5411 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x-1T2V4fEe2rXNsIDUvqhw" y="10"/> | ||
5412 | </children> | ||
5413 | <children xmi:type="notation:Node" xmi:id="_x-1T2l4fEe2rXNsIDUvqhw" type="6003"> | ||
5414 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x-1T214fEe2rXNsIDUvqhw" y="10"/> | ||
5415 | </children> | ||
5416 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_x-1T014fEe2rXNsIDUvqhw" routing="Tree"/> | ||
5417 | <styles xmi:type="notation:FontStyle" xmi:id="_x-1T1F4fEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> | ||
5418 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_x-1T1V4fEe2rXNsIDUvqhw" points="[0, 0, 36, 36]$[-36, -36, 0, 0]"/> | ||
5419 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_x-1T3F4fEe2rXNsIDUvqhw" id="(0.3389830508474576,0.0)"/> | ||
5420 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_x-1T3V4fEe2rXNsIDUvqhw" id="(0.5,0.5)"/> | ||
5421 | </edges> | ||
5422 | <edges xmi:type="notation:Edge" xmi:id="_1WZFh14fEe2rXNsIDUvqhw" type="4001" element="_1WX3YF4fEe2rXNsIDUvqhw" source="_x-zepF4fEe2rXNsIDUvqhw" target="_1WZFgF4fEe2rXNsIDUvqhw"> | ||
5423 | <children xmi:type="notation:Node" xmi:id="_1WZFi14fEe2rXNsIDUvqhw" type="6001"> | ||
5424 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1WZFjF4fEe2rXNsIDUvqhw" x="-76" y="-100"/> | ||
5425 | </children> | ||
5426 | <children xmi:type="notation:Node" xmi:id="_1WZskF4fEe2rXNsIDUvqhw" type="6002"> | ||
5427 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1WZskV4fEe2rXNsIDUvqhw" x="-25"/> | ||
5428 | </children> | ||
5429 | <children xmi:type="notation:Node" xmi:id="_1WZskl4fEe2rXNsIDUvqhw" type="6003"> | ||
5430 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1WZsk14fEe2rXNsIDUvqhw" x="-86"/> | ||
5431 | </children> | ||
5432 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_1WZFiF4fEe2rXNsIDUvqhw" routing="Rectilinear"/> | ||
5433 | <styles xmi:type="notation:FontStyle" xmi:id="_1WZFiV4fEe2rXNsIDUvqhw" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> | ||
5434 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1WZFil4fEe2rXNsIDUvqhw" points="[4, 49, -44, -359]$[4, 191, -44, -217]$[43, 191, -5, -217]$[43, 359, -5, -49]"/> | ||
5435 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WZslF4fEe2rXNsIDUvqhw" id="(0.5,0.5)"/> | ||
5436 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1WZslV4fEe2rXNsIDUvqhw" id="(0.5,0.5)"/> | ||
5437 | </edges> | ||
5438 | <edges xmi:type="notation:Edge" xmi:id="_mjEwQF4hEe2rXNsIDUvqhw" type="4001" element="_mjCUBl4hEe2rXNsIDUvqhw" source="_x-y3m14fEe2rXNsIDUvqhw" target="_mjEJMF4hEe2rXNsIDUvqhw"> | ||
5439 | <children xmi:type="notation:Node" xmi:id="_mjEwRF4hEe2rXNsIDUvqhw" type="6001"> | ||
5440 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mjEwRV4hEe2rXNsIDUvqhw" x="-17" y="1"/> | ||
5441 | </children> | 5762 | </children> |
5442 | <children xmi:type="notation:Node" xmi:id="_mjEwRl4hEe2rXNsIDUvqhw" type="6002"> | 5763 | <children xmi:type="notation:Node" xmi:id="_nW4NghOtEe-xzrPFjBSxRw" type="6002"> |
5443 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mjEwR14hEe2rXNsIDUvqhw" x="10"/> | 5764 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nW4NgxOtEe-xzrPFjBSxRw" y="10"/> |
5444 | </children> | 5765 | </children> |
5445 | <children xmi:type="notation:Node" xmi:id="_mjEwSF4hEe2rXNsIDUvqhw" type="6003"> | 5766 | <children xmi:type="notation:Node" xmi:id="_nW4NhBOtEe-xzrPFjBSxRw" type="6003"> |
5446 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mjEwSV4hEe2rXNsIDUvqhw" x="10"/> | 5767 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nW4NhROtEe-xzrPFjBSxRw" x="-20" y="10"/> |
5447 | </children> | 5768 | </children> |
5448 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_mjEwQV4hEe2rXNsIDUvqhw" routing="Rectilinear"/> | 5769 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_nW3mcxOtEe-xzrPFjBSxRw" routing="Tree"/> |
5449 | <styles xmi:type="notation:FontStyle" xmi:id="_mjEwQl4hEe2rXNsIDUvqhw" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> | 5770 | <styles xmi:type="notation:FontStyle" xmi:id="_nW3mdBOtEe-xzrPFjBSxRw" fontName="Noto Sans" fontHeight="8"/> |
5450 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mjEwQ14hEe2rXNsIDUvqhw" points="[1, 49, 1, -143]$[1, 143, 1, -49]"/> | 5771 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nW3mdROtEe-xzrPFjBSxRw" points="[0, 49, 161, -131]$[0, 95, 161, -85]$[-160, 95, 1, -85]$[-160, 131, 1, -49]"/> |
5451 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mjEwSl4hEe2rXNsIDUvqhw" id="(0.5,0.5)"/> | 5772 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nW4NhhOtEe-xzrPFjBSxRw" id="(0.5,0.5)"/> |
5452 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mjEwS14hEe2rXNsIDUvqhw" id="(0.5,0.5)"/> | 5773 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nW4NhxOtEe-xzrPFjBSxRw" id="(0.5,0.5)"/> |
5453 | </edges> | 5774 | </edges> |
5454 | <edges xmi:type="notation:Edge" xmi:id="_mjEwTF4hEe2rXNsIDUvqhw" type="4001" element="_mjCUDV4hEe2rXNsIDUvqhw" source="_x-zepF4fEe2rXNsIDUvqhw" target="_mjEJMF4hEe2rXNsIDUvqhw"> | 5775 | <edges xmi:type="notation:Edge" xmi:id="_syOb4BOtEe-xzrPFjBSxRw" type="4001" element="_sxjtgBOtEe-xzrPFjBSxRw" source="_x-y3lF4fEe2rXNsIDUvqhw" target="_nWw4wBOtEe-xzrPFjBSxRw"> |
5455 | <children xmi:type="notation:Node" xmi:id="_mjEwUF4hEe2rXNsIDUvqhw" type="6001"> | 5776 | <children xmi:type="notation:Node" xmi:id="_syPC8BOtEe-xzrPFjBSxRw" type="6001"> |
5456 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mjEwUV4hEe2rXNsIDUvqhw" x="-131" y="5"/> | 5777 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_syPC8ROtEe-xzrPFjBSxRw" x="5" y="-16"/> |
5457 | </children> | 5778 | </children> |
5458 | <children xmi:type="notation:Node" xmi:id="_mjEwUl4hEe2rXNsIDUvqhw" type="6002"> | 5779 | <children xmi:type="notation:Node" xmi:id="_syPC8hOtEe-xzrPFjBSxRw" type="6002"> |
5459 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mjEwU14hEe2rXNsIDUvqhw" x="-25" y="10"/> | 5780 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_syPC8xOtEe-xzrPFjBSxRw" x="43"/> |
5460 | </children> | 5781 | </children> |
5461 | <children xmi:type="notation:Node" xmi:id="_mjFXUF4hEe2rXNsIDUvqhw" type="6003"> | 5782 | <children xmi:type="notation:Node" xmi:id="_syPC9BOtEe-xzrPFjBSxRw" type="6003"> |
5462 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mjFXUV4hEe2rXNsIDUvqhw" x="-36" y="-100"/> | 5783 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_syPC9ROtEe-xzrPFjBSxRw" x="-48" y="75"/> |
5463 | </children> | 5784 | </children> |
5464 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_mjEwTV4hEe2rXNsIDUvqhw" routing="Rectilinear"/> | 5785 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_syOb4ROtEe-xzrPFjBSxRw" routing="Rectilinear"/> |
5465 | <styles xmi:type="notation:FontStyle" xmi:id="_mjEwTl4hEe2rXNsIDUvqhw" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> | 5786 | <styles xmi:type="notation:FontStyle" xmi:id="_syOb4hOtEe-xzrPFjBSxRw" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> |
5466 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mjEwT14hEe2rXNsIDUvqhw" points="[59, 11, -193, -181]$[109, 11, -143, -181]$[109, 193, -143, 1]$[193, 193, -59, 1]"/> | 5787 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_syOb4xOtEe-xzrPFjBSxRw" points="[49, 0, -109, -202]$[49, 94, -109, -108]$[179, 94, 21, -108]$[179, 202, 21, 0]"/> |
5467 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mjFXUl4hEe2rXNsIDUvqhw" id="(0.5,0.5)"/> | 5788 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_syPC9hOtEe-xzrPFjBSxRw" id="(0.23121387283236994,1.0)"/> |
5468 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mjFXU14hEe2rXNsIDUvqhw" id="(0.5,0.5)"/> | 5789 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_syPC9xOtEe-xzrPFjBSxRw" id="(0.3135593220338983,0.0)"/> |
5469 | </edges> | 5790 | </edges> |
5470 | <edges xmi:type="notation:Edge" xmi:id="_mjFXVF4hEe2rXNsIDUvqhw" type="4001" element="_mjC7Il4hEe2rXNsIDUvqhw" source="_1WZFgF4fEe2rXNsIDUvqhw" target="_mjEJMF4hEe2rXNsIDUvqhw"> | 5791 | <edges xmi:type="notation:Edge" xmi:id="_hHiKkBRWEe-4k7CzzL6IsA" type="4001" element="_hHIh9hRWEe-4k7CzzL6IsA" source="_x-y3lF4fEe2rXNsIDUvqhw" target="_e75ZcBRWEe-4k7CzzL6IsA"> |
5471 | <children xmi:type="notation:Node" xmi:id="_mjFXWF4hEe2rXNsIDUvqhw" type="6001"> | 5792 | <children xmi:type="notation:Node" xmi:id="_hHixoBRWEe-4k7CzzL6IsA" type="6001"> |
5472 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mjFXWV4hEe2rXNsIDUvqhw" y="-10"/> | 5793 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hHixoRRWEe-4k7CzzL6IsA" y="-10"/> |
5473 | </children> | 5794 | </children> |
5474 | <children xmi:type="notation:Node" xmi:id="_mjFXWl4hEe2rXNsIDUvqhw" type="6002"> | 5795 | <children xmi:type="notation:Node" xmi:id="_hHixohRWEe-4k7CzzL6IsA" type="6002"> |
5475 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mjFXW14hEe2rXNsIDUvqhw" y="10"/> | 5796 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hHixoxRWEe-4k7CzzL6IsA" y="10"/> |
5476 | </children> | 5797 | </children> |
5477 | <children xmi:type="notation:Node" xmi:id="_mjFXXF4hEe2rXNsIDUvqhw" type="6003"> | 5798 | <children xmi:type="notation:Node" xmi:id="_hHixpBRWEe-4k7CzzL6IsA" type="6003"> |
5478 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mjFXXV4hEe2rXNsIDUvqhw" y="10"/> | 5799 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hHixpRRWEe-4k7CzzL6IsA" y="10"/> |
5479 | </children> | 5800 | </children> |
5480 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_mjFXVV4hEe2rXNsIDUvqhw" routing="Tree"/> | 5801 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_hHiKkRRWEe-4k7CzzL6IsA" routing="Rectilinear"/> |
5481 | <styles xmi:type="notation:FontStyle" xmi:id="_mjFXVl4hEe2rXNsIDUvqhw" fontName="Noto Sans" fontHeight="8"/> | 5802 | <styles xmi:type="notation:FontStyle" xmi:id="_hHiKkhRWEe-4k7CzzL6IsA" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> |
5482 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mjFXV14hEe2rXNsIDUvqhw" points="[26, 1, -688, -26]$[654, 24, -60, -3]"/> | 5803 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hHiKkxRWEe-4k7CzzL6IsA" points="[0, 0, -162, 0]$[162, 0, 0, 0]"/> |
5483 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mjFXXl4hEe2rXNsIDUvqhw" id="(0.7966101694915254,0.11224489795918367)"/> | 5804 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hHjYsBRWEe-4k7CzzL6IsA" id="(1.0,0.5)"/> |
5484 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mjFXX14hEe2rXNsIDUvqhw" id="(0.5,0.5)"/> | 5805 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hHjYsRRWEe-4k7CzzL6IsA" id="(0.0,0.5)"/> |
5485 | </edges> | 5806 | </edges> |
5486 | <edges xmi:type="notation:Edge" xmi:id="_vYOzIF4hEe2rXNsIDUvqhw" type="4001" element="_vYNlAl4hEe2rXNsIDUvqhw" source="_x-y3lF4fEe2rXNsIDUvqhw" target="_vYOzEF4hEe2rXNsIDUvqhw"> | 5807 | <edges xmi:type="notation:Edge" xmi:id="_q3XtCBRWEe-4k7CzzL6IsA" type="4001" element="_q2tloxRWEe-4k7CzzL6IsA" source="_x-y3lF4fEe2rXNsIDUvqhw" target="_mJXFsBRWEe-4k7CzzL6IsA"> |
5487 | <children xmi:type="notation:Node" xmi:id="_vYPaIF4hEe2rXNsIDUvqhw" type="6001"> | 5808 | <children xmi:type="notation:Node" xmi:id="_q3YUABRWEe-4k7CzzL6IsA" type="6001"> |
5488 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vYPaIV4hEe2rXNsIDUvqhw" x="-10"/> | 5809 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q3YUARRWEe-4k7CzzL6IsA" x="-16" y="-10"/> |
5489 | </children> | 5810 | </children> |
5490 | <children xmi:type="notation:Node" xmi:id="_vYPaIl4hEe2rXNsIDUvqhw" type="6002"> | 5811 | <children xmi:type="notation:Node" xmi:id="_q3YUAhRWEe-4k7CzzL6IsA" type="6002"> |
5491 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vYPaI14hEe2rXNsIDUvqhw" x="10"/> | 5812 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q3YUAxRWEe-4k7CzzL6IsA" x="3" y="10"/> |
5492 | </children> | 5813 | </children> |
5493 | <children xmi:type="notation:Node" xmi:id="_vYPaJF4hEe2rXNsIDUvqhw" type="6003"> | 5814 | <children xmi:type="notation:Node" xmi:id="_q3YUBBRWEe-4k7CzzL6IsA" type="6003"> |
5494 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vYPaJV4hEe2rXNsIDUvqhw" x="10"/> | 5815 | <layoutConstraint xmi:type="notation:Bounds" xmi:id="_q3YUBRRWEe-4k7CzzL6IsA" x="-3" y="10"/> |
5495 | </children> | 5816 | </children> |
5496 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_vYOzIV4hEe2rXNsIDUvqhw" routing="Rectilinear"/> | 5817 | <styles xmi:type="notation:ConnectorStyle" xmi:id="_q3XtCRRWEe-4k7CzzL6IsA" routing="Rectilinear"/> |
5497 | <styles xmi:type="notation:FontStyle" xmi:id="_vYOzIl4hEe2rXNsIDUvqhw" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> | 5818 | <styles xmi:type="notation:FontStyle" xmi:id="_q3XtChRWEe-4k7CzzL6IsA" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/> |
5498 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vYOzI14hEe2rXNsIDUvqhw" points="[0, 49, 7, -155]$[0, 155, 7, -49]"/> | 5819 | <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_q3XtCxRWEe-4k7CzzL6IsA" points="[-19, 0, 108, -202]$[-19, 94, 108, -108]$[-127, 94, 0, -108]$[-127, 202, 0, 0]"/> |
5499 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vYPaJl4hEe2rXNsIDUvqhw" id="(0.5,0.5)"/> | 5820 | <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_q3YUBhRWEe-4k7CzzL6IsA" id="(0.5,1.0)"/> |
5500 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vYPaJ14hEe2rXNsIDUvqhw" id="(0.5,0.5)"/> | 5821 | <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_q3YUBxRWEe-4k7CzzL6IsA" id="(0.4152542372881356,0.0)"/> |
5501 | </edges> | 5822 | </edges> |
5502 | </data> | 5823 | </data> |
5503 | </ownedAnnotationEntries> | 5824 | </ownedAnnotationEntries> |
@@ -5514,7 +5835,7 @@ | |||
5514 | </computedStyleDescriptions> | 5835 | </computedStyleDescriptions> |
5515 | </data> | 5836 | </data> |
5516 | </ownedAnnotationEntries> | 5837 | </ownedAnnotationEntries> |
5517 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_x-tYAF4fEe2rXNsIDUvqhw" name="Action" tooltipText="" incomingEdges="_x-xpcV4fEe2rXNsIDUvqhw _x-xpeF4fEe2rXNsIDUvqhw _x-yQg14fEe2rXNsIDUvqhw" width="12" height="10"> | 5838 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_x-tYAF4fEe2rXNsIDUvqhw" name="Action" tooltipText="" incomingEdges="_x-xpcV4fEe2rXNsIDUvqhw" width="12" height="10"> |
5518 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Action"/> | 5839 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Action"/> |
5519 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Action"/> | 5840 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Action"/> |
5520 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | 5841 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> |
@@ -5526,7 +5847,7 @@ | |||
5526 | </ownedStyle> | 5847 | </ownedStyle> |
5527 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> | 5848 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> |
5528 | </ownedDiagramElements> | 5849 | </ownedDiagramElements> |
5529 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_x-t_EF4fEe2rXNsIDUvqhw" name="AssertionAction" tooltipText="" outgoingEdges="_x-xpcV4fEe2rXNsIDUvqhw _vYNlAl4hEe2rXNsIDUvqhw" width="12" height="10"> | 5850 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_x-t_EF4fEe2rXNsIDUvqhw" name="AssertionAction" tooltipText="" outgoingEdges="_x-xpcV4fEe2rXNsIDUvqhw _sxjtgBOtEe-xzrPFjBSxRw _hHIh9hRWEe-4k7CzzL6IsA _q2tloxRWEe-4k7CzzL6IsA" width="12" height="10"> |
5530 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionAction"/> | 5851 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionAction"/> |
5531 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionAction"/> | 5852 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionAction"/> |
5532 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | 5853 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> |
@@ -5536,44 +5857,6 @@ | |||
5536 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> | 5857 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> |
5537 | </ownedStyle> | 5858 | </ownedStyle> |
5538 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> | 5859 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> |
5539 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_x-wbWF4fEe2rXNsIDUvqhw" name="value : LogicValue = TRUE" tooltipText=""> | ||
5540 | <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//AssertionAction/value"/> | ||
5541 | <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//AssertionAction/value"/> | ||
5542 | <ownedStyle xmi:type="diagram:BundledImage" uid="_x-wbWV4fEe2rXNsIDUvqhw" labelAlignment="LEFT"> | ||
5543 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/> | ||
5544 | </ownedStyle> | ||
5545 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> | ||
5546 | </ownedElements> | ||
5547 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_x-wbWl4fEe2rXNsIDUvqhw" name="overwrite : EBoolean = FALSE" tooltipText=""> | ||
5548 | <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//AssertionAction/overwrite"/> | ||
5549 | <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//AssertionAction/overwrite"/> | ||
5550 | <ownedStyle xmi:type="diagram:BundledImage" uid="_x-xCYF4fEe2rXNsIDUvqhw" labelAlignment="LEFT"> | ||
5551 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/> | ||
5552 | </ownedStyle> | ||
5553 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> | ||
5554 | </ownedElements> | ||
5555 | </ownedDiagramElements> | ||
5556 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_x-t_E14fEe2rXNsIDUvqhw" name="DeleteAction" tooltipText="" outgoingEdges="_x-xpeF4fEe2rXNsIDUvqhw _mjCUBl4hEe2rXNsIDUvqhw" width="12" height="10"> | ||
5557 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//DeleteAction"/> | ||
5558 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//DeleteAction"/> | ||
5559 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | ||
5560 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> | ||
5561 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> | ||
5562 | <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_x-t_FF4fEe2rXNsIDUvqhw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> | ||
5563 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> | ||
5564 | </ownedStyle> | ||
5565 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> | ||
5566 | </ownedDiagramElements> | ||
5567 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_x-umIF4fEe2rXNsIDUvqhw" name="NewAction" tooltipText="" outgoingEdges="_x-yQg14fEe2rXNsIDUvqhw _1WX3YF4fEe2rXNsIDUvqhw _mjCUDV4hEe2rXNsIDUvqhw" width="12" height="10"> | ||
5568 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NewAction"/> | ||
5569 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NewAction"/> | ||
5570 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | ||
5571 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> | ||
5572 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> | ||
5573 | <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_x-umIV4fEe2rXNsIDUvqhw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> | ||
5574 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> | ||
5575 | </ownedStyle> | ||
5576 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> | ||
5577 | </ownedDiagramElements> | 5860 | </ownedDiagramElements> |
5578 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_x-xpcV4fEe2rXNsIDUvqhw" sourceNode="_x-t_EF4fEe2rXNsIDUvqhw" targetNode="_x-tYAF4fEe2rXNsIDUvqhw"> | 5861 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_x-xpcV4fEe2rXNsIDUvqhw" sourceNode="_x-t_EF4fEe2rXNsIDUvqhw" targetNode="_x-tYAF4fEe2rXNsIDUvqhw"> |
5579 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionAction"/> | 5862 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionAction"/> |
@@ -5587,57 +5870,10 @@ | |||
5587 | </ownedStyle> | 5870 | </ownedStyle> |
5588 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/> | 5871 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/> |
5589 | </ownedDiagramElements> | 5872 | </ownedDiagramElements> |
5590 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_x-xpeF4fEe2rXNsIDUvqhw" sourceNode="_x-t_E14fEe2rXNsIDUvqhw" targetNode="_x-tYAF4fEe2rXNsIDUvqhw"> | 5873 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_mi_QsF4hEe2rXNsIDUvqhw" name="VariableOrNode" visible="false" tooltipText="" width="12" height="10"> |
5591 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//DeleteAction"/> | ||
5592 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//DeleteAction"/> | ||
5593 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_x-xpeV4fEe2rXNsIDUvqhw" targetArrow="InputClosedArrow" routingStyle="tree"> | ||
5594 | <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/> | ||
5595 | <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_x-xpel4fEe2rXNsIDUvqhw" showIcon="false"> | ||
5596 | <labelFormat>italic</labelFormat> | ||
5597 | </beginLabelStyle> | ||
5598 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_x-xpe14fEe2rXNsIDUvqhw" showIcon="false"/> | ||
5599 | </ownedStyle> | ||
5600 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/> | ||
5601 | </ownedDiagramElements> | ||
5602 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_x-yQg14fEe2rXNsIDUvqhw" sourceNode="_x-umIF4fEe2rXNsIDUvqhw" targetNode="_x-tYAF4fEe2rXNsIDUvqhw"> | ||
5603 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NewAction"/> | ||
5604 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NewAction"/> | ||
5605 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_x-yQhF4fEe2rXNsIDUvqhw" targetArrow="InputClosedArrow" routingStyle="tree"> | ||
5606 | <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/> | ||
5607 | <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_x-yQhV4fEe2rXNsIDUvqhw" showIcon="false"> | ||
5608 | <labelFormat>italic</labelFormat> | ||
5609 | </beginLabelStyle> | ||
5610 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_x-yQhl4fEe2rXNsIDUvqhw" showIcon="false"/> | ||
5611 | </ownedStyle> | ||
5612 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/> | ||
5613 | </ownedDiagramElements> | ||
5614 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_1WVbIF4fEe2rXNsIDUvqhw" name="NewVariable" tooltipText="" outgoingEdges="_mjC7Il4hEe2rXNsIDUvqhw" incomingEdges="_1WX3YF4fEe2rXNsIDUvqhw" width="12" height="10"> | ||
5615 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NewVariable"/> | ||
5616 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NewVariable"/> | ||
5617 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | ||
5618 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> | ||
5619 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> | ||
5620 | <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_1WVbIV4fEe2rXNsIDUvqhw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216"> | ||
5621 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> | ||
5622 | </ownedStyle> | ||
5623 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> | ||
5624 | </ownedDiagramElements> | ||
5625 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_1WX3YF4fEe2rXNsIDUvqhw" name="[0..1] variable" sourceNode="_x-umIF4fEe2rXNsIDUvqhw" targetNode="_1WVbIF4fEe2rXNsIDUvqhw"> | ||
5626 | <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//NewAction/variable"/> | ||
5627 | <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//NewAction/variable"/> | ||
5628 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_1WX3ZF4fEe2rXNsIDUvqhw" description="_1WX3YV4fEe2rXNsIDUvqhw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0"> | ||
5629 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_1WX3Zl4fEe2rXNsIDUvqhw" showIcon="false"> | ||
5630 | <customFeatures>labelSize</customFeatures> | ||
5631 | </centerLabelStyle> | ||
5632 | <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_1WX3ZV4fEe2rXNsIDUvqhw" showIcon="false" labelColor="39,76,114"> | ||
5633 | <customFeatures>labelSize</customFeatures> | ||
5634 | </endLabelStyle> | ||
5635 | </ownedStyle> | ||
5636 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> | ||
5637 | </ownedDiagramElements> | ||
5638 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_mi_QsF4hEe2rXNsIDUvqhw" name="VariableOrNode" tooltipText="" incomingEdges="_mjCUBl4hEe2rXNsIDUvqhw _mjCUDV4hEe2rXNsIDUvqhw _mjC7Il4hEe2rXNsIDUvqhw" width="12" height="10"> | ||
5639 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//VariableOrNode"/> | 5874 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//VariableOrNode"/> |
5640 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//VariableOrNode"/> | 5875 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//VariableOrNode"/> |
5876 | <graphicalFilters xmi:type="diagram:HideFilter" uid="_IgckgBOwEe-4k7CzzL6IsA"/> | ||
5641 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | 5877 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> |
5642 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> | 5878 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> |
5643 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> | 5879 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> |
@@ -5647,49 +5883,10 @@ | |||
5647 | </ownedStyle> | 5883 | </ownedStyle> |
5648 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> | 5884 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> |
5649 | </ownedDiagramElements> | 5885 | </ownedDiagramElements> |
5650 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_mjCUBl4hEe2rXNsIDUvqhw" name="[0..1] variableOrNode" sourceNode="_x-t_E14fEe2rXNsIDUvqhw" targetNode="_mi_QsF4hEe2rXNsIDUvqhw"> | 5886 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_vYLvwF4hEe2rXNsIDUvqhw" name="Atom" visible="false" tooltipText="" outgoingEdges="_nWqyLBOtEe-xzrPFjBSxRw" width="12" height="10"> |
5651 | <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//DeleteAction/variableOrNode"/> | ||
5652 | <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//DeleteAction/variableOrNode"/> | ||
5653 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_mjCUB14hEe2rXNsIDUvqhw" routingStyle="manhattan" strokeColor="0,0,0"> | ||
5654 | <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/> | ||
5655 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_mjCUCV4hEe2rXNsIDUvqhw" showIcon="false"> | ||
5656 | <customFeatures>labelSize</customFeatures> | ||
5657 | </centerLabelStyle> | ||
5658 | <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_mjCUCF4hEe2rXNsIDUvqhw" showIcon="false" labelColor="39,76,114"> | ||
5659 | <customFeatures>labelSize</customFeatures> | ||
5660 | </endLabelStyle> | ||
5661 | </ownedStyle> | ||
5662 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> | ||
5663 | </ownedDiagramElements> | ||
5664 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_mjCUDV4hEe2rXNsIDUvqhw" name="[0..1] parent" sourceNode="_x-umIF4fEe2rXNsIDUvqhw" targetNode="_mi_QsF4hEe2rXNsIDUvqhw"> | ||
5665 | <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//NewAction/parent"/> | ||
5666 | <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//NewAction/parent"/> | ||
5667 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_mjCUDl4hEe2rXNsIDUvqhw" routingStyle="manhattan" strokeColor="0,0,0"> | ||
5668 | <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/> | ||
5669 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_mjCUEF4hEe2rXNsIDUvqhw" showIcon="false"> | ||
5670 | <customFeatures>labelSize</customFeatures> | ||
5671 | </centerLabelStyle> | ||
5672 | <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_mjCUD14hEe2rXNsIDUvqhw" showIcon="false" labelColor="39,76,114"> | ||
5673 | <customFeatures>labelSize</customFeatures> | ||
5674 | </endLabelStyle> | ||
5675 | </ownedStyle> | ||
5676 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> | ||
5677 | </ownedDiagramElements> | ||
5678 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_mjC7Il4hEe2rXNsIDUvqhw" sourceNode="_1WVbIF4fEe2rXNsIDUvqhw" targetNode="_mi_QsF4hEe2rXNsIDUvqhw"> | ||
5679 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NewVariable"/> | ||
5680 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NewVariable"/> | ||
5681 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_mjC7I14hEe2rXNsIDUvqhw" lineStyle="dot" targetArrow="InputClosedArrow" routingStyle="tree" strokeColor="125,125,125"> | ||
5682 | <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.1/@style"/> | ||
5683 | <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_mjC7JF4hEe2rXNsIDUvqhw" showIcon="false"> | ||
5684 | <labelFormat>italic</labelFormat> | ||
5685 | </beginLabelStyle> | ||
5686 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_mjC7JV4hEe2rXNsIDUvqhw" showIcon="false"/> | ||
5687 | </ownedStyle> | ||
5688 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/> | ||
5689 | </ownedDiagramElements> | ||
5690 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_vYLvwF4hEe2rXNsIDUvqhw" name="Atom" tooltipText="" incomingEdges="_vYNlAl4hEe2rXNsIDUvqhw" width="12" height="10"> | ||
5691 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Atom"/> | 5887 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Atom"/> |
5692 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Atom"/> | 5888 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Atom"/> |
5889 | <graphicalFilters xmi:type="diagram:HideFilter" uid="_c74pgBRWEe-4k7CzzL6IsA"/> | ||
5693 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | 5890 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> |
5694 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> | 5891 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> |
5695 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> | 5892 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> |
@@ -5697,7 +5894,7 @@ | |||
5697 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> | 5894 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/> |
5698 | </ownedStyle> | 5895 | </ownedStyle> |
5699 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> | 5896 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> |
5700 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_vYM9414hEe2rXNsIDUvqhw" name="transitiveClosure : EBoolean = false" tooltipText=""> | 5897 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_vYM9414hEe2rXNsIDUvqhw" name="transitiveClosure : EBoolean = false" visible="false" tooltipText=""> |
5701 | <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//Atom/transitiveClosure"/> | 5898 | <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//Atom/transitiveClosure"/> |
5702 | <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//Atom/transitiveClosure"/> | 5899 | <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//Atom/transitiveClosure"/> |
5703 | <ownedStyle xmi:type="diagram:BundledImage" uid="_vYM95F4hEe2rXNsIDUvqhw" labelAlignment="LEFT"> | 5900 | <ownedStyle xmi:type="diagram:BundledImage" uid="_vYM95F4hEe2rXNsIDUvqhw" labelAlignment="LEFT"> |
@@ -5705,31 +5902,11 @@ | |||
5705 | </ownedStyle> | 5902 | </ownedStyle> |
5706 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> | 5903 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/> |
5707 | </ownedElements> | 5904 | </ownedElements> |
5708 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_3vrVA163Ee2rXNsIDUvqhw" name=" arguments : Expr" tooltipText=""> | ||
5709 | <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Atom/arguments"/> | ||
5710 | <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Atom/arguments"/> | ||
5711 | <ownedStyle xmi:type="diagram:BundledImage" uid="_3vrVBF63Ee2rXNsIDUvqhw" labelAlignment="LEFT" color="114,159,207"> | ||
5712 | <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']/@style"/> | ||
5713 | </ownedStyle> | ||
5714 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/> | ||
5715 | </ownedElements> | ||
5716 | </ownedDiagramElements> | ||
5717 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_vYNlAl4hEe2rXNsIDUvqhw" name="[0..1] atom" sourceNode="_x-t_EF4fEe2rXNsIDUvqhw" targetNode="_vYLvwF4hEe2rXNsIDUvqhw"> | ||
5718 | <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AssertionAction/atom"/> | ||
5719 | <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AssertionAction/atom"/> | ||
5720 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_vYNlA14hEe2rXNsIDUvqhw" description="_1WX3YV4fEe2rXNsIDUvqhw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0"> | ||
5721 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_vYNlBV4hEe2rXNsIDUvqhw" showIcon="false"> | ||
5722 | <customFeatures>labelSize</customFeatures> | ||
5723 | </centerLabelStyle> | ||
5724 | <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_vYNlBF4hEe2rXNsIDUvqhw" showIcon="false" labelColor="39,76,114"> | ||
5725 | <customFeatures>labelSize</customFeatures> | ||
5726 | </endLabelStyle> | ||
5727 | </ownedStyle> | ||
5728 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> | ||
5729 | </ownedDiagramElements> | 5905 | </ownedDiagramElements> |
5730 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_4xTbQF4hEe2rXNsIDUvqhw" name="LogicValue" tooltipText="" width="12" height="10"> | 5906 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_4xTbQF4hEe2rXNsIDUvqhw" name="LogicValue" visible="false" tooltipText="" width="12" height="10"> |
5731 | <target xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//LogicValue"/> | 5907 | <target xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//LogicValue"/> |
5732 | <semanticElements xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//LogicValue"/> | 5908 | <semanticElements xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//LogicValue"/> |
5909 | <graphicalFilters xmi:type="diagram:HideFilter" uid="_lpamIBOtEe-xzrPFjBSxRw"/> | ||
5733 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | 5910 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> |
5734 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> | 5911 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> |
5735 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> | 5912 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> |
@@ -5737,7 +5914,7 @@ | |||
5737 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/> | 5914 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/> |
5738 | </ownedStyle> | 5915 | </ownedStyle> |
5739 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"/> | 5916 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"/> |
5740 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_4xV3g14hEe2rXNsIDUvqhw" name="TRUE" tooltipText=""> | 5917 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_4xV3g14hEe2rXNsIDUvqhw" name="TRUE" visible="false" tooltipText=""> |
5741 | <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LogicValue/TRUE"/> | 5918 | <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LogicValue/TRUE"/> |
5742 | <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LogicValue/TRUE"/> | 5919 | <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LogicValue/TRUE"/> |
5743 | <ownedStyle xmi:type="diagram:BundledImage" uid="_4xV3hF4hEe2rXNsIDUvqhw" labelAlignment="LEFT"> | 5920 | <ownedStyle xmi:type="diagram:BundledImage" uid="_4xV3hF4hEe2rXNsIDUvqhw" labelAlignment="LEFT"> |
@@ -5745,7 +5922,7 @@ | |||
5745 | </ownedStyle> | 5922 | </ownedStyle> |
5746 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> | 5923 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> |
5747 | </ownedElements> | 5924 | </ownedElements> |
5748 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_4xV3hV4hEe2rXNsIDUvqhw" name="FALSE" tooltipText=""> | 5925 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_4xV3hV4hEe2rXNsIDUvqhw" name="FALSE" visible="false" tooltipText=""> |
5749 | <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LogicValue/FALSE"/> | 5926 | <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LogicValue/FALSE"/> |
5750 | <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LogicValue/FALSE"/> | 5927 | <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LogicValue/FALSE"/> |
5751 | <ownedStyle xmi:type="diagram:BundledImage" uid="_4xV3hl4hEe2rXNsIDUvqhw" labelAlignment="LEFT"> | 5928 | <ownedStyle xmi:type="diagram:BundledImage" uid="_4xV3hl4hEe2rXNsIDUvqhw" labelAlignment="LEFT"> |
@@ -5753,7 +5930,7 @@ | |||
5753 | </ownedStyle> | 5930 | </ownedStyle> |
5754 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> | 5931 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> |
5755 | </ownedElements> | 5932 | </ownedElements> |
5756 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_4xWekF4hEe2rXNsIDUvqhw" name="UNKNOWN" tooltipText=""> | 5933 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_4xWekF4hEe2rXNsIDUvqhw" name="UNKNOWN" visible="false" tooltipText=""> |
5757 | <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LogicValue/UNKNOWN"/> | 5934 | <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LogicValue/UNKNOWN"/> |
5758 | <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LogicValue/UNKNOWN"/> | 5935 | <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LogicValue/UNKNOWN"/> |
5759 | <ownedStyle xmi:type="diagram:BundledImage" uid="_4xWekV4hEe2rXNsIDUvqhw" labelAlignment="LEFT"> | 5936 | <ownedStyle xmi:type="diagram:BundledImage" uid="_4xWekV4hEe2rXNsIDUvqhw" labelAlignment="LEFT"> |
@@ -5761,7 +5938,7 @@ | |||
5761 | </ownedStyle> | 5938 | </ownedStyle> |
5762 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> | 5939 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> |
5763 | </ownedElements> | 5940 | </ownedElements> |
5764 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_4xWekl4hEe2rXNsIDUvqhw" name="ERROR" tooltipText=""> | 5941 | <ownedElements xmi:type="diagram:DNodeListElement" uid="_4xWekl4hEe2rXNsIDUvqhw" name="ERROR" visible="false" tooltipText=""> |
5765 | <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LogicValue/ERROR"/> | 5942 | <target xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LogicValue/ERROR"/> |
5766 | <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LogicValue/ERROR"/> | 5943 | <semanticElements xmi:type="ecore:EEnumLiteral" href="src/main/resources/model/problem.ecore#//LogicValue/ERROR"/> |
5767 | <ownedStyle xmi:type="diagram:BundledImage" uid="_4xWek14hEe2rXNsIDUvqhw" labelAlignment="LEFT"> | 5944 | <ownedStyle xmi:type="diagram:BundledImage" uid="_4xWek14hEe2rXNsIDUvqhw" labelAlignment="LEFT"> |
@@ -5770,6 +5947,82 @@ | |||
5770 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> | 5947 | <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/> |
5771 | </ownedElements> | 5948 | </ownedElements> |
5772 | </ownedDiagramElements> | 5949 | </ownedDiagramElements> |
5950 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_nWhBIBOtEe-xzrPFjBSxRw" name="Expr" tooltipText="" incomingEdges="_nWqyLBOtEe-xzrPFjBSxRw _sxjtgBOtEe-xzrPFjBSxRw" width="12" height="10"> | ||
5951 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Expr"/> | ||
5952 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Expr"/> | ||
5953 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | ||
5954 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> | ||
5955 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> | ||
5956 | <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_nWhBIROtEe-xzrPFjBSxRw" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228"> | ||
5957 | <labelFormat>italic</labelFormat> | ||
5958 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/> | ||
5959 | </ownedStyle> | ||
5960 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> | ||
5961 | </ownedDiagramElements> | ||
5962 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_nWqyLBOtEe-xzrPFjBSxRw" visible="false" sourceNode="_vYLvwF4hEe2rXNsIDUvqhw" targetNode="_nWhBIBOtEe-xzrPFjBSxRw"> | ||
5963 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Atom"/> | ||
5964 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Atom"/> | ||
5965 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_nWqyLROtEe-xzrPFjBSxRw" targetArrow="InputClosedArrow" routingStyle="tree"> | ||
5966 | <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/> | ||
5967 | <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_nWqyLhOtEe-xzrPFjBSxRw" showIcon="false"> | ||
5968 | <labelFormat>italic</labelFormat> | ||
5969 | </beginLabelStyle> | ||
5970 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_nWqyLxOtEe-xzrPFjBSxRw" showIcon="false"/> | ||
5971 | </ownedStyle> | ||
5972 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/> | ||
5973 | </ownedDiagramElements> | ||
5974 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sxjtgBOtEe-xzrPFjBSxRw" name="[0..1] value" sourceNode="_x-t_EF4fEe2rXNsIDUvqhw" targetNode="_nWhBIBOtEe-xzrPFjBSxRw"> | ||
5975 | <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AssertionAction/value"/> | ||
5976 | <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AssertionAction/value"/> | ||
5977 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_sxkUkBOtEe-xzrPFjBSxRw" description="_1WX3YV4fEe2rXNsIDUvqhw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0"> | ||
5978 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_sxkUkhOtEe-xzrPFjBSxRw" showIcon="false"/> | ||
5979 | <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_sxkUkROtEe-xzrPFjBSxRw" labelSize="6" showIcon="false" labelColor="39,76,114"/> | ||
5980 | </ownedStyle> | ||
5981 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> | ||
5982 | </ownedDiagramElements> | ||
5983 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_e7zS0BRWEe-4k7CzzL6IsA" name="Relation" tooltipText="" incomingEdges="_hHIh9hRWEe-4k7CzzL6IsA" width="12" height="10"> | ||
5984 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Relation"/> | ||
5985 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Relation"/> | ||
5986 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | ||
5987 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> | ||
5988 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> | ||
5989 | <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_e7zS0RRWEe-4k7CzzL6IsA" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228"> | ||
5990 | <labelFormat>italic</labelFormat> | ||
5991 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/> | ||
5992 | </ownedStyle> | ||
5993 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> | ||
5994 | </ownedDiagramElements> | ||
5995 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_hHIh9hRWEe-4k7CzzL6IsA" name="[0..1] relation" sourceNode="_x-t_EF4fEe2rXNsIDUvqhw" targetNode="_e7zS0BRWEe-4k7CzzL6IsA"> | ||
5996 | <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AssertionAction/relation"/> | ||
5997 | <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AssertionAction/relation"/> | ||
5998 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_hHIh9xRWEe-4k7CzzL6IsA" routingStyle="manhattan" strokeColor="0,0,0"> | ||
5999 | <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/> | ||
6000 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_hHIh-RRWEe-4k7CzzL6IsA" showIcon="false"/> | ||
6001 | <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_hHIh-BRWEe-4k7CzzL6IsA" labelSize="6" showIcon="false" labelColor="39,76,114"/> | ||
6002 | </ownedStyle> | ||
6003 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> | ||
6004 | </ownedDiagramElements> | ||
6005 | <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_mJSNMBRWEe-4k7CzzL6IsA" name="AssertionArgument" tooltipText="" incomingEdges="_q2tloxRWEe-4k7CzzL6IsA" width="12" height="10"> | ||
6006 | <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionArgument"/> | ||
6007 | <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionArgument"/> | ||
6008 | <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> | ||
6009 | <arrangeConstraints>KEEP_SIZE</arrangeConstraints> | ||
6010 | <arrangeConstraints>KEEP_RATIO</arrangeConstraints> | ||
6011 | <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_mJSNMRRWEe-4k7CzzL6IsA" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228"> | ||
6012 | <labelFormat>italic</labelFormat> | ||
6013 | <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/> | ||
6014 | </ownedStyle> | ||
6015 | <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/> | ||
6016 | </ownedDiagramElements> | ||
6017 | <ownedDiagramElements xmi:type="diagram:DEdge" uid="_q2tloxRWEe-4k7CzzL6IsA" name="[0..*] arguments" sourceNode="_x-t_EF4fEe2rXNsIDUvqhw" targetNode="_mJSNMBRWEe-4k7CzzL6IsA"> | ||
6018 | <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AssertionAction/arguments"/> | ||
6019 | <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//AssertionAction/arguments"/> | ||
6020 | <ownedStyle xmi:type="diagram:EdgeStyle" uid="_q2uzwBRWEe-4k7CzzL6IsA" description="_1WX3YV4fEe2rXNsIDUvqhw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0"> | ||
6021 | <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_q2uzwhRWEe-4k7CzzL6IsA" showIcon="false"/> | ||
6022 | <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_q2uzwRRWEe-4k7CzzL6IsA" labelSize="6" showIcon="false" labelColor="39,76,114"/> | ||
6023 | </ownedStyle> | ||
6024 | <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/> | ||
6025 | </ownedDiagramElements> | ||
5773 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> | 6026 | <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> |
5774 | <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_sCFBgV4fEe2rXNsIDUvqhw"/> | 6027 | <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_sCFBgV4fEe2rXNsIDUvqhw"/> |
5775 | <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/> | 6028 | <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/> |
diff --git a/subprojects/language-model/src/main/resources/model/problem.ecore b/subprojects/language-model/src/main/resources/model/problem.ecore index 9a349490..e6af9fab 100644 --- a/subprojects/language-model/src/main/resources/model/problem.ecore +++ b/subprojects/language-model/src/main/resources/model/problem.ecore | |||
@@ -38,6 +38,9 @@ | |||
38 | </eClassifiers> | 38 | </eClassifiers> |
39 | <eClassifiers xsi:type="ecore:EClass" name="Parameter" eSuperTypes="#//Variable"> | 39 | <eClassifiers xsi:type="ecore:EClass" name="Parameter" eSuperTypes="#//Variable"> |
40 | <eStructuralFeatures xsi:type="ecore:EReference" name="parameterType" eType="#//Relation"/> | 40 | <eStructuralFeatures xsi:type="ecore:EReference" name="parameterType" eType="#//Relation"/> |
41 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="concreteness" eType="#//Concreteness"/> | ||
42 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="modality" eType="#//Modality"/> | ||
43 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="binding" eType="#//ParameterBinding"/> | ||
41 | </eClassifiers> | 44 | </eClassifiers> |
42 | <eClassifiers xsi:type="ecore:EClass" name="Variable" abstract="true" eSuperTypes="#//VariableOrNode"/> | 45 | <eClassifiers xsi:type="ecore:EClass" name="Variable" abstract="true" eSuperTypes="#//VariableOrNode"/> |
43 | <eClassifiers xsi:type="ecore:EClass" name="Atom" eSuperTypes="#//Expr"> | 46 | <eClassifiers xsi:type="ecore:EClass" name="Atom" eSuperTypes="#//Expr"> |
@@ -109,7 +112,7 @@ | |||
109 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="stringValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> | 112 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="stringValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> |
110 | </eClassifiers> | 113 | </eClassifiers> |
111 | <eClassifiers xsi:type="ecore:EClass" name="NodeAssertionArgument" eSuperTypes="#//AssertionArgument"> | 114 | <eClassifiers xsi:type="ecore:EClass" name="NodeAssertionArgument" eSuperTypes="#//AssertionArgument"> |
112 | <eStructuralFeatures xsi:type="ecore:EReference" name="node" eType="#//Node"/> | 115 | <eStructuralFeatures xsi:type="ecore:EReference" name="node" eType="#//VariableOrNode"/> |
113 | </eClassifiers> | 116 | </eClassifiers> |
114 | <eClassifiers xsi:type="ecore:EClass" name="AssertionArgument" abstract="true"/> | 117 | <eClassifiers xsi:type="ecore:EClass" name="AssertionArgument" abstract="true"/> |
115 | <eClassifiers xsi:type="ecore:EClass" name="NodeDeclaration" eSuperTypes="#//Statement"> | 118 | <eClassifiers xsi:type="ecore:EClass" name="NodeDeclaration" eSuperTypes="#//Statement"> |
@@ -128,6 +131,7 @@ | |||
128 | eType="#//Consequent" containment="true"/> | 131 | eType="#//Consequent" containment="true"/> |
129 | <eStructuralFeatures xsi:type="ecore:EReference" name="preconditions" upperBound="-1" | 132 | <eStructuralFeatures xsi:type="ecore:EReference" name="preconditions" upperBound="-1" |
130 | eType="#//Conjunction" containment="true"/> | 133 | eType="#//Conjunction" containment="true"/> |
134 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//RuleKind"/> | ||
131 | </eClassifiers> | 135 | </eClassifiers> |
132 | <eClassifiers xsi:type="ecore:EClass" name="Consequent"> | 136 | <eClassifiers xsi:type="ecore:EClass" name="Consequent"> |
133 | <eStructuralFeatures xsi:type="ecore:EReference" name="actions" upperBound="-1" | 137 | <eStructuralFeatures xsi:type="ecore:EReference" name="actions" upperBound="-1" |
@@ -135,21 +139,12 @@ | |||
135 | </eClassifiers> | 139 | </eClassifiers> |
136 | <eClassifiers xsi:type="ecore:EClass" name="Action" abstract="true"/> | 140 | <eClassifiers xsi:type="ecore:EClass" name="Action" abstract="true"/> |
137 | <eClassifiers xsi:type="ecore:EClass" name="AssertionAction" eSuperTypes="#//Action"> | 141 | <eClassifiers xsi:type="ecore:EClass" name="AssertionAction" eSuperTypes="#//Action"> |
138 | <eStructuralFeatures xsi:type="ecore:EReference" name="atom" eType="#//Atom" containment="true"/> | 142 | <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//Expr" |
139 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="#//LogicValue" | ||
140 | defaultValueLiteral="TRUE"/> | ||
141 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="overwrite" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" | ||
142 | defaultValueLiteral="FALSE"/> | ||
143 | </eClassifiers> | ||
144 | <eClassifiers xsi:type="ecore:EClass" name="DeleteAction" eSuperTypes="#//Action"> | ||
145 | <eStructuralFeatures xsi:type="ecore:EReference" name="variableOrNode" eType="#//VariableOrNode"/> | ||
146 | </eClassifiers> | ||
147 | <eClassifiers xsi:type="ecore:EClass" name="NewAction" eSuperTypes="#//Action"> | ||
148 | <eStructuralFeatures xsi:type="ecore:EReference" name="variable" eType="#//NewVariable" | ||
149 | containment="true"/> | 143 | containment="true"/> |
150 | <eStructuralFeatures xsi:type="ecore:EReference" name="parent" eType="#//VariableOrNode"/> | 144 | <eStructuralFeatures xsi:type="ecore:EReference" name="relation" eType="#//Relation"/> |
145 | <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1" | ||
146 | eType="#//AssertionArgument" containment="true"/> | ||
151 | </eClassifiers> | 147 | </eClassifiers> |
152 | <eClassifiers xsi:type="ecore:EClass" name="NewVariable" eSuperTypes="#//Variable"/> | ||
153 | <eClassifiers xsi:type="ecore:EEnum" name="ComparisonOp"> | 148 | <eClassifiers xsi:type="ecore:EEnum" name="ComparisonOp"> |
154 | <eLiterals name="LESS"/> | 149 | <eLiterals name="LESS"/> |
155 | <eLiterals name="LESS_EQ" value="1"/> | 150 | <eLiterals name="LESS_EQ" value="1"/> |
@@ -264,4 +259,27 @@ | |||
264 | <eClassifiers xsi:type="ecore:EClass" name="AssignmentExpr" eSuperTypes="#//BinaryExpr"/> | 259 | <eClassifiers xsi:type="ecore:EClass" name="AssignmentExpr" eSuperTypes="#//BinaryExpr"/> |
265 | <eClassifiers xsi:type="ecore:EClass" name="InfiniteConstant" eSuperTypes="#//Constant"/> | 260 | <eClassifiers xsi:type="ecore:EClass" name="InfiniteConstant" eSuperTypes="#//Constant"/> |
266 | <eClassifiers xsi:type="ecore:EClass" name="AggregatorDeclaration" eSuperTypes="#//Statement #//NamedElement"/> | 261 | <eClassifiers xsi:type="ecore:EClass" name="AggregatorDeclaration" eSuperTypes="#//Statement #//NamedElement"/> |
262 | <eClassifiers xsi:type="ecore:EClass" name="ModalExpr" eSuperTypes="#//UnaryExpr"> | ||
263 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="concreteness" eType="#//Concreteness"/> | ||
264 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="modality" eType="#//Modality"/> | ||
265 | </eClassifiers> | ||
266 | <eClassifiers xsi:type="ecore:EEnum" name="Modality"> | ||
267 | <eLiterals name="NONE"/> | ||
268 | <eLiterals name="MUST" value="1"/> | ||
269 | <eLiterals name="MAY" value="2"/> | ||
270 | </eClassifiers> | ||
271 | <eClassifiers xsi:type="ecore:EEnum" name="Concreteness"> | ||
272 | <eLiterals name="PARTIAL"/> | ||
273 | <eLiterals name="CANDIDATE" value="1"/> | ||
274 | </eClassifiers> | ||
275 | <eClassifiers xsi:type="ecore:EEnum" name="RuleKind"> | ||
276 | <eLiterals name="REFINEMENT"/> | ||
277 | <eLiterals name="PROPAGATION" value="1"/> | ||
278 | <eLiterals name="DECISION" value="2"/> | ||
279 | </eClassifiers> | ||
280 | <eClassifiers xsi:type="ecore:EEnum" name="ParameterBinding"> | ||
281 | <eLiterals name="SINGLE"/> | ||
282 | <eLiterals name="FOCUS" value="1"/> | ||
283 | <eLiterals name="MULTI" value="2"/> | ||
284 | </eClassifiers> | ||
267 | </ecore:EPackage> | 285 | </ecore:EPackage> |
diff --git a/subprojects/language-model/src/main/resources/model/problem.genmodel b/subprojects/language-model/src/main/resources/model/problem.genmodel index 2a1d8522..7fc9f760 100644 --- a/subprojects/language-model/src/main/resources/model/problem.genmodel +++ b/subprojects/language-model/src/main/resources/model/problem.genmodel | |||
@@ -60,6 +60,25 @@ | |||
60 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//LatticeBinaryOp/MEET"/> | 60 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//LatticeBinaryOp/MEET"/> |
61 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//LatticeBinaryOp/JOIN"/> | 61 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//LatticeBinaryOp/JOIN"/> |
62 | </genEnums> | 62 | </genEnums> |
63 | <genEnums typeSafeEnumCompatible="false" ecoreEnum="problem.ecore#//Modality"> | ||
64 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//Modality/NONE"/> | ||
65 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//Modality/MUST"/> | ||
66 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//Modality/MAY"/> | ||
67 | </genEnums> | ||
68 | <genEnums typeSafeEnumCompatible="false" ecoreEnum="problem.ecore#//Concreteness"> | ||
69 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//Concreteness/PARTIAL"/> | ||
70 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//Concreteness/CANDIDATE"/> | ||
71 | </genEnums> | ||
72 | <genEnums typeSafeEnumCompatible="false" ecoreEnum="problem.ecore#//RuleKind"> | ||
73 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//RuleKind/REFINEMENT"/> | ||
74 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//RuleKind/PROPAGATION"/> | ||
75 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//RuleKind/DECISION"/> | ||
76 | </genEnums> | ||
77 | <genEnums typeSafeEnumCompatible="false" ecoreEnum="problem.ecore#//ParameterBinding"> | ||
78 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ParameterBinding/SINGLE"/> | ||
79 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ParameterBinding/FOCUS"/> | ||
80 | <genEnumLiterals ecoreEnumLiteral="problem.ecore#//ParameterBinding/MULTI"/> | ||
81 | </genEnums> | ||
63 | <genClasses ecoreClass="problem.ecore#//Problem"> | 82 | <genClasses ecoreClass="problem.ecore#//Problem"> |
64 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Problem/nodes"/> | 83 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Problem/nodes"/> |
65 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Problem/statements"/> | 84 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Problem/statements"/> |
@@ -88,6 +107,9 @@ | |||
88 | </genClasses> | 107 | </genClasses> |
89 | <genClasses ecoreClass="problem.ecore#//Parameter"> | 108 | <genClasses ecoreClass="problem.ecore#//Parameter"> |
90 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Parameter/parameterType"/> | 109 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Parameter/parameterType"/> |
110 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//Parameter/concreteness"/> | ||
111 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//Parameter/modality"/> | ||
112 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//Parameter/binding"/> | ||
91 | </genClasses> | 113 | </genClasses> |
92 | <genClasses ecoreClass="problem.ecore#//Variable"/> | 114 | <genClasses ecoreClass="problem.ecore#//Variable"/> |
93 | <genClasses ecoreClass="problem.ecore#//Atom"> | 115 | <genClasses ecoreClass="problem.ecore#//Atom"> |
@@ -153,24 +175,17 @@ | |||
153 | <genClasses ecoreClass="problem.ecore#//RuleDefinition"> | 175 | <genClasses ecoreClass="problem.ecore#//RuleDefinition"> |
154 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//RuleDefinition/consequents"/> | 176 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//RuleDefinition/consequents"/> |
155 | <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//RuleDefinition/preconditions"/> | 177 | <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//RuleDefinition/preconditions"/> |
178 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//RuleDefinition/kind"/> | ||
156 | </genClasses> | 179 | </genClasses> |
157 | <genClasses ecoreClass="problem.ecore#//Consequent"> | 180 | <genClasses ecoreClass="problem.ecore#//Consequent"> |
158 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Consequent/actions"/> | 181 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Consequent/actions"/> |
159 | </genClasses> | 182 | </genClasses> |
160 | <genClasses ecoreClass="problem.ecore#//Action"/> | 183 | <genClasses ecoreClass="problem.ecore#//Action"/> |
161 | <genClasses ecoreClass="problem.ecore#//AssertionAction"> | 184 | <genClasses ecoreClass="problem.ecore#//AssertionAction"> |
162 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//AssertionAction/atom"/> | 185 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//AssertionAction/value"/> |
163 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//AssertionAction/value"/> | 186 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//AssertionAction/relation"/> |
164 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//AssertionAction/overwrite"/> | 187 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//AssertionAction/arguments"/> |
165 | </genClasses> | 188 | </genClasses> |
166 | <genClasses ecoreClass="problem.ecore#//DeleteAction"> | ||
167 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//DeleteAction/variableOrNode"/> | ||
168 | </genClasses> | ||
169 | <genClasses ecoreClass="problem.ecore#//NewAction"> | ||
170 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//NewAction/variable"/> | ||
171 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//NewAction/parent"/> | ||
172 | </genClasses> | ||
173 | <genClasses ecoreClass="problem.ecore#//NewVariable"/> | ||
174 | <genClasses ecoreClass="problem.ecore#//Expr"/> | 189 | <genClasses ecoreClass="problem.ecore#//Expr"/> |
175 | <genClasses ecoreClass="problem.ecore#//VariableOrNodeExpr"> | 190 | <genClasses ecoreClass="problem.ecore#//VariableOrNodeExpr"> |
176 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//VariableOrNodeExpr/variableOrNode"/> | 191 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//VariableOrNodeExpr/variableOrNode"/> |
@@ -232,5 +247,9 @@ | |||
232 | <genClasses ecoreClass="problem.ecore#//AssignmentExpr"/> | 247 | <genClasses ecoreClass="problem.ecore#//AssignmentExpr"/> |
233 | <genClasses ecoreClass="problem.ecore#//InfiniteConstant"/> | 248 | <genClasses ecoreClass="problem.ecore#//InfiniteConstant"/> |
234 | <genClasses ecoreClass="problem.ecore#//AggregatorDeclaration"/> | 249 | <genClasses ecoreClass="problem.ecore#//AggregatorDeclaration"/> |
250 | <genClasses ecoreClass="problem.ecore#//ModalExpr"> | ||
251 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ModalExpr/concreteness"/> | ||
252 | <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ModalExpr/modality"/> | ||
253 | </genClasses> | ||
235 | </genPackages> | 254 | </genPackages> |
236 | </genmodel:GenModel> | 255 | </genmodel:GenModel> |
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ModelInitializer.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ModelInitializer.java index ccfb630f..59ceae3f 100644 --- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ModelInitializer.java +++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ModelInitializer.java | |||
@@ -521,7 +521,12 @@ public class ModelInitializer { | |||
521 | for (int i = 0; i < arity; i++) { | 521 | for (int i = 0; i < arity; i++) { |
522 | var argument = arguments.get(i); | 522 | var argument = arguments.get(i); |
523 | if (argument instanceof NodeAssertionArgument nodeArgument) { | 523 | if (argument instanceof NodeAssertionArgument nodeArgument) { |
524 | nodes[i] = getNodeId(nodeArgument.getNode()); | 524 | var variableOrNode = nodeArgument.getNode(); |
525 | if (variableOrNode instanceof Node node) { | ||
526 | nodes[i] = getNodeId(node); | ||
527 | } else { | ||
528 | throw new TracedException(argument, "Invalid assertion argument: " + variableOrNode); | ||
529 | } | ||
525 | } else if (argument instanceof WildcardAssertionArgument) { | 530 | } else if (argument instanceof WildcardAssertionArgument) { |
526 | nodes[i] = -1; | 531 | nodes[i] = -1; |
527 | } else { | 532 | } else { |
diff --git a/subprojects/language/src/main/java/tools/refinery/language/Problem.xtext b/subprojects/language/src/main/java/tools/refinery/language/Problem.xtext index 08f7a585..64998cd0 100644 --- a/subprojects/language/src/main/java/tools/refinery/language/Problem.xtext +++ b/subprojects/language/src/main/java/tools/refinery/language/Problem.xtext | |||
@@ -18,7 +18,7 @@ enum ModuleKind: | |||
18 | Statement: | 18 | Statement: |
19 | ImportStatement | Assertion | ClassDeclaration | EnumDeclaration | | 19 | ImportStatement | Assertion | ClassDeclaration | EnumDeclaration | |
20 | DatatypeDeclaration | AggregatorDeclaration | PredicateDefinition | | 20 | DatatypeDeclaration | AggregatorDeclaration | PredicateDefinition | |
21 | /* FunctionDefinition | RuleDefinition | */ | 21 | /* FunctionDefinition | */ RuleDefinition | |
22 | ScopeDeclaration | NodeDeclaration; | 22 | ScopeDeclaration | NodeDeclaration; |
23 | 23 | ||
24 | ImportStatement: | 24 | ImportStatement: |
@@ -75,35 +75,40 @@ Conjunction: | |||
75 | // | 75 | // |
76 | //Case: | 76 | //Case: |
77 | // Conjunction ({Match.condition=current} "->" value=Expr)?; | 77 | // Conjunction ({Match.condition=current} "->" value=Expr)?; |
78 | //RuleDefinition: | 78 | |
79 | // "rule" | 79 | enum RuleKind: |
80 | // name=Identifier | 80 | DECISION="decision" | PROPAGATION="propagation"; |
81 | // "(" (parameters+=Parameter ("," parameters+=Parameter)*)? ")" | 81 | |
82 | // (":" preconditions+=Conjunction (";" preconditions+=Conjunction)*)? | 82 | RuleDefinition: |
83 | // "==>" consequents+=Consequent (";" consequents+=Consequent)*)? | 83 | kind=RuleKind? "rule" |
84 | // "."; | 84 | name=Identifier |
85 | "(" (parameters+=Parameter ("," parameters+=Parameter)*)? ")" | ||
86 | (":" preconditions+=Conjunction (";" preconditions+=Conjunction)*)? | ||
87 | ("==>" consequents+=Consequent (";" consequents+=Consequent)*)? | ||
88 | "."; | ||
89 | |||
90 | enum ParameterBinding: | ||
91 | FOCUS="&" | MULTI="*"; | ||
85 | 92 | ||
86 | Parameter: | 93 | Parameter: |
87 | parameterType=[Relation|QualifiedName]? name=Identifier; | 94 | ( |
95 | (concreteness=Concreteness? modality=Modality)? | ||
96 | parameterType=[Relation|QualifiedName] | ||
97 | )? binding=ParameterBinding? name=Identifier; | ||
88 | 98 | ||
89 | //Consequent: | 99 | Consequent: |
90 | // actions+=Action ("," actions+=Action)*; | 100 | actions+=Action ("," actions+=Action)*; |
91 | // | 101 | |
92 | //Action: | 102 | Action: |
93 | // AssertionAction | DeleteAction | NewAction; | 103 | AssertionAction; |
94 | // | 104 | |
95 | //AssertionAction: | 105 | AssertionAction: |
96 | // value=ShortLogicValue? atom=Atom | | 106 | relation=[Relation|QualifiedName] |
97 | // atom=Atom (overwrite?=":=" | "<:") value=LogicValue; | 107 | "(" (arguments+=AssertionArgument ("," arguments+=AssertionArgument)*)? ")" |
98 | // | 108 | ":" value=Expr | |
99 | //DeleteAction: | 109 | value=ShortLogicConstant |
100 | // "delete" variableOrNode=[VariableOrNode|QualifiedName]; | 110 | relation=[Relation|QualifiedName] |
101 | // | 111 | "(" (arguments+=AssertionArgument ("," arguments+=AssertionArgument)*)? ")"; |
102 | //NewAction: | ||
103 | // "new" variable=NewVariable ("<:" parent=[VariableOrNode|QualifiedName])?; | ||
104 | // | ||
105 | //NewVariable: | ||
106 | // name=Identifier; | ||
107 | 112 | ||
108 | Expr: | 113 | Expr: |
109 | AssignmentExpr; | 114 | AssignmentExpr; |
@@ -159,7 +164,7 @@ RangeExpr returns Expr: | |||
159 | 164 | ||
160 | UnaryExpr returns Expr: | 165 | UnaryExpr returns Expr: |
161 | ArithmeticUnaryExpr | NegationExpr | | 166 | ArithmeticUnaryExpr | NegationExpr | |
162 | CountExpr | AggregationExpr | CastExpr; | 167 | CountExpr | AggregationExpr | ModalExpr | CastExpr; |
163 | 168 | ||
164 | enum UnaryOp: | 169 | enum UnaryOp: |
165 | PLUS="+" | MINUS="-"; | 170 | PLUS="+" | MINUS="-"; |
@@ -177,6 +182,15 @@ AggregationExpr: | |||
177 | aggregator=[AggregatorDeclaration|QualifiedName] | 182 | aggregator=[AggregatorDeclaration|QualifiedName] |
178 | "{" value=Expr "|" condition=ComparisonExpr "}"; | 183 | "{" value=Expr "|" condition=ComparisonExpr "}"; |
179 | 184 | ||
185 | enum Concreteness: | ||
186 | CANDIDATE="candidate"; | ||
187 | |||
188 | enum Modality: | ||
189 | MUST="must" | MAY="may"; | ||
190 | |||
191 | ModalExpr: | ||
192 | concreteness=Concreteness? modality=Modality body=UnaryExpr; | ||
193 | |||
180 | CastExpr returns Expr: | 194 | CastExpr returns Expr: |
181 | CastExprBody ({CastExpr.body=current} "as" targetType=[Relation|QualifiedName])?; | 195 | CastExprBody ({CastExpr.body=current} "as" targetType=[Relation|QualifiedName])?; |
182 | 196 | ||
@@ -281,7 +295,7 @@ Identifier: | |||
281 | 295 | ||
282 | NonContainmentIdentifier: | 296 | NonContainmentIdentifier: |
283 | ID | "atom" | "multi" | "contained" | "problem" | "module" | | 297 | ID | "atom" | "multi" | "contained" | "problem" | "module" | |
284 | "datatype" | "aggregator"; | 298 | "datatype" | "aggregator" | "decision" | "propagation"; |
285 | 299 | ||
286 | Real returns ecore::EDouble: | 300 | Real returns ecore::EDouble: |
287 | EXPONENTIAL | INT "." (INT | EXPONENTIAL); | 301 | EXPONENTIAL | INT "." (INT | EXPONENTIAL); |
diff --git a/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemScopeProvider.java b/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemScopeProvider.java index d94c9a13..21f64236 100644 --- a/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemScopeProvider.java +++ b/subprojects/language/src/main/java/tools/refinery/language/scoping/ProblemScopeProvider.java | |||
@@ -31,11 +31,11 @@ public class ProblemScopeProvider extends AbstractProblemScopeProvider { | |||
31 | public IScope getScope(EObject context, EReference reference) { | 31 | public IScope getScope(EObject context, EReference reference) { |
32 | var scope = super.getScope(context, reference); | 32 | var scope = super.getScope(context, reference); |
33 | if (reference == ProblemPackage.Literals.NODE_ASSERTION_ARGUMENT__NODE) { | 33 | if (reference == ProblemPackage.Literals.NODE_ASSERTION_ARGUMENT__NODE) { |
34 | return getNodesScope(context, scope); | 34 | // On the right side of a rule, assertion arguments may refer to variables. |
35 | var rule = EcoreUtil2.getContainerOfType(context, RuleDefinition.class); | ||
36 | return rule == null ? getNodesScope(context, scope) : getVariableScope(context, scope); | ||
35 | } | 37 | } |
36 | if (reference == ProblemPackage.Literals.VARIABLE_OR_NODE_EXPR__VARIABLE_OR_NODE | 38 | if (reference == ProblemPackage.Literals.VARIABLE_OR_NODE_EXPR__VARIABLE_OR_NODE) { |
37 | || reference == ProblemPackage.Literals.NEW_ACTION__PARENT | ||
38 | || reference == ProblemPackage.Literals.DELETE_ACTION__VARIABLE_OR_NODE) { | ||
39 | return getVariableScope(context, scope); | 39 | return getVariableScope(context, scope); |
40 | } | 40 | } |
41 | if (reference == ProblemPackage.Literals.REFERENCE_DECLARATION__OPPOSITE) { | 41 | if (reference == ProblemPackage.Literals.REFERENCE_DECLARATION__OPPOSITE) { |
@@ -81,13 +81,6 @@ public class ProblemScopeProvider extends AbstractProblemScopeProvider { | |||
81 | switch (currentContext) { | 81 | switch (currentContext) { |
82 | case ExistentialQuantifier quantifier -> variables.addAll(quantifier.getImplicitVariables()); | 82 | case ExistentialQuantifier quantifier -> variables.addAll(quantifier.getImplicitVariables()); |
83 | case Match match -> variables.addAll(match.getCondition().getImplicitVariables()); | 83 | case Match match -> variables.addAll(match.getCondition().getImplicitVariables()); |
84 | case Consequent consequent -> { | ||
85 | for (var literal : consequent.getActions()) { | ||
86 | if (literal instanceof NewAction newAction && newAction.getVariable() != null) { | ||
87 | variables.add(newAction.getVariable()); | ||
88 | } | ||
89 | } | ||
90 | } | ||
91 | default -> { | 84 | default -> { |
92 | // Nothing to add. | 85 | // Nothing to add. |
93 | } | 86 | } |
diff --git a/subprojects/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java b/subprojects/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java index 745e2d2b..c49718ab 100644 --- a/subprojects/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java +++ b/subprojects/language/src/main/java/tools/refinery/language/validation/ProblemValidator.java | |||
@@ -472,7 +472,10 @@ public class ProblemValidator extends AbstractProblemValidator { | |||
472 | return null; | 472 | return null; |
473 | } | 473 | } |
474 | if (argument instanceof NodeAssertionArgument nodeAssertionArgument) { | 474 | if (argument instanceof NodeAssertionArgument nodeAssertionArgument) { |
475 | return nodeAssertionArgument.getNode(); | 475 | var variableOrNode = nodeAssertionArgument.getNode(); |
476 | if (variableOrNode == null || variableOrNode instanceof Node) { | ||
477 | return (Node) variableOrNode; | ||
478 | } | ||
476 | } | 479 | } |
477 | throw new IllegalArgumentException("Unknown assertion argument: " + argument); | 480 | throw new IllegalArgumentException("Unknown assertion argument: " + argument); |
478 | } | 481 | } |
@@ -484,8 +487,10 @@ public class ProblemValidator extends AbstractProblemValidator { | |||
484 | } | 487 | } |
485 | for (var argument : assertion.getArguments()) { | 488 | for (var argument : assertion.getArguments()) { |
486 | if (argument instanceof NodeAssertionArgument nodeAssertionArgument) { | 489 | if (argument instanceof NodeAssertionArgument nodeAssertionArgument) { |
487 | var node = nodeAssertionArgument.getNode(); | 490 | var variableOrNode = nodeAssertionArgument.getNode(); |
488 | if (node != null && !node.eIsProxy() && ProblemUtil.isImplicitNode(node)) { | 491 | if (variableOrNode instanceof Node node && |
492 | !variableOrNode.eIsProxy() && | ||
493 | ProblemUtil.isImplicitNode(node)) { | ||
489 | var name = node.getName(); | 494 | var name = node.getName(); |
490 | var message = ("Implicit nodes are not allowed in modules. Explicitly declare '%s' as a node " + | 495 | var message = ("Implicit nodes are not allowed in modules. Explicitly declare '%s' as a node " + |
491 | "with the declaration 'declare %s.'").formatted(name, name); | 496 | "with the declaration 'declare %s.'").formatted(name, name); |
diff --git a/subprojects/language/src/test/java/tools/refinery/language/tests/rules/RuleParsingTest.java b/subprojects/language/src/test/java/tools/refinery/language/tests/rules/RuleParsingTest.java index 56e65550..15636483 100644 --- a/subprojects/language/src/test/java/tools/refinery/language/tests/rules/RuleParsingTest.java +++ b/subprojects/language/src/test/java/tools/refinery/language/tests/rules/RuleParsingTest.java | |||
@@ -9,7 +9,6 @@ import com.google.inject.Inject; | |||
9 | import org.eclipse.xtext.testing.InjectWith; | 9 | import org.eclipse.xtext.testing.InjectWith; |
10 | import org.eclipse.xtext.testing.extensions.InjectionExtension; | 10 | import org.eclipse.xtext.testing.extensions.InjectionExtension; |
11 | import org.junit.jupiter.api.Disabled; | 11 | import org.junit.jupiter.api.Disabled; |
12 | import org.junit.jupiter.api.Test; | ||
13 | import org.junit.jupiter.api.extension.ExtendWith; | 12 | import org.junit.jupiter.api.extension.ExtendWith; |
14 | import org.junit.jupiter.params.ParameterizedTest; | 13 | import org.junit.jupiter.params.ParameterizedTest; |
15 | import org.junit.jupiter.params.provider.ValueSource; | 14 | import org.junit.jupiter.params.provider.ValueSource; |
@@ -17,7 +16,7 @@ import tools.refinery.language.model.tests.utils.ProblemParseHelper; | |||
17 | import tools.refinery.language.tests.ProblemInjectorProvider; | 16 | import tools.refinery.language.tests.ProblemInjectorProvider; |
18 | 17 | ||
19 | import static org.hamcrest.MatcherAssert.assertThat; | 18 | import static org.hamcrest.MatcherAssert.assertThat; |
20 | import static org.hamcrest.Matchers.*; | 19 | import static org.hamcrest.Matchers.empty; |
21 | 20 | ||
22 | @Disabled("TODO: Rework transformation rules") | 21 | @Disabled("TODO: Rework transformation rules") |
23 | @ExtendWith(InjectionExtension.class) | 22 | @ExtendWith(InjectionExtension.class) |
@@ -29,62 +28,13 @@ class RuleParsingTest { | |||
29 | @ParameterizedTest | 28 | @ParameterizedTest |
30 | @ValueSource(strings = { """ | 29 | @ValueSource(strings = { """ |
31 | pred Person(p). | 30 | pred Person(p). |
32 | rule r(p1): must Person(p1) ==> Person(p1) := false. | 31 | rule r(p1): must Person(p1) ==> Person(p1): false. |
33 | """, """ | ||
34 | pred Person(p). | ||
35 | rule r(p1): must Person(p1) ==> Person(p1) <: false. | ||
36 | """, """ | 32 | """, """ |
37 | pred Person(p). | 33 | pred Person(p). |
38 | rule r(p1): must Person(p1) ==> !Person(p1). | 34 | rule r(p1): must Person(p1) ==> !Person(p1). |
39 | """, """ | ||
40 | pred Person(p). | ||
41 | rule r(p1): must Person(p1) ==> delete p1. | ||
42 | """ }) | 35 | """ }) |
43 | void simpleTest(String text) { | 36 | void simpleTest(String text) { |
44 | var problem = parseHelper.parse(text); | 37 | var problem = parseHelper.parse(text); |
45 | assertThat(problem.getResourceErrors(), empty()); | 38 | assertThat(problem.getResourceErrors(), empty()); |
46 | } | 39 | } |
47 | |||
48 | @Test | ||
49 | void newNodeTest() { | ||
50 | var problem = parseHelper.parse(""" | ||
51 | pred Person(p). | ||
52 | rule r(p1): must Person(p1) ==> new p2, Person(p2) := unknown. | ||
53 | """); | ||
54 | assertThat(problem.getResourceErrors(), empty()); | ||
55 | assertThat(problem.rule("r").param(0), equalTo(problem.rule("r").conj(0).lit(0).arg(0).variable())); | ||
56 | assertThat(problem.rule("r").consequent(0).action(0).newVar(), | ||
57 | equalTo(problem.rule("r").consequent(0).action(1).assertedAtom().arg(0).variable())); | ||
58 | } | ||
59 | |||
60 | @Test | ||
61 | void differentScopeTest() { | ||
62 | var problem = parseHelper.parse(""" | ||
63 | pred Friend(a, b). | ||
64 | rule r(p1): !may Friend(p1, p2) ==> new p2, Friend(p1, p2) := true. | ||
65 | """); | ||
66 | assertThat(problem.getResourceErrors(), empty()); | ||
67 | assertThat(problem.rule("r").conj(0).lit(0).negated().arg(1).variable(), | ||
68 | not(equalTo(problem.rule("r").consequent(0).action(1).assertedAtom().arg(1).variable()))); | ||
69 | } | ||
70 | |||
71 | @Test | ||
72 | void parameterShadowingTest() { | ||
73 | var problem = parseHelper.parse(""" | ||
74 | pred Friend(a, b). | ||
75 | rule r(p1, p2): !may Friend(p1, p2) ==> new p2, Friend(p1, p2) := true. | ||
76 | """); | ||
77 | assertThat(problem.getResourceErrors(), empty()); | ||
78 | assertThat(problem.rule("r").param(1), | ||
79 | not(equalTo(problem.rule("r").consequent(0).action(1).assertedAtom().arg(1).variable()))); | ||
80 | } | ||
81 | |||
82 | @Test | ||
83 | void deleteDifferentScopeNodeTest() { | ||
84 | var problem = parseHelper.parse(""" | ||
85 | pred Person(p). | ||
86 | rule r(p1): must Friend(p1, p2) ==> delete p2. | ||
87 | """); | ||
88 | assertThat(problem.getResourceErrors(), not(empty())); | ||
89 | } | ||
90 | } | 40 | } |
diff --git a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedAction.java b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedAction.java index 3a49a0b9..4987cb89 100644 --- a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedAction.java +++ b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedAction.java | |||
@@ -6,25 +6,9 @@ | |||
6 | package tools.refinery.language.model.tests.utils; | 6 | package tools.refinery.language.model.tests.utils; |
7 | 7 | ||
8 | import tools.refinery.language.model.problem.Action; | 8 | import tools.refinery.language.model.problem.Action; |
9 | import tools.refinery.language.model.problem.AssertionAction; | ||
10 | import tools.refinery.language.model.problem.DeleteAction; | ||
11 | import tools.refinery.language.model.problem.NewAction; | ||
12 | import tools.refinery.language.model.problem.VariableOrNode; | ||
13 | 9 | ||
14 | public record WrappedAction(Action action) { | 10 | public record WrappedAction(Action action) { |
15 | public Action get() { | 11 | public Action get() { |
16 | return action; | 12 | return action; |
17 | } | 13 | } |
18 | |||
19 | public VariableOrNode newVar() { | ||
20 | return ((NewAction) action).getVariable(); | ||
21 | } | ||
22 | |||
23 | public VariableOrNode deleteVar() { | ||
24 | return ((DeleteAction) action).getVariableOrNode(); | ||
25 | } | ||
26 | |||
27 | public WrappedAtom assertedAtom() { | ||
28 | return new WrappedAtom(((AssertionAction) action).getAtom()); | ||
29 | } | ||
30 | } | 14 | } |
diff --git a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedAssertionArgument.java b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedAssertionArgument.java index b36f2506..50cb958d 100644 --- a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedAssertionArgument.java +++ b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedAssertionArgument.java | |||
@@ -15,6 +15,6 @@ public record WrappedAssertionArgument(AssertionArgument assertionArgument) { | |||
15 | } | 15 | } |
16 | 16 | ||
17 | public Node node() { | 17 | public Node node() { |
18 | return ((NodeAssertionArgument) assertionArgument).getNode(); | 18 | return (Node) ((NodeAssertionArgument) assertionArgument).getNode(); |
19 | } | 19 | } |
20 | } | 20 | } |