aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar OszkarSemerath <oszka@152.66.252.189>2017-08-16 18:53:37 +0200
committerLibravatar OszkarSemerath <oszka@152.66.252.189>2017-08-16 18:53:37 +0200
commit05cc697cce50c87541cb619854be7ecbcfb586e9 (patch)
tree8fd0054e1ced9992283fddc2e8be28f2a09c9ebb
parentBugfixing typo in generated queries (diff)
downloadVIATRA-Generator-05cc697cce50c87541cb619854be7ecbcfb586e9.tar.gz
VIATRA-Generator-05cc697cce50c87541cb619854be7ecbcfb586e9.tar.zst
VIATRA-Generator-05cc697cce50c87541cb619854be7ecbcfb586e9.zip
Adding transitive closure to the logic language
Diffstat
-rw-r--r--Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguageFactory.java9
-rw-r--r--Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguagePackage.java133
-rw-r--r--Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/TransitiveClosure.java104
-rw-r--r--Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguageFactoryImpl.java11
-rw-r--r--Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguagePackageImpl.java54
-rw-r--r--Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TransitiveClosureImpl.java303
-rw-r--r--Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageAdapterFactory.java18
-rw-r--r--Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageSwitch.java21
-rw-r--r--Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.aird375
-rw-r--r--Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.ecore7
-rw-r--r--Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper.xtend17
11 files changed, 998 insertions, 54 deletions
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguageFactory.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguageFactory.java
index 0d1061d7..57b263aa 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguageFactory.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguageFactory.java
@@ -400,6 +400,15 @@ public interface LogiclanguageFactory extends EFactory {
400 StringLiteral createStringLiteral(); 400 StringLiteral createStringLiteral();
401 401
402 /** 402 /**
403 * Returns a new object of class '<em>Transitive Closure</em>'.
404 * <!-- begin-user-doc -->
405 * <!-- end-user-doc -->
406 * @return a new object of class '<em>Transitive Closure</em>'.
407 * @generated
408 */
409 TransitiveClosure createTransitiveClosure();
410
411 /**
403 * Returns the package supported by this factory. 412 * Returns the package supported by this factory.
404 * <!-- begin-user-doc --> 413 * <!-- begin-user-doc -->
405 * <!-- end-user-doc --> 414 * <!-- end-user-doc -->
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguagePackage.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguagePackage.java
index 4e8cdcdc..59bb841a 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguagePackage.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/LogiclanguagePackage.java
@@ -2630,6 +2630,62 @@ public interface LogiclanguagePackage extends EPackage {
2630 2630
2631 2631
2632 /** 2632 /**
2633 * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.TransitiveClosureImpl <em>Transitive Closure</em>}' class.
2634 * <!-- begin-user-doc -->
2635 * <!-- end-user-doc -->
2636 * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.TransitiveClosureImpl
2637 * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LogiclanguagePackageImpl#getTransitiveClosure()
2638 * @generated
2639 */
2640 int TRANSITIVE_CLOSURE = 57;
2641
2642 /**
2643 * The feature id for the '<em><b>Left Operand</b></em>' containment reference.
2644 * <!-- begin-user-doc -->
2645 * <!-- end-user-doc -->
2646 * @generated
2647 * @ordered
2648 */
2649 int TRANSITIVE_CLOSURE__LEFT_OPERAND = 0;
2650
2651 /**
2652 * The feature id for the '<em><b>Right Operand</b></em>' containment reference.
2653 * <!-- begin-user-doc -->
2654 * <!-- end-user-doc -->
2655 * @generated
2656 * @ordered
2657 */
2658 int TRANSITIVE_CLOSURE__RIGHT_OPERAND = 1;
2659
2660 /**
2661 * The feature id for the '<em><b>Relation</b></em>' reference.
2662 * <!-- begin-user-doc -->
2663 * <!-- end-user-doc -->
2664 * @generated
2665 * @ordered
2666 */
2667 int TRANSITIVE_CLOSURE__RELATION = 2;
2668
2669 /**
2670 * The number of structural features of the '<em>Transitive Closure</em>' class.
2671 * <!-- begin-user-doc -->
2672 * <!-- end-user-doc -->
2673 * @generated
2674 * @ordered
2675 */
2676 int TRANSITIVE_CLOSURE_FEATURE_COUNT = 3;
2677
2678 /**
2679 * The number of operations of the '<em>Transitive Closure</em>' class.
2680 * <!-- begin-user-doc -->
2681 * <!-- end-user-doc -->
2682 * @generated
2683 * @ordered
2684 */
2685 int TRANSITIVE_CLOSURE_OPERATION_COUNT = 0;
2686
2687
2688 /**
2633 * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type <em>Type</em>}'. 2689 * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type <em>Type</em>}'.
2634 * <!-- begin-user-doc --> 2690 * <!-- begin-user-doc -->
2635 * <!-- end-user-doc --> 2691 * <!-- end-user-doc -->
@@ -3871,6 +3927,49 @@ public interface LogiclanguagePackage extends EPackage {
3871 EAttribute getStringLiteral_Value(); 3927 EAttribute getStringLiteral_Value();
3872 3928
3873 /** 3929 /**
3930 * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TransitiveClosure <em>Transitive Closure</em>}'.
3931 * <!-- begin-user-doc -->
3932 * <!-- end-user-doc -->
3933 * @return the meta object for class '<em>Transitive Closure</em>'.
3934 * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TransitiveClosure
3935 * @generated
3936 */
3937 EClass getTransitiveClosure();
3938
3939 /**
3940 * Returns the meta object for the containment reference '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TransitiveClosure#getLeftOperand <em>Left Operand</em>}'.
3941 * <!-- begin-user-doc -->
3942 * <!-- end-user-doc -->
3943 * @return the meta object for the containment reference '<em>Left Operand</em>'.
3944 * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TransitiveClosure#getLeftOperand()
3945 * @see #getTransitiveClosure()
3946 * @generated
3947 */
3948 EReference getTransitiveClosure_LeftOperand();
3949
3950 /**
3951 * Returns the meta object for the containment reference '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TransitiveClosure#getRightOperand <em>Right Operand</em>}'.
3952 * <!-- begin-user-doc -->
3953 * <!-- end-user-doc -->
3954 * @return the meta object for the containment reference '<em>Right Operand</em>'.
3955 * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TransitiveClosure#getRightOperand()
3956 * @see #getTransitiveClosure()
3957 * @generated
3958 */
3959 EReference getTransitiveClosure_RightOperand();
3960
3961 /**
3962 * Returns the meta object for the reference '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TransitiveClosure#getRelation <em>Relation</em>}'.
3963 * <!-- begin-user-doc -->
3964 * <!-- end-user-doc -->
3965 * @return the meta object for the reference '<em>Relation</em>'.
3966 * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TransitiveClosure#getRelation()
3967 * @see #getTransitiveClosure()
3968 * @generated
3969 */
3970 EReference getTransitiveClosure_Relation();
3971
3972 /**
3874 * Returns the factory that creates the instances of the model. 3973 * Returns the factory that creates the instances of the model.
3875 * <!-- begin-user-doc --> 3974 * <!-- begin-user-doc -->
3876 * <!-- end-user-doc --> 3975 * <!-- end-user-doc -->
@@ -4951,6 +5050,40 @@ public interface LogiclanguagePackage extends EPackage {
4951 */ 5050 */
4952 EAttribute STRING_LITERAL__VALUE = eINSTANCE.getStringLiteral_Value(); 5051 EAttribute STRING_LITERAL__VALUE = eINSTANCE.getStringLiteral_Value();
4953 5052
5053 /**
5054 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.TransitiveClosureImpl <em>Transitive Closure</em>}' class.
5055 * <!-- begin-user-doc -->
5056 * <!-- end-user-doc -->
5057 * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.TransitiveClosureImpl
5058 * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LogiclanguagePackageImpl#getTransitiveClosure()
5059 * @generated
5060 */
5061 EClass TRANSITIVE_CLOSURE = eINSTANCE.getTransitiveClosure();
5062
5063 /**
5064 * The meta object literal for the '<em><b>Left Operand</b></em>' containment reference feature.
5065 * <!-- begin-user-doc -->
5066 * <!-- end-user-doc -->
5067 * @generated
5068 */
5069 EReference TRANSITIVE_CLOSURE__LEFT_OPERAND = eINSTANCE.getTransitiveClosure_LeftOperand();
5070
5071 /**
5072 * The meta object literal for the '<em><b>Right Operand</b></em>' containment reference feature.
5073 * <!-- begin-user-doc -->
5074 * <!-- end-user-doc -->
5075 * @generated
5076 */
5077 EReference TRANSITIVE_CLOSURE__RIGHT_OPERAND = eINSTANCE.getTransitiveClosure_RightOperand();
5078
5079 /**
5080 * The meta object literal for the '<em><b>Relation</b></em>' reference feature.
5081 * <!-- begin-user-doc -->
5082 * <!-- end-user-doc -->
5083 * @generated
5084 */
5085 EReference TRANSITIVE_CLOSURE__RELATION = eINSTANCE.getTransitiveClosure_Relation();
5086
4954 } 5087 }
4955 5088
4956} //LogiclanguagePackage 5089} //LogiclanguagePackage
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/TransitiveClosure.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/TransitiveClosure.java
new file mode 100644
index 00000000..92c80341
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/TransitiveClosure.java
@@ -0,0 +1,104 @@
1/**
2 */
3package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage;
4
5import org.eclipse.emf.ecore.EObject;
6
7/**
8 * <!-- begin-user-doc -->
9 * A representation of the model object '<em><b>Transitive Closure</b></em>'.
10 * <!-- end-user-doc -->
11 *
12 * <p>
13 * The following features are supported:
14 * </p>
15 * <ul>
16 * <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TransitiveClosure#getLeftOperand <em>Left Operand</em>}</li>
17 * <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TransitiveClosure#getRightOperand <em>Right Operand</em>}</li>
18 * <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TransitiveClosure#getRelation <em>Relation</em>}</li>
19 * </ul>
20 *
21 * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage#getTransitiveClosure()
22 * @model
23 * @generated
24 */
25public interface TransitiveClosure extends EObject {
26 /**
27 * Returns the value of the '<em><b>Left Operand</b></em>' containment reference.
28 * <!-- begin-user-doc -->
29 * <p>
30 * If the meaning of the '<em>Left Operand</em>' containment reference isn't clear,
31 * there really should be more of a description here...
32 * </p>
33 * <!-- end-user-doc -->
34 * @return the value of the '<em>Left Operand</em>' containment reference.
35 * @see #setLeftOperand(Term)
36 * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage#getTransitiveClosure_LeftOperand()
37 * @model containment="true"
38 * @generated
39 */
40 Term getLeftOperand();
41
42 /**
43 * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TransitiveClosure#getLeftOperand <em>Left Operand</em>}' containment reference.
44 * <!-- begin-user-doc -->
45 * <!-- end-user-doc -->
46 * @param value the new value of the '<em>Left Operand</em>' containment reference.
47 * @see #getLeftOperand()
48 * @generated
49 */
50 void setLeftOperand(Term value);
51
52 /**
53 * Returns the value of the '<em><b>Right Operand</b></em>' containment reference.
54 * <!-- begin-user-doc -->
55 * <p>
56 * If the meaning of the '<em>Right Operand</em>' containment reference isn't clear,
57 * there really should be more of a description here...
58 * </p>
59 * <!-- end-user-doc -->
60 * @return the value of the '<em>Right Operand</em>' containment reference.
61 * @see #setRightOperand(Term)
62 * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage#getTransitiveClosure_RightOperand()
63 * @model containment="true"
64 * @generated
65 */
66 Term getRightOperand();
67
68 /**
69 * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TransitiveClosure#getRightOperand <em>Right Operand</em>}' containment reference.
70 * <!-- begin-user-doc -->
71 * <!-- end-user-doc -->
72 * @param value the new value of the '<em>Right Operand</em>' containment reference.
73 * @see #getRightOperand()
74 * @generated
75 */
76 void setRightOperand(Term value);
77
78 /**
79 * Returns the value of the '<em><b>Relation</b></em>' reference.
80 * <!-- begin-user-doc -->
81 * <p>
82 * If the meaning of the '<em>Relation</em>' reference isn't clear,
83 * there really should be more of a description here...
84 * </p>
85 * <!-- end-user-doc -->
86 * @return the value of the '<em>Relation</em>' reference.
87 * @see #setRelation(Relation)
88 * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage#getTransitiveClosure_Relation()
89 * @model
90 * @generated
91 */
92 Relation getRelation();
93
94 /**
95 * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TransitiveClosure#getRelation <em>Relation</em>}' reference.
96 * <!-- begin-user-doc -->
97 * <!-- end-user-doc -->
98 * @param value the new value of the '<em>Relation</em>' reference.
99 * @see #getRelation()
100 * @generated
101 */
102 void setRelation(Relation value);
103
104} // TransitiveClosure
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguageFactoryImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguageFactoryImpl.java
index b4d03cfd..0ad07f55 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguageFactoryImpl.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguageFactoryImpl.java
@@ -98,6 +98,7 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu
98 case LogiclanguagePackage.INSTANCE_OF: return createInstanceOf(); 98 case LogiclanguagePackage.INSTANCE_OF: return createInstanceOf();
99 case LogiclanguagePackage.STRING_TYPE_REFERENCE: return createStringTypeReference(); 99 case LogiclanguagePackage.STRING_TYPE_REFERENCE: return createStringTypeReference();
100 case LogiclanguagePackage.STRING_LITERAL: return createStringLiteral(); 100 case LogiclanguagePackage.STRING_LITERAL: return createStringLiteral();
101 case LogiclanguagePackage.TRANSITIVE_CLOSURE: return createTransitiveClosure();
101 default: 102 default:
102 throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); 103 throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
103 } 104 }
@@ -528,6 +529,16 @@ public class LogiclanguageFactoryImpl extends EFactoryImpl implements Logiclangu
528 * <!-- end-user-doc --> 529 * <!-- end-user-doc -->
529 * @generated 530 * @generated
530 */ 531 */
532 public TransitiveClosure createTransitiveClosure() {
533 TransitiveClosureImpl transitiveClosure = new TransitiveClosureImpl();
534 return transitiveClosure;
535 }
536
537 /**
538 * <!-- begin-user-doc -->
539 * <!-- end-user-doc -->
540 * @generated
541 */
531 public LogiclanguagePackage getLogiclanguagePackage() { 542 public LogiclanguagePackage getLogiclanguagePackage() {
532 return (LogiclanguagePackage)getEPackage(); 543 return (LogiclanguagePackage)getEPackage();
533 } 544 }
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguagePackageImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguagePackageImpl.java
index 8bc329d5..73560344 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguagePackageImpl.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguagePackageImpl.java
@@ -54,6 +54,7 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.SymbolicDeclaration;
54import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.SymbolicValue; 54import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.SymbolicValue;
55import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term; 55import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;
56import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TermDescription; 56import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TermDescription;
57import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TransitiveClosure;
57import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type; 58import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;
58import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDeclaration; 59import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDeclaration;
59import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDefinition; 60import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDefinition;
@@ -484,6 +485,13 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu
484 private EClass stringLiteralEClass = null; 485 private EClass stringLiteralEClass = null;
485 486
486 /** 487 /**
488 * <!-- begin-user-doc -->
489 * <!-- end-user-doc -->
490 * @generated
491 */
492 private EClass transitiveClosureEClass = null;
493
494 /**
487 * Creates an instance of the model <b>Package</b>, registered with 495 * Creates an instance of the model <b>Package</b>, registered with
488 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package 496 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
489 * package URI value. 497 * package URI value.
@@ -1619,6 +1627,42 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu
1619 * <!-- end-user-doc --> 1627 * <!-- end-user-doc -->
1620 * @generated 1628 * @generated
1621 */ 1629 */
1630 public EClass getTransitiveClosure() {
1631 return transitiveClosureEClass;
1632 }
1633
1634 /**
1635 * <!-- begin-user-doc -->
1636 * <!-- end-user-doc -->
1637 * @generated
1638 */
1639 public EReference getTransitiveClosure_LeftOperand() {
1640 return (EReference)transitiveClosureEClass.getEStructuralFeatures().get(0);
1641 }
1642
1643 /**
1644 * <!-- begin-user-doc -->
1645 * <!-- end-user-doc -->
1646 * @generated
1647 */
1648 public EReference getTransitiveClosure_RightOperand() {
1649 return (EReference)transitiveClosureEClass.getEStructuralFeatures().get(1);
1650 }
1651
1652 /**
1653 * <!-- begin-user-doc -->
1654 * <!-- end-user-doc -->
1655 * @generated
1656 */
1657 public EReference getTransitiveClosure_Relation() {
1658 return (EReference)transitiveClosureEClass.getEStructuralFeatures().get(2);
1659 }
1660
1661 /**
1662 * <!-- begin-user-doc -->
1663 * <!-- end-user-doc -->
1664 * @generated
1665 */
1622 public LogiclanguageFactory getLogiclanguageFactory() { 1666 public LogiclanguageFactory getLogiclanguageFactory() {
1623 return (LogiclanguageFactory)getEFactoryInstance(); 1667 return (LogiclanguageFactory)getEFactoryInstance();
1624 } 1668 }
@@ -1816,6 +1860,11 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu
1816 1860
1817 stringLiteralEClass = createEClass(STRING_LITERAL); 1861 stringLiteralEClass = createEClass(STRING_LITERAL);
1818 createEAttribute(stringLiteralEClass, STRING_LITERAL__VALUE); 1862 createEAttribute(stringLiteralEClass, STRING_LITERAL__VALUE);
1863
1864 transitiveClosureEClass = createEClass(TRANSITIVE_CLOSURE);
1865 createEReference(transitiveClosureEClass, TRANSITIVE_CLOSURE__LEFT_OPERAND);
1866 createEReference(transitiveClosureEClass, TRANSITIVE_CLOSURE__RIGHT_OPERAND);
1867 createEReference(transitiveClosureEClass, TRANSITIVE_CLOSURE__RELATION);
1819 } 1868 }
1820 1869
1821 /** 1870 /**
@@ -2080,6 +2129,11 @@ public class LogiclanguagePackageImpl extends EPackageImpl implements Logiclangu
2080 initEClass(stringLiteralEClass, StringLiteral.class, "StringLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 2129 initEClass(stringLiteralEClass, StringLiteral.class, "StringLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
2081 initEAttribute(getStringLiteral_Value(), ecorePackage.getEString(), "value", null, 1, 1, StringLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 2130 initEAttribute(getStringLiteral_Value(), ecorePackage.getEString(), "value", null, 1, 1, StringLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
2082 2131
2132 initEClass(transitiveClosureEClass, TransitiveClosure.class, "TransitiveClosure", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
2133 initEReference(getTransitiveClosure_LeftOperand(), this.getTerm(), null, "leftOperand", null, 0, 1, TransitiveClosure.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
2134 initEReference(getTransitiveClosure_RightOperand(), this.getTerm(), null, "rightOperand", null, 0, 1, TransitiveClosure.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
2135 initEReference(getTransitiveClosure_Relation(), this.getRelation(), null, "relation", null, 0, 1, TransitiveClosure.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
2136
2083 // Create resource 2137 // Create resource
2084 createResource(eNS_URI); 2138 createResource(eNS_URI);
2085 } 2139 }
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TransitiveClosureImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TransitiveClosureImpl.java
new file mode 100644
index 00000000..9633334b
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TransitiveClosureImpl.java
@@ -0,0 +1,303 @@
1/**
2 */
3package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
4
5import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
6import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Relation;
7import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;
8import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TransitiveClosure;
9
10import org.eclipse.emf.common.notify.Notification;
11import org.eclipse.emf.common.notify.NotificationChain;
12
13import org.eclipse.emf.ecore.EClass;
14import org.eclipse.emf.ecore.InternalEObject;
15
16import org.eclipse.emf.ecore.impl.ENotificationImpl;
17import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
18
19/**
20 * <!-- begin-user-doc -->
21 * An implementation of the model object '<em><b>Transitive Closure</b></em>'.
22 * <!-- end-user-doc -->
23 * <p>
24 * The following features are implemented:
25 * </p>
26 * <ul>
27 * <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.TransitiveClosureImpl#getLeftOperand <em>Left Operand</em>}</li>
28 * <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.TransitiveClosureImpl#getRightOperand <em>Right Operand</em>}</li>
29 * <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.TransitiveClosureImpl#getRelation <em>Relation</em>}</li>
30 * </ul>
31 *
32 * @generated
33 */
34public class TransitiveClosureImpl extends MinimalEObjectImpl.Container implements TransitiveClosure {
35 /**
36 * The cached value of the '{@link #getLeftOperand() <em>Left Operand</em>}' containment reference.
37 * <!-- begin-user-doc -->
38 * <!-- end-user-doc -->
39 * @see #getLeftOperand()
40 * @generated
41 * @ordered
42 */
43 protected Term leftOperand;
44
45 /**
46 * The cached value of the '{@link #getRightOperand() <em>Right Operand</em>}' containment reference.
47 * <!-- begin-user-doc -->
48 * <!-- end-user-doc -->
49 * @see #getRightOperand()
50 * @generated
51 * @ordered
52 */
53 protected Term rightOperand;
54
55 /**
56 * The cached value of the '{@link #getRelation() <em>Relation</em>}' reference.
57 * <!-- begin-user-doc -->
58 * <!-- end-user-doc -->
59 * @see #getRelation()
60 * @generated
61 * @ordered
62 */
63 protected Relation relation;
64
65 /**
66 * <!-- begin-user-doc -->
67 * <!-- end-user-doc -->
68 * @generated
69 */
70 protected TransitiveClosureImpl() {
71 super();
72 }
73
74 /**
75 * <!-- begin-user-doc -->
76 * <!-- end-user-doc -->
77 * @generated
78 */
79 @Override
80 protected EClass eStaticClass() {
81 return LogiclanguagePackage.Literals.TRANSITIVE_CLOSURE;
82 }
83
84 /**
85 * <!-- begin-user-doc -->
86 * <!-- end-user-doc -->
87 * @generated
88 */
89 public Term getLeftOperand() {
90 return leftOperand;
91 }
92
93 /**
94 * <!-- begin-user-doc -->
95 * <!-- end-user-doc -->
96 * @generated
97 */
98 public NotificationChain basicSetLeftOperand(Term newLeftOperand, NotificationChain msgs) {
99 Term oldLeftOperand = leftOperand;
100 leftOperand = newLeftOperand;
101 if (eNotificationRequired()) {
102 ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.TRANSITIVE_CLOSURE__LEFT_OPERAND, oldLeftOperand, newLeftOperand);
103 if (msgs == null) msgs = notification; else msgs.add(notification);
104 }
105 return msgs;
106 }
107
108 /**
109 * <!-- begin-user-doc -->
110 * <!-- end-user-doc -->
111 * @generated
112 */
113 public void setLeftOperand(Term newLeftOperand) {
114 if (newLeftOperand != leftOperand) {
115 NotificationChain msgs = null;
116 if (leftOperand != null)
117 msgs = ((InternalEObject)leftOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.TRANSITIVE_CLOSURE__LEFT_OPERAND, null, msgs);
118 if (newLeftOperand != null)
119 msgs = ((InternalEObject)newLeftOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.TRANSITIVE_CLOSURE__LEFT_OPERAND, null, msgs);
120 msgs = basicSetLeftOperand(newLeftOperand, msgs);
121 if (msgs != null) msgs.dispatch();
122 }
123 else if (eNotificationRequired())
124 eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.TRANSITIVE_CLOSURE__LEFT_OPERAND, newLeftOperand, newLeftOperand));
125 }
126
127 /**
128 * <!-- begin-user-doc -->
129 * <!-- end-user-doc -->
130 * @generated
131 */
132 public Term getRightOperand() {
133 return rightOperand;
134 }
135
136 /**
137 * <!-- begin-user-doc -->
138 * <!-- end-user-doc -->
139 * @generated
140 */
141 public NotificationChain basicSetRightOperand(Term newRightOperand, NotificationChain msgs) {
142 Term oldRightOperand = rightOperand;
143 rightOperand = newRightOperand;
144 if (eNotificationRequired()) {
145 ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.TRANSITIVE_CLOSURE__RIGHT_OPERAND, oldRightOperand, newRightOperand);
146 if (msgs == null) msgs = notification; else msgs.add(notification);
147 }
148 return msgs;
149 }
150
151 /**
152 * <!-- begin-user-doc -->
153 * <!-- end-user-doc -->
154 * @generated
155 */
156 public void setRightOperand(Term newRightOperand) {
157 if (newRightOperand != rightOperand) {
158 NotificationChain msgs = null;
159 if (rightOperand != null)
160 msgs = ((InternalEObject)rightOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.TRANSITIVE_CLOSURE__RIGHT_OPERAND, null, msgs);
161 if (newRightOperand != null)
162 msgs = ((InternalEObject)newRightOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.TRANSITIVE_CLOSURE__RIGHT_OPERAND, null, msgs);
163 msgs = basicSetRightOperand(newRightOperand, msgs);
164 if (msgs != null) msgs.dispatch();
165 }
166 else if (eNotificationRequired())
167 eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.TRANSITIVE_CLOSURE__RIGHT_OPERAND, newRightOperand, newRightOperand));
168 }
169
170 /**
171 * <!-- begin-user-doc -->
172 * <!-- end-user-doc -->
173 * @generated
174 */
175 public Relation getRelation() {
176 if (relation != null && relation.eIsProxy()) {
177 InternalEObject oldRelation = (InternalEObject)relation;
178 relation = (Relation)eResolveProxy(oldRelation);
179 if (relation != oldRelation) {
180 if (eNotificationRequired())
181 eNotify(new ENotificationImpl(this, Notification.RESOLVE, LogiclanguagePackage.TRANSITIVE_CLOSURE__RELATION, oldRelation, relation));
182 }
183 }
184 return relation;
185 }
186
187 /**
188 * <!-- begin-user-doc -->
189 * <!-- end-user-doc -->
190 * @generated
191 */
192 public Relation basicGetRelation() {
193 return relation;
194 }
195
196 /**
197 * <!-- begin-user-doc -->
198 * <!-- end-user-doc -->
199 * @generated
200 */
201 public void setRelation(Relation newRelation) {
202 Relation oldRelation = relation;
203 relation = newRelation;
204 if (eNotificationRequired())
205 eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.TRANSITIVE_CLOSURE__RELATION, oldRelation, relation));
206 }
207
208 /**
209 * <!-- begin-user-doc -->
210 * <!-- end-user-doc -->
211 * @generated
212 */
213 @Override
214 public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
215 switch (featureID) {
216 case LogiclanguagePackage.TRANSITIVE_CLOSURE__LEFT_OPERAND:
217 return basicSetLeftOperand(null, msgs);
218 case LogiclanguagePackage.TRANSITIVE_CLOSURE__RIGHT_OPERAND:
219 return basicSetRightOperand(null, msgs);
220 }
221 return super.eInverseRemove(otherEnd, featureID, msgs);
222 }
223
224 /**
225 * <!-- begin-user-doc -->
226 * <!-- end-user-doc -->
227 * @generated
228 */
229 @Override
230 public Object eGet(int featureID, boolean resolve, boolean coreType) {
231 switch (featureID) {
232 case LogiclanguagePackage.TRANSITIVE_CLOSURE__LEFT_OPERAND:
233 return getLeftOperand();
234 case LogiclanguagePackage.TRANSITIVE_CLOSURE__RIGHT_OPERAND:
235 return getRightOperand();
236 case LogiclanguagePackage.TRANSITIVE_CLOSURE__RELATION:
237 if (resolve) return getRelation();
238 return basicGetRelation();
239 }
240 return super.eGet(featureID, resolve, coreType);
241 }
242
243 /**
244 * <!-- begin-user-doc -->
245 * <!-- end-user-doc -->
246 * @generated
247 */
248 @Override
249 public void eSet(int featureID, Object newValue) {
250 switch (featureID) {
251 case LogiclanguagePackage.TRANSITIVE_CLOSURE__LEFT_OPERAND:
252 setLeftOperand((Term)newValue);
253 return;
254 case LogiclanguagePackage.TRANSITIVE_CLOSURE__RIGHT_OPERAND:
255 setRightOperand((Term)newValue);
256 return;
257 case LogiclanguagePackage.TRANSITIVE_CLOSURE__RELATION:
258 setRelation((Relation)newValue);
259 return;
260 }
261 super.eSet(featureID, newValue);
262 }
263
264 /**
265 * <!-- begin-user-doc -->
266 * <!-- end-user-doc -->
267 * @generated
268 */
269 @Override
270 public void eUnset(int featureID) {
271 switch (featureID) {
272 case LogiclanguagePackage.TRANSITIVE_CLOSURE__LEFT_OPERAND:
273 setLeftOperand((Term)null);
274 return;
275 case LogiclanguagePackage.TRANSITIVE_CLOSURE__RIGHT_OPERAND:
276 setRightOperand((Term)null);
277 return;
278 case LogiclanguagePackage.TRANSITIVE_CLOSURE__RELATION:
279 setRelation((Relation)null);
280 return;
281 }
282 super.eUnset(featureID);
283 }
284
285 /**
286 * <!-- begin-user-doc -->
287 * <!-- end-user-doc -->
288 * @generated
289 */
290 @Override
291 public boolean eIsSet(int featureID) {
292 switch (featureID) {
293 case LogiclanguagePackage.TRANSITIVE_CLOSURE__LEFT_OPERAND:
294 return leftOperand != null;
295 case LogiclanguagePackage.TRANSITIVE_CLOSURE__RIGHT_OPERAND:
296 return rightOperand != null;
297 case LogiclanguagePackage.TRANSITIVE_CLOSURE__RELATION:
298 return relation != null;
299 }
300 return super.eIsSet(featureID);
301 }
302
303} //TransitiveClosureImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageAdapterFactory.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageAdapterFactory.java
index c756cf31..d61c3a2a 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageAdapterFactory.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageAdapterFactory.java
@@ -296,6 +296,10 @@ public class LogiclanguageAdapterFactory extends AdapterFactoryImpl {
296 return createStringLiteralAdapter(); 296 return createStringLiteralAdapter();
297 } 297 }
298 @Override 298 @Override
299 public Adapter caseTransitiveClosure(TransitiveClosure object) {
300 return createTransitiveClosureAdapter();
301 }
302 @Override
299 public Adapter defaultCase(EObject object) { 303 public Adapter defaultCase(EObject object) {
300 return createEObjectAdapter(); 304 return createEObjectAdapter();
301 } 305 }
@@ -1114,6 +1118,20 @@ public class LogiclanguageAdapterFactory extends AdapterFactoryImpl {
1114 } 1118 }
1115 1119
1116 /** 1120 /**
1121 * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TransitiveClosure <em>Transitive Closure</em>}'.
1122 * <!-- begin-user-doc -->
1123 * This default implementation returns null so that we can easily ignore cases;
1124 * it's useful to ignore a case when inheritance will catch all the cases anyway.
1125 * <!-- end-user-doc -->
1126 * @return the new adapter.
1127 * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TransitiveClosure
1128 * @generated
1129 */
1130 public Adapter createTransitiveClosureAdapter() {
1131 return null;
1132 }
1133
1134 /**
1117 * Creates a new adapter for the default case. 1135 * Creates a new adapter for the default case.
1118 * <!-- begin-user-doc --> 1136 * <!-- begin-user-doc -->
1119 * This default implementation returns null. 1137 * This default implementation returns null.
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageSwitch.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageSwitch.java
index 43376940..74575fb6 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageSwitch.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/util/LogiclanguageSwitch.java
@@ -544,6 +544,12 @@ public class LogiclanguageSwitch<T> extends Switch<T> {
544 if (result == null) result = defaultCase(theEObject); 544 if (result == null) result = defaultCase(theEObject);
545 return result; 545 return result;
546 } 546 }
547 case LogiclanguagePackage.TRANSITIVE_CLOSURE: {
548 TransitiveClosure transitiveClosure = (TransitiveClosure)theEObject;
549 T result = caseTransitiveClosure(transitiveClosure);
550 if (result == null) result = defaultCase(theEObject);
551 return result;
552 }
547 default: return defaultCase(theEObject); 553 default: return defaultCase(theEObject);
548 } 554 }
549 } 555 }
@@ -1404,6 +1410,21 @@ public class LogiclanguageSwitch<T> extends Switch<T> {
1404 } 1410 }
1405 1411
1406 /** 1412 /**
1413 * Returns the result of interpreting the object as an instance of '<em>Transitive Closure</em>'.
1414 * <!-- begin-user-doc -->
1415 * This implementation returns null;
1416 * returning a non-null result will terminate the switch.
1417 * <!-- end-user-doc -->
1418 * @param object the target of the switch.
1419 * @return the result of interpreting the object as an instance of '<em>Transitive Closure</em>'.
1420 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
1421 * @generated
1422 */
1423 public T caseTransitiveClosure(TransitiveClosure object) {
1424 return null;
1425 }
1426
1427 /**
1407 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. 1428 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
1408 * <!-- begin-user-doc --> 1429 * <!-- begin-user-doc -->
1409 * This implementation returns null; 1430 * This implementation returns null;
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.aird b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.aird
index 16247fdd..bed19d16 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.aird
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.aird
@@ -7295,10 +7295,6 @@
7295 <children xmi:type="notation:Node" xmi:id="_l6XR7LdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIH7dnEeau1vMV3Bsx4w"> 7295 <children xmi:type="notation:Node" xmi:id="_l6XR7LdnEeau1vMV3Bsx4w" type="2003" element="_l6ZIH7dnEeau1vMV3Bsx4w">
7296 <children xmi:type="notation:Node" xmi:id="_l6XR7bdnEeau1vMV3Bsx4w" type="5007"/> 7296 <children xmi:type="notation:Node" xmi:id="_l6XR7bdnEeau1vMV3Bsx4w" type="5007"/>
7297 <children xmi:type="notation:Node" xmi:id="_l6XR7rdnEeau1vMV3Bsx4w" type="7004"> 7297 <children xmi:type="notation:Node" xmi:id="_l6XR7rdnEeau1vMV3Bsx4w" type="7004">
7298 <children xmi:type="notation:Node" xmi:id="_SzhvMHuWEeeCn_RNMwgEBg" type="3010" element="_SyqzkHuWEeeCn_RNMwgEBg">
7299 <styles xmi:type="notation:FontStyle" xmi:id="_SzhvMXuWEeeCn_RNMwgEBg" fontName="Segoe UI" fontHeight="8"/>
7300 <layoutConstraint xmi:type="notation:Location" xmi:id="_SzhvMnuWEeeCn_RNMwgEBg"/>
7301 </children>
7302 <styles xmi:type="notation:SortingStyle" xmi:id="_l6XR77dnEeau1vMV3Bsx4w"/> 7298 <styles xmi:type="notation:SortingStyle" xmi:id="_l6XR77dnEeau1vMV3Bsx4w"/>
7303 <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XR8LdnEeau1vMV3Bsx4w"/> 7299 <styles xmi:type="notation:FilteringStyle" xmi:id="_l6XR8LdnEeau1vMV3Bsx4w"/>
7304 </children> 7300 </children>
@@ -7618,6 +7614,41 @@
7618 <styles xmi:type="notation:ShapeStyle" xmi:id="_Xh-bUXuWEeeCn_RNMwgEBg" fontName="Segoe UI" fontHeight="8"/> 7614 <styles xmi:type="notation:ShapeStyle" xmi:id="_Xh-bUXuWEeeCn_RNMwgEBg" fontName="Segoe UI" fontHeight="8"/>
7619 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xh-bUnuWEeeCn_RNMwgEBg" x="1085" y="519" width="120" height="54"/> 7615 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xh-bUnuWEeeCn_RNMwgEBg" x="1085" y="519" width="120" height="54"/>
7620 </children> 7616 </children>
7617 <children xmi:type="notation:Node" xmi:id="_PSQLAIKgEeeAppuRs-roLg" type="2003" element="_PQURUIKgEeeAppuRs-roLg">
7618 <children xmi:type="notation:Node" xmi:id="_PSZU8IKgEeeAppuRs-roLg" type="5007"/>
7619 <children xmi:type="notation:Node" xmi:id="_PSZU8YKgEeeAppuRs-roLg" type="7004">
7620 <styles xmi:type="notation:SortingStyle" xmi:id="_PSZU8oKgEeeAppuRs-roLg"/>
7621 <styles xmi:type="notation:FilteringStyle" xmi:id="_PSZU84KgEeeAppuRs-roLg"/>
7622 </children>
7623 <styles xmi:type="notation:ShapeStyle" xmi:id="_PSQLAYKgEeeAppuRs-roLg" fontName="Segoe UI" fontHeight="8"/>
7624 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSQLAoKgEeeAppuRs-roLg" x="2100" y="210" width="120" height="100"/>
7625 </children>
7626 <children xmi:type="notation:Node" xmi:id="_e1tR0IKgEeeAppuRs-roLg" type="2003" element="_e0z58IKgEeeAppuRs-roLg">
7627 <children xmi:type="notation:Node" xmi:id="_e1tR04KgEeeAppuRs-roLg" type="5007"/>
7628 <children xmi:type="notation:Node" xmi:id="_e1tR1IKgEeeAppuRs-roLg" type="7004">
7629 <children xmi:type="notation:Node" xmi:id="_e1tR14KgEeeAppuRs-roLg" type="3010" element="_e1Ql4IKgEeeAppuRs-roLg">
7630 <styles xmi:type="notation:FontStyle" xmi:id="_e1tR2IKgEeeAppuRs-roLg" fontName="Segoe UI" fontHeight="8" bold="true"/>
7631 <layoutConstraint xmi:type="notation:Location" xmi:id="_e1tR2YKgEeeAppuRs-roLg"/>
7632 </children>
7633 <styles xmi:type="notation:SortingStyle" xmi:id="_e1tR1YKgEeeAppuRs-roLg"/>
7634 <styles xmi:type="notation:FilteringStyle" xmi:id="_e1tR1oKgEeeAppuRs-roLg"/>
7635 </children>
7636 <styles xmi:type="notation:ShapeStyle" xmi:id="_e1tR0YKgEeeAppuRs-roLg" fontName="Segoe UI" fontHeight="8" italic="true"/>
7637 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e1tR0oKgEeeAppuRs-roLg" x="2020" y="-110"/>
7638 </children>
7639 <children xmi:type="notation:Node" xmi:id="_hTMLdIKhEeeAppuRs-roLg" type="2003" element="_hSSzkIKhEeeAppuRs-roLg">
7640 <children xmi:type="notation:Node" xmi:id="_hTMLd4KhEeeAppuRs-roLg" type="5007"/>
7641 <children xmi:type="notation:Node" xmi:id="_hTMLeIKhEeeAppuRs-roLg" type="7004">
7642 <children xmi:type="notation:Node" xmi:id="_hTMLe4KhEeeAppuRs-roLg" type="3010" element="_hSvfgIKhEeeAppuRs-roLg">
7643 <styles xmi:type="notation:FontStyle" xmi:id="_hTMLfIKhEeeAppuRs-roLg" fontName="Segoe UI" fontHeight="8"/>
7644 <layoutConstraint xmi:type="notation:Location" xmi:id="_hTMLfYKhEeeAppuRs-roLg"/>
7645 </children>
7646 <styles xmi:type="notation:SortingStyle" xmi:id="_hTMLeYKhEeeAppuRs-roLg"/>
7647 <styles xmi:type="notation:FilteringStyle" xmi:id="_hTMLeoKhEeeAppuRs-roLg"/>
7648 </children>
7649 <styles xmi:type="notation:ShapeStyle" xmi:id="_hTMLdYKhEeeAppuRs-roLg" fontName="Segoe UI" fontHeight="8" italic="true"/>
7650 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTMLdoKhEeeAppuRs-roLg" x="2251" y="46"/>
7651 </children>
7621 <styles xmi:type="notation:DiagramStyle" xmi:id="_l6X5OrdnEeau1vMV3Bsx4w"/> 7652 <styles xmi:type="notation:DiagramStyle" xmi:id="_l6X5OrdnEeau1vMV3Bsx4w"/>
7622 <edges xmi:type="notation:Edge" xmi:id="_l6X5a7dnEeau1vMV3Bsx4w" type="4001" element="_l6Zt6bdnEeau1vMV3Bsx4w" source="_l6XR7LdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w"> 7653 <edges xmi:type="notation:Edge" xmi:id="_l6X5a7dnEeau1vMV3Bsx4w" type="4001" element="_l6Zt6bdnEeau1vMV3Bsx4w" source="_l6XR7LdnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
7623 <children xmi:type="notation:Node" xmi:id="_l6X5bLdnEeau1vMV3Bsx4w" type="6001"> 7654 <children xmi:type="notation:Node" xmi:id="_l6X5bLdnEeau1vMV3Bsx4w" type="6001">
@@ -7973,17 +8004,17 @@
7973 </edges> 8004 </edges>
7974 <edges xmi:type="notation:Edge" xmi:id="_l6YfpLdnEeau1vMV3Bsx4w" type="4001" element="_l6ZuRbdnEeau1vMV3Bsx4w" source="_l6X4q7dnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w"> 8005 <edges xmi:type="notation:Edge" xmi:id="_l6YfpLdnEeau1vMV3Bsx4w" type="4001" element="_l6ZuRbdnEeau1vMV3Bsx4w" source="_l6X4q7dnEeau1vMV3Bsx4w" target="_l6XR27dnEeau1vMV3Bsx4w">
7975 <children xmi:type="notation:Node" xmi:id="_l6YfpbdnEeau1vMV3Bsx4w" type="6001"> 8006 <children xmi:type="notation:Node" xmi:id="_l6YfpbdnEeau1vMV3Bsx4w" type="6001">
7976 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YfprdnEeau1vMV3Bsx4w" x="-6" y="-10"/> 8007 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YfprdnEeau1vMV3Bsx4w" x="64" y="-10"/>
7977 </children> 8008 </children>
7978 <children xmi:type="notation:Node" xmi:id="_l6Yfp7dnEeau1vMV3Bsx4w" type="6002"> 8009 <children xmi:type="notation:Node" xmi:id="_l6Yfp7dnEeau1vMV3Bsx4w" type="6002">
7979 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YfqLdnEeau1vMV3Bsx4w" x="347" y="10"/> 8010 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YfqLdnEeau1vMV3Bsx4w" x="436" y="10"/>
7980 </children> 8011 </children>
7981 <children xmi:type="notation:Node" xmi:id="_l6YfqbdnEeau1vMV3Bsx4w" type="6003"> 8012 <children xmi:type="notation:Node" xmi:id="_l6YfqbdnEeau1vMV3Bsx4w" type="6003">
7982 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YfqrdnEeau1vMV3Bsx4w" x="61" y="10"/> 8013 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l6YfqrdnEeau1vMV3Bsx4w" x="111" y="10"/>
7983 </children> 8014 </children>
7984 <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6Yfq7dnEeau1vMV3Bsx4w" routing="Rectilinear"/> 8015 <styles xmi:type="notation:ConnectorStyle" xmi:id="_l6Yfq7dnEeau1vMV3Bsx4w" routing="Rectilinear"/>
7985 <styles xmi:type="notation:FontStyle" xmi:id="_l6YfrLdnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/> 8016 <styles xmi:type="notation:FontStyle" xmi:id="_l6YfrLdnEeau1vMV3Bsx4w" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
7986 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YfrbdnEeau1vMV3Bsx4w" points="[59, 1, -1261, 95]$[1261, 1, -59, 95]"/> 8017 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l6YfrbdnEeau1vMV3Bsx4w" points="[1, 0, -1319, 94]$[1, -40, -1319, 54]$[1320, -40, 0, 54]$[1320, -94, 0, 0]"/>
7987 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YfrrdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/> 8018 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6YfrrdnEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
7988 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yfr7dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/> 8019 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l6Yfr7dnEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
7989 </edges> 8020 </edges>
@@ -8579,22 +8610,6 @@
8579 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bo5d8LqxEeau1vMV3Bsx4w" id="(0.5,0.0)"/> 8610 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bo5d8LqxEeau1vMV3Bsx4w" id="(0.5,0.0)"/>
8580 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bo5d8bqxEeau1vMV3Bsx4w" id="(0.5,1.0)"/> 8611 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Bo5d8bqxEeau1vMV3Bsx4w" id="(0.5,1.0)"/>
8581 </edges> 8612 </edges>
8582 <edges xmi:type="notation:Edge" xmi:id="_SzmAoHuWEeeCn_RNMwgEBg" type="4001" element="_SzZzYHuWEeeCn_RNMwgEBg" source="_l6XSGLdnEeau1vMV3Bsx4w" target="_l6X43LdnEeau1vMV3Bsx4w">
8583 <children xmi:type="notation:Node" xmi:id="_SzmApHuWEeeCn_RNMwgEBg" type="6001">
8584 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SzmApXuWEeeCn_RNMwgEBg" y="-10"/>
8585 </children>
8586 <children xmi:type="notation:Node" xmi:id="_SzmnsHuWEeeCn_RNMwgEBg" type="6002">
8587 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SzmnsXuWEeeCn_RNMwgEBg" y="10"/>
8588 </children>
8589 <children xmi:type="notation:Node" xmi:id="_SzmnsnuWEeeCn_RNMwgEBg" type="6003">
8590 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Szmns3uWEeeCn_RNMwgEBg" y="10"/>
8591 </children>
8592 <styles xmi:type="notation:ConnectorStyle" xmi:id="_SzmAoXuWEeeCn_RNMwgEBg" routing="Tree"/>
8593 <styles xmi:type="notation:FontStyle" xmi:id="_SzmAonuWEeeCn_RNMwgEBg" fontName="Segoe UI" fontHeight="8"/>
8594 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SzmAo3uWEeeCn_RNMwgEBg" points="[1760, 440, 1760, 440]$[2855, -1, 2855, -1]"/>
8595 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SznOwHuWEeeCn_RNMwgEBg" id="(0.5,0.5)"/>
8596 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SznOwXuWEeeCn_RNMwgEBg" id="(0.5,1.0)"/>
8597 </edges>
8598 <edges xmi:type="notation:Edge" xmi:id="_zFvSUHuWEeeCn_RNMwgEBg" type="4001" element="_zEk0sHuWEeeCn_RNMwgEBg" source="_Xh-bUHuWEeeCn_RNMwgEBg" target="_l6XR87dnEeau1vMV3Bsx4w"> 8613 <edges xmi:type="notation:Edge" xmi:id="_zFvSUHuWEeeCn_RNMwgEBg" type="4001" element="_zEk0sHuWEeeCn_RNMwgEBg" source="_Xh-bUHuWEeeCn_RNMwgEBg" target="_l6XR87dnEeau1vMV3Bsx4w">
8599 <children xmi:type="notation:Node" xmi:id="_zFv5YHuWEeeCn_RNMwgEBg" type="6001"> 8614 <children xmi:type="notation:Node" xmi:id="_zFv5YHuWEeeCn_RNMwgEBg" type="6001">
8600 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zFv5YXuWEeeCn_RNMwgEBg" y="-10"/> 8615 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zFv5YXuWEeeCn_RNMwgEBg" y="-10"/>
@@ -8611,9 +8626,137 @@
8611 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zFwgcnuWEeeCn_RNMwgEBg" id="(0.5932203389830508,0.0)"/> 8626 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zFwgcnuWEeeCn_RNMwgEBg" id="(0.5932203389830508,0.0)"/>
8612 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zFwgc3uWEeeCn_RNMwgEBg" id="(0.5,1.0)"/> 8627 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zFwgc3uWEeeCn_RNMwgEBg" id="(0.5,1.0)"/>
8613 </edges> 8628 </edges>
8629 <edges xmi:type="notation:Edge" xmi:id="_Vj8LgIKgEeeAppuRs-roLg" type="4001" element="_Vi5psIKgEeeAppuRs-roLg" source="_PSQLAIKgEeeAppuRs-roLg" target="_l6XR27dnEeau1vMV3Bsx4w">
8630 <children xmi:type="notation:Node" xmi:id="_VkF8gIKgEeeAppuRs-roLg" type="6001">
8631 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VkF8gYKgEeeAppuRs-roLg" x="-31" y="10"/>
8632 </children>
8633 <children xmi:type="notation:Node" xmi:id="_VkF8goKgEeeAppuRs-roLg" type="6002">
8634 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VkF8g4KgEeeAppuRs-roLg" x="-8" y="10"/>
8635 </children>
8636 <children xmi:type="notation:Node" xmi:id="_VkF8hIKgEeeAppuRs-roLg" type="6003">
8637 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VkF8hYKgEeeAppuRs-roLg" x="-25" y="223"/>
8638 </children>
8639 <styles xmi:type="notation:ConnectorStyle" xmi:id="_Vj8LgYKgEeeAppuRs-roLg" routing="Rectilinear"/>
8640 <styles xmi:type="notation:FontStyle" xmi:id="_Vj8LgoKgEeeAppuRs-roLg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
8641 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Vj8Lg4KgEeeAppuRs-roLg" points="[0, 0, 352, 201]$[-410, 0, -58, 201]$[-410, -114, -58, 87]"/>
8642 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VkF8hoKgEeeAppuRs-roLg" id="(0.0,0.6122448979591837)"/>
8643 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VkF8h4KgEeeAppuRs-roLg" id="(1.0,0.11224489795918367)"/>
8644 </edges>
8645 <edges xmi:type="notation:Edge" xmi:id="_YR4_gIKgEeeAppuRs-roLg" type="4001" element="_YRIxkIKgEeeAppuRs-roLg" source="_PSQLAIKgEeeAppuRs-roLg" target="_l6XR27dnEeau1vMV3Bsx4w">
8646 <children xmi:type="notation:Node" xmi:id="_YR4_hIKgEeeAppuRs-roLg" type="6001">
8647 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YR4_hYKgEeeAppuRs-roLg" x="-22" y="10"/>
8648 </children>
8649 <children xmi:type="notation:Node" xmi:id="_YR4_hoKgEeeAppuRs-roLg" type="6002">
8650 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YR4_h4KgEeeAppuRs-roLg" x="-5" y="10"/>
8651 </children>
8652 <children xmi:type="notation:Node" xmi:id="_YR4_iIKgEeeAppuRs-roLg" type="6003">
8653 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YR4_iYKgEeeAppuRs-roLg" y="218"/>
8654 </children>
8655 <styles xmi:type="notation:ConnectorStyle" xmi:id="_YR4_gYKgEeeAppuRs-roLg" routing="Rectilinear"/>
8656 <styles xmi:type="notation:FontStyle" xmi:id="_YR4_goKgEeeAppuRs-roLg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
8657 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YR4_g4KgEeeAppuRs-roLg" points="[0, 0, 352, 165]$[-410, 0, -58, 165]$[-410, -84, -58, 81]"/>
8658 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YR4_ioKgEeeAppuRs-roLg" id="(0.0,0.30612244897959184)"/>
8659 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YR4_i4KgEeeAppuRs-roLg" id="(1.0,0.17346938775510204)"/>
8660 </edges>
8661 <edges xmi:type="notation:Edge" xmi:id="_e12bwIKgEeeAppuRs-roLg" type="4001" element="_e1Zv0IKgEeeAppuRs-roLg" source="_l6XR7LdnEeau1vMV3Bsx4w" target="_e1tR0IKgEeeAppuRs-roLg">
8662 <children xmi:type="notation:Node" xmi:id="_e12bxIKgEeeAppuRs-roLg" type="6001">
8663 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e12bxYKgEeeAppuRs-roLg" x="-22" y="125"/>
8664 </children>
8665 <children xmi:type="notation:Node" xmi:id="_e12bxoKgEeeAppuRs-roLg" type="6002">
8666 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e12bx4KgEeeAppuRs-roLg" x="-32" y="37"/>
8667 </children>
8668 <children xmi:type="notation:Node" xmi:id="_e12byIKgEeeAppuRs-roLg" type="6003">
8669 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e12byYKgEeeAppuRs-roLg" x="-44" y="-10"/>
8670 </children>
8671 <styles xmi:type="notation:ConnectorStyle" xmi:id="_e12bwYKgEeeAppuRs-roLg" routing="Rectilinear"/>
8672 <styles xmi:type="notation:FontStyle" xmi:id="_e12bwoKgEeeAppuRs-roLg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
8673 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e12bw4KgEeeAppuRs-roLg" points="[16, 49, 241, 369]$[16, 112, 241, 432]$[-241, 112, -16, 432]$[-241, -271, -16, 49]"/>
8674 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e12byoKgEeeAppuRs-roLg" id="(0.5,0.5)"/>
8675 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e12by4KgEeeAppuRs-roLg" id="(0.5,0.5)"/>
8676 </edges>
8677 <edges xmi:type="notation:Edge" xmi:id="_e12bzIKgEeeAppuRs-roLg" type="4001" element="_e1jg0IKgEeeAppuRs-roLg" source="_l6XSGLdnEeau1vMV3Bsx4w" target="_e1tR0IKgEeeAppuRs-roLg">
8678 <children xmi:type="notation:Node" xmi:id="_e2AMwIKgEeeAppuRs-roLg" type="6001">
8679 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e2AMwYKgEeeAppuRs-roLg" y="-10"/>
8680 </children>
8681 <children xmi:type="notation:Node" xmi:id="_e2AMwoKgEeeAppuRs-roLg" type="6002">
8682 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e2AMw4KgEeeAppuRs-roLg" y="10"/>
8683 </children>
8684 <children xmi:type="notation:Node" xmi:id="_e2AMxIKgEeeAppuRs-roLg" type="6003">
8685 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e2AMxYKgEeeAppuRs-roLg" y="10"/>
8686 </children>
8687 <styles xmi:type="notation:ConnectorStyle" xmi:id="_e12bzYKgEeeAppuRs-roLg" routing="Tree"/>
8688 <styles xmi:type="notation:FontStyle" xmi:id="_e12bzoKgEeeAppuRs-roLg" fontName="Segoe UI" fontHeight="8"/>
8689 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e12bz4KgEeeAppuRs-roLg" points="[1760, 440, 1760, 440]$[0, 0, 0, 0]"/>
8690 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e2AMxoKgEeeAppuRs-roLg" id="(0.5,0.5)"/>
8691 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e2AMx4KgEeeAppuRs-roLg" id="(0.5,0.5)"/>
8692 </edges>
8693 <edges xmi:type="notation:Edge" xmi:id="_e2AMyIKgEeeAppuRs-roLg" type="4001" element="_e1jg1IKgEeeAppuRs-roLg" source="_e1tR0IKgEeeAppuRs-roLg" target="_l6X43LdnEeau1vMV3Bsx4w">
8694 <children xmi:type="notation:Node" xmi:id="_e2AMzIKgEeeAppuRs-roLg" type="6001">
8695 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e2AMzYKgEeeAppuRs-roLg" y="-10"/>
8696 </children>
8697 <children xmi:type="notation:Node" xmi:id="_e2AMzoKgEeeAppuRs-roLg" type="6002">
8698 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e2AMz4KgEeeAppuRs-roLg" y="10"/>
8699 </children>
8700 <children xmi:type="notation:Node" xmi:id="_e2AM0IKgEeeAppuRs-roLg" type="6003">
8701 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e2AM0YKgEeeAppuRs-roLg" y="10"/>
8702 </children>
8703 <styles xmi:type="notation:ConnectorStyle" xmi:id="_e2AMyYKgEeeAppuRs-roLg" routing="Tree"/>
8704 <styles xmi:type="notation:FontStyle" xmi:id="_e2AMyoKgEeeAppuRs-roLg" fontName="Segoe UI" fontHeight="8"/>
8705 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e2AMy4KgEeeAppuRs-roLg" points="[0, 0, 0, 0]$[2855, -1, 2855, -1]"/>
8706 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e2AM0oKgEeeAppuRs-roLg" id="(0.5,0.5)"/>
8707 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_e2AM04KgEeeAppuRs-roLg" id="(0.5,1.0)"/>
8708 </edges>
8709 <edges xmi:type="notation:Edge" xmi:id="_hTVVYIKhEeeAppuRs-roLg" type="4001" element="_hS4pcIKhEeeAppuRs-roLg" source="_hTMLdIKhEeeAppuRs-roLg" target="_JfwFgLd8Eeau1vMV3Bsx4w">
8710 <children xmi:type="notation:Node" xmi:id="_hTVVZIKhEeeAppuRs-roLg" type="6001">
8711 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTVVZYKhEeeAppuRs-roLg" x="92" y="21"/>
8712 </children>
8713 <children xmi:type="notation:Node" xmi:id="_hTVVZoKhEeeAppuRs-roLg" type="6002">
8714 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTVVZ4KhEeeAppuRs-roLg" x="244" y="10"/>
8715 </children>
8716 <children xmi:type="notation:Node" xmi:id="_hTVVaIKhEeeAppuRs-roLg" type="6003">
8717 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTVVaYKhEeeAppuRs-roLg" x="31" y="10"/>
8718 </children>
8719 <styles xmi:type="notation:ConnectorStyle" xmi:id="_hTVVYYKhEeeAppuRs-roLg" routing="Rectilinear"/>
8720 <styles xmi:type="notation:FontStyle" xmi:id="_hTVVYoKhEeeAppuRs-roLg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
8721 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hTVVY4KhEeeAppuRs-roLg" points="[-97, 49, 353, -490]$[-97, 508, 353, -31]$[-391, 508, 59, -31]"/>
8722 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hTVVaoKhEeeAppuRs-roLg" id="(0.5,0.5)"/>
8723 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hTVVa4KhEeeAppuRs-roLg" id="(0.5,0.5)"/>
8724 </edges>
8725 <edges xmi:type="notation:Edge" xmi:id="_hTVVbIKhEeeAppuRs-roLg" type="4001" element="_hTMLcIKhEeeAppuRs-roLg" source="_hTMLdIKhEeeAppuRs-roLg" target="_e1tR0IKgEeeAppuRs-roLg">
8726 <children xmi:type="notation:Node" xmi:id="_hTVVcIKhEeeAppuRs-roLg" type="6001">
8727 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTVVcYKhEeeAppuRs-roLg" y="-10"/>
8728 </children>
8729 <children xmi:type="notation:Node" xmi:id="_hTVVcoKhEeeAppuRs-roLg" type="6002">
8730 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTVVc4KhEeeAppuRs-roLg" y="10"/>
8731 </children>
8732 <children xmi:type="notation:Node" xmi:id="_hTVVdIKhEeeAppuRs-roLg" type="6003">
8733 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hTVVdYKhEeeAppuRs-roLg" y="10"/>
8734 </children>
8735 <styles xmi:type="notation:ConnectorStyle" xmi:id="_hTVVbYKhEeeAppuRs-roLg" routing="Tree"/>
8736 <styles xmi:type="notation:FontStyle" xmi:id="_hTVVboKhEeeAppuRs-roLg" fontName="Segoe UI" fontHeight="8"/>
8737 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hTVVb4KhEeeAppuRs-roLg" points="[0, 0, 0, 0]$[2020, -111, 2020, -111]"/>
8738 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hTVVdoKhEeeAppuRs-roLg" id="(0.5,0.5)"/>
8739 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hTVVd4KhEeeAppuRs-roLg" id="(0.5,0.5)"/>
8740 </edges>
8741 <edges xmi:type="notation:Edge" xmi:id="_mN2HkIKhEeeAppuRs-roLg" type="4001" element="_mNGgsIKhEeeAppuRs-roLg" source="_PSQLAIKgEeeAppuRs-roLg" target="_hTMLdIKhEeeAppuRs-roLg">
8742 <children xmi:type="notation:Node" xmi:id="_mN2HlIKhEeeAppuRs-roLg" type="6001">
8743 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mN2HlYKhEeeAppuRs-roLg" y="-10"/>
8744 </children>
8745 <children xmi:type="notation:Node" xmi:id="_mN2HloKhEeeAppuRs-roLg" type="6002">
8746 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mN2Hl4KhEeeAppuRs-roLg" y="10"/>
8747 </children>
8748 <children xmi:type="notation:Node" xmi:id="_mN2HmIKhEeeAppuRs-roLg" type="6003">
8749 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mN2HmYKhEeeAppuRs-roLg" y="10"/>
8750 </children>
8751 <styles xmi:type="notation:ConnectorStyle" xmi:id="_mN2HkYKhEeeAppuRs-roLg" routing="Rectilinear"/>
8752 <styles xmi:type="notation:FontStyle" xmi:id="_mN2HkoKhEeeAppuRs-roLg" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
8753 <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mN2Hk4KhEeeAppuRs-roLg" points="[0, 0, -166, 66]$[166, -66, 0, 0]"/>
8754 <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mN2HmoKhEeeAppuRs-roLg" id="(0.5,0.0)"/>
8755 <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mN2Hm4KhEeeAppuRs-roLg" id="(0.3592233009708738,1.0)"/>
8756 </edges>
8614 </data> 8757 </data>
8615 </ownedAnnotationEntries> 8758 </ownedAnnotationEntries>
8616 <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIGbdnEeau1vMV3Bsx4w" name="Term" tooltipText="" outgoingEdges="_l6ZufbdnEeau1vMV3Bsx4w" incomingEdges="_l6Zt6bdnEeau1vMV3Bsx4w _l6Zt9bdnEeau1vMV3Bsx4w _l6Zt-bdnEeau1vMV3Bsx4w _l6Zt_bdnEeau1vMV3Bsx4w _l6ZuAbdnEeau1vMV3Bsx4w _l6ZuBbdnEeau1vMV3Bsx4w _l6ZuCbdnEeau1vMV3Bsx4w _l6ZuDbdnEeau1vMV3Bsx4w _l6ZuEbdnEeau1vMV3Bsx4w _l6ZuFbdnEeau1vMV3Bsx4w _l6ZuGbdnEeau1vMV3Bsx4w _l6ZuHbdnEeau1vMV3Bsx4w _l6ZuIbdnEeau1vMV3Bsx4w _l6ZuJbdnEeau1vMV3Bsx4w _l6ZuKbdnEeau1vMV3Bsx4w _l6ZuLbdnEeau1vMV3Bsx4w _l6ZuMbdnEeau1vMV3Bsx4w _l6ZuNbdnEeau1vMV3Bsx4w _l6ZuObdnEeau1vMV3Bsx4w _l6ZuPbdnEeau1vMV3Bsx4w _l6ZuQbdnEeau1vMV3Bsx4w _l6ZuRbdnEeau1vMV3Bsx4w _l6ZuhbdnEeau1vMV3Bsx4w _l6ZuibdnEeau1vMV3Bsx4w _l6ZunbdnEeau1vMV3Bsx4w _l6ZuqbdnEeau1vMV3Bsx4w _l6ZuwbdnEeau1vMV3Bsx4w _l6Zu3bdnEeau1vMV3Bsx4w _l6ZvHbdnEeau1vMV3Bsx4w _l6ZvIbdnEeau1vMV3Bsx4w _l6ZvJbdnEeau1vMV3Bsx4w _l6ZvKbdnEeau1vMV3Bsx4w _l6ZvZ7dnEeau1vMV3Bsx4w _kQZhsLd1Eeau1vMV3Bsx4w _BoaVwLqxEeau1vMV3Bsx4w" width="12" height="10"> 8759 <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIGbdnEeau1vMV3Bsx4w" name="Term" tooltipText="" outgoingEdges="_l6ZufbdnEeau1vMV3Bsx4w" incomingEdges="_l6Zt6bdnEeau1vMV3Bsx4w _l6Zt9bdnEeau1vMV3Bsx4w _l6Zt-bdnEeau1vMV3Bsx4w _l6Zt_bdnEeau1vMV3Bsx4w _l6ZuAbdnEeau1vMV3Bsx4w _l6ZuBbdnEeau1vMV3Bsx4w _l6ZuCbdnEeau1vMV3Bsx4w _l6ZuDbdnEeau1vMV3Bsx4w _l6ZuEbdnEeau1vMV3Bsx4w _l6ZuFbdnEeau1vMV3Bsx4w _l6ZuGbdnEeau1vMV3Bsx4w _l6ZuHbdnEeau1vMV3Bsx4w _l6ZuIbdnEeau1vMV3Bsx4w _l6ZuJbdnEeau1vMV3Bsx4w _l6ZuKbdnEeau1vMV3Bsx4w _l6ZuLbdnEeau1vMV3Bsx4w _l6ZuMbdnEeau1vMV3Bsx4w _l6ZuNbdnEeau1vMV3Bsx4w _l6ZuObdnEeau1vMV3Bsx4w _l6ZuPbdnEeau1vMV3Bsx4w _l6ZuQbdnEeau1vMV3Bsx4w _l6ZuRbdnEeau1vMV3Bsx4w _l6ZuhbdnEeau1vMV3Bsx4w _l6ZuibdnEeau1vMV3Bsx4w _l6ZunbdnEeau1vMV3Bsx4w _l6ZuqbdnEeau1vMV3Bsx4w _l6ZuwbdnEeau1vMV3Bsx4w _l6Zu3bdnEeau1vMV3Bsx4w _l6ZvHbdnEeau1vMV3Bsx4w _l6ZvIbdnEeau1vMV3Bsx4w _l6ZvJbdnEeau1vMV3Bsx4w _l6ZvKbdnEeau1vMV3Bsx4w _l6ZvZ7dnEeau1vMV3Bsx4w _kQZhsLd1Eeau1vMV3Bsx4w _BoaVwLqxEeau1vMV3Bsx4w _Vi5psIKgEeeAppuRs-roLg _YRIxkIKgEeeAppuRs-roLg" width="12" height="10">
8617 <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Term"/> 8760 <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Term"/>
8618 <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Term"/> 8761 <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Term"/>
8619 <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZIGrdnEeau1vMV3Bsx4w" 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"> 8762 <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_l6ZIGrdnEeau1vMV3Bsx4w" 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">
@@ -8622,7 +8765,7 @@
8622 </ownedStyle> 8765 </ownedStyle>
8623 <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']"/> 8766 <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']"/>
8624 </ownedDiagramElements> 8767 </ownedDiagramElements>
8625 <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIH7dnEeau1vMV3Bsx4w" name="SymbolicValue" tooltipText="" outgoingEdges="_l6Zt6bdnEeau1vMV3Bsx4w _l6ZuhbdnEeau1vMV3Bsx4w" width="12" height="10"> 8768 <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIH7dnEeau1vMV3Bsx4w" name="SymbolicValue" tooltipText="" outgoingEdges="_l6Zt6bdnEeau1vMV3Bsx4w _l6ZuhbdnEeau1vMV3Bsx4w _e1Zv0IKgEeeAppuRs-roLg" width="12" height="10">
8626 <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//SymbolicValue"/> 8769 <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//SymbolicValue"/>
8627 <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//SymbolicValue"/> 8770 <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//SymbolicValue"/>
8628 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> 8771 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -8632,14 +8775,6 @@
8632 <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"/> 8775 <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"/>
8633 </ownedStyle> 8776 </ownedStyle>
8634 <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']"/> 8777 <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']"/>
8635 <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_SyqzkHuWEeeCn_RNMwgEBg" name=" symbolicReference : SymbolicDeclaration" tooltipText="">
8636 <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//SymbolicValue/symbolicReference"/>
8637 <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//SymbolicValue/symbolicReference"/>
8638 <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_SysowHuWEeeCn_RNMwgEBg" labelAlignment="LEFT" color="114,159,207">
8639 <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"/>
8640 </ownedStyle>
8641 <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']"/>
8642 </ownedElements>
8643 </ownedDiagramElements> 8778 </ownedDiagramElements>
8644 <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIIbdnEeau1vMV3Bsx4w" name="AtomicTerm" tooltipText="" outgoingEdges="_l6ZuibdnEeau1vMV3Bsx4w" incomingEdges="_l6ZujbdnEeau1vMV3Bsx4w _l6ZukbdnEeau1vMV3Bsx4w _l6ZulbdnEeau1vMV3Bsx4w _zEk0sHuWEeeCn_RNMwgEBg" width="12" height="10"> 8779 <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIIbdnEeau1vMV3Bsx4w" name="AtomicTerm" tooltipText="" outgoingEdges="_l6ZuibdnEeau1vMV3Bsx4w" incomingEdges="_l6ZujbdnEeau1vMV3Bsx4w _l6ZukbdnEeau1vMV3Bsx4w _l6ZulbdnEeau1vMV3Bsx4w _zEk0sHuWEeeCn_RNMwgEBg" width="12" height="10">
8645 <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//AtomicTerm"/> 8780 <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//AtomicTerm"/>
@@ -8707,7 +8842,7 @@
8707 <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']"/> 8842 <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']"/>
8708 </ownedElements> 8843 </ownedElements>
8709 </ownedDiagramElements> 8844 </ownedDiagramElements>
8710 <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIL7dnEeau1vMV3Bsx4w" name="Variable" tooltipText="" outgoingEdges="_JfkfULd8Eeau1vMV3Bsx4w _SzZzYHuWEeeCn_RNMwgEBg" incomingEdges="_l6Zt8bdnEeau1vMV3Bsx4w" width="12" height="10"> 8845 <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6ZIL7dnEeau1vMV3Bsx4w" name="Variable" tooltipText="" outgoingEdges="_JfkfULd8Eeau1vMV3Bsx4w _e1jg0IKgEeeAppuRs-roLg" incomingEdges="_l6Zt8bdnEeau1vMV3Bsx4w" width="12" height="10">
8711 <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/> 8846 <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/>
8712 <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/> 8847 <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/>
8713 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> 8848 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -8946,7 +9081,7 @@
8946 </ownedStyle> 9081 </ownedStyle>
8947 <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']"/> 9082 <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']"/>
8948 </ownedDiagramElements> 9083 </ownedDiagramElements>
8949 <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6Ztz7dnEeau1vMV3Bsx4w" name="TermDescription" tooltipText="" incomingEdges="_l6ZufbdnEeau1vMV3Bsx4w _SzZzYHuWEeeCn_RNMwgEBg" width="12" height="10"> 9084 <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_l6Ztz7dnEeau1vMV3Bsx4w" name="TermDescription" tooltipText="" incomingEdges="_l6ZufbdnEeau1vMV3Bsx4w _e1jg1IKgEeeAppuRs-roLg" width="12" height="10">
8950 <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TermDescription"/> 9085 <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TermDescription"/>
8951 <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TermDescription"/> 9086 <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TermDescription"/>
8952 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> 9087 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -9694,7 +9829,7 @@
9694 </ownedStyle> 9829 </ownedStyle>
9695 <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']"/> 9830 <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']"/>
9696 </ownedDiagramElements> 9831 </ownedDiagramElements>
9697 <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_JfJBgLd8Eeau1vMV3Bsx4w" name="TypeReference" tooltipText="" incomingEdges="_JfkfULd8Eeau1vMV3Bsx4w _LsuTYLd8Eeau1vMV3Bsx4w" width="12" height="10"> 9832 <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_JfJBgLd8Eeau1vMV3Bsx4w" name="TypeReference" tooltipText="" incomingEdges="_JfkfULd8Eeau1vMV3Bsx4w _LsuTYLd8Eeau1vMV3Bsx4w _hS4pcIKhEeeAppuRs-roLg" width="12" height="10">
9698 <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeReference"/> 9833 <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeReference"/>
9699 <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeReference"/> 9834 <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TypeReference"/>
9700 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints> 9835 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -9743,18 +9878,6 @@
9743 </ownedStyle> 9878 </ownedStyle>
9744 <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']"/> 9879 <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']"/>
9745 </ownedDiagramElements> 9880 </ownedDiagramElements>
9746 <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_SzZzYHuWEeeCn_RNMwgEBg" sourceNode="_l6ZIL7dnEeau1vMV3Bsx4w" targetNode="_l6Ztz7dnEeau1vMV3Bsx4w">
9747 <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/>
9748 <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Variable/@eGenericSuperTypes.0"/>
9749 <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_SzaacHuWEeeCn_RNMwgEBg" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
9750 <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"/>
9751 <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_SzaacXuWEeeCn_RNMwgEBg" showIcon="false">
9752 <labelFormat>italic</labelFormat>
9753 </beginLabelStyle>
9754 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_SzaacnuWEeeCn_RNMwgEBg" showIcon="false"/>
9755 </ownedStyle>
9756 <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']"/>
9757 </ownedDiagramElements>
9758 <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_XgmiUHuWEeeCn_RNMwgEBg" name="StringLiteral" tooltipText="" outgoingEdges="_zEk0sHuWEeeCn_RNMwgEBg" width="12" height="10"> 9881 <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_XgmiUHuWEeeCn_RNMwgEBg" name="StringLiteral" tooltipText="" outgoingEdges="_zEk0sHuWEeeCn_RNMwgEBg" width="12" height="10">
9759 <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//StringLiteral"/> 9882 <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//StringLiteral"/>
9760 <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//StringLiteral"/> 9883 <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//StringLiteral"/>
@@ -9786,6 +9909,160 @@
9786 </ownedStyle> 9909 </ownedStyle>
9787 <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']"/> 9910 <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']"/>
9788 </ownedDiagramElements> 9911 </ownedDiagramElements>
9912 <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_PQURUIKgEeeAppuRs-roLg" name="TransitiveClosure" tooltipText="" outgoingEdges="_Vi5psIKgEeeAppuRs-roLg _YRIxkIKgEeeAppuRs-roLg _mNGgsIKhEeeAppuRs-roLg" width="12" height="10">
9913 <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//TransitiveClosure"/>
9914 <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//TransitiveClosure"/>
9915 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
9916 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
9917 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
9918 <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_PQdbQIKgEeeAppuRs-roLg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
9919 <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"/>
9920 </ownedStyle>
9921 <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']"/>
9922 </ownedDiagramElements>
9923 <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_Vi5psIKgEeeAppuRs-roLg" name="[0..1] leftOperand" sourceNode="_PQURUIKgEeeAppuRs-roLg" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
9924 <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//TransitiveClosure/leftOperand"/>
9925 <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//TransitiveClosure/leftOperand"/>
9926 <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_Vi5psYKgEeeAppuRs-roLg" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
9927 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_Vi5psoKgEeeAppuRs-roLg" showIcon="false">
9928 <customFeatures>labelSize</customFeatures>
9929 </centerLabelStyle>
9930 <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_Vi5ps4KgEeeAppuRs-roLg" showIcon="false" labelColor="39,76,114">
9931 <customFeatures>labelSize</customFeatures>
9932 </endLabelStyle>
9933 </ownedStyle>
9934 <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']"/>
9935 </ownedDiagramElements>
9936 <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_YRIxkIKgEeeAppuRs-roLg" name="[0..1] rightOperand" sourceNode="_PQURUIKgEeeAppuRs-roLg" targetNode="_l6ZIGbdnEeau1vMV3Bsx4w">
9937 <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//TransitiveClosure/rightOperand"/>
9938 <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//TransitiveClosure/rightOperand"/>
9939 <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_YRIxkYKgEeeAppuRs-roLg" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
9940 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_YRIxkoKgEeeAppuRs-roLg" showIcon="false">
9941 <customFeatures>labelSize</customFeatures>
9942 </centerLabelStyle>
9943 <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_YRIxk4KgEeeAppuRs-roLg" showIcon="false" labelColor="39,76,114">
9944 <customFeatures>labelSize</customFeatures>
9945 </endLabelStyle>
9946 </ownedStyle>
9947 <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']"/>
9948 </ownedDiagramElements>
9949 <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_e0z58IKgEeeAppuRs-roLg" name="SymbolicDeclaration" tooltipText="" outgoingEdges="_e1jg1IKgEeeAppuRs-roLg" incomingEdges="_e1Zv0IKgEeeAppuRs-roLg _e1jg0IKgEeeAppuRs-roLg _hTMLcIKhEeeAppuRs-roLg" width="12" height="10">
9950 <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//SymbolicDeclaration"/>
9951 <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//SymbolicDeclaration"/>
9952 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
9953 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
9954 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
9955 <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_e0z58YKgEeeAppuRs-roLg" 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">
9956 <labelFormat>italic</labelFormat>
9957 <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"/>
9958 </ownedStyle>
9959 <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']"/>
9960 <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_e1Ql4IKgEeeAppuRs-roLg" name="name : EString" tooltipText="">
9961 <target xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//SymbolicDeclaration/name"/>
9962 <semanticElements xmi:type="ecore:EAttribute" href="logiclanguage.ecore#//SymbolicDeclaration/name"/>
9963 <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_e1Ql4YKgEeeAppuRs-roLg" labelAlignment="LEFT" description="_fCSyIHuWEeeCn_RNMwgEBg">
9964 <labelFormat>bold</labelFormat>
9965 </ownedStyle>
9966 <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']"/>
9967 </ownedElements>
9968 </ownedDiagramElements>
9969 <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_e1Zv0IKgEeeAppuRs-roLg" name="[0..1] symbolicReference" sourceNode="_l6ZIH7dnEeau1vMV3Bsx4w" targetNode="_e0z58IKgEeeAppuRs-roLg">
9970 <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//SymbolicValue/symbolicReference"/>
9971 <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//SymbolicValue/symbolicReference"/>
9972 <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_e1Zv0YKgEeeAppuRs-roLg" routingStyle="manhattan" strokeColor="0,0,0">
9973 <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"/>
9974 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_e1Zv0oKgEeeAppuRs-roLg" showIcon="false">
9975 <customFeatures>labelSize</customFeatures>
9976 </centerLabelStyle>
9977 <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_e1Zv04KgEeeAppuRs-roLg" showIcon="false" labelColor="39,76,114">
9978 <customFeatures>labelSize</customFeatures>
9979 </endLabelStyle>
9980 </ownedStyle>
9981 <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']"/>
9982 </ownedDiagramElements>
9983 <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_e1jg0IKgEeeAppuRs-roLg" sourceNode="_l6ZIL7dnEeau1vMV3Bsx4w" targetNode="_e0z58IKgEeeAppuRs-roLg">
9984 <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Variable"/>
9985 <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Variable/@eGenericSuperTypes.0"/>
9986 <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_e1jg0YKgEeeAppuRs-roLg" targetArrow="InputClosedArrow" routingStyle="tree">
9987 <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"/>
9988 <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_e1jg0oKgEeeAppuRs-roLg" showIcon="false">
9989 <labelFormat>italic</labelFormat>
9990 </beginLabelStyle>
9991 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_e1jg04KgEeeAppuRs-roLg" showIcon="false"/>
9992 </ownedStyle>
9993 <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']"/>
9994 </ownedDiagramElements>
9995 <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_e1jg1IKgEeeAppuRs-roLg" sourceNode="_e0z58IKgEeeAppuRs-roLg" targetNode="_l6Ztz7dnEeau1vMV3Bsx4w">
9996 <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//SymbolicDeclaration"/>
9997 <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//SymbolicDeclaration/@eGenericSuperTypes.0"/>
9998 <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_e1jg1YKgEeeAppuRs-roLg" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
9999 <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"/>
10000 <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_e1jg1oKgEeeAppuRs-roLg" showIcon="false">
10001 <labelFormat>italic</labelFormat>
10002 </beginLabelStyle>
10003 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_e1jg14KgEeeAppuRs-roLg" showIcon="false"/>
10004 </ownedStyle>
10005 <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']"/>
10006 </ownedDiagramElements>
10007 <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_hSSzkIKhEeeAppuRs-roLg" name="Relation" tooltipText="" outgoingEdges="_hS4pcIKhEeeAppuRs-roLg _hTMLcIKhEeeAppuRs-roLg" incomingEdges="_mNGgsIKhEeeAppuRs-roLg" width="12" height="10">
10008 <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Relation"/>
10009 <semanticElements xmi:type="ecore:EClass" href="logiclanguage.ecore#//Relation"/>
10010 <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
10011 <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
10012 <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
10013 <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_hSSzkYKhEeeAppuRs-roLg" 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">
10014 <labelFormat>italic</labelFormat>
10015 <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"/>
10016 </ownedStyle>
10017 <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']"/>
10018 <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_hSvfgIKhEeeAppuRs-roLg" name=" annotations : RelationAnnotation" tooltipText="">
10019 <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Relation/annotations"/>
10020 <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Relation/annotations"/>
10021 <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_hSvfgYKhEeeAppuRs-roLg" labelAlignment="LEFT" color="114,159,207">
10022 <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"/>
10023 </ownedStyle>
10024 <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']"/>
10025 </ownedElements>
10026 </ownedDiagramElements>
10027 <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_hS4pcIKhEeeAppuRs-roLg" name="[0..*] parameters" sourceNode="_hSSzkIKhEeeAppuRs-roLg" targetNode="_JfJBgLd8Eeau1vMV3Bsx4w">
10028 <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//Relation/parameters"/>
10029 <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//Relation/parameters"/>
10030 <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_hS4pcYKhEeeAppuRs-roLg" description="_l6XRhLdnEeau1vMV3Bsx4w" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
10031 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_hS4pcoKhEeeAppuRs-roLg" showIcon="false">
10032 <customFeatures>labelSize</customFeatures>
10033 </centerLabelStyle>
10034 <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_hS4pc4KhEeeAppuRs-roLg" showIcon="false" labelColor="39,76,114">
10035 <customFeatures>labelSize</customFeatures>
10036 </endLabelStyle>
10037 </ownedStyle>
10038 <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']"/>
10039 </ownedDiagramElements>
10040 <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_hTMLcIKhEeeAppuRs-roLg" sourceNode="_hSSzkIKhEeeAppuRs-roLg" targetNode="_e0z58IKgEeeAppuRs-roLg">
10041 <target xmi:type="ecore:EClass" href="logiclanguage.ecore#//Relation"/>
10042 <semanticElements xmi:type="ecore:EGenericType" href="logiclanguage.ecore#//Relation/@eGenericSuperTypes.0"/>
10043 <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_hTMLcYKhEeeAppuRs-roLg" targetArrow="InputClosedArrow" routingStyle="tree">
10044 <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"/>
10045 <beginLabelStyle xmi:type="diagram:BeginLabelStyle" xmi:id="_hTMLcoKhEeeAppuRs-roLg" showIcon="false">
10046 <labelFormat>italic</labelFormat>
10047 </beginLabelStyle>
10048 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_hTMLc4KhEeeAppuRs-roLg" showIcon="false"/>
10049 </ownedStyle>
10050 <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']"/>
10051 </ownedDiagramElements>
10052 <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_mNGgsIKhEeeAppuRs-roLg" name="[0..1] relation" sourceNode="_PQURUIKgEeeAppuRs-roLg" targetNode="_hSSzkIKhEeeAppuRs-roLg">
10053 <target xmi:type="ecore:EReference" href="logiclanguage.ecore#//TransitiveClosure/relation"/>
10054 <semanticElements xmi:type="ecore:EReference" href="logiclanguage.ecore#//TransitiveClosure/relation"/>
10055 <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_mNGgsYKhEeeAppuRs-roLg" routingStyle="manhattan" strokeColor="0,0,0">
10056 <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"/>
10057 <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_mNGgsoKhEeeAppuRs-roLg" showIcon="false">
10058 <customFeatures>labelSize</customFeatures>
10059 </centerLabelStyle>
10060 <endLabelStyle xmi:type="diagram:EndLabelStyle" xmi:id="_mNGgs4KhEeeAppuRs-roLg" showIcon="false" labelColor="39,76,114">
10061 <customFeatures>labelSize</customFeatures>
10062 </endLabelStyle>
10063 </ownedStyle>
10064 <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']"/>
10065 </ownedDiagramElements>
9789 <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/> 10066 <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
9790 <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_l6Zva7dnEeau1vMV3Bsx4w"/> 10067 <filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_l6Zva7dnEeau1vMV3Bsx4w"/>
9791 <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/> 10068 <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/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.ecore b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.ecore
index bf42e9b9..5effb631 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.ecore
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/model/logiclanguage.ecore
@@ -204,4 +204,11 @@
204 <eClassifiers xsi:type="ecore:EClass" name="StringLiteral" eSuperTypes="#//AtomicTerm"> 204 <eClassifiers xsi:type="ecore:EClass" name="StringLiteral" eSuperTypes="#//AtomicTerm">
205 <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> 205 <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
206 </eClassifiers> 206 </eClassifiers>
207 <eClassifiers xsi:type="ecore:EClass" name="TransitiveClosure">
208 <eStructuralFeatures xsi:type="ecore:EReference" name="leftOperand" eType="#//Term"
209 containment="true"/>
210 <eStructuralFeatures xsi:type="ecore:EReference" name="rightOperand" eType="#//Term"
211 containment="true"/>
212 <eStructuralFeatures xsi:type="ecore:EReference" name="relation" eType="#//Relation"/>
213 </eClassifiers>
207</ecore:EPackage> 214</ecore:EPackage>
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper.xtend b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper.xtend
index e5c443f6..ee2f49ed 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper.xtend
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper.xtend
@@ -282,11 +282,18 @@ class Logic2AlloyLanguageMapper {
282 if(config.typeScopes.maxNewIntegers == LogicSolverConfiguration::Unlimited) throw new UnsupportedOperationException( 282 if(config.typeScopes.maxNewIntegers == LogicSolverConfiguration::Unlimited) throw new UnsupportedOperationException(
283 '''An integer scope have to be specified for Alloy!''') 283 '''An integer scope have to be specified for Alloy!''')
284 it.typeScopes += createALSIntScope => [ 284 it.typeScopes += createALSIntScope => [
285 val knownIntegerMax = config.typeScopes.knownIntegers.max 285 if(config.typeScopes.knownIntegers.empty) {
286 val knownIntegerMin = config.typeScopes.knownIntegers.min 286 number = Integer.SIZE-Integer.numberOfLeadingZeros(config.typeScopes.maxNewIntegers+1/2)
287 val needNewPlaces = Math.max(knownIntegerMax - knownIntegerMin - config.typeScopes.maxNewIntegers,0) 287 } else {
288 val maxAbsoluteValue = Math.max(Math.abs(knownIntegerMax)+needNewPlaces+1/2, Math.abs(knownIntegerMin)+needNewPlaces/2) 288 var scope = Math.max(
289 number = Integer.SIZE-Integer.numberOfLeadingZeros(maxAbsoluteValue) 289 Math.abs(config.typeScopes.knownIntegers.max),
290 Math.abs(config.typeScopes.knownIntegers.min))
291 if(scope*2+1 < config.typeScopes.knownIntegers.size + config.typeScopes.maxNewIntegers) {
292 scope += ((config.typeScopes.knownIntegers.size + config.typeScopes.maxNewIntegers) - (scope*2))/2
293 }
294 number = Integer.SIZE-Integer.numberOfLeadingZeros(scope)
295 }
296
290 ] 297 ]
291// for(definedScope : config.typeScopes.allDefinedScope) { 298// for(definedScope : config.typeScopes.allDefinedScope) {
292// it.typeScopes += createALSSigScope => [ 299// it.typeScopes += createALSSigScope => [
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-06-26 12:23:14 +0000