diff options
author | ArenBabikian <aren.babikian@mail.mcgill.ca> | 2020-05-06 16:16:57 -0400 |
---|---|---|
committer | ArenBabikian <aren.babikian@mail.mcgill.ca> | 2020-05-06 16:16:57 -0400 |
commit | e44d27fde5c3b6c933ea3de33781f6ad03d6545b (patch) | |
tree | fd4a58ed41ff3a91702cb1b7b89a9d9688fc1b4e /Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs | |
parent | Adjust classpath for Z3 in viatra2logic (diff) | |
download | VIATRA-Generator-e44d27fde5c3b6c933ea3de33781f6ad03d6545b.tar.gz VIATRA-Generator-e44d27fde5c3b6c933ea3de33781f6ad03d6545b.tar.zst VIATRA-Generator-e44d27fde5c3b6c933ea3de33781f6ad03d6545b.zip |
Adjustments to FamilyTree and Pledge Case studies
Diffstat (limited to 'Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs')
6 files changed, 192 insertions, 64 deletions
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/debug/errors.txt b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/debug/errors.txt new file mode 100644 index 00000000..b7eed629 --- /dev/null +++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/debug/errors.txt | |||
@@ -0,0 +1,16 @@ | |||
1 | Error occured (NullPointerException): | ||
2 | hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PConstraintTransformer.hasValueExpression(PConstraintTransformer.java:487) | ||
3 | hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PConstraintTransformer._transformConstraint(PConstraintTransformer.java:614) | ||
4 | hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PConstraintTransformer.transformConstraint(PConstraintTransformer.java:689) | ||
5 | hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.RelationDefinitionIndexer.transformPattern(RelationDefinitionIndexer.java:169) | ||
6 | hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.RelationDefinitionIndexer.generateRelationDefinitions(RelationDefinitionIndexer.java:51) | ||
7 | hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternGenerator.transformBaseProperties(PatternGenerator.java:747) | ||
8 | hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternProvider.generateQueries(PatternProvider.java:59) | ||
9 | hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMethodProvider.createModelGenerationMethod(ModelGenerationMethodProvider.java:57) | ||
10 | hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasoner.solve(ViatraReasoner.java:96) | ||
11 | hu.bme.mit.inf.dslreasoner.application.execution.GenerationTaskExecutor.executeGenerationTask(GenerationTaskExecutor.java:316) | ||
12 | hu.bme.mit.inf.dslreasoner.application.execution.ScriptExecutor._execute(ScriptExecutor.java:129) | ||
13 | hu.bme.mit.inf.dslreasoner.application.execution.ScriptExecutor.execute(ScriptExecutor.java:338) | ||
14 | hu.bme.mit.inf.dslreasoner.application.execution.ScriptExecutor.executeScript(ScriptExecutor.java:110) | ||
15 | hu.bme.mit.inf.dslreasoner.application.execution.StandaloneScriptExecutor.executeScript(StandaloneScriptExecutor.java:149) | ||
16 | run.FamilyTreeGen.main(FamilyTreeGen.java:7) | ||
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/debug/generation.logicproblem b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/debug/generation.logicproblem index dd3b15b1..327ce8b0 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/debug/generation.logicproblem +++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/debug/generation.logicproblem | |||
@@ -123,7 +123,7 @@ | |||
123 | </expression> | 123 | </expression> |
124 | </value> | 124 | </value> |
125 | </assertions> | 125 | </assertions> |
126 | <assertions name="errorpattern queries memberIsItsOwnParent" annotations="//@annotations.5"> | 126 | <assertions name="errorpattern queries memberIsItsOwnParent" annotations="//@annotations.8"> |
127 | <value xsi:type="language_1:Forall"> | 127 | <value xsi:type="language_1:Forall"> |
128 | <quantifiedVariables name="p0"> | 128 | <quantifiedVariables name="p0"> |
129 | <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/> | 129 | <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/> |
@@ -135,6 +135,38 @@ | |||
135 | </expression> | 135 | </expression> |
136 | </value> | 136 | </value> |
137 | </assertions> | 137 | </assertions> |
138 | <assertions name="errorpattern queries twoMembersHaveNoParent" annotations="//@annotations.9"> | ||
139 | <value xsi:type="language_1:Forall"> | ||
140 | <quantifiedVariables name="p0"> | ||
141 | <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/> | ||
142 | </quantifiedVariables> | ||
143 | <quantifiedVariables name="p1"> | ||
144 | <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/> | ||
145 | </quantifiedVariables> | ||
146 | <expression xsi:type="language_1:Not"> | ||
147 | <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6"> | ||
148 | <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.5/@value/@quantifiedVariables.0"/> | ||
149 | <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.5/@value/@quantifiedVariables.1"/> | ||
150 | </operand> | ||
151 | </expression> | ||
152 | </value> | ||
153 | </assertions> | ||
154 | <assertions name="errorpattern queries parentTooYoung" annotations="//@annotations.10"> | ||
155 | <value xsi:type="language_1:Forall"> | ||
156 | <quantifiedVariables name="p0"> | ||
157 | <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/> | ||
158 | </quantifiedVariables> | ||
159 | <quantifiedVariables name="p1"> | ||
160 | <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/> | ||
161 | </quantifiedVariables> | ||
162 | <expression xsi:type="language_1:Not"> | ||
163 | <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8"> | ||
164 | <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.6/@value/@quantifiedVariables.0"/> | ||
165 | <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.6/@value/@quantifiedVariables.1"/> | ||
166 | </operand> | ||
167 | </expression> | ||
168 | </value> | ||
169 | </assertions> | ||
138 | <relations xsi:type="language_1:RelationDeclaration" name="members reference FamilyTree"> | 170 | <relations xsi:type="language_1:RelationDeclaration" name="members reference FamilyTree"> |
139 | <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/> | 171 | <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/> |
140 | <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/> | 172 | <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/> |
@@ -178,7 +210,114 @@ | |||
178 | </operands> | 210 | </operands> |
179 | </value> | 211 | </value> |
180 | </relations> | 212 | </relations> |
181 | <containmentHierarchies typesOrderedInHierarchy="//@types.0 //@types.1" containmentRelations="//@relations.0"/> | 213 | <relations xsi:type="language_1:RelationDefinition" name="pattern queries twoMembersHaveNoParent" annotations="//@annotations.5"> |
214 | <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/> | ||
215 | <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/> | ||
216 | <variables name="parameter m1"> | ||
217 | <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/> | ||
218 | </variables> | ||
219 | <variables name="parameter m2"> | ||
220 | <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/> | ||
221 | </variables> | ||
222 | <value xsi:type="language_1:Or"> | ||
223 | <operands xsi:type="language_1:And"> | ||
224 | <operands xsi:type="language_1:InstanceOf"> | ||
225 | <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6/@variables.0"/> | ||
226 | <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/> | ||
227 | </operands> | ||
228 | <operands xsi:type="language_1:InstanceOf"> | ||
229 | <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6/@variables.1"/> | ||
230 | <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/> | ||
231 | </operands> | ||
232 | <operands xsi:type="language_1:Not"> | ||
233 | <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7"> | ||
234 | <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6/@variables.0"/> | ||
235 | </operand> | ||
236 | </operands> | ||
237 | <operands xsi:type="language_1:Not"> | ||
238 | <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7"> | ||
239 | <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6/@variables.1"/> | ||
240 | </operand> | ||
241 | </operands> | ||
242 | <operands xsi:type="language_1:Distinct"> | ||
243 | <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6/@variables.0"/> | ||
244 | <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6/@variables.1"/> | ||
245 | </operands> | ||
246 | </operands> | ||
247 | </value> | ||
248 | </relations> | ||
249 | <relations xsi:type="language_1:RelationDefinition" name="pattern queries memberHasParent" annotations="//@annotations.6"> | ||
250 | <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/> | ||
251 | <variables name="parameter m"> | ||
252 | <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/> | ||
253 | </variables> | ||
254 | <value xsi:type="language_1:Or"> | ||
255 | <operands xsi:type="language_1:Exists"> | ||
256 | <quantifiedVariables name="variable 0"> | ||
257 | <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/> | ||
258 | </quantifiedVariables> | ||
259 | <expression xsi:type="language_1:And"> | ||
260 | <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2"> | ||
261 | <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7/@variables.0"/> | ||
262 | <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7/@value/@operands.0/@quantifiedVariables.0"/> | ||
263 | </operands> | ||
264 | <operands xsi:type="language_1:InstanceOf"> | ||
265 | <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7/@value/@operands.0/@quantifiedVariables.0"/> | ||
266 | <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/> | ||
267 | </operands> | ||
268 | </expression> | ||
269 | </operands> | ||
270 | </value> | ||
271 | </relations> | ||
272 | <relations xsi:type="language_1:RelationDefinition" name="pattern queries parentTooYoung" annotations="//@annotations.7"> | ||
273 | <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/> | ||
274 | <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/> | ||
275 | <variables name="parameter m"> | ||
276 | <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/> | ||
277 | </variables> | ||
278 | <variables name="parameter p"> | ||
279 | <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/> | ||
280 | </variables> | ||
281 | <value xsi:type="language_1:Or"> | ||
282 | <operands xsi:type="language_1:Exists"> | ||
283 | <quantifiedVariables name="variable 0"> | ||
284 | <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/> | ||
285 | </quantifiedVariables> | ||
286 | <quantifiedVariables name="variable mAge"> | ||
287 | <range xsi:type="language_1:IntTypeReference"/> | ||
288 | </quantifiedVariables> | ||
289 | <quantifiedVariables name="variable pAge"> | ||
290 | <range xsi:type="language_1:IntTypeReference"/> | ||
291 | </quantifiedVariables> | ||
292 | <expression xsi:type="language_1:And"> | ||
293 | <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.0"> | ||
294 | <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8/@value/@operands.0/@quantifiedVariables.0"/> | ||
295 | <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8/@variables.0"/> | ||
296 | </operands> | ||
297 | <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.2"> | ||
298 | <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8/@variables.0"/> | ||
299 | <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8/@variables.1"/> | ||
300 | </operands> | ||
301 | <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.4"> | ||
302 | <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8/@variables.0"/> | ||
303 | <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8/@value/@operands.0/@quantifiedVariables.1"/> | ||
304 | </operands> | ||
305 | <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.4"> | ||
306 | <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8/@variables.1"/> | ||
307 | <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8/@value/@operands.0/@quantifiedVariables.2"/> | ||
308 | </operands> | ||
309 | <operands xsi:type="language_1:LessOrEqualThan"> | ||
310 | <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8/@value/@operands.0/@quantifiedVariables.1"/> | ||
311 | <rightOperand xsi:type="language_1:Plus"> | ||
312 | <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8/@value/@operands.0/@quantifiedVariables.2"/> | ||
313 | <rightOperand xsi:type="language_1:IntLiteral" value="12"/> | ||
314 | </rightOperand> | ||
315 | </operands> | ||
316 | </expression> | ||
317 | </operands> | ||
318 | </value> | ||
319 | </relations> | ||
320 | <containmentHierarchies typesOrderedInHierarchy="//@types.1 //@types.0" containmentRelations="//@relations.0"/> | ||
182 | <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.0" relation="//@relations.2" upper="2"/> | 321 | <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.0" relation="//@relations.2" upper="2"/> |
183 | <annotations xsi:type="ecore2logicannotations:InverseRelationAssertion" target="//@assertions.1" inverseA="//@relations.1" inverseB="//@relations.2"/> | 322 | <annotations xsi:type="ecore2logicannotations:InverseRelationAssertion" target="//@assertions.1" inverseA="//@relations.1" inverseB="//@relations.2"/> |
184 | <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.2" relation="//@relations.3" upper="1"/> | 323 | <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.2" relation="//@relations.3" upper="1"/> |
@@ -186,5 +325,16 @@ | |||
186 | <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.5" patternFullyQualifiedName="queries.memberIsItsOwnParent"> | 325 | <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.5" patternFullyQualifiedName="queries.memberIsItsOwnParent"> |
187 | <variableTrace targetLogicVariable="//@relations.5/@value/@operands.0/@quantifiedVariables.0"/> | 326 | <variableTrace targetLogicVariable="//@relations.5/@value/@operands.0/@quantifiedVariables.0"/> |
188 | </annotations> | 327 | </annotations> |
328 | <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.6" patternFullyQualifiedName="queries.twoMembersHaveNoParent"/> | ||
329 | <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.7" patternFullyQualifiedName="queries.memberHasParent"> | ||
330 | <variableTrace targetLogicVariable="//@relations.7/@value/@operands.0/@quantifiedVariables.0"/> | ||
331 | </annotations> | ||
332 | <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.8" patternFullyQualifiedName="queries.parentTooYoung"> | ||
333 | <variableTrace targetLogicVariable="//@relations.8/@value/@operands.0/@quantifiedVariables.0"/> | ||
334 | <variableTrace targetLogicVariable="//@relations.8/@value/@operands.0/@quantifiedVariables.1"/> | ||
335 | <variableTrace targetLogicVariable="//@relations.8/@value/@operands.0/@quantifiedVariables.2"/> | ||
336 | </annotations> | ||
189 | <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.4" query="//@annotations.4"/> | 337 | <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.4" query="//@annotations.4"/> |
338 | <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.5" query="//@annotations.5"/> | ||
339 | <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.6" query="//@annotations.7"/> | ||
190 | </language:LogicProblem> | 340 | </language:LogicProblem> |
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/log.txt b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/log.txt index 6186ec60..43befb00 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/log.txt +++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/log.txt | |||
@@ -1 +1 @@ | |||
Model generation finished | Model generation started | ||
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/models/1.gml b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/models/1.gml index 0182add9..88392428 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/models/1.gml +++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/models/1.gml | |||
@@ -667,8 +667,8 @@ graph | |||
667 | ] | 667 | ] |
668 | edge | 668 | edge |
669 | [ | 669 | [ |
670 | source 9 | 670 | source 8 |
671 | target 8 | 671 | target 9 |
672 | graphics | 672 | graphics |
673 | [ | 673 | [ |
674 | fill "#000000" | 674 | fill "#000000" |
@@ -686,8 +686,8 @@ graph | |||
686 | ] | 686 | ] |
687 | edge | 687 | edge |
688 | [ | 688 | [ |
689 | source 8 | 689 | source 9 |
690 | target 9 | 690 | target 8 |
691 | graphics | 691 | graphics |
692 | [ | 692 | [ |
693 | fill "#000000" | 693 | fill "#000000" |
@@ -706,7 +706,7 @@ graph | |||
706 | edge | 706 | edge |
707 | [ | 707 | [ |
708 | source 10 | 708 | source 10 |
709 | target 11 | 709 | target 9 |
710 | graphics | 710 | graphics |
711 | [ | 711 | [ |
712 | fill "#000000" | 712 | fill "#000000" |
@@ -724,8 +724,8 @@ graph | |||
724 | ] | 724 | ] |
725 | edge | 725 | edge |
726 | [ | 726 | [ |
727 | source 8 | 727 | source 10 |
728 | target 10 | 728 | target 8 |
729 | graphics | 729 | graphics |
730 | [ | 730 | [ |
731 | fill "#000000" | 731 | fill "#000000" |
@@ -743,8 +743,8 @@ graph | |||
743 | ] | 743 | ] |
744 | edge | 744 | edge |
745 | [ | 745 | [ |
746 | source 11 | 746 | source 9 |
747 | target 9 | 747 | target 10 |
748 | graphics | 748 | graphics |
749 | [ | 749 | [ |
750 | fill "#000000" | 750 | fill "#000000" |
@@ -781,7 +781,7 @@ graph | |||
781 | ] | 781 | ] |
782 | edge | 782 | edge |
783 | [ | 783 | [ |
784 | source 10 | 784 | source 9 |
785 | target 8 | 785 | target 8 |
786 | graphics | 786 | graphics |
787 | [ | 787 | [ |
@@ -790,7 +790,7 @@ graph | |||
790 | ] | 790 | ] |
791 | LabelGraphics | 791 | LabelGraphics |
792 | [ | 792 | [ |
793 | text "children reference Member" | 793 | text "parents reference Member" |
794 | fontSize 14 | 794 | fontSize 14 |
795 | fontName "Consolas" | 795 | fontName "Consolas" |
796 | configuration "AutoFlippingLabel" | 796 | configuration "AutoFlippingLabel" |
@@ -820,7 +820,7 @@ graph | |||
820 | edge | 820 | edge |
821 | [ | 821 | [ |
822 | source 9 | 822 | source 9 |
823 | target 8 | 823 | target 10 |
824 | graphics | 824 | graphics |
825 | [ | 825 | [ |
826 | fill "#000000" | 826 | fill "#000000" |
@@ -838,7 +838,7 @@ graph | |||
838 | ] | 838 | ] |
839 | edge | 839 | edge |
840 | [ | 840 | [ |
841 | source 11 | 841 | source 8 |
842 | target 10 | 842 | target 10 |
843 | graphics | 843 | graphics |
844 | [ | 844 | [ |
@@ -858,26 +858,7 @@ graph | |||
858 | edge | 858 | edge |
859 | [ | 859 | [ |
860 | source 10 | 860 | source 10 |
861 | target 8 | 861 | target 9 |
862 | graphics | ||
863 | [ | ||
864 | fill "#000000" | ||
865 | targetArrow "standard" | ||
866 | ] | ||
867 | LabelGraphics | ||
868 | [ | ||
869 | text "parents reference Member" | ||
870 | fontSize 14 | ||
871 | fontName "Consolas" | ||
872 | configuration "AutoFlippingLabel" | ||
873 | model "six_pos" | ||
874 | position "thead" | ||
875 | ] | ||
876 | ] | ||
877 | edge | ||
878 | [ | ||
879 | source 9 | ||
880 | target 11 | ||
881 | graphics | 862 | graphics |
882 | [ | 863 | [ |
883 | fill "#000000" | 864 | fill "#000000" |
@@ -914,27 +895,8 @@ graph | |||
914 | ] | 895 | ] |
915 | edge | 896 | edge |
916 | [ | 897 | [ |
917 | source 8 | 898 | source 9 |
918 | target 10 | 899 | target 5 |
919 | graphics | ||
920 | [ | ||
921 | fill "#000000" | ||
922 | targetArrow "standard" | ||
923 | ] | ||
924 | LabelGraphics | ||
925 | [ | ||
926 | text "parents reference Member" | ||
927 | fontSize 14 | ||
928 | fontName "Consolas" | ||
929 | configuration "AutoFlippingLabel" | ||
930 | model "six_pos" | ||
931 | position "thead" | ||
932 | ] | ||
933 | ] | ||
934 | edge | ||
935 | [ | ||
936 | source 8 | ||
937 | target 6 | ||
938 | graphics | 900 | graphics |
939 | [ | 901 | [ |
940 | fill "#000000" | 902 | fill "#000000" |
@@ -952,7 +914,7 @@ graph | |||
952 | ] | 914 | ] |
953 | edge | 915 | edge |
954 | [ | 916 | [ |
955 | source 9 | 917 | source 8 |
956 | target 5 | 918 | target 5 |
957 | graphics | 919 | graphics |
958 | [ | 920 | [ |
@@ -972,7 +934,7 @@ graph | |||
972 | edge | 934 | edge |
973 | [ | 935 | [ |
974 | source 10 | 936 | source 10 |
975 | target 2 | 937 | target 5 |
976 | graphics | 938 | graphics |
977 | [ | 939 | [ |
978 | fill "#000000" | 940 | fill "#000000" |
@@ -991,7 +953,7 @@ graph | |||
991 | edge | 953 | edge |
992 | [ | 954 | [ |
993 | source 11 | 955 | source 11 |
994 | target 4 | 956 | target 6 |
995 | graphics | 957 | graphics |
996 | [ | 958 | [ |
997 | fill "#000000" | 959 | fill "#000000" |
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/models/1.png b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/models/1.png index 391d902b..4c0da9fb 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/models/1.png +++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/models/1.png | |||
Binary files differ | |||
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/models/1.xmi b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/models/1.xmi index 11e0e7c3..25c5bfed 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/models/1.xmi +++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/outputs/models/1.xmi | |||
@@ -1,8 +1,8 @@ | |||
1 | <?xml version="1.0" encoding="ASCII"?> | 1 | <?xml version="1.0" encoding="ASCII"?> |
2 | <familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree inputs/familytree.ecore"> | 2 | <familytree:FamilyTree xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:familytree="http://www.example.org/familytree" xsi:schemaLocation="http://www.example.org/familytree inputs/familytree.ecore"> |
3 | <members age="4" children="//@members.4" parents="//@members.3 //@members.4"/> | 3 | <members age="4" children="//@members.2 //@members.4" parents="//@members.1 //@members.2"/> |
4 | <members age="5" children="//@members.0"/> | ||
5 | <members age="4" children="//@members.0 //@members.4" parents="//@members.0 //@members.4"/> | ||
4 | <members/> | 6 | <members/> |
5 | <members age="1" children="//@members.3 //@members.4" parents="//@members.3 //@members.4"/> | 7 | <members age="4" children="//@members.2" parents="//@members.0 //@members.2"/> |
6 | <members age="3" children="//@members.0 //@members.2" parents="//@members.2"/> | ||
7 | <members age="5" children="//@members.0 //@members.2" parents="//@members.0 //@members.2"/> | ||
8 | </familytree:FamilyTree> | 8 | </familytree:FamilyTree> |