aboutsummaryrefslogtreecommitdiffstats
path: root/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage
diff options
context:
space:
mode:
authorLibravatar Oszkar Semerath <semerath@mit.bme.hu>2020-05-06 00:27:55 +0200
committerLibravatar Oszkar Semerath <semerath@mit.bme.hu>2020-05-06 00:27:55 +0200
commit820151b6d27643ba0927ca84d1bccadbd695a55d (patch)
tree9d3a5786b7f90723a6af967875f861a89e5b897e /Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage
parentcolor update (diff)
downloadVIATRA-Generator-820151b6d27643ba0927ca84d1bccadbd695a55d.tar.gz
VIATRA-Generator-820151b6d27643ba0927ca84d1bccadbd695a55d.tar.zst
VIATRA-Generator-820151b6d27643ba0927ca84d1bccadbd695a55d.zip
PS language update
Diffstat (limited to 'Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage')
-rw-r--r--Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/NamedObject.java2
-rw-r--r--Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Predicate.java46
-rw-r--r--Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/SolverLanguageFactory.java18
-rw-r--r--Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/SolverLanguagePackage.java230
-rw-r--r--Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PredicateImpl.java150
-rw-r--r--Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguageFactoryImpl.java28
-rw-r--r--Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguagePackageImpl.java71
-rw-r--r--Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageAdapterFactory.java42
-rw-r--r--Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageSwitch.java53
9 files changed, 268 insertions, 372 deletions
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/NamedObject.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/NamedObject.java
index a6deaea8..b44ef060 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/NamedObject.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/NamedObject.java
@@ -20,7 +20,7 @@ package org.eclipse.viatra.solver.language.solverLanguage;
20 * @model 20 * @model
21 * @generated 21 * @generated
22 */ 22 */
23public interface NamedObject extends org.eclipse.viatra.solver.language.solverLanguage.Object 23public interface NamedObject extends org.eclipse.viatra.solver.language.solverLanguage.Object, Literal
24{ 24{
25 /** 25 /**
26 * Returns the value of the '<em><b>Name</b></em>' attribute. 26 * Returns the value of the '<em><b>Name</b></em>' attribute.
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Predicate.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Predicate.java
index fc61ea86..7892fd57 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Predicate.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Predicate.java
@@ -14,6 +14,8 @@ import org.eclipse.emf.common.util.EList;
14 * The following features are supported: 14 * The following features are supported:
15 * </p> 15 * </p>
16 * <ul> 16 * <ul>
17 * <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate#isIsError <em>Is Error</em>}</li>
18 * <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate#getSymbol <em>Symbol</em>}</li>
17 * <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate#getParameters <em>Parameters</em>}</li> 19 * <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate#getParameters <em>Parameters</em>}</li>
18 * <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate#getBodies <em>Bodies</em>}</li> 20 * <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate#getBodies <em>Bodies</em>}</li>
19 * </ul> 21 * </ul>
@@ -25,6 +27,50 @@ import org.eclipse.emf.common.util.EList;
25public interface Predicate extends Statement 27public interface Predicate extends Statement
26{ 28{
27 /** 29 /**
30 * Returns the value of the '<em><b>Is Error</b></em>' attribute.
31 * <!-- begin-user-doc -->
32 * <!-- end-user-doc -->
33 * @return the value of the '<em>Is Error</em>' attribute.
34 * @see #setIsError(boolean)
35 * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getPredicate_IsError()
36 * @model
37 * @generated
38 */
39 boolean isIsError();
40
41 /**
42 * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate#isIsError <em>Is Error</em>}' attribute.
43 * <!-- begin-user-doc -->
44 * <!-- end-user-doc -->
45 * @param value the new value of the '<em>Is Error</em>' attribute.
46 * @see #isIsError()
47 * @generated
48 */
49 void setIsError(boolean value);
50
51 /**
52 * Returns the value of the '<em><b>Symbol</b></em>' containment reference.
53 * <!-- begin-user-doc -->
54 * <!-- end-user-doc -->
55 * @return the value of the '<em>Symbol</em>' containment reference.
56 * @see #setSymbol(ModelSymbol)
57 * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getPredicate_Symbol()
58 * @model containment="true"
59 * @generated
60 */
61 ModelSymbol getSymbol();
62
63 /**
64 * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate#getSymbol <em>Symbol</em>}' containment reference.
65 * <!-- begin-user-doc -->
66 * <!-- end-user-doc -->
67 * @param value the new value of the '<em>Symbol</em>' containment reference.
68 * @see #getSymbol()
69 * @generated
70 */
71 void setSymbol(ModelSymbol value);
72
73 /**
28 * Returns the value of the '<em><b>Parameters</b></em>' containment reference list. 74 * Returns the value of the '<em><b>Parameters</b></em>' containment reference list.
29 * The list contents are of type {@link org.eclipse.viatra.solver.language.solverLanguage.Parameter}. 75 * The list contents are of type {@link org.eclipse.viatra.solver.language.solverLanguage.Parameter}.
30 * <!-- begin-user-doc --> 76 * <!-- begin-user-doc -->
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/SolverLanguageFactory.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/SolverLanguageFactory.java
index ebe2abdb..c5d4cbff 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/SolverLanguageFactory.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/SolverLanguageFactory.java
@@ -258,24 +258,6 @@ public interface SolverLanguageFactory extends EFactory
258 Predicate createPredicate(); 258 Predicate createPredicate();
259 259
260 /** 260 /**
261 * Returns a new object of class '<em>Predicate Symbol</em>'.
262 * <!-- begin-user-doc -->
263 * <!-- end-user-doc -->
264 * @return a new object of class '<em>Predicate Symbol</em>'.
265 * @generated
266 */
267 PredicateSymbol createPredicateSymbol();
268
269 /**
270 * Returns a new object of class '<em>Error Predicate</em>'.
271 * <!-- begin-user-doc -->
272 * <!-- end-user-doc -->
273 * @return a new object of class '<em>Error Predicate</em>'.
274 * @generated
275 */
276 ErrorPredicate createErrorPredicate();
277
278 /**
279 * Returns a new object of class '<em>Parameter</em>'. 261 * Returns a new object of class '<em>Parameter</em>'.
280 * <!-- begin-user-doc --> 262 * <!-- begin-user-doc -->
281 * <!-- end-user-doc --> 263 * <!-- end-user-doc -->
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/SolverLanguagePackage.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/SolverLanguagePackage.java
index 3bd01417..9767d002 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/SolverLanguagePackage.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/SolverLanguagePackage.java
@@ -642,59 +642,13 @@ public interface SolverLanguagePackage extends EPackage
642 int PREDICATE = 25; 642 int PREDICATE = 25;
643 643
644 /** 644 /**
645 * The feature id for the '<em><b>Parameters</b></em>' containment reference list. 645 * The feature id for the '<em><b>Is Error</b></em>' attribute.
646 * <!-- begin-user-doc -->
647 * <!-- end-user-doc -->
648 * @generated
649 * @ordered
650 */
651 int PREDICATE__PARAMETERS = STATEMENT_FEATURE_COUNT + 0;
652
653 /**
654 * The feature id for the '<em><b>Bodies</b></em>' containment reference list.
655 * <!-- begin-user-doc -->
656 * <!-- end-user-doc -->
657 * @generated
658 * @ordered
659 */
660 int PREDICATE__BODIES = STATEMENT_FEATURE_COUNT + 1;
661
662 /**
663 * The number of structural features of the '<em>Predicate</em>' class.
664 * <!-- begin-user-doc -->
665 * <!-- end-user-doc -->
666 * @generated
667 * @ordered
668 */
669 int PREDICATE_FEATURE_COUNT = STATEMENT_FEATURE_COUNT + 2;
670
671 /**
672 * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateSymbolImpl <em>Predicate Symbol</em>}' class.
673 * <!-- begin-user-doc -->
674 * <!-- end-user-doc -->
675 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateSymbolImpl
676 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getPredicateSymbol()
677 * @generated
678 */
679 int PREDICATE_SYMBOL = 26;
680
681 /**
682 * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
683 * <!-- begin-user-doc --> 646 * <!-- begin-user-doc -->
684 * <!-- end-user-doc --> 647 * <!-- end-user-doc -->
685 * @generated 648 * @generated
686 * @ordered 649 * @ordered
687 */ 650 */
688 int PREDICATE_SYMBOL__PARAMETERS = PREDICATE__PARAMETERS; 651 int PREDICATE__IS_ERROR = STATEMENT_FEATURE_COUNT + 0;
689
690 /**
691 * The feature id for the '<em><b>Bodies</b></em>' containment reference list.
692 * <!-- begin-user-doc -->
693 * <!-- end-user-doc -->
694 * @generated
695 * @ordered
696 */
697 int PREDICATE_SYMBOL__BODIES = PREDICATE__BODIES;
698 652
699 /** 653 /**
700 * The feature id for the '<em><b>Symbol</b></em>' containment reference. 654 * The feature id for the '<em><b>Symbol</b></em>' containment reference.
@@ -703,26 +657,7 @@ public interface SolverLanguagePackage extends EPackage
703 * @generated 657 * @generated
704 * @ordered 658 * @ordered
705 */ 659 */
706 int PREDICATE_SYMBOL__SYMBOL = PREDICATE_FEATURE_COUNT + 0; 660 int PREDICATE__SYMBOL = STATEMENT_FEATURE_COUNT + 1;
707
708 /**
709 * The number of structural features of the '<em>Predicate Symbol</em>' class.
710 * <!-- begin-user-doc -->
711 * <!-- end-user-doc -->
712 * @generated
713 * @ordered
714 */
715 int PREDICATE_SYMBOL_FEATURE_COUNT = PREDICATE_FEATURE_COUNT + 1;
716
717 /**
718 * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ErrorPredicateImpl <em>Error Predicate</em>}' class.
719 * <!-- begin-user-doc -->
720 * <!-- end-user-doc -->
721 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ErrorPredicateImpl
722 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getErrorPredicate()
723 * @generated
724 */
725 int ERROR_PREDICATE = 27;
726 661
727 /** 662 /**
728 * The feature id for the '<em><b>Parameters</b></em>' containment reference list. 663 * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
@@ -731,7 +666,7 @@ public interface SolverLanguagePackage extends EPackage
731 * @generated 666 * @generated
732 * @ordered 667 * @ordered
733 */ 668 */
734 int ERROR_PREDICATE__PARAMETERS = PREDICATE__PARAMETERS; 669 int PREDICATE__PARAMETERS = STATEMENT_FEATURE_COUNT + 2;
735 670
736 /** 671 /**
737 * The feature id for the '<em><b>Bodies</b></em>' containment reference list. 672 * The feature id for the '<em><b>Bodies</b></em>' containment reference list.
@@ -740,25 +675,16 @@ public interface SolverLanguagePackage extends EPackage
740 * @generated 675 * @generated
741 * @ordered 676 * @ordered
742 */ 677 */
743 int ERROR_PREDICATE__BODIES = PREDICATE__BODIES; 678 int PREDICATE__BODIES = STATEMENT_FEATURE_COUNT + 3;
744 679
745 /** 680 /**
746 * The feature id for the '<em><b>Name</b></em>' attribute. 681 * The number of structural features of the '<em>Predicate</em>' class.
747 * <!-- begin-user-doc -->
748 * <!-- end-user-doc -->
749 * @generated
750 * @ordered
751 */
752 int ERROR_PREDICATE__NAME = PREDICATE_FEATURE_COUNT + 0;
753
754 /**
755 * The number of structural features of the '<em>Error Predicate</em>' class.
756 * <!-- begin-user-doc --> 682 * <!-- begin-user-doc -->
757 * <!-- end-user-doc --> 683 * <!-- end-user-doc -->
758 * @generated 684 * @generated
759 * @ordered 685 * @ordered
760 */ 686 */
761 int ERROR_PREDICATE_FEATURE_COUNT = PREDICATE_FEATURE_COUNT + 1; 687 int PREDICATE_FEATURE_COUNT = STATEMENT_FEATURE_COUNT + 4;
762 688
763 /** 689 /**
764 * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ParameterImpl <em>Parameter</em>}' class. 690 * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ParameterImpl <em>Parameter</em>}' class.
@@ -768,7 +694,7 @@ public interface SolverLanguagePackage extends EPackage
768 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getParameter() 694 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getParameter()
769 * @generated 695 * @generated
770 */ 696 */
771 int PARAMETER = 28; 697 int PARAMETER = 26;
772 698
773 /** 699 /**
774 * The feature id for the '<em><b>Variable</b></em>' containment reference. 700 * The feature id for the '<em><b>Variable</b></em>' containment reference.
@@ -805,7 +731,7 @@ public interface SolverLanguagePackage extends EPackage
805 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getPatternBody() 731 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getPatternBody()
806 * @generated 732 * @generated
807 */ 733 */
808 int PATTERN_BODY = 29; 734 int PATTERN_BODY = 27;
809 735
810 /** 736 /**
811 * The feature id for the '<em><b>Constraints</b></em>' containment reference list. 737 * The feature id for the '<em><b>Constraints</b></em>' containment reference list.
@@ -833,7 +759,7 @@ public interface SolverLanguagePackage extends EPackage
833 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getPolarity() 759 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getPolarity()
834 * @generated 760 * @generated
835 */ 761 */
836 int POLARITY = 30; 762 int POLARITY = 28;
837 763
838 /** 764 /**
839 * The number of structural features of the '<em>Polarity</em>' class. 765 * The number of structural features of the '<em>Polarity</em>' class.
@@ -852,7 +778,7 @@ public interface SolverLanguagePackage extends EPackage
852 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getConstraint() 778 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getConstraint()
853 * @generated 779 * @generated
854 */ 780 */
855 int CONSTRAINT = 31; 781 int CONSTRAINT = 29;
856 782
857 /** 783 /**
858 * The feature id for the '<em><b>Polarity</b></em>' containment reference. 784 * The feature id for the '<em><b>Polarity</b></em>' containment reference.
@@ -907,7 +833,7 @@ public interface SolverLanguagePackage extends EPackage
907 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getClosureType() 833 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getClosureType()
908 * @generated 834 * @generated
909 */ 835 */
910 int CLOSURE_TYPE = 32; 836 int CLOSURE_TYPE = 30;
911 837
912 /** 838 /**
913 * The number of structural features of the '<em>Closure Type</em>' class. 839 * The number of structural features of the '<em>Closure Type</em>' class.
@@ -926,7 +852,7 @@ public interface SolverLanguagePackage extends EPackage
926 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getLiteral() 852 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getLiteral()
927 * @generated 853 * @generated
928 */ 854 */
929 int LITERAL = 33; 855 int LITERAL = 31;
930 856
931 /** 857 /**
932 * The number of structural features of the '<em>Literal</em>' class. 858 * The number of structural features of the '<em>Literal</em>' class.
@@ -945,7 +871,7 @@ public interface SolverLanguagePackage extends EPackage
945 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getVariable() 871 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getVariable()
946 * @generated 872 * @generated
947 */ 873 */
948 int VARIABLE = 34; 874 int VARIABLE = 32;
949 875
950 /** 876 /**
951 * The feature id for the '<em><b>Name</b></em>' attribute. 877 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -973,7 +899,7 @@ public interface SolverLanguagePackage extends EPackage
973 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getAllInstances() 899 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getAllInstances()
974 * @generated 900 * @generated
975 */ 901 */
976 int ALL_INSTANCES = 35; 902 int ALL_INSTANCES = 33;
977 903
978 /** 904 /**
979 * The feature id for the '<em><b>Symbol</b></em>' containment reference. 905 * The feature id for the '<em><b>Symbol</b></em>' containment reference.
@@ -1001,7 +927,7 @@ public interface SolverLanguagePackage extends EPackage
1001 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getAllObjects() 927 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getAllObjects()
1002 * @generated 928 * @generated
1003 */ 929 */
1004 int ALL_OBJECTS = 36; 930 int ALL_OBJECTS = 34;
1005 931
1006 /** 932 /**
1007 * The number of structural features of the '<em>All Objects</em>' class. 933 * The number of structural features of the '<em>All Objects</em>' class.
@@ -1020,7 +946,7 @@ public interface SolverLanguagePackage extends EPackage
1020 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getDefaultInterpretation() 946 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getDefaultInterpretation()
1021 * @generated 947 * @generated
1022 */ 948 */
1023 int DEFAULT_INTERPRETATION = 37; 949 int DEFAULT_INTERPRETATION = 35;
1024 950
1025 /** 951 /**
1026 * The feature id for the '<em><b>Interpretation</b></em>' containment reference. 952 * The feature id for the '<em><b>Interpretation</b></em>' containment reference.
@@ -1048,7 +974,7 @@ public interface SolverLanguagePackage extends EPackage
1048 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getCDInterpretation() 974 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getCDInterpretation()
1049 * @generated 975 * @generated
1050 */ 976 */
1051 int CD_INTERPRETATION = 38; 977 int CD_INTERPRETATION = 36;
1052 978
1053 /** 979 /**
1054 * The number of structural features of the '<em>CD Interpretation</em>' class. 980 * The number of structural features of the '<em>CD Interpretation</em>' class.
@@ -1067,7 +993,7 @@ public interface SolverLanguagePackage extends EPackage
1067 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getClassInterpretation() 993 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getClassInterpretation()
1068 * @generated 994 * @generated
1069 */ 995 */
1070 int CLASS_INTERPRETATION = 39; 996 int CLASS_INTERPRETATION = 37;
1071 997
1072 /** 998 /**
1073 * The feature id for the '<em><b>Abstract</b></em>' attribute. 999 * The feature id for the '<em><b>Abstract</b></em>' attribute.
@@ -1122,7 +1048,7 @@ public interface SolverLanguagePackage extends EPackage
1122 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getEnumInterpretation() 1048 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getEnumInterpretation()
1123 * @generated 1049 * @generated
1124 */ 1050 */
1125 int ENUM_INTERPRETATION = 40; 1051 int ENUM_INTERPRETATION = 38;
1126 1052
1127 /** 1053 /**
1128 * The feature id for the '<em><b>Symbol</b></em>' containment reference. 1054 * The feature id for the '<em><b>Symbol</b></em>' containment reference.
@@ -1159,7 +1085,7 @@ public interface SolverLanguagePackage extends EPackage
1159 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getFieldRelationInterpretation() 1085 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getFieldRelationInterpretation()
1160 * @generated 1086 * @generated
1161 */ 1087 */
1162 int FIELD_RELATION_INTERPRETATION = 41; 1088 int FIELD_RELATION_INTERPRETATION = 39;
1163 1089
1164 /** 1090 /**
1165 * The feature id for the '<em><b>Containment</b></em>' attribute. 1091 * The feature id for the '<em><b>Containment</b></em>' attribute.
@@ -1214,7 +1140,7 @@ public interface SolverLanguagePackage extends EPackage
1214 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getGlobalRelationInterpretation() 1140 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getGlobalRelationInterpretation()
1215 * @generated 1141 * @generated
1216 */ 1142 */
1217 int GLOBAL_RELATION_INTERPRETATION = 42; 1143 int GLOBAL_RELATION_INTERPRETATION = 40;
1218 1144
1219 /** 1145 /**
1220 * The feature id for the '<em><b>Containment</b></em>' attribute. 1146 * The feature id for the '<em><b>Containment</b></em>' attribute.
@@ -1287,7 +1213,7 @@ public interface SolverLanguagePackage extends EPackage
1287 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getMultiplicityDefinition() 1213 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getMultiplicityDefinition()
1288 * @generated 1214 * @generated
1289 */ 1215 */
1290 int MULTIPLICITY_DEFINITION = 43; 1216 int MULTIPLICITY_DEFINITION = 41;
1291 1217
1292 /** 1218 /**
1293 * The feature id for the '<em><b>Lower</b></em>' attribute. 1219 * The feature id for the '<em><b>Lower</b></em>' attribute.
@@ -1333,7 +1259,7 @@ public interface SolverLanguagePackage extends EPackage
1333 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getBooleanTrue() 1259 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getBooleanTrue()
1334 * @generated 1260 * @generated
1335 */ 1261 */
1336 int BOOLEAN_TRUE = 44; 1262 int BOOLEAN_TRUE = 42;
1337 1263
1338 /** 1264 /**
1339 * The number of structural features of the '<em>Boolean True</em>' class. 1265 * The number of structural features of the '<em>Boolean True</em>' class.
@@ -1352,7 +1278,7 @@ public interface SolverLanguagePackage extends EPackage
1352 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getBooleanFalse() 1278 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getBooleanFalse()
1353 * @generated 1279 * @generated
1354 */ 1280 */
1355 int BOOLEAN_FALSE = 45; 1281 int BOOLEAN_FALSE = 43;
1356 1282
1357 /** 1283 /**
1358 * The number of structural features of the '<em>Boolean False</em>' class. 1284 * The number of structural features of the '<em>Boolean False</em>' class.
@@ -1371,7 +1297,7 @@ public interface SolverLanguagePackage extends EPackage
1371 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getTrue() 1297 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getTrue()
1372 * @generated 1298 * @generated
1373 */ 1299 */
1374 int TRUE = 46; 1300 int TRUE = 44;
1375 1301
1376 /** 1302 /**
1377 * The number of structural features of the '<em>True</em>' class. 1303 * The number of structural features of the '<em>True</em>' class.
@@ -1390,7 +1316,7 @@ public interface SolverLanguagePackage extends EPackage
1390 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getFalse() 1316 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getFalse()
1391 * @generated 1317 * @generated
1392 */ 1318 */
1393 int FALSE = 47; 1319 int FALSE = 45;
1394 1320
1395 /** 1321 /**
1396 * The number of structural features of the '<em>False</em>' class. 1322 * The number of structural features of the '<em>False</em>' class.
@@ -1409,7 +1335,7 @@ public interface SolverLanguagePackage extends EPackage
1409 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getUnknown() 1335 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getUnknown()
1410 * @generated 1336 * @generated
1411 */ 1337 */
1412 int UNKNOWN = 48; 1338 int UNKNOWN = 46;
1413 1339
1414 /** 1340 /**
1415 * The number of structural features of the '<em>Unknown</em>' class. 1341 * The number of structural features of the '<em>Unknown</em>' class.
@@ -1428,7 +1354,7 @@ public interface SolverLanguagePackage extends EPackage
1428 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getError() 1354 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getError()
1429 * @generated 1355 * @generated
1430 */ 1356 */
1431 int ERROR = 49; 1357 int ERROR = 47;
1432 1358
1433 /** 1359 /**
1434 * The number of structural features of the '<em>Error</em>' class. 1360 * The number of structural features of the '<em>Error</em>' class.
@@ -1447,7 +1373,7 @@ public interface SolverLanguagePackage extends EPackage
1447 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getPositive() 1373 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getPositive()
1448 * @generated 1374 * @generated
1449 */ 1375 */
1450 int POSITIVE = 50; 1376 int POSITIVE = 48;
1451 1377
1452 /** 1378 /**
1453 * The number of structural features of the '<em>Positive</em>' class. 1379 * The number of structural features of the '<em>Positive</em>' class.
@@ -1466,7 +1392,7 @@ public interface SolverLanguagePackage extends EPackage
1466 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getNegative() 1392 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getNegative()
1467 * @generated 1393 * @generated
1468 */ 1394 */
1469 int NEGATIVE = 51; 1395 int NEGATIVE = 49;
1470 1396
1471 /** 1397 /**
1472 * The number of structural features of the '<em>Negative</em>' class. 1398 * The number of structural features of the '<em>Negative</em>' class.
@@ -1485,7 +1411,7 @@ public interface SolverLanguagePackage extends EPackage
1485 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getReflexiveClosure() 1411 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getReflexiveClosure()
1486 * @generated 1412 * @generated
1487 */ 1413 */
1488 int REFLEXIVE_CLOSURE = 52; 1414 int REFLEXIVE_CLOSURE = 50;
1489 1415
1490 /** 1416 /**
1491 * The number of structural features of the '<em>Reflexive Closure</em>' class. 1417 * The number of structural features of the '<em>Reflexive Closure</em>' class.
@@ -1504,7 +1430,7 @@ public interface SolverLanguagePackage extends EPackage
1504 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getIrreflexiveClosure() 1430 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getIrreflexiveClosure()
1505 * @generated 1431 * @generated
1506 */ 1432 */
1507 int IRREFLEXIVE_CLOSURE = 53; 1433 int IRREFLEXIVE_CLOSURE = 51;
1508 1434
1509 /** 1435 /**
1510 * The number of structural features of the '<em>Irreflexive Closure</em>' class. 1436 * The number of structural features of the '<em>Irreflexive Closure</em>' class.
@@ -1898,68 +1824,48 @@ public interface SolverLanguagePackage extends EPackage
1898 EClass getPredicate(); 1824 EClass getPredicate();
1899 1825
1900 /** 1826 /**
1901 * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate#getParameters <em>Parameters</em>}'. 1827 * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate#isIsError <em>Is Error</em>}'.
1902 * <!-- begin-user-doc --> 1828 * <!-- begin-user-doc -->
1903 * <!-- end-user-doc --> 1829 * <!-- end-user-doc -->
1904 * @return the meta object for the containment reference list '<em>Parameters</em>'. 1830 * @return the meta object for the attribute '<em>Is Error</em>'.
1905 * @see org.eclipse.viatra.solver.language.solverLanguage.Predicate#getParameters() 1831 * @see org.eclipse.viatra.solver.language.solverLanguage.Predicate#isIsError()
1906 * @see #getPredicate() 1832 * @see #getPredicate()
1907 * @generated 1833 * @generated
1908 */ 1834 */
1909 EReference getPredicate_Parameters(); 1835 EAttribute getPredicate_IsError();
1910 1836
1911 /** 1837 /**
1912 * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate#getBodies <em>Bodies</em>}'. 1838 * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate#getSymbol <em>Symbol</em>}'.
1913 * <!-- begin-user-doc -->
1914 * <!-- end-user-doc -->
1915 * @return the meta object for the containment reference list '<em>Bodies</em>'.
1916 * @see org.eclipse.viatra.solver.language.solverLanguage.Predicate#getBodies()
1917 * @see #getPredicate()
1918 * @generated
1919 */
1920 EReference getPredicate_Bodies();
1921
1922 /**
1923 * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.PredicateSymbol <em>Predicate Symbol</em>}'.
1924 * <!-- begin-user-doc -->
1925 * <!-- end-user-doc -->
1926 * @return the meta object for class '<em>Predicate Symbol</em>'.
1927 * @see org.eclipse.viatra.solver.language.solverLanguage.PredicateSymbol
1928 * @generated
1929 */
1930 EClass getPredicateSymbol();
1931
1932 /**
1933 * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.PredicateSymbol#getSymbol <em>Symbol</em>}'.
1934 * <!-- begin-user-doc --> 1839 * <!-- begin-user-doc -->
1935 * <!-- end-user-doc --> 1840 * <!-- end-user-doc -->
1936 * @return the meta object for the containment reference '<em>Symbol</em>'. 1841 * @return the meta object for the containment reference '<em>Symbol</em>'.
1937 * @see org.eclipse.viatra.solver.language.solverLanguage.PredicateSymbol#getSymbol() 1842 * @see org.eclipse.viatra.solver.language.solverLanguage.Predicate#getSymbol()
1938 * @see #getPredicateSymbol() 1843 * @see #getPredicate()
1939 * @generated 1844 * @generated
1940 */ 1845 */
1941 EReference getPredicateSymbol_Symbol(); 1846 EReference getPredicate_Symbol();
1942 1847
1943 /** 1848 /**
1944 * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.ErrorPredicate <em>Error Predicate</em>}'. 1849 * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate#getParameters <em>Parameters</em>}'.
1945 * <!-- begin-user-doc --> 1850 * <!-- begin-user-doc -->
1946 * <!-- end-user-doc --> 1851 * <!-- end-user-doc -->
1947 * @return the meta object for class '<em>Error Predicate</em>'. 1852 * @return the meta object for the containment reference list '<em>Parameters</em>'.
1948 * @see org.eclipse.viatra.solver.language.solverLanguage.ErrorPredicate 1853 * @see org.eclipse.viatra.solver.language.solverLanguage.Predicate#getParameters()
1854 * @see #getPredicate()
1949 * @generated 1855 * @generated
1950 */ 1856 */
1951 EClass getErrorPredicate(); 1857 EReference getPredicate_Parameters();
1952 1858
1953 /** 1859 /**
1954 * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.ErrorPredicate#getName <em>Name</em>}'. 1860 * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate#getBodies <em>Bodies</em>}'.
1955 * <!-- begin-user-doc --> 1861 * <!-- begin-user-doc -->
1956 * <!-- end-user-doc --> 1862 * <!-- end-user-doc -->
1957 * @return the meta object for the attribute '<em>Name</em>'. 1863 * @return the meta object for the containment reference list '<em>Bodies</em>'.
1958 * @see org.eclipse.viatra.solver.language.solverLanguage.ErrorPredicate#getName() 1864 * @see org.eclipse.viatra.solver.language.solverLanguage.Predicate#getBodies()
1959 * @see #getErrorPredicate() 1865 * @see #getPredicate()
1960 * @generated 1866 * @generated
1961 */ 1867 */
1962 EAttribute getErrorPredicate_Name(); 1868 EReference getPredicate_Bodies();
1963 1869
1964 /** 1870 /**
1965 * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Parameter <em>Parameter</em>}'. 1871 * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Parameter <em>Parameter</em>}'.
@@ -2912,30 +2818,12 @@ public interface SolverLanguagePackage extends EPackage
2912 EClass PREDICATE = eINSTANCE.getPredicate(); 2818 EClass PREDICATE = eINSTANCE.getPredicate();
2913 2819
2914 /** 2820 /**
2915 * The meta object literal for the '<em><b>Parameters</b></em>' containment reference list feature. 2821 * The meta object literal for the '<em><b>Is Error</b></em>' attribute feature.
2916 * <!-- begin-user-doc -->
2917 * <!-- end-user-doc -->
2918 * @generated
2919 */
2920 EReference PREDICATE__PARAMETERS = eINSTANCE.getPredicate_Parameters();
2921
2922 /**
2923 * The meta object literal for the '<em><b>Bodies</b></em>' containment reference list feature.
2924 * <!-- begin-user-doc -->
2925 * <!-- end-user-doc -->
2926 * @generated
2927 */
2928 EReference PREDICATE__BODIES = eINSTANCE.getPredicate_Bodies();
2929
2930 /**
2931 * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateSymbolImpl <em>Predicate Symbol</em>}' class.
2932 * <!-- begin-user-doc --> 2822 * <!-- begin-user-doc -->
2933 * <!-- end-user-doc --> 2823 * <!-- end-user-doc -->
2934 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateSymbolImpl
2935 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getPredicateSymbol()
2936 * @generated 2824 * @generated
2937 */ 2825 */
2938 EClass PREDICATE_SYMBOL = eINSTANCE.getPredicateSymbol(); 2826 EAttribute PREDICATE__IS_ERROR = eINSTANCE.getPredicate_IsError();
2939 2827
2940 /** 2828 /**
2941 * The meta object literal for the '<em><b>Symbol</b></em>' containment reference feature. 2829 * The meta object literal for the '<em><b>Symbol</b></em>' containment reference feature.
@@ -2943,25 +2831,23 @@ public interface SolverLanguagePackage extends EPackage
2943 * <!-- end-user-doc --> 2831 * <!-- end-user-doc -->
2944 * @generated 2832 * @generated
2945 */ 2833 */
2946 EReference PREDICATE_SYMBOL__SYMBOL = eINSTANCE.getPredicateSymbol_Symbol(); 2834 EReference PREDICATE__SYMBOL = eINSTANCE.getPredicate_Symbol();
2947 2835
2948 /** 2836 /**
2949 * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ErrorPredicateImpl <em>Error Predicate</em>}' class. 2837 * The meta object literal for the '<em><b>Parameters</b></em>' containment reference list feature.
2950 * <!-- begin-user-doc --> 2838 * <!-- begin-user-doc -->
2951 * <!-- end-user-doc --> 2839 * <!-- end-user-doc -->
2952 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ErrorPredicateImpl
2953 * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getErrorPredicate()
2954 * @generated 2840 * @generated
2955 */ 2841 */
2956 EClass ERROR_PREDICATE = eINSTANCE.getErrorPredicate(); 2842 EReference PREDICATE__PARAMETERS = eINSTANCE.getPredicate_Parameters();
2957 2843
2958 /** 2844 /**
2959 * The meta object literal for the '<em><b>Name</b></em>' attribute feature. 2845 * The meta object literal for the '<em><b>Bodies</b></em>' containment reference list feature.
2960 * <!-- begin-user-doc --> 2846 * <!-- begin-user-doc -->
2961 * <!-- end-user-doc --> 2847 * <!-- end-user-doc -->
2962 * @generated 2848 * @generated
2963 */ 2849 */
2964 EAttribute ERROR_PREDICATE__NAME = eINSTANCE.getErrorPredicate_Name(); 2850 EReference PREDICATE__BODIES = eINSTANCE.getPredicate_Bodies();
2965 2851
2966 /** 2852 /**
2967 * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ParameterImpl <em>Parameter</em>}' class. 2853 * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ParameterImpl <em>Parameter</em>}' class.
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PredicateImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PredicateImpl.java
index 947d74bb..d3c7366d 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PredicateImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PredicateImpl.java
@@ -5,6 +5,7 @@ package org.eclipse.viatra.solver.language.solverLanguage.impl;
5 5
6import java.util.Collection; 6import java.util.Collection;
7 7
8import org.eclipse.emf.common.notify.Notification;
8import org.eclipse.emf.common.notify.NotificationChain; 9import org.eclipse.emf.common.notify.NotificationChain;
9 10
10import org.eclipse.emf.common.util.EList; 11import org.eclipse.emf.common.util.EList;
@@ -12,9 +13,12 @@ import org.eclipse.emf.common.util.EList;
12import org.eclipse.emf.ecore.EClass; 13import org.eclipse.emf.ecore.EClass;
13import org.eclipse.emf.ecore.InternalEObject; 14import org.eclipse.emf.ecore.InternalEObject;
14 15
16import org.eclipse.emf.ecore.impl.ENotificationImpl;
17
15import org.eclipse.emf.ecore.util.EObjectContainmentEList; 18import org.eclipse.emf.ecore.util.EObjectContainmentEList;
16import org.eclipse.emf.ecore.util.InternalEList; 19import org.eclipse.emf.ecore.util.InternalEList;
17 20
21import org.eclipse.viatra.solver.language.solverLanguage.ModelSymbol;
18import org.eclipse.viatra.solver.language.solverLanguage.Parameter; 22import org.eclipse.viatra.solver.language.solverLanguage.Parameter;
19import org.eclipse.viatra.solver.language.solverLanguage.PatternBody; 23import org.eclipse.viatra.solver.language.solverLanguage.PatternBody;
20import org.eclipse.viatra.solver.language.solverLanguage.Predicate; 24import org.eclipse.viatra.solver.language.solverLanguage.Predicate;
@@ -28,6 +32,8 @@ import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
28 * The following features are implemented: 32 * The following features are implemented:
29 * </p> 33 * </p>
30 * <ul> 34 * <ul>
35 * <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateImpl#isIsError <em>Is Error</em>}</li>
36 * <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateImpl#getSymbol <em>Symbol</em>}</li>
31 * <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateImpl#getParameters <em>Parameters</em>}</li> 37 * <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateImpl#getParameters <em>Parameters</em>}</li>
32 * <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateImpl#getBodies <em>Bodies</em>}</li> 38 * <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateImpl#getBodies <em>Bodies</em>}</li>
33 * </ul> 39 * </ul>
@@ -37,6 +43,36 @@ import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
37public class PredicateImpl extends StatementImpl implements Predicate 43public class PredicateImpl extends StatementImpl implements Predicate
38{ 44{
39 /** 45 /**
46 * The default value of the '{@link #isIsError() <em>Is Error</em>}' attribute.
47 * <!-- begin-user-doc -->
48 * <!-- end-user-doc -->
49 * @see #isIsError()
50 * @generated
51 * @ordered
52 */
53 protected static final boolean IS_ERROR_EDEFAULT = false;
54
55 /**
56 * The cached value of the '{@link #isIsError() <em>Is Error</em>}' attribute.
57 * <!-- begin-user-doc -->
58 * <!-- end-user-doc -->
59 * @see #isIsError()
60 * @generated
61 * @ordered
62 */
63 protected boolean isError = IS_ERROR_EDEFAULT;
64
65 /**
66 * The cached value of the '{@link #getSymbol() <em>Symbol</em>}' containment reference.
67 * <!-- begin-user-doc -->
68 * <!-- end-user-doc -->
69 * @see #getSymbol()
70 * @generated
71 * @ordered
72 */
73 protected ModelSymbol symbol;
74
75 /**
40 * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list. 76 * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list.
41 * <!-- begin-user-doc --> 77 * <!-- begin-user-doc -->
42 * <!-- end-user-doc --> 78 * <!-- end-user-doc -->
@@ -83,6 +119,81 @@ public class PredicateImpl extends StatementImpl implements Predicate
83 * @generated 119 * @generated
84 */ 120 */
85 @Override 121 @Override
122 public boolean isIsError()
123 {
124 return isError;
125 }
126
127 /**
128 * <!-- begin-user-doc -->
129 * <!-- end-user-doc -->
130 * @generated
131 */
132 @Override
133 public void setIsError(boolean newIsError)
134 {
135 boolean oldIsError = isError;
136 isError = newIsError;
137 if (eNotificationRequired())
138 eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.PREDICATE__IS_ERROR, oldIsError, isError));
139 }
140
141 /**
142 * <!-- begin-user-doc -->
143 * <!-- end-user-doc -->
144 * @generated
145 */
146 @Override
147 public ModelSymbol getSymbol()
148 {
149 return symbol;
150 }
151
152 /**
153 * <!-- begin-user-doc -->
154 * <!-- end-user-doc -->
155 * @generated
156 */
157 public NotificationChain basicSetSymbol(ModelSymbol newSymbol, NotificationChain msgs)
158 {
159 ModelSymbol oldSymbol = symbol;
160 symbol = newSymbol;
161 if (eNotificationRequired())
162 {
163 ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.PREDICATE__SYMBOL, oldSymbol, newSymbol);
164 if (msgs == null) msgs = notification; else msgs.add(notification);
165 }
166 return msgs;
167 }
168
169 /**
170 * <!-- begin-user-doc -->
171 * <!-- end-user-doc -->
172 * @generated
173 */
174 @Override
175 public void setSymbol(ModelSymbol newSymbol)
176 {
177 if (newSymbol != symbol)
178 {
179 NotificationChain msgs = null;
180 if (symbol != null)
181 msgs = ((InternalEObject)symbol).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.PREDICATE__SYMBOL, null, msgs);
182 if (newSymbol != null)
183 msgs = ((InternalEObject)newSymbol).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.PREDICATE__SYMBOL, null, msgs);
184 msgs = basicSetSymbol(newSymbol, msgs);
185 if (msgs != null) msgs.dispatch();
186 }
187 else if (eNotificationRequired())
188 eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.PREDICATE__SYMBOL, newSymbol, newSymbol));
189 }
190
191 /**
192 * <!-- begin-user-doc -->
193 * <!-- end-user-doc -->
194 * @generated
195 */
196 @Override
86 public EList<Parameter> getParameters() 197 public EList<Parameter> getParameters()
87 { 198 {
88 if (parameters == null) 199 if (parameters == null)
@@ -117,6 +228,8 @@ public class PredicateImpl extends StatementImpl implements Predicate
117 { 228 {
118 switch (featureID) 229 switch (featureID)
119 { 230 {
231 case SolverLanguagePackage.PREDICATE__SYMBOL:
232 return basicSetSymbol(null, msgs);
120 case SolverLanguagePackage.PREDICATE__PARAMETERS: 233 case SolverLanguagePackage.PREDICATE__PARAMETERS:
121 return ((InternalEList<?>)getParameters()).basicRemove(otherEnd, msgs); 234 return ((InternalEList<?>)getParameters()).basicRemove(otherEnd, msgs);
122 case SolverLanguagePackage.PREDICATE__BODIES: 235 case SolverLanguagePackage.PREDICATE__BODIES:
@@ -135,6 +248,10 @@ public class PredicateImpl extends StatementImpl implements Predicate
135 { 248 {
136 switch (featureID) 249 switch (featureID)
137 { 250 {
251 case SolverLanguagePackage.PREDICATE__IS_ERROR:
252 return isIsError();
253 case SolverLanguagePackage.PREDICATE__SYMBOL:
254 return getSymbol();
138 case SolverLanguagePackage.PREDICATE__PARAMETERS: 255 case SolverLanguagePackage.PREDICATE__PARAMETERS:
139 return getParameters(); 256 return getParameters();
140 case SolverLanguagePackage.PREDICATE__BODIES: 257 case SolverLanguagePackage.PREDICATE__BODIES:
@@ -154,6 +271,12 @@ public class PredicateImpl extends StatementImpl implements Predicate
154 { 271 {
155 switch (featureID) 272 switch (featureID)
156 { 273 {
274 case SolverLanguagePackage.PREDICATE__IS_ERROR:
275 setIsError((Boolean)newValue);
276 return;
277 case SolverLanguagePackage.PREDICATE__SYMBOL:
278 setSymbol((ModelSymbol)newValue);
279 return;
157 case SolverLanguagePackage.PREDICATE__PARAMETERS: 280 case SolverLanguagePackage.PREDICATE__PARAMETERS:
158 getParameters().clear(); 281 getParameters().clear();
159 getParameters().addAll((Collection<? extends Parameter>)newValue); 282 getParameters().addAll((Collection<? extends Parameter>)newValue);
@@ -176,6 +299,12 @@ public class PredicateImpl extends StatementImpl implements Predicate
176 { 299 {
177 switch (featureID) 300 switch (featureID)
178 { 301 {
302 case SolverLanguagePackage.PREDICATE__IS_ERROR:
303 setIsError(IS_ERROR_EDEFAULT);
304 return;
305 case SolverLanguagePackage.PREDICATE__SYMBOL:
306 setSymbol((ModelSymbol)null);
307 return;
179 case SolverLanguagePackage.PREDICATE__PARAMETERS: 308 case SolverLanguagePackage.PREDICATE__PARAMETERS:
180 getParameters().clear(); 309 getParameters().clear();
181 return; 310 return;
@@ -196,6 +325,10 @@ public class PredicateImpl extends StatementImpl implements Predicate
196 { 325 {
197 switch (featureID) 326 switch (featureID)
198 { 327 {
328 case SolverLanguagePackage.PREDICATE__IS_ERROR:
329 return isError != IS_ERROR_EDEFAULT;
330 case SolverLanguagePackage.PREDICATE__SYMBOL:
331 return symbol != null;
199 case SolverLanguagePackage.PREDICATE__PARAMETERS: 332 case SolverLanguagePackage.PREDICATE__PARAMETERS:
200 return parameters != null && !parameters.isEmpty(); 333 return parameters != null && !parameters.isEmpty();
201 case SolverLanguagePackage.PREDICATE__BODIES: 334 case SolverLanguagePackage.PREDICATE__BODIES:
@@ -204,4 +337,21 @@ public class PredicateImpl extends StatementImpl implements Predicate
204 return super.eIsSet(featureID); 337 return super.eIsSet(featureID);
205 } 338 }
206 339
340 /**
341 * <!-- begin-user-doc -->
342 * <!-- end-user-doc -->
343 * @generated
344 */
345 @Override
346 public String toString()
347 {
348 if (eIsProxy()) return super.toString();
349
350 StringBuilder result = new StringBuilder(super.toString());
351 result.append(" (isError: ");
352 result.append(isError);
353 result.append(')');
354 return result.toString();
355 }
356
207} //PredicateImpl 357} //PredicateImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguageFactoryImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguageFactoryImpl.java
index 12ffc551..5cb1dcdc 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguageFactoryImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguageFactoryImpl.java
@@ -29,7 +29,6 @@ import org.eclipse.viatra.solver.language.solverLanguage.DataSymbol;
29import org.eclipse.viatra.solver.language.solverLanguage.DefaultInterpretation; 29import org.eclipse.viatra.solver.language.solverLanguage.DefaultInterpretation;
30import org.eclipse.viatra.solver.language.solverLanguage.EnumInterpretation; 30import org.eclipse.viatra.solver.language.solverLanguage.EnumInterpretation;
31import org.eclipse.viatra.solver.language.solverLanguage.EqualsSymbol; 31import org.eclipse.viatra.solver.language.solverLanguage.EqualsSymbol;
32import org.eclipse.viatra.solver.language.solverLanguage.ErrorPredicate;
33import org.eclipse.viatra.solver.language.solverLanguage.ExistSymbol; 32import org.eclipse.viatra.solver.language.solverLanguage.ExistSymbol;
34import org.eclipse.viatra.solver.language.solverLanguage.False; 33import org.eclipse.viatra.solver.language.solverLanguage.False;
35import org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation; 34import org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation;
@@ -49,7 +48,6 @@ import org.eclipse.viatra.solver.language.solverLanguage.PatternBody;
49import org.eclipse.viatra.solver.language.solverLanguage.Polarity; 48import org.eclipse.viatra.solver.language.solverLanguage.Polarity;
50import org.eclipse.viatra.solver.language.solverLanguage.Positive; 49import org.eclipse.viatra.solver.language.solverLanguage.Positive;
51import org.eclipse.viatra.solver.language.solverLanguage.Predicate; 50import org.eclipse.viatra.solver.language.solverLanguage.Predicate;
52import org.eclipse.viatra.solver.language.solverLanguage.PredicateSymbol;
53import org.eclipse.viatra.solver.language.solverLanguage.Problem; 51import org.eclipse.viatra.solver.language.solverLanguage.Problem;
54import org.eclipse.viatra.solver.language.solverLanguage.RealObject; 52import org.eclipse.viatra.solver.language.solverLanguage.RealObject;
55import org.eclipse.viatra.solver.language.solverLanguage.RealSymbol; 53import org.eclipse.viatra.solver.language.solverLanguage.RealSymbol;
@@ -144,8 +142,6 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
144 case SolverLanguagePackage.REAL_OBJECT: return createRealObject(); 142 case SolverLanguagePackage.REAL_OBJECT: return createRealObject();
145 case SolverLanguagePackage.STRING_OBJECT: return createStringObject(); 143 case SolverLanguagePackage.STRING_OBJECT: return createStringObject();
146 case SolverLanguagePackage.PREDICATE: return createPredicate(); 144 case SolverLanguagePackage.PREDICATE: return createPredicate();
147 case SolverLanguagePackage.PREDICATE_SYMBOL: return createPredicateSymbol();
148 case SolverLanguagePackage.ERROR_PREDICATE: return createErrorPredicate();
149 case SolverLanguagePackage.PARAMETER: return createParameter(); 145 case SolverLanguagePackage.PARAMETER: return createParameter();
150 case SolverLanguagePackage.PATTERN_BODY: return createPatternBody(); 146 case SolverLanguagePackage.PATTERN_BODY: return createPatternBody();
151 case SolverLanguagePackage.POLARITY: return createPolarity(); 147 case SolverLanguagePackage.POLARITY: return createPolarity();
@@ -495,30 +491,6 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
495 * @generated 491 * @generated
496 */ 492 */
497 @Override 493 @Override
498 public PredicateSymbol createPredicateSymbol()
499 {
500 PredicateSymbolImpl predicateSymbol = new PredicateSymbolImpl();
501 return predicateSymbol;
502 }
503
504 /**
505 * <!-- begin-user-doc -->
506 * <!-- end-user-doc -->
507 * @generated
508 */
509 @Override
510 public ErrorPredicate createErrorPredicate()
511 {
512 ErrorPredicateImpl errorPredicate = new ErrorPredicateImpl();
513 return errorPredicate;
514 }
515
516 /**
517 * <!-- begin-user-doc -->
518 * <!-- end-user-doc -->
519 * @generated
520 */
521 @Override
522 public Parameter createParameter() 494 public Parameter createParameter()
523 { 495 {
524 ParameterImpl parameter = new ParameterImpl(); 496 ParameterImpl parameter = new ParameterImpl();
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguagePackageImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguagePackageImpl.java
index 9e5d391b..f617be3f 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguagePackageImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguagePackageImpl.java
@@ -28,7 +28,6 @@ import org.eclipse.viatra.solver.language.solverLanguage.DataSymbol;
28import org.eclipse.viatra.solver.language.solverLanguage.DefaultInterpretation; 28import org.eclipse.viatra.solver.language.solverLanguage.DefaultInterpretation;
29import org.eclipse.viatra.solver.language.solverLanguage.EnumInterpretation; 29import org.eclipse.viatra.solver.language.solverLanguage.EnumInterpretation;
30import org.eclipse.viatra.solver.language.solverLanguage.EqualsSymbol; 30import org.eclipse.viatra.solver.language.solverLanguage.EqualsSymbol;
31import org.eclipse.viatra.solver.language.solverLanguage.ErrorPredicate;
32import org.eclipse.viatra.solver.language.solverLanguage.ExistSymbol; 31import org.eclipse.viatra.solver.language.solverLanguage.ExistSymbol;
33import org.eclipse.viatra.solver.language.solverLanguage.False; 32import org.eclipse.viatra.solver.language.solverLanguage.False;
34import org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation; 33import org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation;
@@ -48,7 +47,6 @@ import org.eclipse.viatra.solver.language.solverLanguage.PatternBody;
48import org.eclipse.viatra.solver.language.solverLanguage.Polarity; 47import org.eclipse.viatra.solver.language.solverLanguage.Polarity;
49import org.eclipse.viatra.solver.language.solverLanguage.Positive; 48import org.eclipse.viatra.solver.language.solverLanguage.Positive;
50import org.eclipse.viatra.solver.language.solverLanguage.Predicate; 49import org.eclipse.viatra.solver.language.solverLanguage.Predicate;
51import org.eclipse.viatra.solver.language.solverLanguage.PredicateSymbol;
52import org.eclipse.viatra.solver.language.solverLanguage.Problem; 50import org.eclipse.viatra.solver.language.solverLanguage.Problem;
53import org.eclipse.viatra.solver.language.solverLanguage.RealObject; 51import org.eclipse.viatra.solver.language.solverLanguage.RealObject;
54import org.eclipse.viatra.solver.language.solverLanguage.RealSymbol; 52import org.eclipse.viatra.solver.language.solverLanguage.RealSymbol;
@@ -260,20 +258,6 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
260 * <!-- end-user-doc --> 258 * <!-- end-user-doc -->
261 * @generated 259 * @generated
262 */ 260 */
263 private EClass predicateSymbolEClass = null;
264
265 /**
266 * <!-- begin-user-doc -->
267 * <!-- end-user-doc -->
268 * @generated
269 */
270 private EClass errorPredicateEClass = null;
271
272 /**
273 * <!-- begin-user-doc -->
274 * <!-- end-user-doc -->
275 * @generated
276 */
277 private EClass parameterEClass = null; 261 private EClass parameterEClass = null;
278 262
279 /** 263 /**
@@ -927,9 +911,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
927 * @generated 911 * @generated
928 */ 912 */
929 @Override 913 @Override
930 public EReference getPredicate_Parameters() 914 public EAttribute getPredicate_IsError()
931 { 915 {
932 return (EReference)predicateEClass.getEStructuralFeatures().get(0); 916 return (EAttribute)predicateEClass.getEStructuralFeatures().get(0);
933 } 917 }
934 918
935 /** 919 /**
@@ -938,7 +922,7 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
938 * @generated 922 * @generated
939 */ 923 */
940 @Override 924 @Override
941 public EReference getPredicate_Bodies() 925 public EReference getPredicate_Symbol()
942 { 926 {
943 return (EReference)predicateEClass.getEStructuralFeatures().get(1); 927 return (EReference)predicateEClass.getEStructuralFeatures().get(1);
944 } 928 }
@@ -949,31 +933,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
949 * @generated 933 * @generated
950 */ 934 */
951 @Override 935 @Override
952 public EClass getPredicateSymbol() 936 public EReference getPredicate_Parameters()
953 {
954 return predicateSymbolEClass;
955 }
956
957 /**
958 * <!-- begin-user-doc -->
959 * <!-- end-user-doc -->
960 * @generated
961 */
962 @Override
963 public EReference getPredicateSymbol_Symbol()
964 {
965 return (EReference)predicateSymbolEClass.getEStructuralFeatures().get(0);
966 }
967
968 /**
969 * <!-- begin-user-doc -->
970 * <!-- end-user-doc -->
971 * @generated
972 */
973 @Override
974 public EClass getErrorPredicate()
975 { 937 {
976 return errorPredicateEClass; 938 return (EReference)predicateEClass.getEStructuralFeatures().get(2);
977 } 939 }
978 940
979 /** 941 /**
@@ -982,9 +944,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
982 * @generated 944 * @generated
983 */ 945 */
984 @Override 946 @Override
985 public EAttribute getErrorPredicate_Name() 947 public EReference getPredicate_Bodies()
986 { 948 {
987 return (EAttribute)errorPredicateEClass.getEStructuralFeatures().get(0); 949 return (EReference)predicateEClass.getEStructuralFeatures().get(3);
988 } 950 }
989 951
990 /** 952 /**
@@ -1685,15 +1647,11 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
1685 createEAttribute(stringObjectEClass, STRING_OBJECT__VALUE); 1647 createEAttribute(stringObjectEClass, STRING_OBJECT__VALUE);
1686 1648
1687 predicateEClass = createEClass(PREDICATE); 1649 predicateEClass = createEClass(PREDICATE);
1650 createEAttribute(predicateEClass, PREDICATE__IS_ERROR);
1651 createEReference(predicateEClass, PREDICATE__SYMBOL);
1688 createEReference(predicateEClass, PREDICATE__PARAMETERS); 1652 createEReference(predicateEClass, PREDICATE__PARAMETERS);
1689 createEReference(predicateEClass, PREDICATE__BODIES); 1653 createEReference(predicateEClass, PREDICATE__BODIES);
1690 1654
1691 predicateSymbolEClass = createEClass(PREDICATE_SYMBOL);
1692 createEReference(predicateSymbolEClass, PREDICATE_SYMBOL__SYMBOL);
1693
1694 errorPredicateEClass = createEClass(ERROR_PREDICATE);
1695 createEAttribute(errorPredicateEClass, ERROR_PREDICATE__NAME);
1696
1697 parameterEClass = createEClass(PARAMETER); 1655 parameterEClass = createEClass(PARAMETER);
1698 createEReference(parameterEClass, PARAMETER__VARIABLE); 1656 createEReference(parameterEClass, PARAMETER__VARIABLE);
1699 createEReference(parameterEClass, PARAMETER__TYPE); 1657 createEReference(parameterEClass, PARAMETER__TYPE);
@@ -1818,6 +1776,7 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
1818 stringSymbolEClass.getESuperTypes().add(this.getDataSymbol()); 1776 stringSymbolEClass.getESuperTypes().add(this.getDataSymbol());
1819 objectEClass.getESuperTypes().add(this.getComplexObject()); 1777 objectEClass.getESuperTypes().add(this.getComplexObject());
1820 namedObjectEClass.getESuperTypes().add(this.getObject()); 1778 namedObjectEClass.getESuperTypes().add(this.getObject());
1779 namedObjectEClass.getESuperTypes().add(this.getLiteral());
1821 unnamedObjectEClass.getESuperTypes().add(this.getObject()); 1780 unnamedObjectEClass.getESuperTypes().add(this.getObject());
1822 dataObjectEClass.getESuperTypes().add(this.getObject()); 1781 dataObjectEClass.getESuperTypes().add(this.getObject());
1823 dataObjectEClass.getESuperTypes().add(this.getLiteral()); 1782 dataObjectEClass.getESuperTypes().add(this.getLiteral());
@@ -1826,8 +1785,6 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
1826 realObjectEClass.getESuperTypes().add(this.getDataObject()); 1785 realObjectEClass.getESuperTypes().add(this.getDataObject());
1827 stringObjectEClass.getESuperTypes().add(this.getDataObject()); 1786 stringObjectEClass.getESuperTypes().add(this.getDataObject());
1828 predicateEClass.getESuperTypes().add(this.getStatement()); 1787 predicateEClass.getESuperTypes().add(this.getStatement());
1829 predicateSymbolEClass.getESuperTypes().add(this.getPredicate());
1830 errorPredicateEClass.getESuperTypes().add(this.getPredicate());
1831 variableEClass.getESuperTypes().add(this.getLiteral()); 1788 variableEClass.getESuperTypes().add(this.getLiteral());
1832 allInstancesEClass.getESuperTypes().add(this.getComplexObject()); 1789 allInstancesEClass.getESuperTypes().add(this.getComplexObject());
1833 allObjectsEClass.getESuperTypes().add(this.getComplexObject()); 1790 allObjectsEClass.getESuperTypes().add(this.getComplexObject());
@@ -1910,15 +1867,11 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
1910 initEAttribute(getStringObject_Value(), ecorePackage.getEString(), "value", null, 0, 1, StringObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 1867 initEAttribute(getStringObject_Value(), ecorePackage.getEString(), "value", null, 0, 1, StringObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
1911 1868
1912 initEClass(predicateEClass, Predicate.class, "Predicate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 1869 initEClass(predicateEClass, Predicate.class, "Predicate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
1870 initEAttribute(getPredicate_IsError(), ecorePackage.getEBoolean(), "isError", null, 0, 1, Predicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
1871 initEReference(getPredicate_Symbol(), this.getModelSymbol(), null, "symbol", null, 0, 1, Predicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
1913 initEReference(getPredicate_Parameters(), this.getParameter(), null, "parameters", null, 0, -1, Predicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 1872 initEReference(getPredicate_Parameters(), this.getParameter(), null, "parameters", null, 0, -1, Predicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
1914 initEReference(getPredicate_Bodies(), this.getPatternBody(), null, "bodies", null, 0, -1, Predicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 1873 initEReference(getPredicate_Bodies(), this.getPatternBody(), null, "bodies", null, 0, -1, Predicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
1915 1874
1916 initEClass(predicateSymbolEClass, PredicateSymbol.class, "PredicateSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
1917 initEReference(getPredicateSymbol_Symbol(), this.getModelSymbol(), null, "symbol", null, 0, 1, PredicateSymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
1918
1919 initEClass(errorPredicateEClass, ErrorPredicate.class, "ErrorPredicate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
1920 initEAttribute(getErrorPredicate_Name(), ecorePackage.getEString(), "name", null, 0, 1, ErrorPredicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
1921
1922 initEClass(parameterEClass, Parameter.class, "Parameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 1875 initEClass(parameterEClass, Parameter.class, "Parameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
1923 initEReference(getParameter_Variable(), this.getVariable(), null, "variable", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 1876 initEReference(getParameter_Variable(), this.getVariable(), null, "variable", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
1924 initEReference(getParameter_Type(), this.getSymbol(), null, "type", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 1877 initEReference(getParameter_Type(), this.getSymbol(), null, "type", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageAdapterFactory.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageAdapterFactory.java
index e76e359a..9931598c 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageAdapterFactory.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageAdapterFactory.java
@@ -28,7 +28,6 @@ import org.eclipse.viatra.solver.language.solverLanguage.DataSymbol;
28import org.eclipse.viatra.solver.language.solverLanguage.DefaultInterpretation; 28import org.eclipse.viatra.solver.language.solverLanguage.DefaultInterpretation;
29import org.eclipse.viatra.solver.language.solverLanguage.EnumInterpretation; 29import org.eclipse.viatra.solver.language.solverLanguage.EnumInterpretation;
30import org.eclipse.viatra.solver.language.solverLanguage.EqualsSymbol; 30import org.eclipse.viatra.solver.language.solverLanguage.EqualsSymbol;
31import org.eclipse.viatra.solver.language.solverLanguage.ErrorPredicate;
32import org.eclipse.viatra.solver.language.solverLanguage.ExistSymbol; 31import org.eclipse.viatra.solver.language.solverLanguage.ExistSymbol;
33import org.eclipse.viatra.solver.language.solverLanguage.False; 32import org.eclipse.viatra.solver.language.solverLanguage.False;
34import org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation; 33import org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation;
@@ -48,7 +47,6 @@ import org.eclipse.viatra.solver.language.solverLanguage.PatternBody;
48import org.eclipse.viatra.solver.language.solverLanguage.Polarity; 47import org.eclipse.viatra.solver.language.solverLanguage.Polarity;
49import org.eclipse.viatra.solver.language.solverLanguage.Positive; 48import org.eclipse.viatra.solver.language.solverLanguage.Positive;
50import org.eclipse.viatra.solver.language.solverLanguage.Predicate; 49import org.eclipse.viatra.solver.language.solverLanguage.Predicate;
51import org.eclipse.viatra.solver.language.solverLanguage.PredicateSymbol;
52import org.eclipse.viatra.solver.language.solverLanguage.Problem; 50import org.eclipse.viatra.solver.language.solverLanguage.Problem;
53import org.eclipse.viatra.solver.language.solverLanguage.RealObject; 51import org.eclipse.viatra.solver.language.solverLanguage.RealObject;
54import org.eclipse.viatra.solver.language.solverLanguage.RealSymbol; 52import org.eclipse.viatra.solver.language.solverLanguage.RealSymbol;
@@ -258,16 +256,6 @@ public class SolverLanguageAdapterFactory extends AdapterFactoryImpl
258 return createPredicateAdapter(); 256 return createPredicateAdapter();
259 } 257 }
260 @Override 258 @Override
261 public Adapter casePredicateSymbol(PredicateSymbol object)
262 {
263 return createPredicateSymbolAdapter();
264 }
265 @Override
266 public Adapter caseErrorPredicate(ErrorPredicate object)
267 {
268 return createErrorPredicateAdapter();
269 }
270 @Override
271 public Adapter caseParameter(Parameter object) 259 public Adapter caseParameter(Parameter object)
272 { 260 {
273 return createParameterAdapter(); 261 return createParameterAdapter();
@@ -810,36 +798,6 @@ public class SolverLanguageAdapterFactory extends AdapterFactoryImpl
810 } 798 }
811 799
812 /** 800 /**
813 * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.PredicateSymbol <em>Predicate Symbol</em>}'.
814 * <!-- begin-user-doc -->
815 * This default implementation returns null so that we can easily ignore cases;
816 * it's useful to ignore a case when inheritance will catch all the cases anyway.
817 * <!-- end-user-doc -->
818 * @return the new adapter.
819 * @see org.eclipse.viatra.solver.language.solverLanguage.PredicateSymbol
820 * @generated
821 */
822 public Adapter createPredicateSymbolAdapter()
823 {
824 return null;
825 }
826
827 /**
828 * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.ErrorPredicate <em>Error Predicate</em>}'.
829 * <!-- begin-user-doc -->
830 * This default implementation returns null so that we can easily ignore cases;
831 * it's useful to ignore a case when inheritance will catch all the cases anyway.
832 * <!-- end-user-doc -->
833 * @return the new adapter.
834 * @see org.eclipse.viatra.solver.language.solverLanguage.ErrorPredicate
835 * @generated
836 */
837 public Adapter createErrorPredicateAdapter()
838 {
839 return null;
840 }
841
842 /**
843 * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Parameter <em>Parameter</em>}'. 801 * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Parameter <em>Parameter</em>}'.
844 * <!-- begin-user-doc --> 802 * <!-- begin-user-doc -->
845 * This default implementation returns null so that we can easily ignore cases; 803 * This default implementation returns null so that we can easily ignore cases;
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageSwitch.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageSwitch.java
index 9bc874e3..6f6bcd17 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageSwitch.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageSwitch.java
@@ -26,7 +26,6 @@ import org.eclipse.viatra.solver.language.solverLanguage.DataSymbol;
26import org.eclipse.viatra.solver.language.solverLanguage.DefaultInterpretation; 26import org.eclipse.viatra.solver.language.solverLanguage.DefaultInterpretation;
27import org.eclipse.viatra.solver.language.solverLanguage.EnumInterpretation; 27import org.eclipse.viatra.solver.language.solverLanguage.EnumInterpretation;
28import org.eclipse.viatra.solver.language.solverLanguage.EqualsSymbol; 28import org.eclipse.viatra.solver.language.solverLanguage.EqualsSymbol;
29import org.eclipse.viatra.solver.language.solverLanguage.ErrorPredicate;
30import org.eclipse.viatra.solver.language.solverLanguage.ExistSymbol; 29import org.eclipse.viatra.solver.language.solverLanguage.ExistSymbol;
31import org.eclipse.viatra.solver.language.solverLanguage.False; 30import org.eclipse.viatra.solver.language.solverLanguage.False;
32import org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation; 31import org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation;
@@ -46,7 +45,6 @@ import org.eclipse.viatra.solver.language.solverLanguage.PatternBody;
46import org.eclipse.viatra.solver.language.solverLanguage.Polarity; 45import org.eclipse.viatra.solver.language.solverLanguage.Polarity;
47import org.eclipse.viatra.solver.language.solverLanguage.Positive; 46import org.eclipse.viatra.solver.language.solverLanguage.Positive;
48import org.eclipse.viatra.solver.language.solverLanguage.Predicate; 47import org.eclipse.viatra.solver.language.solverLanguage.Predicate;
49import org.eclipse.viatra.solver.language.solverLanguage.PredicateSymbol;
50import org.eclipse.viatra.solver.language.solverLanguage.Problem; 48import org.eclipse.viatra.solver.language.solverLanguage.Problem;
51import org.eclipse.viatra.solver.language.solverLanguage.RealObject; 49import org.eclipse.viatra.solver.language.solverLanguage.RealObject;
52import org.eclipse.viatra.solver.language.solverLanguage.RealSymbol; 50import org.eclipse.viatra.solver.language.solverLanguage.RealSymbol;
@@ -275,6 +273,7 @@ public class SolverLanguageSwitch<T> extends Switch<T>
275 NamedObject namedObject = (NamedObject)theEObject; 273 NamedObject namedObject = (NamedObject)theEObject;
276 T result = caseNamedObject(namedObject); 274 T result = caseNamedObject(namedObject);
277 if (result == null) result = caseObject(namedObject); 275 if (result == null) result = caseObject(namedObject);
276 if (result == null) result = caseLiteral(namedObject);
278 if (result == null) result = caseComplexObject(namedObject); 277 if (result == null) result = caseComplexObject(namedObject);
279 if (result == null) result = defaultCase(theEObject); 278 if (result == null) result = defaultCase(theEObject);
280 return result; 279 return result;
@@ -350,24 +349,6 @@ public class SolverLanguageSwitch<T> extends Switch<T>
350 if (result == null) result = defaultCase(theEObject); 349 if (result == null) result = defaultCase(theEObject);
351 return result; 350 return result;
352 } 351 }
353 case SolverLanguagePackage.PREDICATE_SYMBOL:
354 {
355 PredicateSymbol predicateSymbol = (PredicateSymbol)theEObject;
356 T result = casePredicateSymbol(predicateSymbol);
357 if (result == null) result = casePredicate(predicateSymbol);
358 if (result == null) result = caseStatement(predicateSymbol);
359 if (result == null) result = defaultCase(theEObject);
360 return result;
361 }
362 case SolverLanguagePackage.ERROR_PREDICATE:
363 {
364 ErrorPredicate errorPredicate = (ErrorPredicate)theEObject;
365 T result = caseErrorPredicate(errorPredicate);
366 if (result == null) result = casePredicate(errorPredicate);
367 if (result == null) result = caseStatement(errorPredicate);
368 if (result == null) result = defaultCase(theEObject);
369 return result;
370 }
371 case SolverLanguagePackage.PARAMETER: 352 case SolverLanguagePackage.PARAMETER:
372 { 353 {
373 Parameter parameter = (Parameter)theEObject; 354 Parameter parameter = (Parameter)theEObject;
@@ -997,38 +978,6 @@ public class SolverLanguageSwitch<T> extends Switch<T>
997 } 978 }
998 979
999 /** 980 /**
1000 * Returns the result of interpreting the object as an instance of '<em>Predicate Symbol</em>'.
1001 * <!-- begin-user-doc -->
1002 * This implementation returns null;
1003 * returning a non-null result will terminate the switch.
1004 * <!-- end-user-doc -->
1005 * @param object the target of the switch.
1006 * @return the result of interpreting the object as an instance of '<em>Predicate Symbol</em>'.
1007 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
1008 * @generated
1009 */
1010 public T casePredicateSymbol(PredicateSymbol object)
1011 {
1012 return null;
1013 }
1014
1015 /**
1016 * Returns the result of interpreting the object as an instance of '<em>Error Predicate</em>'.
1017 * <!-- begin-user-doc -->
1018 * This implementation returns null;
1019 * returning a non-null result will terminate the switch.
1020 * <!-- end-user-doc -->
1021 * @param object the target of the switch.
1022 * @return the result of interpreting the object as an instance of '<em>Error Predicate</em>'.
1023 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
1024 * @generated
1025 */
1026 public T caseErrorPredicate(ErrorPredicate object)
1027 {
1028 return null;
1029 }
1030
1031 /**
1032 * Returns the result of interpreting the object as an instance of '<em>Parameter</em>'. 981 * Returns the result of interpreting the object as an instance of '<em>Parameter</em>'.
1033 * <!-- begin-user-doc --> 982 * <!-- begin-user-doc -->
1034 * This implementation returns null; 983 * This implementation returns null;
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-03 15:27:28 +0000