1 files changed, 2645 insertions, 1332 deletions
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/services/SolverLanguageGrammarAccess.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/services/SolverLanguageGrammarAccess.java
index e6a8f1d9..0252938a 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/services/SolverLanguageGrammarAccess.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/services/SolverLanguageGrammarAccess.java
@@ -1,5 +1,5 @@
 /*
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.services;
@@ -9,6 +9,9 @@ import java.util.List;
 import org.eclipse.xtext.Action;
 import org.eclipse.xtext.Alternatives;
 import org.eclipse.xtext.Assignment;
+import org.eclipse.xtext.CrossReference;
+import org.eclipse.xtext.EnumLiteralDeclaration;
+import org.eclipse.xtext.EnumRule;
 import org.eclipse.xtext.Grammar;
 import org.eclipse.xtext.GrammarUtil;
 import org.eclipse.xtext.Group;
@@ -17,6 +20,7 @@ import org.eclipse.xtext.ParserRule;
 import org.eclipse.xtext.RuleCall;
 import org.eclipse.xtext.TerminalRule;
 import org.eclipse.xtext.common.services.TerminalsGrammarAccess;
+import org.eclipse.xtext.service.AbstractElementFinder.AbstractEnumRuleElementFinder;
 import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder;
 import org.eclipse.xtext.service.GrammarProvider;
@@ -40,624 +44,1340 @@ public class SolverLanguageGrammarAccess extends AbstractGrammarElementFinder {
        }
        public class StatementElements extends AbstractParserRuleElementFinder {
                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.Statement");
-                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final Group cGroup = (Group)rule.eContents().get(1);
-                private final RuleCall cInterpretationParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+                private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);
-                private final RuleCall cPredicateParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+                private final RuleCall cAssertionOrDefinitionParserRuleCall_0_0 = (RuleCall)cAlternatives_0.eContents().get(0);
+                private final RuleCall cPredicateDefinitionParserRuleCall_0_1 = (RuleCall)cAlternatives_0.eContents().get(1);
+                private final RuleCall cUnnamedErrorPrediateDefinitionParserRuleCall_0_2 = (RuleCall)cAlternatives_0.eContents().get(2);
+                private final RuleCall cDefaultDefinitionParserRuleCall_0_3 = (RuleCall)cAlternatives_0.eContents().get(3);
+                private final RuleCall cExternPredicateDefinitionParserRuleCall_0_4 = (RuleCall)cAlternatives_0.eContents().get(4);
+                private final RuleCall cMetricDefinitionParserRuleCall_0_5 = (RuleCall)cAlternatives_0.eContents().get(5);
+                private final RuleCall cExternMetricDefinitionParserRuleCall_0_6 = (RuleCall)cAlternatives_0.eContents().get(6);
+                private final RuleCall cClassDefinitionParserRuleCall_0_7 = (RuleCall)cAlternatives_0.eContents().get(7);
+                private final RuleCall cScopeDefinitionParserRuleCall_0_8 = (RuleCall)cAlternatives_0.eContents().get(8);
+                private final RuleCall cObjectiveDefinitionParserRuleCall_0_9 = (RuleCall)cAlternatives_0.eContents().get(9);
+                private final RuleCall cFULL_STOPTerminalRuleCall_1 = (RuleCall)cGroup.eContents().get(1);
                
                //Statement:
-                //      Interpretation | Predicate;
+                //      (AssertionOrDefinition | PredicateDefinition | UnnamedErrorPrediateDefinition | DefaultDefinition |
+                //      ExternPredicateDefinition | MetricDefinition | ExternMetricDefinition | ClassDefinition | ScopeDefinition |
+                //      ObjectiveDefinition) FULL_STOP;
                @Override public ParserRule getRule() { return rule; }
                
-                //Interpretation | Predicate
+                //(AssertionOrDefinition | PredicateDefinition | UnnamedErrorPrediateDefinition | DefaultDefinition |
-                public Alternatives getAlternatives() { return cAlternatives; }
+                //ExternPredicateDefinition | MetricDefinition | ExternMetricDefinition | ClassDefinition | ScopeDefinition |
+                //ObjectiveDefinition) FULL_STOP
+                public Group getGroup() { return cGroup; }
+                
+                //(AssertionOrDefinition | PredicateDefinition | UnnamedErrorPrediateDefinition | DefaultDefinition |
+                //ExternPredicateDefinition | MetricDefinition | ExternMetricDefinition | ClassDefinition | ScopeDefinition |
+                //ObjectiveDefinition)
+                public Alternatives getAlternatives_0() { return cAlternatives_0; }
+                
+                //AssertionOrDefinition
+                public RuleCall getAssertionOrDefinitionParserRuleCall_0_0() { return cAssertionOrDefinitionParserRuleCall_0_0; }
+                
+                //PredicateDefinition
+                public RuleCall getPredicateDefinitionParserRuleCall_0_1() { return cPredicateDefinitionParserRuleCall_0_1; }
+                
+                //UnnamedErrorPrediateDefinition
+                public RuleCall getUnnamedErrorPrediateDefinitionParserRuleCall_0_2() { return cUnnamedErrorPrediateDefinitionParserRuleCall_0_2; }
+                
+                //DefaultDefinition
+                public RuleCall getDefaultDefinitionParserRuleCall_0_3() { return cDefaultDefinitionParserRuleCall_0_3; }
+                
+                //ExternPredicateDefinition
+                public RuleCall getExternPredicateDefinitionParserRuleCall_0_4() { return cExternPredicateDefinitionParserRuleCall_0_4; }
+                
+                //MetricDefinition
+                public RuleCall getMetricDefinitionParserRuleCall_0_5() { return cMetricDefinitionParserRuleCall_0_5; }
                
-                //Interpretation
+                //ExternMetricDefinition
-                public RuleCall getInterpretationParserRuleCall_0() { return cInterpretationParserRuleCall_0; }
+                public RuleCall getExternMetricDefinitionParserRuleCall_0_6() { return cExternMetricDefinitionParserRuleCall_0_6; }
                
-                //Predicate
+                //ClassDefinition
-                public RuleCall getPredicateParserRuleCall_1() { return cPredicateParserRuleCall_1; }
+                public RuleCall getClassDefinitionParserRuleCall_0_7() { return cClassDefinitionParserRuleCall_0_7; }
+                
+                //ScopeDefinition
+                public RuleCall getScopeDefinitionParserRuleCall_0_8() { return cScopeDefinitionParserRuleCall_0_8; }
+                
+                //ObjectiveDefinition
+                public RuleCall getObjectiveDefinitionParserRuleCall_0_9() { return cObjectiveDefinitionParserRuleCall_0_9; }
+                
+                //FULL_STOP
+                public RuleCall getFULL_STOPTerminalRuleCall_1() { return cFULL_STOPTerminalRuleCall_1; }
        }
-        public class REALLiteralElements extends AbstractParserRuleElementFinder {
+        public class AssertionOrDefinitionElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.REALLiteral");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.AssertionOrDefinition");
                private final Group cGroup = (Group)rule.eContents().get(1);
-                private final Keyword cHyphenMinusKeyword_0 = (Keyword)cGroup.eContents().get(0);
+                private final RuleCall cExpressionParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
-                private final RuleCall cINTTerminalRuleCall_1 = (RuleCall)cGroup.eContents().get(1);
+                private final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1);
-                private final Keyword cFullStopKeyword_2 = (Keyword)cGroup.eContents().get(2);
+                private final Group cGroup_1_0 = (Group)cAlternatives_1.eContents().get(0);
-                private final RuleCall cINTTerminalRuleCall_3 = (RuleCall)cGroup.eContents().get(3);
+                private final Action cAssertionBodyAction_1_0_0 = (Action)cGroup_1_0.eContents().get(0);
+                private final Group cGroup_1_0_1 = (Group)cGroup_1_0.eContents().get(1);
+                private final Keyword cColonKeyword_1_0_1_0 = (Keyword)cGroup_1_0_1.eContents().get(0);
+                private final Assignment cRangeAssignment_1_0_1_1 = (Assignment)cGroup_1_0_1.eContents().get(1);
+                private final RuleCall cRangeExpressionParserRuleCall_1_0_1_1_0 = (RuleCall)cRangeAssignment_1_0_1_1.eContents().get(0);
+                private final Group cGroup_1_1 = (Group)cAlternatives_1.eContents().get(1);
+                private final Action cPredicateDefinitionHeadAction_1_1_0 = (Action)cGroup_1_1.eContents().get(0);
+                private final Keyword cColonHyphenMinusKeyword_1_1_1 = (Keyword)cGroup_1_1.eContents().get(1);
+                private final Assignment cBodyAssignment_1_1_2 = (Assignment)cGroup_1_1.eContents().get(2);
+                private final RuleCall cBodyExpressionParserRuleCall_1_1_2_0 = (RuleCall)cBodyAssignment_1_1_2.eContents().get(0);
+                private final Group cGroup_1_2 = (Group)cAlternatives_1.eContents().get(2);
+                private final Action cMetricDefinitionHeadAction_1_2_0 = (Action)cGroup_1_2.eContents().get(0);
+                private final Keyword cEqualsSignKeyword_1_2_1 = (Keyword)cGroup_1_2.eContents().get(1);
+                private final Assignment cBodyAssignment_1_2_2 = (Assignment)cGroup_1_2.eContents().get(2);
+                private final RuleCall cBodyExpressionParserRuleCall_1_2_2_0 = (RuleCall)cBodyAssignment_1_2_2.eContents().get(0);
+                
+                //AssertionOrDefinition Statement:
+                //      Expression ({Assertion.body=current} (":" range=Expression)? | {PredicateDefinition.head=current} ":-"
+                //      body=Expression | {MetricDefinition.head=current} "=" body=Expression);
+                @Override public ParserRule getRule() { return rule; }
+                
+                //Expression ({Assertion.body=current} (":" range=Expression)? | {PredicateDefinition.head=current} ":-" body=Expression |
+                //{MetricDefinition.head=current} "=" body=Expression)
+                public Group getGroup() { return cGroup; }
+                
+                //Expression
+                public RuleCall getExpressionParserRuleCall_0() { return cExpressionParserRuleCall_0; }
+                
+                //({Assertion.body=current} (":" range=Expression)? | {PredicateDefinition.head=current} ":-" body=Expression |
+                //{MetricDefinition.head=current} "=" body=Expression)
+                public Alternatives getAlternatives_1() { return cAlternatives_1; }
                
-                //REALLiteral ecore::EBigDecimal:
+                //{Assertion.body=current} (":" range=Expression)?
-                //      '-'? INT '.' INT;
+                public Group getGroup_1_0() { return cGroup_1_0; }
+                
+                //{Assertion.body=current}
+                public Action getAssertionBodyAction_1_0_0() { return cAssertionBodyAction_1_0_0; }
+                
+                //(":" range=Expression)?
+                public Group getGroup_1_0_1() { return cGroup_1_0_1; }
+                
+                //":"
+                public Keyword getColonKeyword_1_0_1_0() { return cColonKeyword_1_0_1_0; }
+                
+                //range=Expression
+                public Assignment getRangeAssignment_1_0_1_1() { return cRangeAssignment_1_0_1_1; }
+                
+                //Expression
+                public RuleCall getRangeExpressionParserRuleCall_1_0_1_1_0() { return cRangeExpressionParserRuleCall_1_0_1_1_0; }
+                
+                //{PredicateDefinition.head=current} ":-" body=Expression
+                public Group getGroup_1_1() { return cGroup_1_1; }
+                
+                //{PredicateDefinition.head=current}
+                public Action getPredicateDefinitionHeadAction_1_1_0() { return cPredicateDefinitionHeadAction_1_1_0; }
+                
+                //":-"
+                public Keyword getColonHyphenMinusKeyword_1_1_1() { return cColonHyphenMinusKeyword_1_1_1; }
+                
+                //body=Expression
+                public Assignment getBodyAssignment_1_1_2() { return cBodyAssignment_1_1_2; }
+                
+                //Expression
+                public RuleCall getBodyExpressionParserRuleCall_1_1_2_0() { return cBodyExpressionParserRuleCall_1_1_2_0; }
+                
+                //{MetricDefinition.head=current} "=" body=Expression
+                public Group getGroup_1_2() { return cGroup_1_2; }
+                
+                //{MetricDefinition.head=current}
+                public Action getMetricDefinitionHeadAction_1_2_0() { return cMetricDefinitionHeadAction_1_2_0; }
+                
+                //"="
+                public Keyword getEqualsSignKeyword_1_2_1() { return cEqualsSignKeyword_1_2_1; }
+                
+                //body=Expression
+                public Assignment getBodyAssignment_1_2_2() { return cBodyAssignment_1_2_2; }
+                
+                //Expression
+                public RuleCall getBodyExpressionParserRuleCall_1_2_2_0() { return cBodyExpressionParserRuleCall_1_2_2_0; }
+        }
+        public class PredicateDefinitionElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.PredicateDefinition");
+                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final Alternatives cAlternatives_0 = (Alternatives)cGroup.eContents().get(0);
+                private final Group cGroup_0_0 = (Group)cAlternatives_0.eContents().get(0);
+                private final Assignment cFunctionalAssignment_0_0_0 = (Assignment)cGroup_0_0.eContents().get(0);
+                private final Keyword cFunctionalFunctionalKeyword_0_0_0_0 = (Keyword)cFunctionalAssignment_0_0_0.eContents().get(0);
+                private final Assignment cErrorAssignment_0_0_1 = (Assignment)cGroup_0_0.eContents().get(1);
+                private final Keyword cErrorErrorKeyword_0_0_1_0 = (Keyword)cErrorAssignment_0_0_1.eContents().get(0);
+                private final Group cGroup_0_1 = (Group)cAlternatives_0.eContents().get(1);
+                private final Assignment cErrorAssignment_0_1_0 = (Assignment)cGroup_0_1.eContents().get(0);
+                private final Keyword cErrorErrorKeyword_0_1_0_0 = (Keyword)cErrorAssignment_0_1_0.eContents().get(0);
+                private final Assignment cFunctionalAssignment_0_1_1 = (Assignment)cGroup_0_1.eContents().get(1);
+                private final Keyword cFunctionalFunctionalKeyword_0_1_1_0 = (Keyword)cFunctionalAssignment_0_1_1.eContents().get(0);
+                private final Assignment cHeadAssignment_1 = (Assignment)cGroup.eContents().get(1);
+                private final RuleCall cHeadCallParserRuleCall_1_0 = (RuleCall)cHeadAssignment_1.eContents().get(0);
+                private final Keyword cColonHyphenMinusKeyword_2 = (Keyword)cGroup.eContents().get(2);
+                private final Assignment cBodyAssignment_3 = (Assignment)cGroup.eContents().get(3);
+                private final RuleCall cBodyExpressionParserRuleCall_3_0 = (RuleCall)cBodyAssignment_3.eContents().get(0);
+                
+                //PredicateDefinition:
+                //      (functional?="functional" error?="error"? | error?="error" functional?="functional"?) head=Call ":-" body=Expression;
                @Override public ParserRule getRule() { return rule; }
                
-                //'-'? INT '.' INT
+                //(functional?="functional" error?="error"? | error?="error" functional?="functional"?) head=Call ":-" body=Expression
                public Group getGroup() { return cGroup; }
                
-                //'-'?
+                //(functional?="functional" error?="error"? | error?="error" functional?="functional"?)
-                public Keyword getHyphenMinusKeyword_0() { return cHyphenMinusKeyword_0; }
+                public Alternatives getAlternatives_0() { return cAlternatives_0; }
                
-                //INT
+                //functional?="functional" error?="error"?
-                public RuleCall getINTTerminalRuleCall_1() { return cINTTerminalRuleCall_1; }
+                public Group getGroup_0_0() { return cGroup_0_0; }
                
-                //'.'
+                //functional?="functional"
-                public Keyword getFullStopKeyword_2() { return cFullStopKeyword_2; }
+                public Assignment getFunctionalAssignment_0_0_0() { return cFunctionalAssignment_0_0_0; }
                
-                //INT
+                //"functional"
-                public RuleCall getINTTerminalRuleCall_3() { return cINTTerminalRuleCall_3; }
+                public Keyword getFunctionalFunctionalKeyword_0_0_0_0() { return cFunctionalFunctionalKeyword_0_0_0_0; }
+                
+                //error?="error"?
+                public Assignment getErrorAssignment_0_0_1() { return cErrorAssignment_0_0_1; }
+                
+                //"error"
+                public Keyword getErrorErrorKeyword_0_0_1_0() { return cErrorErrorKeyword_0_0_1_0; }
+                
+                //error?="error" functional?="functional"?
+                public Group getGroup_0_1() { return cGroup_0_1; }
+                
+                //error?="error"
+                public Assignment getErrorAssignment_0_1_0() { return cErrorAssignment_0_1_0; }
+                
+                //"error"
+                public Keyword getErrorErrorKeyword_0_1_0_0() { return cErrorErrorKeyword_0_1_0_0; }
+                
+                //functional?="functional"?
+                public Assignment getFunctionalAssignment_0_1_1() { return cFunctionalAssignment_0_1_1; }
+                
+                //"functional"
+                public Keyword getFunctionalFunctionalKeyword_0_1_1_0() { return cFunctionalFunctionalKeyword_0_1_1_0; }
+                
+                //head=Call
+                public Assignment getHeadAssignment_1() { return cHeadAssignment_1; }
+                
+                //Call
+                public RuleCall getHeadCallParserRuleCall_1_0() { return cHeadCallParserRuleCall_1_0; }
+                
+                //":-"
+                public Keyword getColonHyphenMinusKeyword_2() { return cColonHyphenMinusKeyword_2; }
+                
+                //body=Expression
+                public Assignment getBodyAssignment_3() { return cBodyAssignment_3; }
+                
+                //Expression
+                public RuleCall getBodyExpressionParserRuleCall_3_0() { return cBodyExpressionParserRuleCall_3_0; }
+        }
+        public class UnnamedErrorPrediateDefinitionElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.UnnamedErrorPrediateDefinition");
+                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final Keyword cErrorKeyword_0 = (Keyword)cGroup.eContents().get(0);
+                private final Assignment cArgumentListAssignment_1 = (Assignment)cGroup.eContents().get(1);
+                private final RuleCall cArgumentListArgumentListParserRuleCall_1_0 = (RuleCall)cArgumentListAssignment_1.eContents().get(0);
+                private final Keyword cColonHyphenMinusKeyword_2 = (Keyword)cGroup.eContents().get(2);
+                private final Assignment cBodyAssignment_3 = (Assignment)cGroup.eContents().get(3);
+                private final RuleCall cBodyExpressionParserRuleCall_3_0 = (RuleCall)cBodyAssignment_3.eContents().get(0);
+                
+                //UnnamedErrorPrediateDefinition:
+                //      "error" argumentList=ArgumentList ":-" body=Expression;
+                @Override public ParserRule getRule() { return rule; }
+                
+                //"error" argumentList=ArgumentList ":-" body=Expression
+                public Group getGroup() { return cGroup; }
+                
+                //"error"
+                public Keyword getErrorKeyword_0() { return cErrorKeyword_0; }
+                
+                //argumentList=ArgumentList
+                public Assignment getArgumentListAssignment_1() { return cArgumentListAssignment_1; }
+                
+                //ArgumentList
+                public RuleCall getArgumentListArgumentListParserRuleCall_1_0() { return cArgumentListArgumentListParserRuleCall_1_0; }
+                
+                //":-"
+                public Keyword getColonHyphenMinusKeyword_2() { return cColonHyphenMinusKeyword_2; }
+                
+                //body=Expression
+                public Assignment getBodyAssignment_3() { return cBodyAssignment_3; }
+                
+                //Expression
+                public RuleCall getBodyExpressionParserRuleCall_3_0() { return cBodyExpressionParserRuleCall_3_0; }
        }
-        public class INTLiteralElements extends AbstractParserRuleElementFinder {
+        public class DefaultDefinitionElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.INTLiteral");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.DefaultDefinition");
                private final Group cGroup = (Group)rule.eContents().get(1);
-                private final Keyword cHyphenMinusKeyword_0 = (Keyword)cGroup.eContents().get(0);
+                private final Keyword cDefaultKeyword_0 = (Keyword)cGroup.eContents().get(0);
-                private final RuleCall cINTTerminalRuleCall_1 = (RuleCall)cGroup.eContents().get(1);
+                private final Assignment cHeadAssignment_1 = (Assignment)cGroup.eContents().get(1);
+                private final RuleCall cHeadCallParserRuleCall_1_0 = (RuleCall)cHeadAssignment_1.eContents().get(0);
+                private final Keyword cColonKeyword_2 = (Keyword)cGroup.eContents().get(2);
+                private final Assignment cRangeAssignment_3 = (Assignment)cGroup.eContents().get(3);
+                private final RuleCall cRangeExpressionParserRuleCall_3_0 = (RuleCall)cRangeAssignment_3.eContents().get(0);
                
-                //INTLiteral ecore::EInt:
+                //DefaultDefinition:
-                //      '-'? INT;
+                //      "default" head=Call ":" range=Expression;
                @Override public ParserRule getRule() { return rule; }
                
-                //'-'? INT
+                //"default" head=Call ":" range=Expression
                public Group getGroup() { return cGroup; }
                
-                //'-'?
+                //"default"
-                public Keyword getHyphenMinusKeyword_0() { return cHyphenMinusKeyword_0; }
+                public Keyword getDefaultKeyword_0() { return cDefaultKeyword_0; }
                
-                //INT
+                //head=Call
-                public RuleCall getINTTerminalRuleCall_1() { return cINTTerminalRuleCall_1; }
+                public Assignment getHeadAssignment_1() { return cHeadAssignment_1; }
+                
+                //Call
+                public RuleCall getHeadCallParserRuleCall_1_0() { return cHeadCallParserRuleCall_1_0; }
+                
+                //":"
+                public Keyword getColonKeyword_2() { return cColonKeyword_2; }
+                
+                //range=Expression
+                public Assignment getRangeAssignment_3() { return cRangeAssignment_3; }
+                
+                //Expression
+                public RuleCall getRangeExpressionParserRuleCall_3_0() { return cRangeExpressionParserRuleCall_3_0; }
        }
-        public class BooleanValueElements extends AbstractParserRuleElementFinder {
+        public class ExternPredicateDefinitionElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.BooleanValue");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.ExternPredicateDefinition");
-                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final Group cGroup = (Group)rule.eContents().get(1);
-                private final Group cGroup_0 = (Group)cAlternatives.eContents().get(0);
+                private final Keyword cExternKeyword_0 = (Keyword)cGroup.eContents().get(0);
-                private final Action cBooleanTrueAction_0_0 = (Action)cGroup_0.eContents().get(0);
+                private final Assignment cHeadAssignment_1 = (Assignment)cGroup.eContents().get(1);
-                private final Keyword cTrueKeyword_0_1 = (Keyword)cGroup_0.eContents().get(1);
+                private final RuleCall cHeadCallParserRuleCall_1_0 = (RuleCall)cHeadAssignment_1.eContents().get(0);
-                private final Group cGroup_1 = (Group)cAlternatives.eContents().get(1);
-                private final Keyword cFalseKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);
-                private final Action cBooleanFalseAction_1_1 = (Action)cGroup_1.eContents().get(1);
                
-                //BooleanValue:
+                //ExternPredicateDefinition:
-                //      {BooleanTrue} 'true' | 'false' {BooleanFalse};
+                //      "extern" head=Call;
                @Override public ParserRule getRule() { return rule; }
                
-                //{BooleanTrue} 'true' | 'false' {BooleanFalse}
+                //"extern" head=Call
-                public Alternatives getAlternatives() { return cAlternatives; }
+                public Group getGroup() { return cGroup; }
                
-                //{BooleanTrue} 'true'
+                //"extern"
-                public Group getGroup_0() { return cGroup_0; }
+                public Keyword getExternKeyword_0() { return cExternKeyword_0; }
                
-                //{BooleanTrue}
+                //head=Call
-                public Action getBooleanTrueAction_0_0() { return cBooleanTrueAction_0_0; }
+                public Assignment getHeadAssignment_1() { return cHeadAssignment_1; }
                
-                //'true'
+                //Call
-                public Keyword getTrueKeyword_0_1() { return cTrueKeyword_0_1; }
+                public RuleCall getHeadCallParserRuleCall_1_0() { return cHeadCallParserRuleCall_1_0; }
+        }
+        public class MetricDefinitionElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.MetricDefinition");
+                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final Assignment cTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);
+                private final RuleCall cTypeMetricTypeEnumRuleCall_0_0 = (RuleCall)cTypeAssignment_0.eContents().get(0);
+                private final Assignment cHeadAssignment_1 = (Assignment)cGroup.eContents().get(1);
+                private final RuleCall cHeadExpressionParserRuleCall_1_0 = (RuleCall)cHeadAssignment_1.eContents().get(0);
+                private final Keyword cEqualsSignKeyword_2 = (Keyword)cGroup.eContents().get(2);
+                private final Assignment cBodyAssignment_3 = (Assignment)cGroup.eContents().get(3);
+                private final RuleCall cBodyExpressionParserRuleCall_3_0 = (RuleCall)cBodyAssignment_3.eContents().get(0);
+                
+                //MetricDefinition:
+                //      type=MetricType head=Expression "=" body=Expression;
+                @Override public ParserRule getRule() { return rule; }
                
-                //'false' {BooleanFalse}
+                //type=MetricType head=Expression "=" body=Expression
-                public Group getGroup_1() { return cGroup_1; }
+                public Group getGroup() { return cGroup; }
+                
+                //type=MetricType
+                public Assignment getTypeAssignment_0() { return cTypeAssignment_0; }
+                
+                //MetricType
+                public RuleCall getTypeMetricTypeEnumRuleCall_0_0() { return cTypeMetricTypeEnumRuleCall_0_0; }
+                
+                //head=Expression
+                public Assignment getHeadAssignment_1() { return cHeadAssignment_1; }
+                
+                //Expression
+                public RuleCall getHeadExpressionParserRuleCall_1_0() { return cHeadExpressionParserRuleCall_1_0; }
+                
+                //"="
+                public Keyword getEqualsSignKeyword_2() { return cEqualsSignKeyword_2; }
                
-                //'false'
+                //body=Expression
-                public Keyword getFalseKeyword_1_0() { return cFalseKeyword_1_0; }
+                public Assignment getBodyAssignment_3() { return cBodyAssignment_3; }
                
-                //{BooleanFalse}
+                //Expression
-                public Action getBooleanFalseAction_1_1() { return cBooleanFalseAction_1_1; }
+                public RuleCall getBodyExpressionParserRuleCall_3_0() { return cBodyExpressionParserRuleCall_3_0; }
        }
-        public class TruthValueElements extends AbstractParserRuleElementFinder {
+        public class ExternMetricDefinitionElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.TruthValue");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.ExternMetricDefinition");
+                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final Keyword cExternKeyword_0 = (Keyword)cGroup.eContents().get(0);
+                private final Assignment cTypeAssignment_1 = (Assignment)cGroup.eContents().get(1);
+                private final RuleCall cTypeMetricTypeEnumRuleCall_1_0 = (RuleCall)cTypeAssignment_1.eContents().get(0);
+                private final Assignment cHeadAssignment_2 = (Assignment)cGroup.eContents().get(2);
+                private final RuleCall cHeadCallParserRuleCall_2_0 = (RuleCall)cHeadAssignment_2.eContents().get(0);
+                
+                //ExternMetricDefinition:
+                //      "extern" type=MetricType head=Call;
+                @Override public ParserRule getRule() { return rule; }
+                
+                //"extern" type=MetricType head=Call
+                public Group getGroup() { return cGroup; }
+                
+                //"extern"
+                public Keyword getExternKeyword_0() { return cExternKeyword_0; }
+                
+                //type=MetricType
+                public Assignment getTypeAssignment_1() { return cTypeAssignment_1; }
+                
+                //MetricType
+                public RuleCall getTypeMetricTypeEnumRuleCall_1_0() { return cTypeMetricTypeEnumRuleCall_1_0; }
+                
+                //head=Call
+                public Assignment getHeadAssignment_2() { return cHeadAssignment_2; }
+                
+                //Call
+                public RuleCall getHeadCallParserRuleCall_2_0() { return cHeadCallParserRuleCall_2_0; }
+        }
+        public class ExpressionElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.Expression");
                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-                private final Group cGroup_0 = (Group)cAlternatives.eContents().get(0);
+                private final RuleCall cIfElseParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
-                private final Action cTrueAction_0_0 = (Action)cGroup_0.eContents().get(0);
+                private final RuleCall cDisjunctiveExpressionParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
-                private final Keyword cTrueKeyword_0_1 = (Keyword)cGroup_0.eContents().get(1);
+                
-                private final Group cGroup_1 = (Group)cAlternatives.eContents().get(1);
+                //Expression:
-                private final Action cFalseAction_1_0 = (Action)cGroup_1.eContents().get(0);
+                //      IfElse | DisjunctiveExpression;
-                private final Keyword cFalseKeyword_1_1 = (Keyword)cGroup_1.eContents().get(1);
-                private final Group cGroup_2 = (Group)cAlternatives.eContents().get(2);
-                private final Action cUnknownAction_2_0 = (Action)cGroup_2.eContents().get(0);
-                private final Keyword cUnknownKeyword_2_1 = (Keyword)cGroup_2.eContents().get(1);
-                private final Group cGroup_3 = (Group)cAlternatives.eContents().get(3);
-                private final Action cErrorAction_3_0 = (Action)cGroup_3.eContents().get(0);
-                private final Keyword cErrorKeyword_3_1 = (Keyword)cGroup_3.eContents().get(1);
-                
-                //TruthValue:
-                //      {True} 'true' | {False} 'false' | {Unknown} 'unknown' | {Error} 'error';
                @Override public ParserRule getRule() { return rule; }
                
-                //{True} 'true' | {False} 'false' | {Unknown} 'unknown' | {Error} 'error'
+                //IfElse | DisjunctiveExpression
                public Alternatives getAlternatives() { return cAlternatives; }
                
-                //{True} 'true'
+                //IfElse
-                public Group getGroup_0() { return cGroup_0; }
+                public RuleCall getIfElseParserRuleCall_0() { return cIfElseParserRuleCall_0; }
                
-                //{True}
+                //DisjunctiveExpression
-                public Action getTrueAction_0_0() { return cTrueAction_0_0; }
+                public RuleCall getDisjunctiveExpressionParserRuleCall_1() { return cDisjunctiveExpressionParserRuleCall_1; }
+        }
+        public class IfElseElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.IfElse");
+                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final Keyword cIfKeyword_0 = (Keyword)cGroup.eContents().get(0);
+                private final Assignment cConditionAssignment_1 = (Assignment)cGroup.eContents().get(1);
+                private final RuleCall cConditionExpressionParserRuleCall_1_0 = (RuleCall)cConditionAssignment_1.eContents().get(0);
+                private final Keyword cThenKeyword_2 = (Keyword)cGroup.eContents().get(2);
+                private final Assignment cThenAssignment_3 = (Assignment)cGroup.eContents().get(3);
+                private final RuleCall cThenExpressionParserRuleCall_3_0 = (RuleCall)cThenAssignment_3.eContents().get(0);
+                private final Keyword cElseKeyword_4 = (Keyword)cGroup.eContents().get(4);
+                private final Assignment cElseAssignment_5 = (Assignment)cGroup.eContents().get(5);
+                private final RuleCall cElseExpressionParserRuleCall_5_0 = (RuleCall)cElseAssignment_5.eContents().get(0);
+                
+                //IfElse:
+                //      "if" condition=Expression "then" then=Expression "else" else=Expression;
+                @Override public ParserRule getRule() { return rule; }
                
-                //'true'
+                //"if" condition=Expression "then" then=Expression "else" else=Expression
-                public Keyword getTrueKeyword_0_1() { return cTrueKeyword_0_1; }
+                public Group getGroup() { return cGroup; }
                
-                //{False} 'false'
+                //"if"
-                public Group getGroup_1() { return cGroup_1; }
+                public Keyword getIfKeyword_0() { return cIfKeyword_0; }
                
-                //{False}
+                //condition=Expression
-                public Action getFalseAction_1_0() { return cFalseAction_1_0; }
+                public Assignment getConditionAssignment_1() { return cConditionAssignment_1; }
                
-                //'false'
+                //Expression
-                public Keyword getFalseKeyword_1_1() { return cFalseKeyword_1_1; }
+                public RuleCall getConditionExpressionParserRuleCall_1_0() { return cConditionExpressionParserRuleCall_1_0; }
                
-                //{Unknown} 'unknown'
+                //"then"
-                public Group getGroup_2() { return cGroup_2; }
+                public Keyword getThenKeyword_2() { return cThenKeyword_2; }
                
-                //{Unknown}
+                //then=Expression
-                public Action getUnknownAction_2_0() { return cUnknownAction_2_0; }
+                public Assignment getThenAssignment_3() { return cThenAssignment_3; }
                
-                //'unknown'
+                //Expression
-                public Keyword getUnknownKeyword_2_1() { return cUnknownKeyword_2_1; }
+                public RuleCall getThenExpressionParserRuleCall_3_0() { return cThenExpressionParserRuleCall_3_0; }
                
-                //{Error} 'error'
+                //"else"
-                public Group getGroup_3() { return cGroup_3; }
+                public Keyword getElseKeyword_4() { return cElseKeyword_4; }
                
-                //{Error}
+                //else=Expression
-                public Action getErrorAction_3_0() { return cErrorAction_3_0; }
+                public Assignment getElseAssignment_5() { return cElseAssignment_5; }
                
-                //'error'
+                //Expression
-                public Keyword getErrorKeyword_3_1() { return cErrorKeyword_3_1; }
+                public RuleCall getElseExpressionParserRuleCall_5_0() { return cElseExpressionParserRuleCall_5_0; }
        }
-        public class InterpretationElements extends AbstractParserRuleElementFinder {
+        public class DisjunctiveExpressionElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.Interpretation");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.DisjunctiveExpression");
-                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final Group cGroup = (Group)rule.eContents().get(1);
-                private final RuleCall cBasicInterpretationParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+                private final RuleCall cConjunctiveExpressionParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
-                private final RuleCall cDefaultInterpretationParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+                private final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1);
-                private final RuleCall cCDInterpretationParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
+                private final Group cGroup_1_0 = (Group)cAlternatives_1.eContents().get(0);
-                
+                private final Action cDisjunctionChildrenAction_1_0_0 = (Action)cGroup_1_0.eContents().get(0);
-                /////////////////////
+                private final Group cGroup_1_0_1 = (Group)cGroup_1_0.eContents().get(1);
-                //// Core grammar
+                private final Keyword cSemicolonKeyword_1_0_1_0 = (Keyword)cGroup_1_0_1.eContents().get(0);
-                // ///////////////////
+                private final Assignment cChildrenAssignment_1_0_1_1 = (Assignment)cGroup_1_0_1.eContents().get(1);
-                //Interpretation:
+                private final RuleCall cChildrenConjunctiveExpressionParserRuleCall_1_0_1_1_0 = (RuleCall)cChildrenAssignment_1_0_1_1.eContents().get(0);
-                //      BasicInterpretation | DefaultInterpretation | CDInterpretation;
+                private final Group cGroup_1_1 = (Group)cAlternatives_1.eContents().get(1);
+                private final Action cCaseConditionAction_1_1_0 = (Action)cGroup_1_1.eContents().get(0);
+                private final Keyword cHyphenMinusGreaterThanSignKeyword_1_1_1 = (Keyword)cGroup_1_1.eContents().get(1);
+                private final Assignment cBodyAssignment_1_1_2 = (Assignment)cGroup_1_1.eContents().get(2);
+                private final RuleCall cBodyConjunctiveExpressionParserRuleCall_1_1_2_0 = (RuleCall)cBodyAssignment_1_1_2.eContents().get(0);
+                private final Action cSwitchCasesAction_1_1_3 = (Action)cGroup_1_1.eContents().get(3);
+                private final Group cGroup_1_1_4 = (Group)cGroup_1_1.eContents().get(4);
+                private final Keyword cSemicolonKeyword_1_1_4_0 = (Keyword)cGroup_1_1_4.eContents().get(0);
+                private final Assignment cCasesAssignment_1_1_4_1 = (Assignment)cGroup_1_1_4.eContents().get(1);
+                private final RuleCall cCasesCaseParserRuleCall_1_1_4_1_0 = (RuleCall)cCasesAssignment_1_1_4_1.eContents().get(0);
+                
+                //DisjunctiveExpression Expression:
+                //      ConjunctiveExpression ({Disjunction.children+=current} (";" children+=ConjunctiveExpression)+ |
+                //      {Case.condition=current} "->" body=ConjunctiveExpression {Switch.cases+=current} (";" cases+=Case)*)?;
                @Override public ParserRule getRule() { return rule; }
                
-                //BasicInterpretation | DefaultInterpretation | CDInterpretation
+                //ConjunctiveExpression ({Disjunction.children+=current} (";" children+=ConjunctiveExpression)+ | {Case.condition=current}
-                public Alternatives getAlternatives() { return cAlternatives; }
+                //"->" body=ConjunctiveExpression {Switch.cases+=current} (";" cases+=Case)*)?
+                public Group getGroup() { return cGroup; }
                
-                //BasicInterpretation
+                //ConjunctiveExpression
-                public RuleCall getBasicInterpretationParserRuleCall_0() { return cBasicInterpretationParserRuleCall_0; }
+                public RuleCall getConjunctiveExpressionParserRuleCall_0() { return cConjunctiveExpressionParserRuleCall_0; }
+                
+                //({Disjunction.children+=current} (";" children+=ConjunctiveExpression)+ | {Case.condition=current} "->"
+                //body=ConjunctiveExpression {Switch.cases+=current} (";" cases+=Case)*)?
+                public Alternatives getAlternatives_1() { return cAlternatives_1; }
+                
+                //{Disjunction.children+=current} (";" children+=ConjunctiveExpression)+
+                public Group getGroup_1_0() { return cGroup_1_0; }
+                
+                //{Disjunction.children+=current}
+                public Action getDisjunctionChildrenAction_1_0_0() { return cDisjunctionChildrenAction_1_0_0; }
+                
+                //(";" children+=ConjunctiveExpression)+
+                public Group getGroup_1_0_1() { return cGroup_1_0_1; }
+                
+                //";"
+                public Keyword getSemicolonKeyword_1_0_1_0() { return cSemicolonKeyword_1_0_1_0; }
+                
+                //children+=ConjunctiveExpression
+                public Assignment getChildrenAssignment_1_0_1_1() { return cChildrenAssignment_1_0_1_1; }
+                
+                //ConjunctiveExpression
+                public RuleCall getChildrenConjunctiveExpressionParserRuleCall_1_0_1_1_0() { return cChildrenConjunctiveExpressionParserRuleCall_1_0_1_1_0; }
+                
+                //{Case.condition=current} "->" body=ConjunctiveExpression {Switch.cases+=current} (";" cases+=Case)*
+                public Group getGroup_1_1() { return cGroup_1_1; }
                
-                //DefaultInterpretation
+                //{Case.condition=current}
-                public RuleCall getDefaultInterpretationParserRuleCall_1() { return cDefaultInterpretationParserRuleCall_1; }
+                public Action getCaseConditionAction_1_1_0() { return cCaseConditionAction_1_1_0; }
                
-                //CDInterpretation
+                //"->"
-                public RuleCall getCDInterpretationParserRuleCall_2() { return cCDInterpretationParserRuleCall_2; }
+                public Keyword getHyphenMinusGreaterThanSignKeyword_1_1_1() { return cHyphenMinusGreaterThanSignKeyword_1_1_1; }
+                
+                //body=ConjunctiveExpression
+                public Assignment getBodyAssignment_1_1_2() { return cBodyAssignment_1_1_2; }
+                
+                //ConjunctiveExpression
+                public RuleCall getBodyConjunctiveExpressionParserRuleCall_1_1_2_0() { return cBodyConjunctiveExpressionParserRuleCall_1_1_2_0; }
+                
+                //{Switch.cases+=current}
+                public Action getSwitchCasesAction_1_1_3() { return cSwitchCasesAction_1_1_3; }
+                
+                //(";" cases+=Case)*
+                public Group getGroup_1_1_4() { return cGroup_1_1_4; }
+                
+                //";"
+                public Keyword getSemicolonKeyword_1_1_4_0() { return cSemicolonKeyword_1_1_4_0; }
+                
+                //cases+=Case
+                public Assignment getCasesAssignment_1_1_4_1() { return cCasesAssignment_1_1_4_1; }
+                
+                //Case
+                public RuleCall getCasesCaseParserRuleCall_1_1_4_1_0() { return cCasesCaseParserRuleCall_1_1_4_1_0; }
        }
-        public class BasicInterpretationElements extends AbstractParserRuleElementFinder {
+        public class CaseElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.BasicInterpretation");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.Case");
                private final Group cGroup = (Group)rule.eContents().get(1);
-                private final Assignment cSymbolAssignment_0 = (Assignment)cGroup.eContents().get(0);
+                private final Assignment cConditionAssignment_0 = (Assignment)cGroup.eContents().get(0);
-                private final RuleCall cSymbolSymbolParserRuleCall_0_0 = (RuleCall)cSymbolAssignment_0.eContents().get(0);
+                private final RuleCall cConditionConjunctiveExpressionParserRuleCall_0_0 = (RuleCall)cConditionAssignment_0.eContents().get(0);
+                private final Keyword cHyphenMinusGreaterThanSignKeyword_1 = (Keyword)cGroup.eContents().get(1);
+                private final Assignment cBodyAssignment_2 = (Assignment)cGroup.eContents().get(2);
+                private final RuleCall cBodyConjunctiveExpressionParserRuleCall_2_0 = (RuleCall)cBodyAssignment_2.eContents().get(0);
+                
+                //Case:
+                //      condition=ConjunctiveExpression "->" body=ConjunctiveExpression;
+                @Override public ParserRule getRule() { return rule; }
+                
+                //condition=ConjunctiveExpression "->" body=ConjunctiveExpression
+                public Group getGroup() { return cGroup; }
+                
+                //condition=ConjunctiveExpression
+                public Assignment getConditionAssignment_0() { return cConditionAssignment_0; }
+                
+                //ConjunctiveExpression
+                public RuleCall getConditionConjunctiveExpressionParserRuleCall_0_0() { return cConditionConjunctiveExpressionParserRuleCall_0_0; }
+                
+                //"->"
+                public Keyword getHyphenMinusGreaterThanSignKeyword_1() { return cHyphenMinusGreaterThanSignKeyword_1; }
+                
+                //body=ConjunctiveExpression
+                public Assignment getBodyAssignment_2() { return cBodyAssignment_2; }
+                
+                //ConjunctiveExpression
+                public RuleCall getBodyConjunctiveExpressionParserRuleCall_2_0() { return cBodyConjunctiveExpressionParserRuleCall_2_0; }
+        }
+        public class ConjunctiveExpressionElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.ConjunctiveExpression");
+                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final RuleCall cComparisonExpressionParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
                private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
-                private final Keyword cLeftParenthesisKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);
+                private final Action cConjunctionChildrenAction_1_0 = (Action)cGroup_1.eContents().get(0);
                private final Group cGroup_1_1 = (Group)cGroup_1.eContents().get(1);
-                private final Assignment cObjectsAssignment_1_1_0 = (Assignment)cGroup_1_1.eContents().get(0);
+                private final Keyword cCommaKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0);
-                private final RuleCall cObjectsComplexObjectParserRuleCall_1_1_0_0 = (RuleCall)cObjectsAssignment_1_1_0.eContents().get(0);
+                private final Assignment cChildrenAssignment_1_1_1 = (Assignment)cGroup_1_1.eContents().get(1);
-                private final Group cGroup_1_1_1 = (Group)cGroup_1_1.eContents().get(1);
+                private final RuleCall cChildrenComparisonExpressionParserRuleCall_1_1_1_0 = (RuleCall)cChildrenAssignment_1_1_1.eContents().get(0);
-                private final Keyword cCommaKeyword_1_1_1_0 = (Keyword)cGroup_1_1_1.eContents().get(0);
-                private final Assignment cObjectsAssignment_1_1_1_1 = (Assignment)cGroup_1_1_1.eContents().get(1);
-                private final RuleCall cObjectsComplexObjectParserRuleCall_1_1_1_1_0 = (RuleCall)cObjectsAssignment_1_1_1_1.eContents().get(0);
-                private final Keyword cRightParenthesisKeyword_1_2 = (Keyword)cGroup_1.eContents().get(2);
-                private final Keyword cColonKeyword_2 = (Keyword)cGroup.eContents().get(2);
-                private final Assignment cValueAssignment_3 = (Assignment)cGroup.eContents().get(3);
-                private final RuleCall cValueTruthValueParserRuleCall_3_0 = (RuleCall)cValueAssignment_3.eContents().get(0);
                
-                //BasicInterpretation:
+                //ConjunctiveExpression Expression:
-                //      symbol=Symbol ('(' (objects+=ComplexObject (',' objects+=ComplexObject)*)? ')')? ':' value=TruthValue;
+                //      ComparisonExpression ({Conjunction.children+=current} ("," children+=ComparisonExpression)+)?;
                @Override public ParserRule getRule() { return rule; }
                
-                //symbol=Symbol ('(' (objects+=ComplexObject (',' objects+=ComplexObject)*)? ')')? ':' value=TruthValue
+                //ComparisonExpression ({Conjunction.children+=current} ("," children+=ComparisonExpression)+)?
                public Group getGroup() { return cGroup; }
                
-                //symbol=Symbol
+                //ComparisonExpression
-                public Assignment getSymbolAssignment_0() { return cSymbolAssignment_0; }
+                public RuleCall getComparisonExpressionParserRuleCall_0() { return cComparisonExpressionParserRuleCall_0; }
-                
-                //Symbol
-                public RuleCall getSymbolSymbolParserRuleCall_0_0() { return cSymbolSymbolParserRuleCall_0_0; }
                
-                //('(' (objects+=ComplexObject (',' objects+=ComplexObject)*)? ')')?
+                //({Conjunction.children+=current} ("," children+=ComparisonExpression)+)?
                public Group getGroup_1() { return cGroup_1; }
                
-                //'('
+                //{Conjunction.children+=current}
-                public Keyword getLeftParenthesisKeyword_1_0() { return cLeftParenthesisKeyword_1_0; }
+                public Action getConjunctionChildrenAction_1_0() { return cConjunctionChildrenAction_1_0; }
                
-                //(objects+=ComplexObject (',' objects+=ComplexObject)*)?
+                //("," children+=ComparisonExpression)+
                public Group getGroup_1_1() { return cGroup_1_1; }
                
-                //objects+=ComplexObject
+                //","
-                public Assignment getObjectsAssignment_1_1_0() { return cObjectsAssignment_1_1_0; }
+                public Keyword getCommaKeyword_1_1_0() { return cCommaKeyword_1_1_0; }
                
-                //ComplexObject
+                //children+=ComparisonExpression
-                public RuleCall getObjectsComplexObjectParserRuleCall_1_1_0_0() { return cObjectsComplexObjectParserRuleCall_1_1_0_0; }
+                public Assignment getChildrenAssignment_1_1_1() { return cChildrenAssignment_1_1_1; }
                
-                //(',' objects+=ComplexObject)*
+                //ComparisonExpression
-                public Group getGroup_1_1_1() { return cGroup_1_1_1; }
+                public RuleCall getChildrenComparisonExpressionParserRuleCall_1_1_1_0() { return cChildrenComparisonExpressionParserRuleCall_1_1_1_0; }
+        }
+        public class ComparisonExpressionElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.ComparisonExpression");
+                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final RuleCall cAdditiveExpressionParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
+                private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
+                private final Action cComparisonLeftAction_1_0 = (Action)cGroup_1.eContents().get(0);
+                private final Assignment cOpAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);
+                private final RuleCall cOpComparisonOperatorEnumRuleCall_1_1_0 = (RuleCall)cOpAssignment_1_1.eContents().get(0);
+                private final Assignment cRightAssignment_1_2 = (Assignment)cGroup_1.eContents().get(2);
+                private final RuleCall cRightAdditiveExpressionParserRuleCall_1_2_0 = (RuleCall)cRightAssignment_1_2.eContents().get(0);
+                
+                //ComparisonExpression Expression:
+                //      AdditiveExpression ({Comparison.left=current} op=ComparisonOperator right=AdditiveExpression)?;
+                @Override public ParserRule getRule() { return rule; }
                
-                //','
+                //AdditiveExpression ({Comparison.left=current} op=ComparisonOperator right=AdditiveExpression)?
-                public Keyword getCommaKeyword_1_1_1_0() { return cCommaKeyword_1_1_1_0; }
+                public Group getGroup() { return cGroup; }
                
-                //objects+=ComplexObject
+                //AdditiveExpression
-                public Assignment getObjectsAssignment_1_1_1_1() { return cObjectsAssignment_1_1_1_1; }
+                public RuleCall getAdditiveExpressionParserRuleCall_0() { return cAdditiveExpressionParserRuleCall_0; }
                
-                //ComplexObject
+                //({Comparison.left=current} op=ComparisonOperator right=AdditiveExpression)?
-                public RuleCall getObjectsComplexObjectParserRuleCall_1_1_1_1_0() { return cObjectsComplexObjectParserRuleCall_1_1_1_1_0; }
+                public Group getGroup_1() { return cGroup_1; }
                
-                //')'
+                //{Comparison.left=current}
-                public Keyword getRightParenthesisKeyword_1_2() { return cRightParenthesisKeyword_1_2; }
+                public Action getComparisonLeftAction_1_0() { return cComparisonLeftAction_1_0; }
                
-                //':'
+                //op=ComparisonOperator
-                public Keyword getColonKeyword_2() { return cColonKeyword_2; }
+                public Assignment getOpAssignment_1_1() { return cOpAssignment_1_1; }
                
-                //value=TruthValue
+                //ComparisonOperator
-                public Assignment getValueAssignment_3() { return cValueAssignment_3; }
+                public RuleCall getOpComparisonOperatorEnumRuleCall_1_1_0() { return cOpComparisonOperatorEnumRuleCall_1_1_0; }
                
-                //TruthValue
+                //right=AdditiveExpression
-                public RuleCall getValueTruthValueParserRuleCall_3_0() { return cValueTruthValueParserRuleCall_3_0; }
+                public Assignment getRightAssignment_1_2() { return cRightAssignment_1_2; }
+                
+                //AdditiveExpression
+                public RuleCall getRightAdditiveExpressionParserRuleCall_1_2_0() { return cRightAdditiveExpressionParserRuleCall_1_2_0; }
        }
-        public class SymbolElements extends AbstractParserRuleElementFinder {
+        public class AdditiveExpressionElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.Symbol");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.AdditiveExpression");
-                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final Group cGroup = (Group)rule.eContents().get(1);
-                private final RuleCall cModelSymbolParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+                private final RuleCall cMultiplicativeExpressionParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
-                private final RuleCall cPartialitySymbolParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+                private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
-                private final RuleCall cDataSymbolParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
+                private final Action cBinaryExpressionLeftAction_1_0 = (Action)cGroup_1.eContents().get(0);
+                private final Assignment cOpAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);
+                private final RuleCall cOpAdditiveBinaryOperatorEnumRuleCall_1_1_0 = (RuleCall)cOpAssignment_1_1.eContents().get(0);
+                private final Assignment cRightAssignment_1_2 = (Assignment)cGroup_1.eContents().get(2);
+                private final RuleCall cRightMultiplicativeExpressionParserRuleCall_1_2_0 = (RuleCall)cRightAssignment_1_2.eContents().get(0);
+                
+                //AdditiveExpression Expression:
+                //      MultiplicativeExpression ({BinaryExpression.left=current} op=AdditiveBinaryOperator right=MultiplicativeExpression)*;
+                @Override public ParserRule getRule() { return rule; }
                
-                //Symbol:
+                //MultiplicativeExpression ({BinaryExpression.left=current} op=AdditiveBinaryOperator right=MultiplicativeExpression)*
-                //      ModelSymbol | PartialitySymbol | DataSymbol;
+                public Group getGroup() { return cGroup; }
+                
+                //MultiplicativeExpression
+                public RuleCall getMultiplicativeExpressionParserRuleCall_0() { return cMultiplicativeExpressionParserRuleCall_0; }
+                
+                //({BinaryExpression.left=current} op=AdditiveBinaryOperator right=MultiplicativeExpression)*
+                public Group getGroup_1() { return cGroup_1; }
+                
+                //{BinaryExpression.left=current}
+                public Action getBinaryExpressionLeftAction_1_0() { return cBinaryExpressionLeftAction_1_0; }
+                
+                //op=AdditiveBinaryOperator
+                public Assignment getOpAssignment_1_1() { return cOpAssignment_1_1; }
+                
+                //AdditiveBinaryOperator
+                public RuleCall getOpAdditiveBinaryOperatorEnumRuleCall_1_1_0() { return cOpAdditiveBinaryOperatorEnumRuleCall_1_1_0; }
+                
+                //right=MultiplicativeExpression
+                public Assignment getRightAssignment_1_2() { return cRightAssignment_1_2; }
+                
+                //MultiplicativeExpression
+                public RuleCall getRightMultiplicativeExpressionParserRuleCall_1_2_0() { return cRightMultiplicativeExpressionParserRuleCall_1_2_0; }
+        }
+        public class MultiplicativeExpressionElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.MultiplicativeExpression");
+                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final RuleCall cExponentialExpressionParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
+                private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
+                private final Action cBinaryExpressionLeftAction_1_0 = (Action)cGroup_1.eContents().get(0);
+                private final Assignment cOpAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);
+                private final RuleCall cOpMultiplicativeBinaryOperatorEnumRuleCall_1_1_0 = (RuleCall)cOpAssignment_1_1.eContents().get(0);
+                private final Assignment cRightAssignment_1_2 = (Assignment)cGroup_1.eContents().get(2);
+                private final RuleCall cRightExponentialExpressionParserRuleCall_1_2_0 = (RuleCall)cRightAssignment_1_2.eContents().get(0);
+                
+                //MultiplicativeExpression Expression:
+                //      ExponentialExpression ({BinaryExpression.left=current} op=MultiplicativeBinaryOperator right=ExponentialExpression)*;
                @Override public ParserRule getRule() { return rule; }
                
-                //ModelSymbol | PartialitySymbol | DataSymbol
+                //ExponentialExpression ({BinaryExpression.left=current} op=MultiplicativeBinaryOperator right=ExponentialExpression)*
-                public Alternatives getAlternatives() { return cAlternatives; }
+                public Group getGroup() { return cGroup; }
+                
+                //ExponentialExpression
+                public RuleCall getExponentialExpressionParserRuleCall_0() { return cExponentialExpressionParserRuleCall_0; }
                
-                //ModelSymbol
+                //({BinaryExpression.left=current} op=MultiplicativeBinaryOperator right=ExponentialExpression)*
-                public RuleCall getModelSymbolParserRuleCall_0() { return cModelSymbolParserRuleCall_0; }
+                public Group getGroup_1() { return cGroup_1; }
                
-                //PartialitySymbol
+                //{BinaryExpression.left=current}
-                public RuleCall getPartialitySymbolParserRuleCall_1() { return cPartialitySymbolParserRuleCall_1; }
+                public Action getBinaryExpressionLeftAction_1_0() { return cBinaryExpressionLeftAction_1_0; }
                
-                //DataSymbol
+                //op=MultiplicativeBinaryOperator
-                public RuleCall getDataSymbolParserRuleCall_2() { return cDataSymbolParserRuleCall_2; }
+                public Assignment getOpAssignment_1_1() { return cOpAssignment_1_1; }
+                
+                //MultiplicativeBinaryOperator
+                public RuleCall getOpMultiplicativeBinaryOperatorEnumRuleCall_1_1_0() { return cOpMultiplicativeBinaryOperatorEnumRuleCall_1_1_0; }
+                
+                //right=ExponentialExpression
+                public Assignment getRightAssignment_1_2() { return cRightAssignment_1_2; }
+                
+                //ExponentialExpression
+                public RuleCall getRightExponentialExpressionParserRuleCall_1_2_0() { return cRightExponentialExpressionParserRuleCall_1_2_0; }
        }
-        public class ModelSymbolElements extends AbstractParserRuleElementFinder {
+        public class ExponentialExpressionElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.ModelSymbol");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.ExponentialExpression");
-                private final Assignment cNameAssignment = (Assignment)rule.eContents().get(1);
+                private final Group cGroup = (Group)rule.eContents().get(1);
-                private final RuleCall cNameIDTerminalRuleCall_0 = (RuleCall)cNameAssignment.eContents().get(0);
+                private final RuleCall cUnaryExpressionParserRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
+                private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
+                private final Action cBinaryExpressionLeftAction_1_0 = (Action)cGroup_1.eContents().get(0);
+                private final Assignment cOpAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);
+                private final RuleCall cOpExponentialOpEnumRuleCall_1_1_0 = (RuleCall)cOpAssignment_1_1.eContents().get(0);
+                private final Assignment cRightAssignment_1_2 = (Assignment)cGroup_1.eContents().get(2);
+                private final RuleCall cRightExponentialExpressionParserRuleCall_1_2_0 = (RuleCall)cRightAssignment_1_2.eContents().get(0);
+                
+                //ExponentialExpression Expression:
+                //      UnaryExpression ({BinaryExpression.left=current} op=ExponentialOp right=ExponentialExpression)?;
+                @Override public ParserRule getRule() { return rule; }
+                
+                //UnaryExpression ({BinaryExpression.left=current} op=ExponentialOp right=ExponentialExpression)?
+                public Group getGroup() { return cGroup; }
+                
+                //UnaryExpression
+                public RuleCall getUnaryExpressionParserRuleCall_0() { return cUnaryExpressionParserRuleCall_0; }
+                
+                //({BinaryExpression.left=current} op=ExponentialOp right=ExponentialExpression)?
+                public Group getGroup_1() { return cGroup_1; }
+                
+                //{BinaryExpression.left=current}
+                public Action getBinaryExpressionLeftAction_1_0() { return cBinaryExpressionLeftAction_1_0; }
+                
+                //op=ExponentialOp
+                public Assignment getOpAssignment_1_1() { return cOpAssignment_1_1; }
+                
+                //ExponentialOp
+                public RuleCall getOpExponentialOpEnumRuleCall_1_1_0() { return cOpExponentialOpEnumRuleCall_1_1_0; }
                
-                //ModelSymbol:
+                //right=ExponentialExpression
-                //      name=ID;
+                public Assignment getRightAssignment_1_2() { return cRightAssignment_1_2; }
+                
+                //ExponentialExpression
+                public RuleCall getRightExponentialExpressionParserRuleCall_1_2_0() { return cRightExponentialExpressionParserRuleCall_1_2_0; }
+        }
+        public class UnaryExpressionElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.UnaryExpression");
+                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final RuleCall cAggregationExpressionParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+                private final Group cGroup_1 = (Group)cAlternatives.eContents().get(1);
+                private final Action cUnaryExpressionAction_1_0 = (Action)cGroup_1.eContents().get(0);
+                private final Assignment cOpAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);
+                private final RuleCall cOpUnaryOpEnumRuleCall_1_1_0 = (RuleCall)cOpAssignment_1_1.eContents().get(0);
+                private final Assignment cBodyAssignment_1_2 = (Assignment)cGroup_1.eContents().get(2);
+                private final RuleCall cBodyAggregationExpressionParserRuleCall_1_2_0 = (RuleCall)cBodyAssignment_1_2.eContents().get(0);
+                
+                //UnaryExpression Expression:
+                //      AggregationExpression | {UnaryExpression} op=UnaryOp body=AggregationExpression;
                @Override public ParserRule getRule() { return rule; }
                
-                //name=ID
+                //AggregationExpression | {UnaryExpression} op=UnaryOp body=AggregationExpression
-                public Assignment getNameAssignment() { return cNameAssignment; }
+                public Alternatives getAlternatives() { return cAlternatives; }
                
-                //ID
+                //AggregationExpression
-                public RuleCall getNameIDTerminalRuleCall_0() { return cNameIDTerminalRuleCall_0; }
+                public RuleCall getAggregationExpressionParserRuleCall_0() { return cAggregationExpressionParserRuleCall_0; }
+                
+                //{UnaryExpression} op=UnaryOp body=AggregationExpression
+                public Group getGroup_1() { return cGroup_1; }
+                
+                //{UnaryExpression}
+                public Action getUnaryExpressionAction_1_0() { return cUnaryExpressionAction_1_0; }
+                
+                //op=UnaryOp
+                public Assignment getOpAssignment_1_1() { return cOpAssignment_1_1; }
+                
+                //UnaryOp
+                public RuleCall getOpUnaryOpEnumRuleCall_1_1_0() { return cOpUnaryOpEnumRuleCall_1_1_0; }
+                
+                //body=AggregationExpression
+                public Assignment getBodyAssignment_1_2() { return cBodyAssignment_1_2; }
+                
+                //AggregationExpression
+                public RuleCall getBodyAggregationExpressionParserRuleCall_1_2_0() { return cBodyAggregationExpressionParserRuleCall_1_2_0; }
        }
-        public class PartialitySymbolElements extends AbstractParserRuleElementFinder {
+        public class AggregationExpressionElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.PartialitySymbol");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.AggregationExpression");
                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-                private final RuleCall cExistSymbolParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+                private final RuleCall cAtomicExpressionParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
-                private final RuleCall cEqualsSymbolParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+                private final RuleCall cCountParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+                private final RuleCall cAggregationParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
                
-                //PartialitySymbol:
+                //AggregationExpression Expression:
-                //      ExistSymbol | EqualsSymbol;
+                //      AtomicExpression | Count | Aggregation;
                @Override public ParserRule getRule() { return rule; }
                
-                //ExistSymbol | EqualsSymbol
+                //AtomicExpression | Count | Aggregation
                public Alternatives getAlternatives() { return cAlternatives; }
                
-                //ExistSymbol
+                //AtomicExpression
-                public RuleCall getExistSymbolParserRuleCall_0() { return cExistSymbolParserRuleCall_0; }
+                public RuleCall getAtomicExpressionParserRuleCall_0() { return cAtomicExpressionParserRuleCall_0; }
+                
+                //Count
+                public RuleCall getCountParserRuleCall_1() { return cCountParserRuleCall_1; }
                
-                //EqualsSymbol
+                //Aggregation
-                public RuleCall getEqualsSymbolParserRuleCall_1() { return cEqualsSymbolParserRuleCall_1; }
+                public RuleCall getAggregationParserRuleCall_2() { return cAggregationParserRuleCall_2; }
        }
-        public class ExistSymbolElements extends AbstractParserRuleElementFinder {
+        public class CountElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.ExistSymbol");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.Count");
                private final Group cGroup = (Group)rule.eContents().get(1);
-                private final Keyword cExistsKeyword_0 = (Keyword)cGroup.eContents().get(0);
+                private final Keyword cCountKeyword_0 = (Keyword)cGroup.eContents().get(0);
-                private final Action cExistSymbolAction_1 = (Action)cGroup.eContents().get(1);
+                private final Keyword cLeftCurlyBracketKeyword_1 = (Keyword)cGroup.eContents().get(1);
-                
+                private final Assignment cBodyAssignment_2 = (Assignment)cGroup.eContents().get(2);
-                //ExistSymbol:
+                private final RuleCall cBodyExpressionParserRuleCall_2_0 = (RuleCall)cBodyAssignment_2.eContents().get(0);
-                //      'exists' {ExistSymbol};
+                private final Keyword cRightCurlyBracketKeyword_3 = (Keyword)cGroup.eContents().get(3);
+                
+                //Count:
+                //      "count" "{" body=Expression "}";
                @Override public ParserRule getRule() { return rule; }
                
-                //'exists' {ExistSymbol}
+                //"count" "{" body=Expression "}"
                public Group getGroup() { return cGroup; }
                
-                //'exists'
+                //"count"
-                public Keyword getExistsKeyword_0() { return cExistsKeyword_0; }
+                public Keyword getCountKeyword_0() { return cCountKeyword_0; }
+                
+                //"{"
+                public Keyword getLeftCurlyBracketKeyword_1() { return cLeftCurlyBracketKeyword_1; }
+                
+                //body=Expression
+                public Assignment getBodyAssignment_2() { return cBodyAssignment_2; }
                
-                //{ExistSymbol}
+                //Expression
-                public Action getExistSymbolAction_1() { return cExistSymbolAction_1; }
+                public RuleCall getBodyExpressionParserRuleCall_2_0() { return cBodyExpressionParserRuleCall_2_0; }
+                
+                //"}"
+                public Keyword getRightCurlyBracketKeyword_3() { return cRightCurlyBracketKeyword_3; }
        }
-        public class EqualsSymbolElements extends AbstractParserRuleElementFinder {
+        public class AggregationElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.EqualsSymbol");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.Aggregation");
                private final Group cGroup = (Group)rule.eContents().get(1);
-                private final Keyword cEqualsKeyword_0 = (Keyword)cGroup.eContents().get(0);
+                private final Assignment cOpAssignment_0 = (Assignment)cGroup.eContents().get(0);
-                private final Action cEqualsSymbolAction_1 = (Action)cGroup.eContents().get(1);
+                private final RuleCall cOpAggregationOpEnumRuleCall_0_0 = (RuleCall)cOpAssignment_0.eContents().get(0);
-                
+                private final Keyword cLeftCurlyBracketKeyword_1 = (Keyword)cGroup.eContents().get(1);
-                //EqualsSymbol:
+                private final Assignment cBodyAssignment_2 = (Assignment)cGroup.eContents().get(2);
-                //      'equals' {EqualsSymbol};
+                private final RuleCall cBodyExpressionParserRuleCall_2_0 = (RuleCall)cBodyAssignment_2.eContents().get(0);
+                private final Keyword cVerticalLineKeyword_3 = (Keyword)cGroup.eContents().get(3);
+                private final Assignment cConditionAssignment_4 = (Assignment)cGroup.eContents().get(4);
+                private final RuleCall cConditionExpressionParserRuleCall_4_0 = (RuleCall)cConditionAssignment_4.eContents().get(0);
+                private final Keyword cRightCurlyBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);
+                
+                //Aggregation:
+                //      op=AggregationOp "{" body=Expression "|" condition=Expression "}";
                @Override public ParserRule getRule() { return rule; }
                
-                //'equals' {EqualsSymbol}
+                //op=AggregationOp "{" body=Expression "|" condition=Expression "}"
                public Group getGroup() { return cGroup; }
                
-                //'equals'
+                //op=AggregationOp
-                public Keyword getEqualsKeyword_0() { return cEqualsKeyword_0; }
+                public Assignment getOpAssignment_0() { return cOpAssignment_0; }
                
-                //{EqualsSymbol}
+                //AggregationOp
-                public Action getEqualsSymbolAction_1() { return cEqualsSymbolAction_1; }
+                public RuleCall getOpAggregationOpEnumRuleCall_0_0() { return cOpAggregationOpEnumRuleCall_0_0; }
+                
+                //"{"
+                public Keyword getLeftCurlyBracketKeyword_1() { return cLeftCurlyBracketKeyword_1; }
+                
+                //body=Expression
+                public Assignment getBodyAssignment_2() { return cBodyAssignment_2; }
+                
+                //Expression
+                public RuleCall getBodyExpressionParserRuleCall_2_0() { return cBodyExpressionParserRuleCall_2_0; }
+                
+                //"|"
+                public Keyword getVerticalLineKeyword_3() { return cVerticalLineKeyword_3; }
+                
+                //condition=Expression
+                public Assignment getConditionAssignment_4() { return cConditionAssignment_4; }
+                
+                //Expression
+                public RuleCall getConditionExpressionParserRuleCall_4_0() { return cConditionExpressionParserRuleCall_4_0; }
+                
+                //"}"
+                public Keyword getRightCurlyBracketKeyword_5() { return cRightCurlyBracketKeyword_5; }
        }
-        public class DataSymbolElements extends AbstractParserRuleElementFinder {
+        public class AtomicExpressionElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.DataSymbol");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.AtomicExpression");
                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-                private final RuleCall cBooleanSymbolParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+                private final RuleCall cReferenceParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
-                private final RuleCall cIntegerSymbolParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+                private final RuleCall cCallParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
-                private final RuleCall cRealSymbolParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
+                private final RuleCall cIntervalParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
-                private final RuleCall cStringSymbolParserRuleCall_3 = (RuleCall)cAlternatives.eContents().get(3);
+                private final RuleCall cLiteralParserRuleCall_3 = (RuleCall)cAlternatives.eContents().get(3);
-                
+                private final Group cGroup_4 = (Group)cAlternatives.eContents().get(4);
-                //DataSymbol:
+                private final Keyword cLeftParenthesisKeyword_4_0 = (Keyword)cGroup_4.eContents().get(0);
-                //      BooleanSymbol | IntegerSymbol | RealSymbol | StringSymbol;
+                private final RuleCall cExpressionParserRuleCall_4_1 = (RuleCall)cGroup_4.eContents().get(1);
+                private final Keyword cRightParenthesisKeyword_4_2 = (Keyword)cGroup_4.eContents().get(2);
+                
+                //AtomicExpression Expression:
+                //      Reference | Call | Interval | Literal | "(" Expression ")";
                @Override public ParserRule getRule() { return rule; }
                
-                //BooleanSymbol | IntegerSymbol | RealSymbol | StringSymbol
+                //Reference | Call | Interval | Literal | "(" Expression ")"
                public Alternatives getAlternatives() { return cAlternatives; }
                
-                //BooleanSymbol
+                //Reference
-                public RuleCall getBooleanSymbolParserRuleCall_0() { return cBooleanSymbolParserRuleCall_0; }
+                public RuleCall getReferenceParserRuleCall_0() { return cReferenceParserRuleCall_0; }
+                
+                //Call
+                public RuleCall getCallParserRuleCall_1() { return cCallParserRuleCall_1; }
                
-                //IntegerSymbol
+                //Interval
-                public RuleCall getIntegerSymbolParserRuleCall_1() { return cIntegerSymbolParserRuleCall_1; }
+                public RuleCall getIntervalParserRuleCall_2() { return cIntervalParserRuleCall_2; }
+                
+                //Literal
+                public RuleCall getLiteralParserRuleCall_3() { return cLiteralParserRuleCall_3; }
                
-                //RealSymbol
+                //"(" Expression ")"
-                public RuleCall getRealSymbolParserRuleCall_2() { return cRealSymbolParserRuleCall_2; }
+                public Group getGroup_4() { return cGroup_4; }
                
-                //StringSymbol
+                //"("
-                public RuleCall getStringSymbolParserRuleCall_3() { return cStringSymbolParserRuleCall_3; }
+                public Keyword getLeftParenthesisKeyword_4_0() { return cLeftParenthesisKeyword_4_0; }
+                
+                //Expression
+                public RuleCall getExpressionParserRuleCall_4_1() { return cExpressionParserRuleCall_4_1; }
+                
+                //")"
+                public Keyword getRightParenthesisKeyword_4_2() { return cRightParenthesisKeyword_4_2; }
        }
-        public class BooleanSymbolElements extends AbstractParserRuleElementFinder {
+        public class CallElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.BooleanSymbol");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.Call");
                private final Group cGroup = (Group)rule.eContents().get(1);
-                private final Keyword cBoolKeyword_0 = (Keyword)cGroup.eContents().get(0);
+                private final Assignment cFunctorAssignment_0 = (Assignment)cGroup.eContents().get(0);
-                private final Action cBooleanSymbolAction_1 = (Action)cGroup.eContents().get(1);
+                private final RuleCall cFunctorReferenceParserRuleCall_0_0 = (RuleCall)cFunctorAssignment_0.eContents().get(0);
-                
+                private final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1);
-                //BooleanSymbol:
+                private final Assignment cTransitiveClosureAssignment_1_0 = (Assignment)cAlternatives_1.eContents().get(0);
-                //      'bool' {BooleanSymbol};
+                private final RuleCall cTransitiveClosureTRANSITIVE_CLOSURETerminalRuleCall_1_0_0 = (RuleCall)cTransitiveClosureAssignment_1_0.eContents().get(0);
+                private final Assignment cReflexiveTransitiveClosureAssignment_1_1 = (Assignment)cAlternatives_1.eContents().get(1);
+                private final RuleCall cReflexiveTransitiveClosureREFLEXIVE_TRANSITIVE_CLOSURETerminalRuleCall_1_1_0 = (RuleCall)cReflexiveTransitiveClosureAssignment_1_1.eContents().get(0);
+                private final Assignment cArgumentListAssignment_2 = (Assignment)cGroup.eContents().get(2);
+                private final RuleCall cArgumentListArgumentListParserRuleCall_2_0 = (RuleCall)cArgumentListAssignment_2.eContents().get(0);
+                
+                //Call:
+                //      functor=Reference (transitiveClosure?=TRANSITIVE_CLOSURE | reflexiveTransitiveClosure?=REFLEXIVE_TRANSITIVE_CLOSURE)?
+                //      argumentList=ArgumentList;
                @Override public ParserRule getRule() { return rule; }
                
-                //'bool' {BooleanSymbol}
+                //functor=Reference (transitiveClosure?=TRANSITIVE_CLOSURE | reflexiveTransitiveClosure?=REFLEXIVE_TRANSITIVE_CLOSURE)?
+                //argumentList=ArgumentList
                public Group getGroup() { return cGroup; }
                
-                //'bool'
+                //functor=Reference
-                public Keyword getBoolKeyword_0() { return cBoolKeyword_0; }
+                public Assignment getFunctorAssignment_0() { return cFunctorAssignment_0; }
+                
+                //Reference
+                public RuleCall getFunctorReferenceParserRuleCall_0_0() { return cFunctorReferenceParserRuleCall_0_0; }
+                
+                //(transitiveClosure?=TRANSITIVE_CLOSURE | reflexiveTransitiveClosure?=REFLEXIVE_TRANSITIVE_CLOSURE)?
+                public Alternatives getAlternatives_1() { return cAlternatives_1; }
+                
+                //transitiveClosure?=TRANSITIVE_CLOSURE
+                public Assignment getTransitiveClosureAssignment_1_0() { return cTransitiveClosureAssignment_1_0; }
+                
+                //TRANSITIVE_CLOSURE
+                public RuleCall getTransitiveClosureTRANSITIVE_CLOSURETerminalRuleCall_1_0_0() { return cTransitiveClosureTRANSITIVE_CLOSURETerminalRuleCall_1_0_0; }
+                
+                //reflexiveTransitiveClosure?=REFLEXIVE_TRANSITIVE_CLOSURE
+                public Assignment getReflexiveTransitiveClosureAssignment_1_1() { return cReflexiveTransitiveClosureAssignment_1_1; }
                
-                //{BooleanSymbol}
+                //REFLEXIVE_TRANSITIVE_CLOSURE
-                public Action getBooleanSymbolAction_1() { return cBooleanSymbolAction_1; }
+                public RuleCall getReflexiveTransitiveClosureREFLEXIVE_TRANSITIVE_CLOSURETerminalRuleCall_1_1_0() { return cReflexiveTransitiveClosureREFLEXIVE_TRANSITIVE_CLOSURETerminalRuleCall_1_1_0; }
+                
+                //argumentList=ArgumentList
+                public Assignment getArgumentListAssignment_2() { return cArgumentListAssignment_2; }
+                
+                //ArgumentList
+                public RuleCall getArgumentListArgumentListParserRuleCall_2_0() { return cArgumentListArgumentListParserRuleCall_2_0; }
        }
-        public class IntegerSymbolElements extends AbstractParserRuleElementFinder {
+        public class ArgumentListElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.IntegerSymbol");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.ArgumentList");
                private final Group cGroup = (Group)rule.eContents().get(1);
-                private final Keyword cIntKeyword_0 = (Keyword)cGroup.eContents().get(0);
+                private final Action cArgumentListAction_0 = (Action)cGroup.eContents().get(0);
-                private final Action cIntegerSymbolAction_1 = (Action)cGroup.eContents().get(1);
+                private final Keyword cLeftParenthesisKeyword_1 = (Keyword)cGroup.eContents().get(1);
+                private final Group cGroup_2 = (Group)cGroup.eContents().get(2);
+                private final Assignment cArgumentsAssignment_2_0 = (Assignment)cGroup_2.eContents().get(0);
+                private final RuleCall cArgumentsArgumentParserRuleCall_2_0_0 = (RuleCall)cArgumentsAssignment_2_0.eContents().get(0);
+                private final Group cGroup_2_1 = (Group)cGroup_2.eContents().get(1);
+                private final Keyword cCommaKeyword_2_1_0 = (Keyword)cGroup_2_1.eContents().get(0);
+                private final Assignment cArgumentsAssignment_2_1_1 = (Assignment)cGroup_2_1.eContents().get(1);
+                private final RuleCall cArgumentsArgumentParserRuleCall_2_1_1_0 = (RuleCall)cArgumentsAssignment_2_1_1.eContents().get(0);
+                private final Keyword cRightParenthesisKeyword_3 = (Keyword)cGroup.eContents().get(3);
                
-                //IntegerSymbol:
+                //ArgumentList:
-                //      'int' {IntegerSymbol};
+                //      {ArgumentList} "(" (arguments+=Argument ("," arguments+=Argument)*)? ")";
                @Override public ParserRule getRule() { return rule; }
                
-                //'int' {IntegerSymbol}
+                //{ArgumentList} "(" (arguments+=Argument ("," arguments+=Argument)*)? ")"
                public Group getGroup() { return cGroup; }
                
-                //'int'
+                //{ArgumentList}
-                public Keyword getIntKeyword_0() { return cIntKeyword_0; }
+                public Action getArgumentListAction_0() { return cArgumentListAction_0; }
+                
+                //"("
+                public Keyword getLeftParenthesisKeyword_1() { return cLeftParenthesisKeyword_1; }
+                
+                //(arguments+=Argument ("," arguments+=Argument)*)?
+                public Group getGroup_2() { return cGroup_2; }
+                
+                //arguments+=Argument
+                public Assignment getArgumentsAssignment_2_0() { return cArgumentsAssignment_2_0; }
+                
+                //Argument
+                public RuleCall getArgumentsArgumentParserRuleCall_2_0_0() { return cArgumentsArgumentParserRuleCall_2_0_0; }
+                
+                //("," arguments+=Argument)*
+                public Group getGroup_2_1() { return cGroup_2_1; }
+                
+                //","
+                public Keyword getCommaKeyword_2_1_0() { return cCommaKeyword_2_1_0; }
+                
+                //arguments+=Argument
+                public Assignment getArgumentsAssignment_2_1_1() { return cArgumentsAssignment_2_1_1; }
+                
+                //Argument
+                public RuleCall getArgumentsArgumentParserRuleCall_2_1_1_0() { return cArgumentsArgumentParserRuleCall_2_1_1_0; }
+                
+                //")"
+                public Keyword getRightParenthesisKeyword_3() { return cRightParenthesisKeyword_3; }
+        }
+        public class ArgumentElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.Argument");
+                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final RuleCall cExpressionArgumentParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+                private final RuleCall cStarArgumentParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+                private final RuleCall cTypedArgumentParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
+                private final RuleCall cTypedStarArgumentParserRuleCall_3 = (RuleCall)cAlternatives.eContents().get(3);
+                
+                //Argument:
+                //      ExpressionArgument | StarArgument | TypedArgument | TypedStarArgument;
+                @Override public ParserRule getRule() { return rule; }
+                
+                //ExpressionArgument | StarArgument | TypedArgument | TypedStarArgument
+                public Alternatives getAlternatives() { return cAlternatives; }
+                
+                //ExpressionArgument
+                public RuleCall getExpressionArgumentParserRuleCall_0() { return cExpressionArgumentParserRuleCall_0; }
+                
+                //StarArgument
+                public RuleCall getStarArgumentParserRuleCall_1() { return cStarArgumentParserRuleCall_1; }
                
-                //{IntegerSymbol}
+                //TypedArgument
-                public Action getIntegerSymbolAction_1() { return cIntegerSymbolAction_1; }
+                public RuleCall getTypedArgumentParserRuleCall_2() { return cTypedArgumentParserRuleCall_2; }
+                
+                //TypedStarArgument
+                public RuleCall getTypedStarArgumentParserRuleCall_3() { return cTypedStarArgumentParserRuleCall_3; }
        }
-        public class RealSymbolElements extends AbstractParserRuleElementFinder {
+        public class ExpressionArgumentElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.RealSymbol");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.ExpressionArgument");
+                private final Assignment cBodyAssignment = (Assignment)rule.eContents().get(1);
+                private final RuleCall cBodyComparisonExpressionParserRuleCall_0 = (RuleCall)cBodyAssignment.eContents().get(0);
+                
+                //ExpressionArgument:
+                //      body=ComparisonExpression;
+                @Override public ParserRule getRule() { return rule; }
+                
+                //body=ComparisonExpression
+                public Assignment getBodyAssignment() { return cBodyAssignment; }
+                
+                //ComparisonExpression
+                public RuleCall getBodyComparisonExpressionParserRuleCall_0() { return cBodyComparisonExpressionParserRuleCall_0; }
+        }
+        public class StarArgumentElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.StarArgument");
                private final Group cGroup = (Group)rule.eContents().get(1);
-                private final Keyword cRealKeyword_0 = (Keyword)cGroup.eContents().get(0);
+                private final Action cStarArgumentAction_0 = (Action)cGroup.eContents().get(0);
-                private final Action cRealSymbolAction_1 = (Action)cGroup.eContents().get(1);
+                private final Keyword cAsteriskKeyword_1 = (Keyword)cGroup.eContents().get(1);
                
-                //RealSymbol:
+                //StarArgument:
-                //      'real' {RealSymbol};
+                //      {StarArgument} "*";
                @Override public ParserRule getRule() { return rule; }
                
-                //'real' {RealSymbol}
+                //{StarArgument} "*"
                public Group getGroup() { return cGroup; }
                
-                //'real'
+                //{StarArgument}
-                public Keyword getRealKeyword_0() { return cRealKeyword_0; }
+                public Action getStarArgumentAction_0() { return cStarArgumentAction_0; }
                
-                //{RealSymbol}
+                //"*"
-                public Action getRealSymbolAction_1() { return cRealSymbolAction_1; }
+                public Keyword getAsteriskKeyword_1() { return cAsteriskKeyword_1; }
        }
-        public class StringSymbolElements extends AbstractParserRuleElementFinder {
+        public class TypedArgumentElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.StringSymbol");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.TypedArgument");
                private final Group cGroup = (Group)rule.eContents().get(1);
-                private final Keyword cStringKeyword_0 = (Keyword)cGroup.eContents().get(0);
+                private final Assignment cTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);
-                private final Action cStringSymbolAction_1 = (Action)cGroup.eContents().get(1);
+                private final CrossReference cTypeNamedElementCrossReference_0_0 = (CrossReference)cTypeAssignment_0.eContents().get(0);
-                
+                private final RuleCall cTypeNamedElementQualifiedNameParserRuleCall_0_0_1 = (RuleCall)cTypeNamedElementCrossReference_0_0.eContents().get(1);
-                //StringSymbol:
+                private final Assignment cVariableAssignment_1 = (Assignment)cGroup.eContents().get(1);
-                //      'string' {StringSymbol};
+                private final CrossReference cVariableNamedElementCrossReference_1_0 = (CrossReference)cVariableAssignment_1.eContents().get(0);
+                private final RuleCall cVariableNamedElementQualifiedNameParserRuleCall_1_0_1 = (RuleCall)cVariableNamedElementCrossReference_1_0.eContents().get(1);
+                
+                //TypedArgument:
+                //      type=[NamedElement|QualifiedName] variable=[NamedElement|QualifiedName];
                @Override public ParserRule getRule() { return rule; }
                
-                //'string' {StringSymbol}
+                //type=[NamedElement|QualifiedName] variable=[NamedElement|QualifiedName]
                public Group getGroup() { return cGroup; }
                
-                //'string'
+                //type=[NamedElement|QualifiedName]
-                public Keyword getStringKeyword_0() { return cStringKeyword_0; }
+                public Assignment getTypeAssignment_0() { return cTypeAssignment_0; }
+                
+                //[NamedElement|QualifiedName]
+                public CrossReference getTypeNamedElementCrossReference_0_0() { return cTypeNamedElementCrossReference_0_0; }
+                
+                //QualifiedName
+                public RuleCall getTypeNamedElementQualifiedNameParserRuleCall_0_0_1() { return cTypeNamedElementQualifiedNameParserRuleCall_0_0_1; }
+                
+                //variable=[NamedElement|QualifiedName]
+                public Assignment getVariableAssignment_1() { return cVariableAssignment_1; }
+                
+                //[NamedElement|QualifiedName]
+                public CrossReference getVariableNamedElementCrossReference_1_0() { return cVariableNamedElementCrossReference_1_0; }
                
-                //{StringSymbol}
+                //QualifiedName
-                public Action getStringSymbolAction_1() { return cStringSymbolAction_1; }
+                public RuleCall getVariableNamedElementQualifiedNameParserRuleCall_1_0_1() { return cVariableNamedElementQualifiedNameParserRuleCall_1_0_1; }
        }
-        public class ComplexObjectElements extends AbstractParserRuleElementFinder {
+        public class TypedStarArgumentElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.ComplexObject");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.TypedStarArgument");
-                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final Group cGroup = (Group)rule.eContents().get(1);
-                private final RuleCall cObjectParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+                private final Assignment cTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);
-                private final RuleCall cAllInstancesParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+                private final CrossReference cTypeNamedElementCrossReference_0_0 = (CrossReference)cTypeAssignment_0.eContents().get(0);
-                private final RuleCall cAllObjectsParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
+                private final RuleCall cTypeNamedElementQualifiedNameParserRuleCall_0_0_1 = (RuleCall)cTypeNamedElementCrossReference_0_0.eContents().get(1);
+                private final Keyword cAsteriskKeyword_1 = (Keyword)cGroup.eContents().get(1);
                
-                //ComplexObject:
+                //TypedStarArgument:
-                //      Object | AllInstances | AllObjects;
+                //      type=[NamedElement|QualifiedName] "*";
                @Override public ParserRule getRule() { return rule; }
                
-                //Object | AllInstances | AllObjects
+                //type=[NamedElement|QualifiedName] "*"
-                public Alternatives getAlternatives() { return cAlternatives; }
+                public Group getGroup() { return cGroup; }
                
-                //Object
+                //type=[NamedElement|QualifiedName]
-                public RuleCall getObjectParserRuleCall_0() { return cObjectParserRuleCall_0; }
+                public Assignment getTypeAssignment_0() { return cTypeAssignment_0; }
                
-                //AllInstances
+                //[NamedElement|QualifiedName]
-                public RuleCall getAllInstancesParserRuleCall_1() { return cAllInstancesParserRuleCall_1; }
+                public CrossReference getTypeNamedElementCrossReference_0_0() { return cTypeNamedElementCrossReference_0_0; }
                
-                //AllObjects
+                //QualifiedName
-                public RuleCall getAllObjectsParserRuleCall_2() { return cAllObjectsParserRuleCall_2; }
+                public RuleCall getTypeNamedElementQualifiedNameParserRuleCall_0_0_1() { return cTypeNamedElementQualifiedNameParserRuleCall_0_0_1; }
+                
+                //"*"
+                public Keyword getAsteriskKeyword_1() { return cAsteriskKeyword_1; }
        }
-        public class ObjectElements extends AbstractParserRuleElementFinder {
+        public class ReferenceElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.Object");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.Reference");
-                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final Assignment cReferredAssignment = (Assignment)rule.eContents().get(1);
-                private final RuleCall cNamedObjectParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+                private final CrossReference cReferredNamedElementCrossReference_0 = (CrossReference)cReferredAssignment.eContents().get(0);
-                private final RuleCall cUnnamedObjectParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+                private final RuleCall cReferredNamedElementQualifiedNameParserRuleCall_0_1 = (RuleCall)cReferredNamedElementCrossReference_0.eContents().get(1);
-                private final RuleCall cDataObjectParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
                
-                //Object:
+                //Reference:
-                //      NamedObject | UnnamedObject | DataObject;
+                //      referred=[NamedElement|QualifiedName];
                @Override public ParserRule getRule() { return rule; }
                
-                //NamedObject | UnnamedObject | DataObject
+                //referred=[NamedElement|QualifiedName]
-                public Alternatives getAlternatives() { return cAlternatives; }
+                public Assignment getReferredAssignment() { return cReferredAssignment; }
-                
-                //NamedObject
-                public RuleCall getNamedObjectParserRuleCall_0() { return cNamedObjectParserRuleCall_0; }
                
-                //UnnamedObject
+                //[NamedElement|QualifiedName]
-                public RuleCall getUnnamedObjectParserRuleCall_1() { return cUnnamedObjectParserRuleCall_1; }
+                public CrossReference getReferredNamedElementCrossReference_0() { return cReferredNamedElementCrossReference_0; }
                
-                //DataObject
+                //QualifiedName
-                public RuleCall getDataObjectParserRuleCall_2() { return cDataObjectParserRuleCall_2; }
+                public RuleCall getReferredNamedElementQualifiedNameParserRuleCall_0_1() { return cReferredNamedElementQualifiedNameParserRuleCall_0_1; }
        }
-        public class NamedObjectElements extends AbstractParserRuleElementFinder {
+        public class IntervalElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.NamedObject");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.Interval");
                private final Group cGroup = (Group)rule.eContents().get(1);
-                private final Keyword cApostropheKeyword_0 = (Keyword)cGroup.eContents().get(0);
+                private final Keyword cLeftSquareBracketKeyword_0 = (Keyword)cGroup.eContents().get(0);
-                private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
+                private final Assignment cLowerBoundAssignment_1 = (Assignment)cGroup.eContents().get(1);
-                private final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);
+                private final RuleCall cLowerBoundExpressionParserRuleCall_1_0 = (RuleCall)cLowerBoundAssignment_1.eContents().get(0);
-                private final Keyword cApostropheKeyword_2 = (Keyword)cGroup.eContents().get(2);
+                private final Keyword cFullStopFullStopKeyword_2 = (Keyword)cGroup.eContents().get(2);
-                
+                private final Assignment cUpperBoundAssignment_3 = (Assignment)cGroup.eContents().get(3);
-                //NamedObject:
+                private final RuleCall cUpperBoundExpressionParserRuleCall_3_0 = (RuleCall)cUpperBoundAssignment_3.eContents().get(0);
-                //      "'" name=ID "'";
+                private final Keyword cRightSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
+                
+                //Interval:
+                //      "[" lowerBound=Expression ".." upperBound=Expression "]";
                @Override public ParserRule getRule() { return rule; }
                
-                //"'" name=ID "'"
+                //"[" lowerBound=Expression ".." upperBound=Expression "]"
                public Group getGroup() { return cGroup; }
                
-                //"'"
+                //"["
-                public Keyword getApostropheKeyword_0() { return cApostropheKeyword_0; }
+                public Keyword getLeftSquareBracketKeyword_0() { return cLeftSquareBracketKeyword_0; }
                
-                //name=ID
+                //lowerBound=Expression
-                public Assignment getNameAssignment_1() { return cNameAssignment_1; }
+                public Assignment getLowerBoundAssignment_1() { return cLowerBoundAssignment_1; }
                
-                //ID
+                //Expression
-                public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
+                public RuleCall getLowerBoundExpressionParserRuleCall_1_0() { return cLowerBoundExpressionParserRuleCall_1_0; }
                
-                //"'"
+                //".."
-                public Keyword getApostropheKeyword_2() { return cApostropheKeyword_2; }
+                public Keyword getFullStopFullStopKeyword_2() { return cFullStopFullStopKeyword_2; }
-        }
-        public class UnnamedObjectElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.UnnamedObject");
-                private final Assignment cNameAssignment = (Assignment)rule.eContents().get(1);
-                private final RuleCall cNameIDTerminalRuleCall_0 = (RuleCall)cNameAssignment.eContents().get(0);
                
-                //UnnamedObject:
+                //upperBound=Expression
-                //      name=ID;
+                public Assignment getUpperBoundAssignment_3() { return cUpperBoundAssignment_3; }
-                @Override public ParserRule getRule() { return rule; }
                
-                //name=ID
+                //Expression
-                public Assignment getNameAssignment() { return cNameAssignment; }
+                public RuleCall getUpperBoundExpressionParserRuleCall_3_0() { return cUpperBoundExpressionParserRuleCall_3_0; }
                
-                //ID
+                //"]"
-                public RuleCall getNameIDTerminalRuleCall_0() { return cNameIDTerminalRuleCall_0; }
+                public Keyword getRightSquareBracketKeyword_4() { return cRightSquareBracketKeyword_4; }
        }
-        public class DataObjectElements extends AbstractParserRuleElementFinder {
+        public class LiteralElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.DataObject");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.Literal");
                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-                private final RuleCall cBooleanObjectParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+                private final RuleCall cLogicLiteralParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
-                private final RuleCall cIntObjectParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+                private final RuleCall cNumericLiteralParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
-                private final RuleCall cRealObjectParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
+                private final RuleCall cInfinityLiteralParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
-                private final RuleCall cStringObjectParserRuleCall_3 = (RuleCall)cAlternatives.eContents().get(3);
+                private final RuleCall cEmptyIntervalLiteralParserRuleCall_3 = (RuleCall)cAlternatives.eContents().get(3);
+                private final RuleCall cStringLiteralParserRuleCall_4 = (RuleCall)cAlternatives.eContents().get(4);
                
-                //DataObject:
+                //Literal:
-                //      BooleanObject | IntObject | RealObject | StringObject;
+                //      LogicLiteral | NumericLiteral | InfinityLiteral | EmptyIntervalLiteral | StringLiteral;
                @Override public ParserRule getRule() { return rule; }
                
-                //BooleanObject | IntObject | RealObject | StringObject
+                //LogicLiteral | NumericLiteral | InfinityLiteral | EmptyIntervalLiteral | StringLiteral
                public Alternatives getAlternatives() { return cAlternatives; }
                
-                //BooleanObject
+                //LogicLiteral
-                public RuleCall getBooleanObjectParserRuleCall_0() { return cBooleanObjectParserRuleCall_0; }
+                public RuleCall getLogicLiteralParserRuleCall_0() { return cLogicLiteralParserRuleCall_0; }
+                
+                //NumericLiteral
+                public RuleCall getNumericLiteralParserRuleCall_1() { return cNumericLiteralParserRuleCall_1; }
                
-                //IntObject
+                //InfinityLiteral
-                public RuleCall getIntObjectParserRuleCall_1() { return cIntObjectParserRuleCall_1; }
+                public RuleCall getInfinityLiteralParserRuleCall_2() { return cInfinityLiteralParserRuleCall_2; }
                
-                //RealObject
+                //EmptyIntervalLiteral
-                public RuleCall getRealObjectParserRuleCall_2() { return cRealObjectParserRuleCall_2; }
+                public RuleCall getEmptyIntervalLiteralParserRuleCall_3() { return cEmptyIntervalLiteralParserRuleCall_3; }
                
-                //StringObject
+                //StringLiteral
-                public RuleCall getStringObjectParserRuleCall_3() { return cStringObjectParserRuleCall_3; }
+                public RuleCall getStringLiteralParserRuleCall_4() { return cStringLiteralParserRuleCall_4; }
        }
-        public class BooleanObjectElements extends AbstractParserRuleElementFinder {
+        public class LogicLiteralElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.BooleanObject");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.LogicLiteral");
                private final Assignment cValueAssignment = (Assignment)rule.eContents().get(1);
-                private final RuleCall cValueBooleanValueParserRuleCall_0 = (RuleCall)cValueAssignment.eContents().get(0);
+                private final RuleCall cValueLogicValueEnumRuleCall_0 = (RuleCall)cValueAssignment.eContents().get(0);
                
-                //BooleanObject:
+                //LogicLiteral:
-                //      value=BooleanValue;
+                //      value=LogicValue;
                @Override public ParserRule getRule() { return rule; }
                
-                //value=BooleanValue
+                //value=LogicValue
                public Assignment getValueAssignment() { return cValueAssignment; }
                
-                //BooleanValue
+                //LogicValue
-                public RuleCall getValueBooleanValueParserRuleCall_0() { return cValueBooleanValueParserRuleCall_0; }
+                public RuleCall getValueLogicValueEnumRuleCall_0() { return cValueLogicValueEnumRuleCall_0; }
        }
-        public class IntObjectElements extends AbstractParserRuleElementFinder {
+        public class NumericLiteralElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.IntObject");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.NumericLiteral");
                private final Assignment cValueAssignment = (Assignment)rule.eContents().get(1);
-                private final RuleCall cValueINTLiteralParserRuleCall_0 = (RuleCall)cValueAssignment.eContents().get(0);
+                private final RuleCall cValueRealParserRuleCall_0 = (RuleCall)cValueAssignment.eContents().get(0);
                
-                //IntObject:
+                //NumericLiteral:
-                //      value=INTLiteral;
+                //      value=Real;
                @Override public ParserRule getRule() { return rule; }
                
-                //value=INTLiteral
+                //value=Real
                public Assignment getValueAssignment() { return cValueAssignment; }
                
-                //INTLiteral
+                //Real
-                public RuleCall getValueINTLiteralParserRuleCall_0() { return cValueINTLiteralParserRuleCall_0; }
+                public RuleCall getValueRealParserRuleCall_0() { return cValueRealParserRuleCall_0; }
        }
-        public class RealObjectElements extends AbstractParserRuleElementFinder {
+        public class InfinityLiteralElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.RealObject");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.InfinityLiteral");
-                private final Assignment cValueAssignment = (Assignment)rule.eContents().get(1);
+                private final Group cGroup = (Group)rule.eContents().get(1);
-                private final RuleCall cValueREALLiteralParserRuleCall_0 = (RuleCall)cValueAssignment.eContents().get(0);
+                private final Action cInfinityLiteralAction_0 = (Action)cGroup.eContents().get(0);
+                private final Keyword cInfKeyword_1 = (Keyword)cGroup.eContents().get(1);
                
-                //RealObject:
+                //InfinityLiteral:
-                //      value=REALLiteral;
+                //      {InfinityLiteral} "inf";
                @Override public ParserRule getRule() { return rule; }
                
-                //value=REALLiteral
+                //{InfinityLiteral} "inf"
-                public Assignment getValueAssignment() { return cValueAssignment; }
+                public Group getGroup() { return cGroup; }
+                
+                //{InfinityLiteral}
+                public Action getInfinityLiteralAction_0() { return cInfinityLiteralAction_0; }
                
-                //REALLiteral
+                //"inf"
-                public RuleCall getValueREALLiteralParserRuleCall_0() { return cValueREALLiteralParserRuleCall_0; }
+                public Keyword getInfKeyword_1() { return cInfKeyword_1; }
        }
-        public class StringObjectElements extends AbstractParserRuleElementFinder {
+        public class EmptyIntervalLiteralElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.StringObject");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.EmptyIntervalLiteral");
+                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final Action cEmptyIntervalLiteralAction_0 = (Action)cGroup.eContents().get(0);
+                private final Keyword cEmptyKeyword_1 = (Keyword)cGroup.eContents().get(1);
+                
+                //EmptyIntervalLiteral:
+                //      {EmptyIntervalLiteral} "empty";
+                @Override public ParserRule getRule() { return rule; }
+                
+                //{EmptyIntervalLiteral} "empty"
+                public Group getGroup() { return cGroup; }
+                
+                //{EmptyIntervalLiteral}
+                public Action getEmptyIntervalLiteralAction_0() { return cEmptyIntervalLiteralAction_0; }
+                
+                //"empty"
+                public Keyword getEmptyKeyword_1() { return cEmptyKeyword_1; }
+        }
+        public class StringLiteralElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.StringLiteral");
                private final Assignment cValueAssignment = (Assignment)rule.eContents().get(1);
                private final RuleCall cValueSTRINGTerminalRuleCall_0 = (RuleCall)cValueAssignment.eContents().get(0);
                
-                //StringObject:
+                //StringLiteral:
                //      value=STRING;
                @Override public ParserRule getRule() { return rule; }
                
@@ -667,817 +1387,1181 @@ public class SolverLanguageGrammarAccess extends AbstractGrammarElementFinder {
                //STRING
                public RuleCall getValueSTRINGTerminalRuleCall_0() { return cValueSTRINGTerminalRuleCall_0; }
        }
-        public class PredicateElements extends AbstractParserRuleElementFinder {
+        public class ClassDefinitionElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.Predicate");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.ClassDefinition");
                private final Group cGroup = (Group)rule.eContents().get(1);
-                private final Assignment cIsErrorAssignment_0 = (Assignment)cGroup.eContents().get(0);
+                private final Assignment cAbstractAssignment_0 = (Assignment)cGroup.eContents().get(0);
-                private final Keyword cIsErrorErrorKeyword_0_0 = (Keyword)cIsErrorAssignment_0.eContents().get(0);
+                private final Keyword cAbstractAbstractKeyword_0_0 = (Keyword)cAbstractAssignment_0.eContents().get(0);
-                private final Assignment cSymbolAssignment_1 = (Assignment)cGroup.eContents().get(1);
+                private final Keyword cClassKeyword_1 = (Keyword)cGroup.eContents().get(1);
-                private final RuleCall cSymbolModelSymbolParserRuleCall_1_0 = (RuleCall)cSymbolAssignment_1.eContents().get(0);
+                private final Assignment cNameAssignment_2 = (Assignment)cGroup.eContents().get(2);
-                private final Group cGroup_2 = (Group)cGroup.eContents().get(2);
+                private final RuleCall cNameIDTerminalRuleCall_2_0 = (RuleCall)cNameAssignment_2.eContents().get(0);
-                private final Keyword cLeftParenthesisKeyword_2_0 = (Keyword)cGroup_2.eContents().get(0);
+                private final Group cGroup_3 = (Group)cGroup.eContents().get(3);
-                private final Group cGroup_2_1 = (Group)cGroup_2.eContents().get(1);
+                private final Keyword cExtendsKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);
-                private final Assignment cParametersAssignment_2_1_0 = (Assignment)cGroup_2_1.eContents().get(0);
+                private final Assignment cSuperclassesAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);
-                private final RuleCall cParametersParameterParserRuleCall_2_1_0_0 = (RuleCall)cParametersAssignment_2_1_0.eContents().get(0);
+                private final CrossReference cSuperclassesNamedElementCrossReference_3_1_0 = (CrossReference)cSuperclassesAssignment_3_1.eContents().get(0);
-                private final Group cGroup_2_1_1 = (Group)cGroup_2_1.eContents().get(1);
+                private final RuleCall cSuperclassesNamedElementQualifiedNameParserRuleCall_3_1_0_1 = (RuleCall)cSuperclassesNamedElementCrossReference_3_1_0.eContents().get(1);
-                private final Keyword cCommaKeyword_2_1_1_0 = (Keyword)cGroup_2_1_1.eContents().get(0);
+                private final Group cGroup_3_2 = (Group)cGroup_3.eContents().get(2);
-                private final Assignment cParametersAssignment_2_1_1_1 = (Assignment)cGroup_2_1_1.eContents().get(1);
+                private final Keyword cCommaKeyword_3_2_0 = (Keyword)cGroup_3_2.eContents().get(0);
-                private final RuleCall cParametersParameterParserRuleCall_2_1_1_1_0 = (RuleCall)cParametersAssignment_2_1_1_1.eContents().get(0);
+                private final Assignment cSuperclassesAssignment_3_2_1 = (Assignment)cGroup_3_2.eContents().get(1);
-                private final Keyword cRightParenthesisKeyword_2_2 = (Keyword)cGroup_2.eContents().get(2);
+                private final CrossReference cSuperclassesNamedElementCrossReference_3_2_1_0 = (CrossReference)cSuperclassesAssignment_3_2_1.eContents().get(0);
-                private final Keyword cColonHyphenMinusKeyword_3 = (Keyword)cGroup.eContents().get(3);
+                private final RuleCall cSuperclassesNamedElementQualifiedNameParserRuleCall_3_2_1_0_1 = (RuleCall)cSuperclassesNamedElementCrossReference_3_2_1_0.eContents().get(1);
-                private final Alternatives cAlternatives_4 = (Alternatives)cGroup.eContents().get(4);
+                private final Keyword cLeftCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
-                private final Keyword cFalseKeyword_4_0 = (Keyword)cAlternatives_4.eContents().get(0);
+                private final Assignment cMembersAssignment_5 = (Assignment)cGroup.eContents().get(5);
-                private final Group cGroup_4_1 = (Group)cAlternatives_4.eContents().get(1);
+                private final RuleCall cMembersMemberDefinitionParserRuleCall_5_0 = (RuleCall)cMembersAssignment_5.eContents().get(0);
-                private final Assignment cBodiesAssignment_4_1_0 = (Assignment)cGroup_4_1.eContents().get(0);
+                private final Keyword cRightCurlyBracketKeyword_6 = (Keyword)cGroup.eContents().get(6);
-                private final RuleCall cBodiesPatternBodyParserRuleCall_4_1_0_0 = (RuleCall)cBodiesAssignment_4_1_0.eContents().get(0);
+                
-                private final Group cGroup_4_1_1 = (Group)cGroup_4_1.eContents().get(1);
+                //ClassDefinition:
-                private final Keyword cVerticalLineKeyword_4_1_1_0 = (Keyword)cGroup_4_1_1.eContents().get(0);
+                //      abstract?="abstract"? "class" name=ID ("extends" superclasses+=[NamedElement|QualifiedName] (","
-                private final Assignment cBodiesAssignment_4_1_1_1 = (Assignment)cGroup_4_1_1.eContents().get(1);
+                //      superclasses+=[NamedElement|QualifiedName])*)?
-                private final RuleCall cBodiesPatternBodyParserRuleCall_4_1_1_1_0 = (RuleCall)cBodiesAssignment_4_1_1_1.eContents().get(0);
+                //      "{" members+=MemberDefinition* "}";
-                private final Keyword cFullStopKeyword_5 = (Keyword)cGroup.eContents().get(5);
-                
-                /////////////////////
-                //// Predicte grammar
-                /////////////////////
-                //Predicate:
-                //      isError?='error'? symbol=ModelSymbol ('(' (parameters+=Parameter (',' parameters+=Parameter)*)? ')')? ':-' ('false' |
-                //      bodies+=PatternBody ('|' bodies+=PatternBody)*) '.';
                @Override public ParserRule getRule() { return rule; }
                
-                //isError?='error'? symbol=ModelSymbol ('(' (parameters+=Parameter (',' parameters+=Parameter)*)? ')')? ':-' ('false' |
+                //abstract?="abstract"? "class" name=ID ("extends" superclasses+=[NamedElement|QualifiedName] (","
-                //bodies+=PatternBody ('|' bodies+=PatternBody)*) '.'
+                //superclasses+=[NamedElement|QualifiedName])*)? "{" members+=MemberDefinition* "}"
                public Group getGroup() { return cGroup; }
                
-                //isError?='error'?
+                //abstract?="abstract"?
-                public Assignment getIsErrorAssignment_0() { return cIsErrorAssignment_0; }
+                public Assignment getAbstractAssignment_0() { return cAbstractAssignment_0; }
                
-                //'error'
+                //"abstract"
-                public Keyword getIsErrorErrorKeyword_0_0() { return cIsErrorErrorKeyword_0_0; }
+                public Keyword getAbstractAbstractKeyword_0_0() { return cAbstractAbstractKeyword_0_0; }
                
-                //symbol=ModelSymbol
+                //"class"
-                public Assignment getSymbolAssignment_1() { return cSymbolAssignment_1; }
+                public Keyword getClassKeyword_1() { return cClassKeyword_1; }
                
-                //ModelSymbol
+                //name=ID
-                public RuleCall getSymbolModelSymbolParserRuleCall_1_0() { return cSymbolModelSymbolParserRuleCall_1_0; }
+                public Assignment getNameAssignment_2() { return cNameAssignment_2; }
                
-                //('(' (parameters+=Parameter (',' parameters+=Parameter)*)? ')')?
+                //ID
-                public Group getGroup_2() { return cGroup_2; }
+                public RuleCall getNameIDTerminalRuleCall_2_0() { return cNameIDTerminalRuleCall_2_0; }
                
-                //'('
+                //("extends" superclasses+=[NamedElement|QualifiedName] ("," superclasses+=[NamedElement|QualifiedName])*)?
-                public Keyword getLeftParenthesisKeyword_2_0() { return cLeftParenthesisKeyword_2_0; }
+                public Group getGroup_3() { return cGroup_3; }
                
-                //(parameters+=Parameter (',' parameters+=Parameter)*)?
+                //"extends"
-                public Group getGroup_2_1() { return cGroup_2_1; }
+                public Keyword getExtendsKeyword_3_0() { return cExtendsKeyword_3_0; }
+                
+                //superclasses+=[NamedElement|QualifiedName]
+                public Assignment getSuperclassesAssignment_3_1() { return cSuperclassesAssignment_3_1; }
+                
+                //[NamedElement|QualifiedName]
+                public CrossReference getSuperclassesNamedElementCrossReference_3_1_0() { return cSuperclassesNamedElementCrossReference_3_1_0; }
+                
+                //QualifiedName
+                public RuleCall getSuperclassesNamedElementQualifiedNameParserRuleCall_3_1_0_1() { return cSuperclassesNamedElementQualifiedNameParserRuleCall_3_1_0_1; }
+                
+                //("," superclasses+=[NamedElement|QualifiedName])*
+                public Group getGroup_3_2() { return cGroup_3_2; }
+                
+                //","
+                public Keyword getCommaKeyword_3_2_0() { return cCommaKeyword_3_2_0; }
+                
+                //superclasses+=[NamedElement|QualifiedName]
+                public Assignment getSuperclassesAssignment_3_2_1() { return cSuperclassesAssignment_3_2_1; }
+                
+                //[NamedElement|QualifiedName]
+                public CrossReference getSuperclassesNamedElementCrossReference_3_2_1_0() { return cSuperclassesNamedElementCrossReference_3_2_1_0; }
+                
+                //QualifiedName
+                public RuleCall getSuperclassesNamedElementQualifiedNameParserRuleCall_3_2_1_0_1() { return cSuperclassesNamedElementQualifiedNameParserRuleCall_3_2_1_0_1; }
+                
+                //"{"
+                public Keyword getLeftCurlyBracketKeyword_4() { return cLeftCurlyBracketKeyword_4; }
+                
+                //members+=MemberDefinition*
+                public Assignment getMembersAssignment_5() { return cMembersAssignment_5; }
+                
+                //MemberDefinition
+                public RuleCall getMembersMemberDefinitionParserRuleCall_5_0() { return cMembersMemberDefinitionParserRuleCall_5_0; }
                
-                //parameters+=Parameter
+                //"}"
-                public Assignment getParametersAssignment_2_1_0() { return cParametersAssignment_2_1_0; }
+                public Keyword getRightCurlyBracketKeyword_6() { return cRightCurlyBracketKeyword_6; }
+        }
+        public class MemberDefinitionElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.MemberDefinition");
+                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final Assignment cContainmentAssignment_0 = (Assignment)cGroup.eContents().get(0);
+                private final Keyword cContainmentContainsKeyword_0_0 = (Keyword)cContainmentAssignment_0.eContents().get(0);
+                private final Assignment cTypeAssignment_1 = (Assignment)cGroup.eContents().get(1);
+                private final CrossReference cTypeNamedElementCrossReference_1_0 = (CrossReference)cTypeAssignment_1.eContents().get(0);
+                private final RuleCall cTypeNamedElementQualifiedNameParserRuleCall_1_0_1 = (RuleCall)cTypeNamedElementCrossReference_1_0.eContents().get(1);
+                private final Assignment cMultiplicityAssignment_2 = (Assignment)cGroup.eContents().get(2);
+                private final RuleCall cMultiplicityMultiplicityParserRuleCall_2_0 = (RuleCall)cMultiplicityAssignment_2.eContents().get(0);
+                private final Assignment cNameAssignment_3 = (Assignment)cGroup.eContents().get(3);
+                private final RuleCall cNameIDTerminalRuleCall_3_0 = (RuleCall)cNameAssignment_3.eContents().get(0);
+                private final Group cGroup_4 = (Group)cGroup.eContents().get(4);
+                private final Keyword cOppositeKeyword_4_0 = (Keyword)cGroup_4.eContents().get(0);
+                private final Assignment cOppositeAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);
+                private final CrossReference cOppositeNamedElementCrossReference_4_1_0 = (CrossReference)cOppositeAssignment_4_1.eContents().get(0);
+                private final RuleCall cOppositeNamedElementQualifiedNameParserRuleCall_4_1_0_1 = (RuleCall)cOppositeNamedElementCrossReference_4_1_0.eContents().get(1);
+                private final Keyword cSemicolonKeyword_5 = (Keyword)cGroup.eContents().get(5);
+                
+                //MemberDefinition:
+                //      containment?="contains"? type=[NamedElement|QualifiedName] multiplicity=Multiplicity? name=ID ("opposite"
+                //      opposite=[NamedElement|QualifiedName])? ";"?;
+                @Override public ParserRule getRule() { return rule; }
                
-                //Parameter
+                //containment?="contains"? type=[NamedElement|QualifiedName] multiplicity=Multiplicity? name=ID ("opposite"
-                public RuleCall getParametersParameterParserRuleCall_2_1_0_0() { return cParametersParameterParserRuleCall_2_1_0_0; }
+                //opposite=[NamedElement|QualifiedName])? ";"?
+                public Group getGroup() { return cGroup; }
                
-                //(',' parameters+=Parameter)*
+                //containment?="contains"?
-                public Group getGroup_2_1_1() { return cGroup_2_1_1; }
+                public Assignment getContainmentAssignment_0() { return cContainmentAssignment_0; }
                
-                //','
+                //"contains"
-                public Keyword getCommaKeyword_2_1_1_0() { return cCommaKeyword_2_1_1_0; }
+                public Keyword getContainmentContainsKeyword_0_0() { return cContainmentContainsKeyword_0_0; }
                
-                //parameters+=Parameter
+                //type=[NamedElement|QualifiedName]
-                public Assignment getParametersAssignment_2_1_1_1() { return cParametersAssignment_2_1_1_1; }
+                public Assignment getTypeAssignment_1() { return cTypeAssignment_1; }
                
-                //Parameter
+                //[NamedElement|QualifiedName]
-                public RuleCall getParametersParameterParserRuleCall_2_1_1_1_0() { return cParametersParameterParserRuleCall_2_1_1_1_0; }
+                public CrossReference getTypeNamedElementCrossReference_1_0() { return cTypeNamedElementCrossReference_1_0; }
                
-                //')'
+                //QualifiedName
-                public Keyword getRightParenthesisKeyword_2_2() { return cRightParenthesisKeyword_2_2; }
+                public RuleCall getTypeNamedElementQualifiedNameParserRuleCall_1_0_1() { return cTypeNamedElementQualifiedNameParserRuleCall_1_0_1; }
                
-                //':-'
+                //multiplicity=Multiplicity?
-                public Keyword getColonHyphenMinusKeyword_3() { return cColonHyphenMinusKeyword_3; }
+                public Assignment getMultiplicityAssignment_2() { return cMultiplicityAssignment_2; }
                
-                //'false' | bodies+=PatternBody ('|' bodies+=PatternBody)*
+                //Multiplicity
-                public Alternatives getAlternatives_4() { return cAlternatives_4; }
+                public RuleCall getMultiplicityMultiplicityParserRuleCall_2_0() { return cMultiplicityMultiplicityParserRuleCall_2_0; }
                
-                //'false'
+                //name=ID
-                public Keyword getFalseKeyword_4_0() { return cFalseKeyword_4_0; }
+                public Assignment getNameAssignment_3() { return cNameAssignment_3; }
                
-                //bodies+=PatternBody ('|' bodies+=PatternBody)*
+                //ID
-                public Group getGroup_4_1() { return cGroup_4_1; }
+                public RuleCall getNameIDTerminalRuleCall_3_0() { return cNameIDTerminalRuleCall_3_0; }
                
-                //bodies+=PatternBody
+                //("opposite" opposite=[NamedElement|QualifiedName])?
-                public Assignment getBodiesAssignment_4_1_0() { return cBodiesAssignment_4_1_0; }
+                public Group getGroup_4() { return cGroup_4; }
                
-                //PatternBody
+                //"opposite"
-                public RuleCall getBodiesPatternBodyParserRuleCall_4_1_0_0() { return cBodiesPatternBodyParserRuleCall_4_1_0_0; }
+                public Keyword getOppositeKeyword_4_0() { return cOppositeKeyword_4_0; }
                
-                //('|' bodies+=PatternBody)*
+                //opposite=[NamedElement|QualifiedName]
-                public Group getGroup_4_1_1() { return cGroup_4_1_1; }
+                public Assignment getOppositeAssignment_4_1() { return cOppositeAssignment_4_1; }
                
-                //'|'
+                //[NamedElement|QualifiedName]
-                public Keyword getVerticalLineKeyword_4_1_1_0() { return cVerticalLineKeyword_4_1_1_0; }
+                public CrossReference getOppositeNamedElementCrossReference_4_1_0() { return cOppositeNamedElementCrossReference_4_1_0; }
                
-                //bodies+=PatternBody
+                //QualifiedName
-                public Assignment getBodiesAssignment_4_1_1_1() { return cBodiesAssignment_4_1_1_1; }
+                public RuleCall getOppositeNamedElementQualifiedNameParserRuleCall_4_1_0_1() { return cOppositeNamedElementQualifiedNameParserRuleCall_4_1_0_1; }
                
-                //PatternBody
+                //";"?
-                public RuleCall getBodiesPatternBodyParserRuleCall_4_1_1_1_0() { return cBodiesPatternBodyParserRuleCall_4_1_1_1_0; }
+                public Keyword getSemicolonKeyword_5() { return cSemicolonKeyword_5; }
+        }
+        public class MultiplicityElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.Multiplicity");
+                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final RuleCall cManyMultiplicityParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+                private final RuleCall cExactMultiplicityParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+                private final RuleCall cBoundedMultiplicityParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
                
-                //'.'
+                //Multiplicity:
-                public Keyword getFullStopKeyword_5() { return cFullStopKeyword_5; }
+                //      ManyMultiplicity | ExactMultiplicity | BoundedMultiplicity;
+                @Override public ParserRule getRule() { return rule; }
+                
+                //ManyMultiplicity | ExactMultiplicity | BoundedMultiplicity
+                public Alternatives getAlternatives() { return cAlternatives; }
+                
+                //ManyMultiplicity
+                public RuleCall getManyMultiplicityParserRuleCall_0() { return cManyMultiplicityParserRuleCall_0; }
+                
+                //ExactMultiplicity
+                public RuleCall getExactMultiplicityParserRuleCall_1() { return cExactMultiplicityParserRuleCall_1; }
+                
+                //BoundedMultiplicity
+                public RuleCall getBoundedMultiplicityParserRuleCall_2() { return cBoundedMultiplicityParserRuleCall_2; }
        }
-        public class ParameterElements extends AbstractParserRuleElementFinder {
+        public class ManyMultiplicityElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.Parameter");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.ManyMultiplicity");
                private final Group cGroup = (Group)rule.eContents().get(1);
-                private final Assignment cVariableAssignment_0 = (Assignment)cGroup.eContents().get(0);
+                private final Action cManyMultiplicityAction_0 = (Action)cGroup.eContents().get(0);
-                private final RuleCall cVariableVariableParserRuleCall_0_0 = (RuleCall)cVariableAssignment_0.eContents().get(0);
+                private final Keyword cLeftSquareBracketKeyword_1 = (Keyword)cGroup.eContents().get(1);
-                private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
+                private final Keyword cRightSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);
-                private final Keyword cColonKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);
-                private final Assignment cTypeAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1);
-                private final RuleCall cTypeSymbolParserRuleCall_1_1_0 = (RuleCall)cTypeAssignment_1_1.eContents().get(0);
                
-                //Parameter:
+                //ManyMultiplicity:
-                //      variable=Variable (':' type=Symbol)?;
+                //      {ManyMultiplicity} "[" "]";
                @Override public ParserRule getRule() { return rule; }
                
-                //variable=Variable (':' type=Symbol)?
+                //{ManyMultiplicity} "[" "]"
                public Group getGroup() { return cGroup; }
                
-                //variable=Variable
+                //{ManyMultiplicity}
-                public Assignment getVariableAssignment_0() { return cVariableAssignment_0; }
+                public Action getManyMultiplicityAction_0() { return cManyMultiplicityAction_0; }
                
-                //Variable
+                //"["
-                public RuleCall getVariableVariableParserRuleCall_0_0() { return cVariableVariableParserRuleCall_0_0; }
+                public Keyword getLeftSquareBracketKeyword_1() { return cLeftSquareBracketKeyword_1; }
                
-                //(':' type=Symbol)?
+                //"]"
-                public Group getGroup_1() { return cGroup_1; }
+                public Keyword getRightSquareBracketKeyword_2() { return cRightSquareBracketKeyword_2; }
+        }
+        public class ExactMultiplicityElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.ExactMultiplicity");
+                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final Keyword cLeftSquareBracketKeyword_0 = (Keyword)cGroup.eContents().get(0);
+                private final Assignment cMultiplicityAssignment_1 = (Assignment)cGroup.eContents().get(1);
+                private final RuleCall cMultiplicityUpperMultiplictyParserRuleCall_1_0 = (RuleCall)cMultiplicityAssignment_1.eContents().get(0);
+                private final Keyword cRightSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);
                
-                //':'
+                //ExactMultiplicity:
-                public Keyword getColonKeyword_1_0() { return cColonKeyword_1_0; }
+                //      "[" multiplicity=UpperMultiplicty "]";
+                @Override public ParserRule getRule() { return rule; }
+                
+                //"[" multiplicity=UpperMultiplicty "]"
+                public Group getGroup() { return cGroup; }
                
-                //type=Symbol
+                //"["
-                public Assignment getTypeAssignment_1_1() { return cTypeAssignment_1_1; }
+                public Keyword getLeftSquareBracketKeyword_0() { return cLeftSquareBracketKeyword_0; }
                
-                //Symbol
+                //multiplicity=UpperMultiplicty
-                public RuleCall getTypeSymbolParserRuleCall_1_1_0() { return cTypeSymbolParserRuleCall_1_1_0; }
+                public Assignment getMultiplicityAssignment_1() { return cMultiplicityAssignment_1; }
+                
+                //UpperMultiplicty
+                public RuleCall getMultiplicityUpperMultiplictyParserRuleCall_1_0() { return cMultiplicityUpperMultiplictyParserRuleCall_1_0; }
+                
+                //"]"
+                public Keyword getRightSquareBracketKeyword_2() { return cRightSquareBracketKeyword_2; }
        }
-        public class PatternBodyElements extends AbstractParserRuleElementFinder {
+        public class BoundedMultiplicityElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.PatternBody");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.BoundedMultiplicity");
                private final Group cGroup = (Group)rule.eContents().get(1);
-                private final Action cPatternBodyAction_0 = (Action)cGroup.eContents().get(0);
+                private final Keyword cLeftSquareBracketKeyword_0 = (Keyword)cGroup.eContents().get(0);
-                private final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1);
+                private final Assignment cLowerBoundAssignment_1 = (Assignment)cGroup.eContents().get(1);
-                private final Keyword cTrueKeyword_1_0 = (Keyword)cAlternatives_1.eContents().get(0);
+                private final RuleCall cLowerBoundINTTerminalRuleCall_1_0 = (RuleCall)cLowerBoundAssignment_1.eContents().get(0);
-                private final Assignment cConstraintsAssignment_1_1 = (Assignment)cAlternatives_1.eContents().get(1);
+                private final Keyword cFullStopFullStopKeyword_2 = (Keyword)cGroup.eContents().get(2);
-                private final RuleCall cConstraintsConstraintParserRuleCall_1_1_0 = (RuleCall)cConstraintsAssignment_1_1.eContents().get(0);
+                private final Assignment cUpperBoundAssignment_3 = (Assignment)cGroup.eContents().get(3);
-                
+                private final RuleCall cUpperBoundUpperMultiplictyParserRuleCall_3_0 = (RuleCall)cUpperBoundAssignment_3.eContents().get(0);
-                //PatternBody:
+                private final Keyword cRightSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
-                //      {PatternBody} ('true' | constraints+=Constraint*);
+                
+                //BoundedMultiplicity:
+                //      "[" lowerBound=INT ".." upperBound=UpperMultiplicty "]";
                @Override public ParserRule getRule() { return rule; }
                
-                //{PatternBody} ('true' | constraints+=Constraint*)
+                //"[" lowerBound=INT ".." upperBound=UpperMultiplicty "]"
                public Group getGroup() { return cGroup; }
                
-                //{PatternBody}
+                //"["
-                public Action getPatternBodyAction_0() { return cPatternBodyAction_0; }
+                public Keyword getLeftSquareBracketKeyword_0() { return cLeftSquareBracketKeyword_0; }
                
-                //'true' | constraints+=Constraint*
+                //lowerBound=INT
-                public Alternatives getAlternatives_1() { return cAlternatives_1; }
+                public Assignment getLowerBoundAssignment_1() { return cLowerBoundAssignment_1; }
+                
+                //INT
+                public RuleCall getLowerBoundINTTerminalRuleCall_1_0() { return cLowerBoundINTTerminalRuleCall_1_0; }
+                
+                //".."
+                public Keyword getFullStopFullStopKeyword_2() { return cFullStopFullStopKeyword_2; }
                
-                //'true'
+                //upperBound=UpperMultiplicty
-                public Keyword getTrueKeyword_1_0() { return cTrueKeyword_1_0; }
+                public Assignment getUpperBoundAssignment_3() { return cUpperBoundAssignment_3; }
                
-                //constraints+=Constraint*
+                //UpperMultiplicty
-                public Assignment getConstraintsAssignment_1_1() { return cConstraintsAssignment_1_1; }
+                public RuleCall getUpperBoundUpperMultiplictyParserRuleCall_3_0() { return cUpperBoundUpperMultiplictyParserRuleCall_3_0; }
                
-                //Constraint
+                //"]"
-                public RuleCall getConstraintsConstraintParserRuleCall_1_1_0() { return cConstraintsConstraintParserRuleCall_1_1_0; }
+                public Keyword getRightSquareBracketKeyword_4() { return cRightSquareBracketKeyword_4; }
        }
-        public class PolarityElements extends AbstractParserRuleElementFinder {
+        public class ScopeDefinitionElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.Polarity");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.ScopeDefinition");
                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-                private final Group cGroup_0 = (Group)cAlternatives.eContents().get(0);
+                private final RuleCall cExactScopeDefinitionParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
-                private final Action cPositiveAction_0_0 = (Action)cGroup_0.eContents().get(0);
+                private final RuleCall cBoundedScopeDefinitionParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
-                private final Keyword cPlusSignKeyword_0_1 = (Keyword)cGroup_0.eContents().get(1);
+                private final RuleCall cLowerBoundedScopeDefinitionParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
-                private final Group cGroup_1 = (Group)cAlternatives.eContents().get(1);
-                private final Action cNegativeAction_1_0 = (Action)cGroup_1.eContents().get(0);
-                private final Keyword cHyphenMinusKeyword_1_1 = (Keyword)cGroup_1.eContents().get(1);
                
-                //Polarity:
+                //ScopeDefinition:
-                //      {Positive} '+' | {Negative} '-';
+                //      ExactScopeDefinition | BoundedScopeDefinition | LowerBoundedScopeDefinition;
                @Override public ParserRule getRule() { return rule; }
                
-                //{Positive} '+' | {Negative} '-'
+                //ExactScopeDefinition | BoundedScopeDefinition | LowerBoundedScopeDefinition
                public Alternatives getAlternatives() { return cAlternatives; }
                
-                //{Positive} '+'
+                //ExactScopeDefinition
-                public Group getGroup_0() { return cGroup_0; }
+                public RuleCall getExactScopeDefinitionParserRuleCall_0() { return cExactScopeDefinitionParserRuleCall_0; }
+                
+                //BoundedScopeDefinition
+                public RuleCall getBoundedScopeDefinitionParserRuleCall_1() { return cBoundedScopeDefinitionParserRuleCall_1; }
+                
+                //LowerBoundedScopeDefinition
+                public RuleCall getLowerBoundedScopeDefinitionParserRuleCall_2() { return cLowerBoundedScopeDefinitionParserRuleCall_2; }
+        }
+        public class ExactScopeDefinitionElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.ExactScopeDefinition");
+                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final Keyword cScopeKeyword_0 = (Keyword)cGroup.eContents().get(0);
+                private final Assignment cTypeAssignment_1 = (Assignment)cGroup.eContents().get(1);
+                private final CrossReference cTypeNamedElementCrossReference_1_0 = (CrossReference)cTypeAssignment_1.eContents().get(0);
+                private final RuleCall cTypeNamedElementQualifiedNameParserRuleCall_1_0_1 = (RuleCall)cTypeNamedElementCrossReference_1_0.eContents().get(1);
+                private final Keyword cEqualsSignEqualsSignKeyword_2 = (Keyword)cGroup.eContents().get(2);
+                private final Assignment cExactScopeAssignment_3 = (Assignment)cGroup.eContents().get(3);
+                private final RuleCall cExactScopeINTTerminalRuleCall_3_0 = (RuleCall)cExactScopeAssignment_3.eContents().get(0);
+                
+                //ExactScopeDefinition:
+                //      "scope" type=[NamedElement|QualifiedName] "==" exactScope=INT;
+                @Override public ParserRule getRule() { return rule; }
                
-                //{Positive}
+                //"scope" type=[NamedElement|QualifiedName] "==" exactScope=INT
-                public Action getPositiveAction_0_0() { return cPositiveAction_0_0; }
+                public Group getGroup() { return cGroup; }
                
-                //'+'
+                //"scope"
-                public Keyword getPlusSignKeyword_0_1() { return cPlusSignKeyword_0_1; }
+                public Keyword getScopeKeyword_0() { return cScopeKeyword_0; }
                
-                //{Negative} '-'
+                //type=[NamedElement|QualifiedName]
-                public Group getGroup_1() { return cGroup_1; }
+                public Assignment getTypeAssignment_1() { return cTypeAssignment_1; }
                
-                //{Negative}
+                //[NamedElement|QualifiedName]
-                public Action getNegativeAction_1_0() { return cNegativeAction_1_0; }
+                public CrossReference getTypeNamedElementCrossReference_1_0() { return cTypeNamedElementCrossReference_1_0; }
                
-                //'-'
+                //QualifiedName
-                public Keyword getHyphenMinusKeyword_1_1() { return cHyphenMinusKeyword_1_1; }
+                public RuleCall getTypeNamedElementQualifiedNameParserRuleCall_1_0_1() { return cTypeNamedElementQualifiedNameParserRuleCall_1_0_1; }
+                
+                //"=="
+                public Keyword getEqualsSignEqualsSignKeyword_2() { return cEqualsSignEqualsSignKeyword_2; }
+                
+                //exactScope=INT
+                public Assignment getExactScopeAssignment_3() { return cExactScopeAssignment_3; }
+                
+                //INT
+                public RuleCall getExactScopeINTTerminalRuleCall_3_0() { return cExactScopeINTTerminalRuleCall_3_0; }
        }
-        public class ConstraintElements extends AbstractParserRuleElementFinder {
+        public class BoundedScopeDefinitionElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.Constraint");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.BoundedScopeDefinition");
-                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final Group cGroup = (Group)rule.eContents().get(1);
-                private final Group cGroup_0 = (Group)cAlternatives.eContents().get(0);
+                private final Keyword cScopeKeyword_0 = (Keyword)cGroup.eContents().get(0);
-                private final Assignment cPolarityAssignment_0_0 = (Assignment)cGroup_0.eContents().get(0);
+                private final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1);
-                private final RuleCall cPolarityPolarityParserRuleCall_0_0_0 = (RuleCall)cPolarityAssignment_0_0.eContents().get(0);
+                private final Group cGroup_1_0 = (Group)cAlternatives_1.eContents().get(0);
-                private final Assignment cSymbolAssignment_0_1 = (Assignment)cGroup_0.eContents().get(1);
+                private final Group cGroup_1_0_0 = (Group)cGroup_1_0.eContents().get(0);
-                private final RuleCall cSymbolModelSymbolParserRuleCall_0_1_0 = (RuleCall)cSymbolAssignment_0_1.eContents().get(0);
+                private final Assignment cLowerBoundAssignment_1_0_0_0 = (Assignment)cGroup_1_0_0.eContents().get(0);
-                private final Group cGroup_0_2 = (Group)cGroup_0.eContents().get(2);
+                private final RuleCall cLowerBoundINTTerminalRuleCall_1_0_0_0_0 = (RuleCall)cLowerBoundAssignment_1_0_0_0.eContents().get(0);
-                private final Keyword cLeftParenthesisKeyword_0_2_0 = (Keyword)cGroup_0_2.eContents().get(0);
+                private final Keyword cLessThanSignEqualsSignKeyword_1_0_0_1 = (Keyword)cGroup_1_0_0.eContents().get(1);
-                private final Assignment cParamsAssignment_0_2_1 = (Assignment)cGroup_0_2.eContents().get(1);
+                private final Assignment cTypeAssignment_1_0_1 = (Assignment)cGroup_1_0.eContents().get(1);
-                private final RuleCall cParamsLiteralParserRuleCall_0_2_1_0 = (RuleCall)cParamsAssignment_0_2_1.eContents().get(0);
+                private final CrossReference cTypeNamedElementCrossReference_1_0_1_0 = (CrossReference)cTypeAssignment_1_0_1.eContents().get(0);
-                private final Group cGroup_0_2_2 = (Group)cGroup_0_2.eContents().get(2);
+                private final RuleCall cTypeNamedElementQualifiedNameParserRuleCall_1_0_1_0_1 = (RuleCall)cTypeNamedElementCrossReference_1_0_1_0.eContents().get(1);
-                private final Keyword cCommaKeyword_0_2_2_0 = (Keyword)cGroup_0_2_2.eContents().get(0);
+                private final Keyword cLessThanSignEqualsSignKeyword_1_0_2 = (Keyword)cGroup_1_0.eContents().get(2);
-                private final Assignment cParamsAssignment_0_2_2_1 = (Assignment)cGroup_0_2_2.eContents().get(1);
+                private final Assignment cUpperBoundAssignment_1_0_3 = (Assignment)cGroup_1_0.eContents().get(3);
-                private final RuleCall cParamsLiteralParserRuleCall_0_2_2_1_0 = (RuleCall)cParamsAssignment_0_2_2_1.eContents().get(0);
+                private final RuleCall cUpperBoundINTTerminalRuleCall_1_0_3_0 = (RuleCall)cUpperBoundAssignment_1_0_3.eContents().get(0);
-                private final Keyword cRightParenthesisKeyword_0_2_3 = (Keyword)cGroup_0_2.eContents().get(3);
+                private final Group cGroup_1_1 = (Group)cAlternatives_1.eContents().get(1);
-                private final Group cGroup_1 = (Group)cAlternatives.eContents().get(1);
+                private final Assignment cUpperBoundAssignment_1_1_0 = (Assignment)cGroup_1_1.eContents().get(0);
-                private final Assignment cClosureTypeAssignment_1_0 = (Assignment)cGroup_1.eContents().get(0);
+                private final RuleCall cUpperBoundINTTerminalRuleCall_1_1_0_0 = (RuleCall)cUpperBoundAssignment_1_1_0.eContents().get(0);
-                private final RuleCall cClosureTypeClosureTypeParserRuleCall_1_0_0 = (RuleCall)cClosureTypeAssignment_1_0.eContents().get(0);
+                private final Keyword cGreaterThanSignEqualsSignKeyword_1_1_1 = (Keyword)cGroup_1_1.eContents().get(1);
-                private final Keyword cLeftParenthesisKeyword_1_1 = (Keyword)cGroup_1.eContents().get(1);
+                private final Assignment cTypeAssignment_1_1_2 = (Assignment)cGroup_1_1.eContents().get(2);
-                private final Assignment cParamsAssignment_1_2 = (Assignment)cGroup_1.eContents().get(2);
+                private final CrossReference cTypeNamedElementCrossReference_1_1_2_0 = (CrossReference)cTypeAssignment_1_1_2.eContents().get(0);
-                private final RuleCall cParamsLiteralParserRuleCall_1_2_0 = (RuleCall)cParamsAssignment_1_2.eContents().get(0);
+                private final RuleCall cTypeNamedElementQualifiedNameParserRuleCall_1_1_2_0_1 = (RuleCall)cTypeNamedElementCrossReference_1_1_2_0.eContents().get(1);
-                private final Group cGroup_1_3 = (Group)cGroup_1.eContents().get(3);
+                private final Group cGroup_1_1_3 = (Group)cGroup_1_1.eContents().get(3);
-                private final Keyword cCommaKeyword_1_3_0 = (Keyword)cGroup_1_3.eContents().get(0);
+                private final Keyword cGreaterThanSignEqualsSignKeyword_1_1_3_0 = (Keyword)cGroup_1_1_3.eContents().get(0);
-                private final Assignment cParamsAssignment_1_3_1 = (Assignment)cGroup_1_3.eContents().get(1);
+                private final Assignment cLowerBoundAssignment_1_1_3_1 = (Assignment)cGroup_1_1_3.eContents().get(1);
-                private final RuleCall cParamsLiteralParserRuleCall_1_3_1_0 = (RuleCall)cParamsAssignment_1_3_1.eContents().get(0);
+                private final RuleCall cLowerBoundINTTerminalRuleCall_1_1_3_1_0 = (RuleCall)cLowerBoundAssignment_1_1_3_1.eContents().get(0);
-                private final Keyword cRightParenthesisKeyword_1_4 = (Keyword)cGroup_1.eContents().get(4);
+                
-                
+                //BoundedScopeDefinition:
-                //Constraint:
+                //      "scope" ((lowerBound=INT "<=")? type=[NamedElement|QualifiedName] "<=" upperBound=INT | upperBound=INT ">="
-                //      polarity=Polarity? symbol=ModelSymbol ('(' params+=Literal? (',' params+=Literal)* ')')? | closureType=ClosureType
+                //      type=[NamedElement|QualifiedName] (">=" lowerBound=INT)?);
-                //      '(' params+=Literal? (',' params+=Literal)* ')';
                @Override public ParserRule getRule() { return rule; }
                
-                //polarity=Polarity? symbol=ModelSymbol ('(' params+=Literal? (',' params+=Literal)* ')')? | closureType=ClosureType '('
+                //"scope" ((lowerBound=INT "<=")? type=[NamedElement|QualifiedName] "<=" upperBound=INT | upperBound=INT ">="
-                //params+=Literal? (',' params+=Literal)* ')'
+                //type=[NamedElement|QualifiedName] (">=" lowerBound=INT)?)
-                public Alternatives getAlternatives() { return cAlternatives; }
+                public Group getGroup() { return cGroup; }
-                
-                //polarity=Polarity? symbol=ModelSymbol ('(' params+=Literal? (',' params+=Literal)* ')')?
-                public Group getGroup_0() { return cGroup_0; }
                
-                //polarity=Polarity?
+                //"scope"
-                public Assignment getPolarityAssignment_0_0() { return cPolarityAssignment_0_0; }
+                public Keyword getScopeKeyword_0() { return cScopeKeyword_0; }
                
-                //Polarity
+                //((lowerBound=INT "<=")? type=[NamedElement|QualifiedName] "<=" upperBound=INT | upperBound=INT ">="
-                public RuleCall getPolarityPolarityParserRuleCall_0_0_0() { return cPolarityPolarityParserRuleCall_0_0_0; }
+                //type=[NamedElement|QualifiedName] (">=" lowerBound=INT)?)
+                public Alternatives getAlternatives_1() { return cAlternatives_1; }
                
-                //symbol=ModelSymbol
+                //(lowerBound=INT "<=")? type=[NamedElement|QualifiedName] "<=" upperBound=INT
-                public Assignment getSymbolAssignment_0_1() { return cSymbolAssignment_0_1; }
+                public Group getGroup_1_0() { return cGroup_1_0; }
                
-                //ModelSymbol
+                //(lowerBound=INT "<=")?
-                public RuleCall getSymbolModelSymbolParserRuleCall_0_1_0() { return cSymbolModelSymbolParserRuleCall_0_1_0; }
+                public Group getGroup_1_0_0() { return cGroup_1_0_0; }
                
-                //('(' params+=Literal? (',' params+=Literal)* ')')?
+                //lowerBound=INT
-                public Group getGroup_0_2() { return cGroup_0_2; }
+                public Assignment getLowerBoundAssignment_1_0_0_0() { return cLowerBoundAssignment_1_0_0_0; }
                
-                //'('
+                //INT
-                public Keyword getLeftParenthesisKeyword_0_2_0() { return cLeftParenthesisKeyword_0_2_0; }
+                public RuleCall getLowerBoundINTTerminalRuleCall_1_0_0_0_0() { return cLowerBoundINTTerminalRuleCall_1_0_0_0_0; }
                
-                //params+=Literal?
+                //"<="
-                public Assignment getParamsAssignment_0_2_1() { return cParamsAssignment_0_2_1; }
+                public Keyword getLessThanSignEqualsSignKeyword_1_0_0_1() { return cLessThanSignEqualsSignKeyword_1_0_0_1; }
                
-                //Literal
+                //type=[NamedElement|QualifiedName]
-                public RuleCall getParamsLiteralParserRuleCall_0_2_1_0() { return cParamsLiteralParserRuleCall_0_2_1_0; }
+                public Assignment getTypeAssignment_1_0_1() { return cTypeAssignment_1_0_1; }
                
-                //(',' params+=Literal)*
+                //[NamedElement|QualifiedName]
-                public Group getGroup_0_2_2() { return cGroup_0_2_2; }
+                public CrossReference getTypeNamedElementCrossReference_1_0_1_0() { return cTypeNamedElementCrossReference_1_0_1_0; }
                
-                //','
+                //QualifiedName
-                public Keyword getCommaKeyword_0_2_2_0() { return cCommaKeyword_0_2_2_0; }
+                public RuleCall getTypeNamedElementQualifiedNameParserRuleCall_1_0_1_0_1() { return cTypeNamedElementQualifiedNameParserRuleCall_1_0_1_0_1; }
                
-                //params+=Literal
+                //"<="
-                public Assignment getParamsAssignment_0_2_2_1() { return cParamsAssignment_0_2_2_1; }
+                public Keyword getLessThanSignEqualsSignKeyword_1_0_2() { return cLessThanSignEqualsSignKeyword_1_0_2; }
                
-                //Literal
+                //upperBound=INT
-                public RuleCall getParamsLiteralParserRuleCall_0_2_2_1_0() { return cParamsLiteralParserRuleCall_0_2_2_1_0; }
+                public Assignment getUpperBoundAssignment_1_0_3() { return cUpperBoundAssignment_1_0_3; }
                
-                //')'
+                //INT
-                public Keyword getRightParenthesisKeyword_0_2_3() { return cRightParenthesisKeyword_0_2_3; }
+                public RuleCall getUpperBoundINTTerminalRuleCall_1_0_3_0() { return cUpperBoundINTTerminalRuleCall_1_0_3_0; }
                
-                //closureType=ClosureType '(' params+=Literal? (',' params+=Literal)* ')'
+                //upperBound=INT ">=" type=[NamedElement|QualifiedName] (">=" lowerBound=INT)?
-                public Group getGroup_1() { return cGroup_1; }
+                public Group getGroup_1_1() { return cGroup_1_1; }
                
-                //closureType=ClosureType
+                //upperBound=INT
-                public Assignment getClosureTypeAssignment_1_0() { return cClosureTypeAssignment_1_0; }
+                public Assignment getUpperBoundAssignment_1_1_0() { return cUpperBoundAssignment_1_1_0; }
                
-                //ClosureType
+                //INT
-                public RuleCall getClosureTypeClosureTypeParserRuleCall_1_0_0() { return cClosureTypeClosureTypeParserRuleCall_1_0_0; }
+                public RuleCall getUpperBoundINTTerminalRuleCall_1_1_0_0() { return cUpperBoundINTTerminalRuleCall_1_1_0_0; }
                
-                //'('
+                //">="
-                public Keyword getLeftParenthesisKeyword_1_1() { return cLeftParenthesisKeyword_1_1; }
+                public Keyword getGreaterThanSignEqualsSignKeyword_1_1_1() { return cGreaterThanSignEqualsSignKeyword_1_1_1; }
                
-                //params+=Literal?
+                //type=[NamedElement|QualifiedName]
-                public Assignment getParamsAssignment_1_2() { return cParamsAssignment_1_2; }
+                public Assignment getTypeAssignment_1_1_2() { return cTypeAssignment_1_1_2; }
                
-                //Literal
+                //[NamedElement|QualifiedName]
-                public RuleCall getParamsLiteralParserRuleCall_1_2_0() { return cParamsLiteralParserRuleCall_1_2_0; }
+                public CrossReference getTypeNamedElementCrossReference_1_1_2_0() { return cTypeNamedElementCrossReference_1_1_2_0; }
                
-                //(',' params+=Literal)*
+                //QualifiedName
-                public Group getGroup_1_3() { return cGroup_1_3; }
+                public RuleCall getTypeNamedElementQualifiedNameParserRuleCall_1_1_2_0_1() { return cTypeNamedElementQualifiedNameParserRuleCall_1_1_2_0_1; }
                
-                //','
+                //(">=" lowerBound=INT)?
-                public Keyword getCommaKeyword_1_3_0() { return cCommaKeyword_1_3_0; }
+                public Group getGroup_1_1_3() { return cGroup_1_1_3; }
                
-                //params+=Literal
+                //">="
-                public Assignment getParamsAssignment_1_3_1() { return cParamsAssignment_1_3_1; }
+                public Keyword getGreaterThanSignEqualsSignKeyword_1_1_3_0() { return cGreaterThanSignEqualsSignKeyword_1_1_3_0; }
                
-                //Literal
+                //lowerBound=INT
-                public RuleCall getParamsLiteralParserRuleCall_1_3_1_0() { return cParamsLiteralParserRuleCall_1_3_1_0; }
+                public Assignment getLowerBoundAssignment_1_1_3_1() { return cLowerBoundAssignment_1_1_3_1; }
                
-                //')'
+                //INT
-                public Keyword getRightParenthesisKeyword_1_4() { return cRightParenthesisKeyword_1_4; }
+                public RuleCall getLowerBoundINTTerminalRuleCall_1_1_3_1_0() { return cLowerBoundINTTerminalRuleCall_1_1_3_1_0; }
        }
-        public class ClosureTypeElements extends AbstractParserRuleElementFinder {
+        public class LowerBoundedScopeDefinitionElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.ClosureType");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.LowerBoundedScopeDefinition");
-                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final Group cGroup = (Group)rule.eContents().get(1);
-                private final Group cGroup_0 = (Group)cAlternatives.eContents().get(0);
+                private final Keyword cScopeKeyword_0 = (Keyword)cGroup.eContents().get(0);
-                private final Action cReflexiveClosureAction_0_0 = (Action)cGroup_0.eContents().get(0);
+                private final Alternatives cAlternatives_1 = (Alternatives)cGroup.eContents().get(1);
-                private final Keyword cAsteriskKeyword_0_1 = (Keyword)cGroup_0.eContents().get(1);
+                private final Group cGroup_1_0 = (Group)cAlternatives_1.eContents().get(0);
-                private final Group cGroup_1 = (Group)cAlternatives.eContents().get(1);
+                private final Assignment cLowerBoundAssignment_1_0_0 = (Assignment)cGroup_1_0.eContents().get(0);
-                private final Action cIrreflexiveClosureAction_1_0 = (Action)cGroup_1.eContents().get(0);
+                private final RuleCall cLowerBoundINTTerminalRuleCall_1_0_0_0 = (RuleCall)cLowerBoundAssignment_1_0_0.eContents().get(0);
-                private final Keyword cPlusSignKeyword_1_1 = (Keyword)cGroup_1.eContents().get(1);
+                private final Keyword cLessThanSignEqualsSignKeyword_1_0_1 = (Keyword)cGroup_1_0.eContents().get(1);
-                
+                private final Assignment cTypeAssignment_1_0_2 = (Assignment)cGroup_1_0.eContents().get(2);
-                //ClosureType:
+                private final CrossReference cTypeNamedElementCrossReference_1_0_2_0 = (CrossReference)cTypeAssignment_1_0_2.eContents().get(0);
-                //      {ReflexiveClosure} '*' | {IrreflexiveClosure} '+';
+                private final RuleCall cTypeNamedElementQualifiedNameParserRuleCall_1_0_2_0_1 = (RuleCall)cTypeNamedElementCrossReference_1_0_2_0.eContents().get(1);
+                private final Group cGroup_1_1 = (Group)cAlternatives_1.eContents().get(1);
+                private final Assignment cTypeAssignment_1_1_0 = (Assignment)cGroup_1_1.eContents().get(0);
+                private final CrossReference cTypeNamedElementCrossReference_1_1_0_0 = (CrossReference)cTypeAssignment_1_1_0.eContents().get(0);
+                private final RuleCall cTypeNamedElementQualifiedNameParserRuleCall_1_1_0_0_1 = (RuleCall)cTypeNamedElementCrossReference_1_1_0_0.eContents().get(1);
+                private final Keyword cGreaterThanSignEqualsSignKeyword_1_1_1 = (Keyword)cGroup_1_1.eContents().get(1);
+                private final Assignment cLowerBoundAssignment_1_1_2 = (Assignment)cGroup_1_1.eContents().get(2);
+                private final RuleCall cLowerBoundINTTerminalRuleCall_1_1_2_0 = (RuleCall)cLowerBoundAssignment_1_1_2.eContents().get(0);
+                
+                //LowerBoundedScopeDefinition:
+                //      "scope" (lowerBound=INT "<=" type=[NamedElement|QualifiedName] | type=[NamedElement|QualifiedName] ">="
+                //      lowerBound=INT);
                @Override public ParserRule getRule() { return rule; }
                
-                //{ReflexiveClosure} '*' | {IrreflexiveClosure} '+'
+                //"scope" (lowerBound=INT "<=" type=[NamedElement|QualifiedName] | type=[NamedElement|QualifiedName] ">=" lowerBound=INT)
-                public Alternatives getAlternatives() { return cAlternatives; }
+                public Group getGroup() { return cGroup; }
                
-                //{ReflexiveClosure} '*'
+                //"scope"
-                public Group getGroup_0() { return cGroup_0; }
+                public Keyword getScopeKeyword_0() { return cScopeKeyword_0; }
                
-                //{ReflexiveClosure}
+                //(lowerBound=INT "<=" type=[NamedElement|QualifiedName] | type=[NamedElement|QualifiedName] ">=" lowerBound=INT)
-                public Action getReflexiveClosureAction_0_0() { return cReflexiveClosureAction_0_0; }
+                public Alternatives getAlternatives_1() { return cAlternatives_1; }
                
-                //'*'
+                //lowerBound=INT "<=" type=[NamedElement|QualifiedName]
-                public Keyword getAsteriskKeyword_0_1() { return cAsteriskKeyword_0_1; }
+                public Group getGroup_1_0() { return cGroup_1_0; }
                
-                //{IrreflexiveClosure} '+'
+                //lowerBound=INT
-                public Group getGroup_1() { return cGroup_1; }
+                public Assignment getLowerBoundAssignment_1_0_0() { return cLowerBoundAssignment_1_0_0; }
                
-                //{IrreflexiveClosure}
+                //INT
-                public Action getIrreflexiveClosureAction_1_0() { return cIrreflexiveClosureAction_1_0; }
+                public RuleCall getLowerBoundINTTerminalRuleCall_1_0_0_0() { return cLowerBoundINTTerminalRuleCall_1_0_0_0; }
                
-                //'+'
+                //"<="
-                public Keyword getPlusSignKeyword_1_1() { return cPlusSignKeyword_1_1; }
+                public Keyword getLessThanSignEqualsSignKeyword_1_0_1() { return cLessThanSignEqualsSignKeyword_1_0_1; }
-        }
-        public class LiteralElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.Literal");
-                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-                private final RuleCall cVariableParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
-                private final RuleCall cDataObjectParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
-                private final RuleCall cNamedObjectParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
                
-                //Literal:
+                //type=[NamedElement|QualifiedName]
-                //      Variable | DataObject | NamedObject;
+                public Assignment getTypeAssignment_1_0_2() { return cTypeAssignment_1_0_2; }
-                @Override public ParserRule getRule() { return rule; }
                
-                //Variable | DataObject | NamedObject
+                //[NamedElement|QualifiedName]
-                public Alternatives getAlternatives() { return cAlternatives; }
+                public CrossReference getTypeNamedElementCrossReference_1_0_2_0() { return cTypeNamedElementCrossReference_1_0_2_0; }
                
-                //Variable
+                //QualifiedName
-                public RuleCall getVariableParserRuleCall_0() { return cVariableParserRuleCall_0; }
+                public RuleCall getTypeNamedElementQualifiedNameParserRuleCall_1_0_2_0_1() { return cTypeNamedElementQualifiedNameParserRuleCall_1_0_2_0_1; }
                
-                //DataObject
+                //type=[NamedElement|QualifiedName] ">=" lowerBound=INT
-                public RuleCall getDataObjectParserRuleCall_1() { return cDataObjectParserRuleCall_1; }
+                public Group getGroup_1_1() { return cGroup_1_1; }
                
-                //NamedObject
+                //type=[NamedElement|QualifiedName]
-                public RuleCall getNamedObjectParserRuleCall_2() { return cNamedObjectParserRuleCall_2; }
+                public Assignment getTypeAssignment_1_1_0() { return cTypeAssignment_1_1_0; }
-        }
-        public class VariableElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.Variable");
-                private final Assignment cNameAssignment = (Assignment)rule.eContents().get(1);
-                private final RuleCall cNameIDTerminalRuleCall_0 = (RuleCall)cNameAssignment.eContents().get(0);
                
-                //Variable:
+                //[NamedElement|QualifiedName]
-                //      name=ID;
+                public CrossReference getTypeNamedElementCrossReference_1_1_0_0() { return cTypeNamedElementCrossReference_1_1_0_0; }
-                @Override public ParserRule getRule() { return rule; }
                
-                //name=ID
+                //QualifiedName
-                public Assignment getNameAssignment() { return cNameAssignment; }
+                public RuleCall getTypeNamedElementQualifiedNameParserRuleCall_1_1_0_0_1() { return cTypeNamedElementQualifiedNameParserRuleCall_1_1_0_0_1; }
                
-                //ID
+                //">="
-                public RuleCall getNameIDTerminalRuleCall_0() { return cNameIDTerminalRuleCall_0; }
+                public Keyword getGreaterThanSignEqualsSignKeyword_1_1_1() { return cGreaterThanSignEqualsSignKeyword_1_1_1; }
+                
+                //lowerBound=INT
+                public Assignment getLowerBoundAssignment_1_1_2() { return cLowerBoundAssignment_1_1_2; }
+                
+                //INT
+                public RuleCall getLowerBoundINTTerminalRuleCall_1_1_2_0() { return cLowerBoundINTTerminalRuleCall_1_1_2_0; }
        }
-        public class AllInstancesElements extends AbstractParserRuleElementFinder {
+        public class ObjectiveDefinitionElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.AllInstances");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.ObjectiveDefinition");
                private final Group cGroup = (Group)rule.eContents().get(1);
-                private final Keyword cColonKeyword_0 = (Keyword)cGroup.eContents().get(0);
+                private final Assignment cKindAssignment_0 = (Assignment)cGroup.eContents().get(0);
-                private final Assignment cSymbolAssignment_1 = (Assignment)cGroup.eContents().get(1);
+                private final RuleCall cKindObjectiveKindEnumRuleCall_0_0 = (RuleCall)cKindAssignment_0.eContents().get(0);
-                private final RuleCall cSymbolSymbolParserRuleCall_1_0 = (RuleCall)cSymbolAssignment_1.eContents().get(0);
+                private final Assignment cObjectiveAssignment_1 = (Assignment)cGroup.eContents().get(1);
-                
+                private final RuleCall cObjectiveExpressionParserRuleCall_1_0 = (RuleCall)cObjectiveAssignment_1.eContents().get(0);
-                /////////////////////
+                
-                //// Complex Interpretation grammar
+                //ObjectiveDefinition:
-                /////////////////////
+                //      kind=ObjectiveKind objective=Expression;
-                //AllInstances:
-                //      ':' symbol=Symbol;
                @Override public ParserRule getRule() { return rule; }
                
-                //':' symbol=Symbol
+                //kind=ObjectiveKind objective=Expression
                public Group getGroup() { return cGroup; }
                
-                //':'
+                //kind=ObjectiveKind
-                public Keyword getColonKeyword_0() { return cColonKeyword_0; }
+                public Assignment getKindAssignment_0() { return cKindAssignment_0; }
+                
+                //ObjectiveKind
+                public RuleCall getKindObjectiveKindEnumRuleCall_0_0() { return cKindObjectiveKindEnumRuleCall_0_0; }
                
-                //symbol=Symbol
+                //objective=Expression
-                public Assignment getSymbolAssignment_1() { return cSymbolAssignment_1; }
+                public Assignment getObjectiveAssignment_1() { return cObjectiveAssignment_1; }
                
-                //Symbol
+                //Expression
-                public RuleCall getSymbolSymbolParserRuleCall_1_0() { return cSymbolSymbolParserRuleCall_1_0; }
+                public RuleCall getObjectiveExpressionParserRuleCall_1_0() { return cObjectiveExpressionParserRuleCall_1_0; }
        }
-        public class AllObjectsElements extends AbstractParserRuleElementFinder {
+        public class UpperMultiplictyElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.AllObjects");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.UpperMultiplicty");
-                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-                private final Action cAllObjectsAction_0 = (Action)cGroup.eContents().get(0);
+                private final RuleCall cINTTerminalRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
-                private final Keyword cAsteriskKeyword_1 = (Keyword)cGroup.eContents().get(1);
+                private final Keyword cAsteriskKeyword_1 = (Keyword)cAlternatives.eContents().get(1);
                
-                //AllObjects:
+                //UpperMultiplicty ecore::EInt:
-                //      {AllObjects} '*';
+                //      INT | "*";
                @Override public ParserRule getRule() { return rule; }
                
-                //{AllObjects} '*'
+                //INT | "*"
-                public Group getGroup() { return cGroup; }
+                public Alternatives getAlternatives() { return cAlternatives; }
                
-                //{AllObjects}
+                //INT
-                public Action getAllObjectsAction_0() { return cAllObjectsAction_0; }
+                public RuleCall getINTTerminalRuleCall_0() { return cINTTerminalRuleCall_0; }
                
-                //'*'
+                //"*"
                public Keyword getAsteriskKeyword_1() { return cAsteriskKeyword_1; }
        }
-        public class DefaultInterpretationElements extends AbstractParserRuleElementFinder {
+        public class RealElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.DefaultInterpretation");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.Real");
                private final Group cGroup = (Group)rule.eContents().get(1);
-                private final Keyword cDefaultKeyword_0 = (Keyword)cGroup.eContents().get(0);
+                private final RuleCall cINTTerminalRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
-                private final Assignment cInterpretationAssignment_1 = (Assignment)cGroup.eContents().get(1);
+                private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
-                private final RuleCall cInterpretationBasicInterpretationParserRuleCall_1_0 = (RuleCall)cInterpretationAssignment_1.eContents().get(0);
+                private final Keyword cFullStopKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);
-                
+                private final RuleCall cINTTerminalRuleCall_1_1 = (RuleCall)cGroup_1.eContents().get(1);
-                /////////////////////
+                
-                //// Defaul Interpretation grammar
+                //Real ecore::EBigDecimal hidden():
-                /////////////////////
+                //      INT ("." INT)?;
-                //DefaultInterpretation:
-                //      'default' interpretation=BasicInterpretation;
                @Override public ParserRule getRule() { return rule; }
                
-                //'default' interpretation=BasicInterpretation
+                //INT ("." INT)?
                public Group getGroup() { return cGroup; }
                
-                //'default'
+                //INT
-                public Keyword getDefaultKeyword_0() { return cDefaultKeyword_0; }
+                public RuleCall getINTTerminalRuleCall_0() { return cINTTerminalRuleCall_0; }
                
-                //interpretation=BasicInterpretation
+                //("." INT)?
-                public Assignment getInterpretationAssignment_1() { return cInterpretationAssignment_1; }
+                public Group getGroup_1() { return cGroup_1; }
+                
+                //"."
+                public Keyword getFullStopKeyword_1_0() { return cFullStopKeyword_1_0; }
                
-                //BasicInterpretation
+                //INT
-                public RuleCall getInterpretationBasicInterpretationParserRuleCall_1_0() { return cInterpretationBasicInterpretationParserRuleCall_1_0; }
+                public RuleCall getINTTerminalRuleCall_1_1() { return cINTTerminalRuleCall_1_1; }
        }
-        public class CDInterpretationElements extends AbstractParserRuleElementFinder {
+        public class QualifiedNameElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.CDInterpretation");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.QualifiedName");
                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-                private final RuleCall cClassInterpretationParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+                private final Group cGroup_0 = (Group)cAlternatives.eContents().get(0);
-                private final RuleCall cEnumInterpretationParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+                private final RuleCall cIDTerminalRuleCall_0_0 = (RuleCall)cGroup_0.eContents().get(0);
-                private final RuleCall cGlobalRelationInterpretationParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
+                private final Group cGroup_0_1 = (Group)cGroup_0.eContents().get(1);
-                
+                private final Keyword cFullStopKeyword_0_1_0 = (Keyword)cGroup_0_1.eContents().get(0);
-                /////////////////////
+                private final RuleCall cIDTerminalRuleCall_0_1_1 = (RuleCall)cGroup_0_1.eContents().get(1);
-                //// Advanced Class-Diagram interpretations
+                private final RuleCall cQUOTED_IDTerminalRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
-                /////////////////////
+                
-                //CDInterpretation:
+                //QualifiedName hidden():
-                //      ClassInterpretation | EnumInterpretation | GlobalRelationInterpretation;
+                //      ID ("." ID)* | QUOTED_ID;
                @Override public ParserRule getRule() { return rule; }
                
-                //ClassInterpretation | EnumInterpretation | GlobalRelationInterpretation
+                //ID ("." ID)* | QUOTED_ID
                public Alternatives getAlternatives() { return cAlternatives; }
                
-                //ClassInterpretation
+                //ID ("." ID)*
-                public RuleCall getClassInterpretationParserRuleCall_0() { return cClassInterpretationParserRuleCall_0; }
+                public Group getGroup_0() { return cGroup_0; }
+                
+                //ID
+                public RuleCall getIDTerminalRuleCall_0_0() { return cIDTerminalRuleCall_0_0; }
+                
+                //("." ID)*
+                public Group getGroup_0_1() { return cGroup_0_1; }
                
-                //EnumInterpretation
+                //"."
-                public RuleCall getEnumInterpretationParserRuleCall_1() { return cEnumInterpretationParserRuleCall_1; }
+                public Keyword getFullStopKeyword_0_1_0() { return cFullStopKeyword_0_1_0; }
                
-                //GlobalRelationInterpretation
+                //ID
-                public RuleCall getGlobalRelationInterpretationParserRuleCall_2() { return cGlobalRelationInterpretationParserRuleCall_2; }
+                public RuleCall getIDTerminalRuleCall_0_1_1() { return cIDTerminalRuleCall_0_1_1; }
+                
+                //QUOTED_ID
+                public RuleCall getQUOTED_IDTerminalRuleCall_1() { return cQUOTED_IDTerminalRuleCall_1; }
        }
-        public class ClassInterpretationElements extends AbstractParserRuleElementFinder {
+        public class NamedElementElements extends AbstractParserRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.ClassInterpretation");
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.NamedElement");
-                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final Assignment cNameAssignment = (Assignment)rule.eContents().get(1);
-                private final Assignment cAbstractAssignment_0 = (Assignment)cGroup.eContents().get(0);
+                private final RuleCall cNameQualifiedNameParserRuleCall_0 = (RuleCall)cNameAssignment.eContents().get(0);
-                private final Keyword cAbstractAbstractKeyword_0_0 = (Keyword)cAbstractAssignment_0.eContents().get(0);
-                private final Keyword cClassKeyword_1 = (Keyword)cGroup.eContents().get(1);
-                private final Assignment cSymbolAssignment_2 = (Assignment)cGroup.eContents().get(2);
-                private final RuleCall cSymbolModelSymbolParserRuleCall_2_0 = (RuleCall)cSymbolAssignment_2.eContents().get(0);
-                private final Group cGroup_3 = (Group)cGroup.eContents().get(3);
-                private final Keyword cExtendsKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);
-                private final Assignment cSupertypesAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);
-                private final RuleCall cSupertypesModelSymbolParserRuleCall_3_1_0 = (RuleCall)cSupertypesAssignment_3_1.eContents().get(0);
-                private final Keyword cLeftCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
-                private final Assignment cFieltAssignment_5 = (Assignment)cGroup.eContents().get(5);
-                private final RuleCall cFieltFieldRelationInterpretationParserRuleCall_5_0 = (RuleCall)cFieltAssignment_5.eContents().get(0);
-                private final Keyword cRightCurlyBracketKeyword_6 = (Keyword)cGroup.eContents().get(6);
                
-                //ClassInterpretation:
+                //NamedElement:
-                //      abstract?='abstract'? 'class' symbol=ModelSymbol ('extends' supertypes+=ModelSymbol+)? '{'
+                //      name=QualifiedName;
-                //      fielt+=FieldRelationInterpretation*
-                //      '}';
                @Override public ParserRule getRule() { return rule; }
                
-                //abstract?='abstract'? 'class' symbol=ModelSymbol ('extends' supertypes+=ModelSymbol+)? '{'
+                //name=QualifiedName
-                //fielt+=FieldRelationInterpretation* '}'
+                public Assignment getNameAssignment() { return cNameAssignment; }
-                public Group getGroup() { return cGroup; }
                
-                //abstract?='abstract'?
+                //QualifiedName
-                public Assignment getAbstractAssignment_0() { return cAbstractAssignment_0; }
+                public RuleCall getNameQualifiedNameParserRuleCall_0() { return cNameQualifiedNameParserRuleCall_0; }
+        }
+        
+        public class MetricTypeElements extends AbstractEnumRuleElementFinder {
+                private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.MetricType");
+                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final EnumLiteralDeclaration cINTEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
+                private final Keyword cINTIntKeyword_0_0 = (Keyword)cINTEnumLiteralDeclaration_0.eContents().get(0);
+                private final EnumLiteralDeclaration cREALEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
+                private final Keyword cREALRealKeyword_1_0 = (Keyword)cREALEnumLiteralDeclaration_1.eContents().get(0);
                
-                //'abstract'
+                //enum MetricType:
-                public Keyword getAbstractAbstractKeyword_0_0() { return cAbstractAbstractKeyword_0_0; }
+                //      INT="int" | REAL="real";
+                public EnumRule getRule() { return rule; }
                
-                //'class'
+                //INT="int" | REAL="real"
-                public Keyword getClassKeyword_1() { return cClassKeyword_1; }
+                public Alternatives getAlternatives() { return cAlternatives; }
                
-                //symbol=ModelSymbol
+                //INT="int"
-                public Assignment getSymbolAssignment_2() { return cSymbolAssignment_2; }
+                public EnumLiteralDeclaration getINTEnumLiteralDeclaration_0() { return cINTEnumLiteralDeclaration_0; }
                
-                //ModelSymbol
+                //"int"
-                public RuleCall getSymbolModelSymbolParserRuleCall_2_0() { return cSymbolModelSymbolParserRuleCall_2_0; }
+                public Keyword getINTIntKeyword_0_0() { return cINTIntKeyword_0_0; }
                
-                //('extends' supertypes+=ModelSymbol+)?
+                //REAL="real"
-                public Group getGroup_3() { return cGroup_3; }
+                public EnumLiteralDeclaration getREALEnumLiteralDeclaration_1() { return cREALEnumLiteralDeclaration_1; }
                
-                //'extends'
+                //"real"
-                public Keyword getExtendsKeyword_3_0() { return cExtendsKeyword_3_0; }
+                public Keyword getREALRealKeyword_1_0() { return cREALRealKeyword_1_0; }
+        }
+        public class BinaryOperatorElements extends AbstractEnumRuleElementFinder {
+                private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.BinaryOperator");
+                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final EnumLiteralDeclaration cEQEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
+                private final Keyword cEQEQKeyword_0_0 = (Keyword)cEQEnumLiteralDeclaration_0.eContents().get(0);
+                private final EnumLiteralDeclaration cNOT_EQEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
+                private final Keyword cNOT_EQNOT_EQKeyword_1_0 = (Keyword)cNOT_EQEnumLiteralDeclaration_1.eContents().get(0);
+                private final EnumLiteralDeclaration cLESSEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
+                private final Keyword cLESSLESSKeyword_2_0 = (Keyword)cLESSEnumLiteralDeclaration_2.eContents().get(0);
+                private final EnumLiteralDeclaration cLESS_EQEnumLiteralDeclaration_3 = (EnumLiteralDeclaration)cAlternatives.eContents().get(3);
+                private final Keyword cLESS_EQLESS_EQKeyword_3_0 = (Keyword)cLESS_EQEnumLiteralDeclaration_3.eContents().get(0);
+                private final EnumLiteralDeclaration cGREATEREnumLiteralDeclaration_4 = (EnumLiteralDeclaration)cAlternatives.eContents().get(4);
+                private final Keyword cGREATERGREATERKeyword_4_0 = (Keyword)cGREATEREnumLiteralDeclaration_4.eContents().get(0);
+                private final EnumLiteralDeclaration cGREATER_EQEnumLiteralDeclaration_5 = (EnumLiteralDeclaration)cAlternatives.eContents().get(5);
+                private final Keyword cGREATER_EQGREATER_EQKeyword_5_0 = (Keyword)cGREATER_EQEnumLiteralDeclaration_5.eContents().get(0);
+                private final EnumLiteralDeclaration cINEnumLiteralDeclaration_6 = (EnumLiteralDeclaration)cAlternatives.eContents().get(6);
+                private final Keyword cININKeyword_6_0 = (Keyword)cINEnumLiteralDeclaration_6.eContents().get(0);
+                private final EnumLiteralDeclaration cADDEnumLiteralDeclaration_7 = (EnumLiteralDeclaration)cAlternatives.eContents().get(7);
+                private final Keyword cADDADDKeyword_7_0 = (Keyword)cADDEnumLiteralDeclaration_7.eContents().get(0);
+                private final EnumLiteralDeclaration cSUBEnumLiteralDeclaration_8 = (EnumLiteralDeclaration)cAlternatives.eContents().get(8);
+                private final Keyword cSUBSUBKeyword_8_0 = (Keyword)cSUBEnumLiteralDeclaration_8.eContents().get(0);
+                private final EnumLiteralDeclaration cMULEnumLiteralDeclaration_9 = (EnumLiteralDeclaration)cAlternatives.eContents().get(9);
+                private final Keyword cMULMULKeyword_9_0 = (Keyword)cMULEnumLiteralDeclaration_9.eContents().get(0);
+                private final EnumLiteralDeclaration cDIVEnumLiteralDeclaration_10 = (EnumLiteralDeclaration)cAlternatives.eContents().get(10);
+                private final Keyword cDIVDIVKeyword_10_0 = (Keyword)cDIVEnumLiteralDeclaration_10.eContents().get(0);
+                private final EnumLiteralDeclaration cPOWEnumLiteralDeclaration_11 = (EnumLiteralDeclaration)cAlternatives.eContents().get(11);
+                private final Keyword cPOWPOWKeyword_11_0 = (Keyword)cPOWEnumLiteralDeclaration_11.eContents().get(0);
+                
+                //enum BinaryOperator:
+                //      EQ | NOT_EQ | LESS | LESS_EQ | GREATER | GREATER_EQ | IN | ADD | SUB | MUL | DIV | POW;
+                public EnumRule getRule() { return rule; }
+                
+                //EQ | NOT_EQ | LESS | LESS_EQ | GREATER | GREATER_EQ | IN | ADD | SUB | MUL | DIV | POW
+                public Alternatives getAlternatives() { return cAlternatives; }
                
-                //supertypes+=ModelSymbol+
+                //EQ
-                public Assignment getSupertypesAssignment_3_1() { return cSupertypesAssignment_3_1; }
+                public EnumLiteralDeclaration getEQEnumLiteralDeclaration_0() { return cEQEnumLiteralDeclaration_0; }
                
-                //ModelSymbol
+                //"EQ"
-                public RuleCall getSupertypesModelSymbolParserRuleCall_3_1_0() { return cSupertypesModelSymbolParserRuleCall_3_1_0; }
+                public Keyword getEQEQKeyword_0_0() { return cEQEQKeyword_0_0; }
                
-                //'{'
+                //NOT_EQ
-                public Keyword getLeftCurlyBracketKeyword_4() { return cLeftCurlyBracketKeyword_4; }
+                public EnumLiteralDeclaration getNOT_EQEnumLiteralDeclaration_1() { return cNOT_EQEnumLiteralDeclaration_1; }
                
-                //fielt+=FieldRelationInterpretation*
+                //"NOT_EQ"
-                public Assignment getFieltAssignment_5() { return cFieltAssignment_5; }
+                public Keyword getNOT_EQNOT_EQKeyword_1_0() { return cNOT_EQNOT_EQKeyword_1_0; }
                
-                //FieldRelationInterpretation
+                //LESS
-                public RuleCall getFieltFieldRelationInterpretationParserRuleCall_5_0() { return cFieltFieldRelationInterpretationParserRuleCall_5_0; }
+                public EnumLiteralDeclaration getLESSEnumLiteralDeclaration_2() { return cLESSEnumLiteralDeclaration_2; }
                
-                //'}'
+                //"LESS"
-                public Keyword getRightCurlyBracketKeyword_6() { return cRightCurlyBracketKeyword_6; }
+                public Keyword getLESSLESSKeyword_2_0() { return cLESSLESSKeyword_2_0; }
+                
+                //LESS_EQ
+                public EnumLiteralDeclaration getLESS_EQEnumLiteralDeclaration_3() { return cLESS_EQEnumLiteralDeclaration_3; }
+                
+                //"LESS_EQ"
+                public Keyword getLESS_EQLESS_EQKeyword_3_0() { return cLESS_EQLESS_EQKeyword_3_0; }
+                
+                //GREATER
+                public EnumLiteralDeclaration getGREATEREnumLiteralDeclaration_4() { return cGREATEREnumLiteralDeclaration_4; }
+                
+                //"GREATER"
+                public Keyword getGREATERGREATERKeyword_4_0() { return cGREATERGREATERKeyword_4_0; }
+                
+                //GREATER_EQ
+                public EnumLiteralDeclaration getGREATER_EQEnumLiteralDeclaration_5() { return cGREATER_EQEnumLiteralDeclaration_5; }
+                
+                //"GREATER_EQ"
+                public Keyword getGREATER_EQGREATER_EQKeyword_5_0() { return cGREATER_EQGREATER_EQKeyword_5_0; }
+                
+                //IN
+                public EnumLiteralDeclaration getINEnumLiteralDeclaration_6() { return cINEnumLiteralDeclaration_6; }
+                
+                //"IN"
+                public Keyword getININKeyword_6_0() { return cININKeyword_6_0; }
+                
+                //ADD
+                public EnumLiteralDeclaration getADDEnumLiteralDeclaration_7() { return cADDEnumLiteralDeclaration_7; }
+                
+                //"ADD"
+                public Keyword getADDADDKeyword_7_0() { return cADDADDKeyword_7_0; }
+                
+                //SUB
+                public EnumLiteralDeclaration getSUBEnumLiteralDeclaration_8() { return cSUBEnumLiteralDeclaration_8; }
+                
+                //"SUB"
+                public Keyword getSUBSUBKeyword_8_0() { return cSUBSUBKeyword_8_0; }
+                
+                //MUL
+                public EnumLiteralDeclaration getMULEnumLiteralDeclaration_9() { return cMULEnumLiteralDeclaration_9; }
+                
+                //"MUL"
+                public Keyword getMULMULKeyword_9_0() { return cMULMULKeyword_9_0; }
+                
+                //DIV
+                public EnumLiteralDeclaration getDIVEnumLiteralDeclaration_10() { return cDIVEnumLiteralDeclaration_10; }
+                
+                //"DIV"
+                public Keyword getDIVDIVKeyword_10_0() { return cDIVDIVKeyword_10_0; }
+                
+                //POW
+                public EnumLiteralDeclaration getPOWEnumLiteralDeclaration_11() { return cPOWEnumLiteralDeclaration_11; }
+                
+                //"POW"
+                public Keyword getPOWPOWKeyword_11_0() { return cPOWPOWKeyword_11_0; }
        }
-        public class EnumInterpretationElements extends AbstractParserRuleElementFinder {
+        public class ComparisonOperatorElements extends AbstractEnumRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.EnumInterpretation");
+                private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.ComparisonOperator");
-                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-                private final Keyword cEnumKeyword_0 = (Keyword)cGroup.eContents().get(0);
+                private final EnumLiteralDeclaration cEQEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
-                private final Assignment cSymbolAssignment_1 = (Assignment)cGroup.eContents().get(1);
+                private final Keyword cEQEqualsSignEqualsSignKeyword_0_0 = (Keyword)cEQEnumLiteralDeclaration_0.eContents().get(0);
-                private final RuleCall cSymbolModelSymbolParserRuleCall_1_0 = (RuleCall)cSymbolAssignment_1.eContents().get(0);
+                private final EnumLiteralDeclaration cNOT_EQEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
-                private final Keyword cLeftCurlyBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);
+                private final Keyword cNOT_EQExclamationMarkEqualsSignKeyword_1_0 = (Keyword)cNOT_EQEnumLiteralDeclaration_1.eContents().get(0);
-                private final Assignment cObjectsAssignment_3 = (Assignment)cGroup.eContents().get(3);
+                private final EnumLiteralDeclaration cLESSEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
-                private final RuleCall cObjectsNamedObjectParserRuleCall_3_0 = (RuleCall)cObjectsAssignment_3.eContents().get(0);
+                private final Keyword cLESSLessThanSignKeyword_2_0 = (Keyword)cLESSEnumLiteralDeclaration_2.eContents().get(0);
-                private final Keyword cRightCurlyBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
+                private final EnumLiteralDeclaration cLESS_EQEnumLiteralDeclaration_3 = (EnumLiteralDeclaration)cAlternatives.eContents().get(3);
-                
+                private final Keyword cLESS_EQLessThanSignEqualsSignKeyword_3_0 = (Keyword)cLESS_EQEnumLiteralDeclaration_3.eContents().get(0);
-                //EnumInterpretation:
+                private final EnumLiteralDeclaration cGREATEREnumLiteralDeclaration_4 = (EnumLiteralDeclaration)cAlternatives.eContents().get(4);
-                //      'enum' Symbol=ModelSymbol '{' objects+=NamedObject+ '}';
+                private final Keyword cGREATERGreaterThanSignKeyword_4_0 = (Keyword)cGREATEREnumLiteralDeclaration_4.eContents().get(0);
-                @Override public ParserRule getRule() { return rule; }
+                private final EnumLiteralDeclaration cGREATER_EQEnumLiteralDeclaration_5 = (EnumLiteralDeclaration)cAlternatives.eContents().get(5);
+                private final Keyword cGREATER_EQGreaterThanSignEqualsSignKeyword_5_0 = (Keyword)cGREATER_EQEnumLiteralDeclaration_5.eContents().get(0);
+                private final EnumLiteralDeclaration cINEnumLiteralDeclaration_6 = (EnumLiteralDeclaration)cAlternatives.eContents().get(6);
+                private final Keyword cINInKeyword_6_0 = (Keyword)cINEnumLiteralDeclaration_6.eContents().get(0);
+                
+                //enum ComparisonOperator returns BinaryOperator:
+                //      EQ="==" | NOT_EQ="!=" | LESS="<" | LESS_EQ="<=" | GREATER=">" | GREATER_EQ=">=" | IN="in";
+                public EnumRule getRule() { return rule; }
+                
+                //EQ="==" | NOT_EQ="!=" | LESS="<" | LESS_EQ="<=" | GREATER=">" | GREATER_EQ=">=" | IN="in"
+                public Alternatives getAlternatives() { return cAlternatives; }
                
-                //'enum' Symbol=ModelSymbol '{' objects+=NamedObject+ '}'
+                //EQ="=="
-                public Group getGroup() { return cGroup; }
+                public EnumLiteralDeclaration getEQEnumLiteralDeclaration_0() { return cEQEnumLiteralDeclaration_0; }
+                
+                //"=="
+                public Keyword getEQEqualsSignEqualsSignKeyword_0_0() { return cEQEqualsSignEqualsSignKeyword_0_0; }
                
-                //'enum'
+                //NOT_EQ="!="
-                public Keyword getEnumKeyword_0() { return cEnumKeyword_0; }
+                public EnumLiteralDeclaration getNOT_EQEnumLiteralDeclaration_1() { return cNOT_EQEnumLiteralDeclaration_1; }
                
-                //Symbol=ModelSymbol
+                //"!="
-                public Assignment getSymbolAssignment_1() { return cSymbolAssignment_1; }
+                public Keyword getNOT_EQExclamationMarkEqualsSignKeyword_1_0() { return cNOT_EQExclamationMarkEqualsSignKeyword_1_0; }
                
-                //ModelSymbol
+                //LESS="<"
-                public RuleCall getSymbolModelSymbolParserRuleCall_1_0() { return cSymbolModelSymbolParserRuleCall_1_0; }
+                public EnumLiteralDeclaration getLESSEnumLiteralDeclaration_2() { return cLESSEnumLiteralDeclaration_2; }
                
-                //'{'
+                //"<"
-                public Keyword getLeftCurlyBracketKeyword_2() { return cLeftCurlyBracketKeyword_2; }
+                public Keyword getLESSLessThanSignKeyword_2_0() { return cLESSLessThanSignKeyword_2_0; }
                
-                //objects+=NamedObject+
+                //LESS_EQ="<="
-                public Assignment getObjectsAssignment_3() { return cObjectsAssignment_3; }
+                public EnumLiteralDeclaration getLESS_EQEnumLiteralDeclaration_3() { return cLESS_EQEnumLiteralDeclaration_3; }
                
-                //NamedObject
+                //"<="
-                public RuleCall getObjectsNamedObjectParserRuleCall_3_0() { return cObjectsNamedObjectParserRuleCall_3_0; }
+                public Keyword getLESS_EQLessThanSignEqualsSignKeyword_3_0() { return cLESS_EQLessThanSignEqualsSignKeyword_3_0; }
                
-                //'}'
+                //GREATER=">"
-                public Keyword getRightCurlyBracketKeyword_4() { return cRightCurlyBracketKeyword_4; }
+                public EnumLiteralDeclaration getGREATEREnumLiteralDeclaration_4() { return cGREATEREnumLiteralDeclaration_4; }
+                
+                //">"
+                public Keyword getGREATERGreaterThanSignKeyword_4_0() { return cGREATERGreaterThanSignKeyword_4_0; }
+                
+                //GREATER_EQ=">="
+                public EnumLiteralDeclaration getGREATER_EQEnumLiteralDeclaration_5() { return cGREATER_EQEnumLiteralDeclaration_5; }
+                
+                //">="
+                public Keyword getGREATER_EQGreaterThanSignEqualsSignKeyword_5_0() { return cGREATER_EQGreaterThanSignEqualsSignKeyword_5_0; }
+                
+                //IN="in"
+                public EnumLiteralDeclaration getINEnumLiteralDeclaration_6() { return cINEnumLiteralDeclaration_6; }
+                
+                //"in"
+                public Keyword getINInKeyword_6_0() { return cINInKeyword_6_0; }
        }
-        public class FieldRelationInterpretationElements extends AbstractParserRuleElementFinder {
+        public class AdditiveBinaryOperatorElements extends AbstractEnumRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.FieldRelationInterpretation");
+                private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.AdditiveBinaryOperator");
-                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-                private final Assignment cContainmentAssignment_0 = (Assignment)cGroup.eContents().get(0);
+                private final EnumLiteralDeclaration cADDEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
-                private final Keyword cContainmentContainmentKeyword_0_0 = (Keyword)cContainmentAssignment_0.eContents().get(0);
+                private final Keyword cADDPlusSignKeyword_0_0 = (Keyword)cADDEnumLiteralDeclaration_0.eContents().get(0);
-                private final Assignment cSymbolAssignment_1 = (Assignment)cGroup.eContents().get(1);
+                private final EnumLiteralDeclaration cSUBEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
-                private final RuleCall cSymbolModelSymbolParserRuleCall_1_0 = (RuleCall)cSymbolAssignment_1.eContents().get(0);
+                private final Keyword cSUBHyphenMinusKeyword_1_0 = (Keyword)cSUBEnumLiteralDeclaration_1.eContents().get(0);
-                private final Keyword cColonKeyword_2 = (Keyword)cGroup.eContents().get(2);
-                private final Assignment cMultiplicityAssignment_3 = (Assignment)cGroup.eContents().get(3);
-                private final RuleCall cMultiplicityMultiplicityDefinitionParserRuleCall_3_0 = (RuleCall)cMultiplicityAssignment_3.eContents().get(0);
-                private final Assignment cTargetAssignment_4 = (Assignment)cGroup.eContents().get(4);
-                private final RuleCall cTargetSymbolParserRuleCall_4_0 = (RuleCall)cTargetAssignment_4.eContents().get(0);
                
-                //FieldRelationInterpretation:
+                //enum AdditiveBinaryOperator returns BinaryOperator:
-                //      containment?='containment'? symbol=ModelSymbol ':' multiplicity=MultiplicityDefinition? target=Symbol;
+                //      ADD="+" | SUB="-";
-                @Override public ParserRule getRule() { return rule; }
+                public EnumRule getRule() { return rule; }
                
-                //containment?='containment'? symbol=ModelSymbol ':' multiplicity=MultiplicityDefinition? target=Symbol
+                //ADD="+" | SUB="-"
-                public Group getGroup() { return cGroup; }
+                public Alternatives getAlternatives() { return cAlternatives; }
                
-                //containment?='containment'?
+                //ADD="+"
-                public Assignment getContainmentAssignment_0() { return cContainmentAssignment_0; }
+                public EnumLiteralDeclaration getADDEnumLiteralDeclaration_0() { return cADDEnumLiteralDeclaration_0; }
                
-                //'containment'
+                //"+"
-                public Keyword getContainmentContainmentKeyword_0_0() { return cContainmentContainmentKeyword_0_0; }
+                public Keyword getADDPlusSignKeyword_0_0() { return cADDPlusSignKeyword_0_0; }
                
-                //symbol=ModelSymbol
+                //SUB="-"
-                public Assignment getSymbolAssignment_1() { return cSymbolAssignment_1; }
+                public EnumLiteralDeclaration getSUBEnumLiteralDeclaration_1() { return cSUBEnumLiteralDeclaration_1; }
                
-                //ModelSymbol
+                //"-"
-                public RuleCall getSymbolModelSymbolParserRuleCall_1_0() { return cSymbolModelSymbolParserRuleCall_1_0; }
+                public Keyword getSUBHyphenMinusKeyword_1_0() { return cSUBHyphenMinusKeyword_1_0; }
+        }
+        public class MultiplicativeBinaryOperatorElements extends AbstractEnumRuleElementFinder {
+                private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.MultiplicativeBinaryOperator");
+                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final EnumLiteralDeclaration cMULEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
+                private final Keyword cMULAsteriskKeyword_0_0 = (Keyword)cMULEnumLiteralDeclaration_0.eContents().get(0);
+                private final EnumLiteralDeclaration cDIVEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
+                private final Keyword cDIVSolidusKeyword_1_0 = (Keyword)cDIVEnumLiteralDeclaration_1.eContents().get(0);
                
-                //':'
+                //enum MultiplicativeBinaryOperator returns BinaryOperator:
-                public Keyword getColonKeyword_2() { return cColonKeyword_2; }
+                //      MUL="*" | DIV="/";
+                public EnumRule getRule() { return rule; }
                
-                //multiplicity=MultiplicityDefinition?
+                //MUL="*" | DIV="/"
-                public Assignment getMultiplicityAssignment_3() { return cMultiplicityAssignment_3; }
+                public Alternatives getAlternatives() { return cAlternatives; }
+                
+                //MUL="*"
+                public EnumLiteralDeclaration getMULEnumLiteralDeclaration_0() { return cMULEnumLiteralDeclaration_0; }
                
-                //MultiplicityDefinition
+                //"*"
-                public RuleCall getMultiplicityMultiplicityDefinitionParserRuleCall_3_0() { return cMultiplicityMultiplicityDefinitionParserRuleCall_3_0; }
+                public Keyword getMULAsteriskKeyword_0_0() { return cMULAsteriskKeyword_0_0; }
                
-                //target=Symbol
+                //DIV="/"
-                public Assignment getTargetAssignment_4() { return cTargetAssignment_4; }
+                public EnumLiteralDeclaration getDIVEnumLiteralDeclaration_1() { return cDIVEnumLiteralDeclaration_1; }
                
-                //Symbol
+                //"/"
-                public RuleCall getTargetSymbolParserRuleCall_4_0() { return cTargetSymbolParserRuleCall_4_0; }
+                public Keyword getDIVSolidusKeyword_1_0() { return cDIVSolidusKeyword_1_0; }
        }
-        public class GlobalRelationInterpretationElements extends AbstractParserRuleElementFinder {
+        public class ExponentialOpElements extends AbstractEnumRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.GlobalRelationInterpretation");
+                private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.ExponentialOp");
-                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final EnumLiteralDeclaration cPOWEnumLiteralDeclaration = (EnumLiteralDeclaration)rule.eContents().get(1);
-                private final Assignment cContainmentAssignment_0 = (Assignment)cGroup.eContents().get(0);
+                private final Keyword cPOWCircumflexAccentKeyword_0 = (Keyword)cPOWEnumLiteralDeclaration.eContents().get(0);
-                private final Keyword cContainmentContainmentKeyword_0_0 = (Keyword)cContainmentAssignment_0.eContents().get(0);
-                private final Keyword cRelationKeyword_1 = (Keyword)cGroup.eContents().get(1);
-                private final Assignment cSymbolAssignment_2 = (Assignment)cGroup.eContents().get(2);
-                private final RuleCall cSymbolModelSymbolParserRuleCall_2_0 = (RuleCall)cSymbolAssignment_2.eContents().get(0);
-                private final Keyword cColonKeyword_3 = (Keyword)cGroup.eContents().get(3);
-                private final Assignment cSourceMultiplicityAssignment_4 = (Assignment)cGroup.eContents().get(4);
-                private final RuleCall cSourceMultiplicityMultiplicityDefinitionParserRuleCall_4_0 = (RuleCall)cSourceMultiplicityAssignment_4.eContents().get(0);
-                private final Assignment cSourceAssignment_5 = (Assignment)cGroup.eContents().get(5);
-                private final RuleCall cSourceSymbolParserRuleCall_5_0 = (RuleCall)cSourceAssignment_5.eContents().get(0);
-                private final Assignment cTargetMultiplicityAssignment_6 = (Assignment)cGroup.eContents().get(6);
-                private final RuleCall cTargetMultiplicityMultiplicityDefinitionParserRuleCall_6_0 = (RuleCall)cTargetMultiplicityAssignment_6.eContents().get(0);
-                private final Assignment cTargetAssignment_7 = (Assignment)cGroup.eContents().get(7);
-                private final RuleCall cTargetSymbolParserRuleCall_7_0 = (RuleCall)cTargetAssignment_7.eContents().get(0);
-                
-                //GlobalRelationInterpretation:
-                //      containment?='containment'? 'relation' symbol=ModelSymbol ':' sourceMultiplicity=MultiplicityDefinition?
-                //      source=Symbol targetMultiplicity=MultiplicityDefinition? target=Symbol;
-                @Override public ParserRule getRule() { return rule; }
                
-                //containment?='containment'? 'relation' symbol=ModelSymbol ':' sourceMultiplicity=MultiplicityDefinition? source=Symbol
+                //enum ExponentialOp returns BinaryOperator:
-                //targetMultiplicity=MultiplicityDefinition? target=Symbol
+                //      POW="^";
-                public Group getGroup() { return cGroup; }
+                public EnumRule getRule() { return rule; }
                
-                //containment?='containment'?
+                //POW="^"
-                public Assignment getContainmentAssignment_0() { return cContainmentAssignment_0; }
+                public EnumLiteralDeclaration getPOWEnumLiteralDeclaration() { return cPOWEnumLiteralDeclaration; }
                
-                //'containment'
+                //"^"
-                public Keyword getContainmentContainmentKeyword_0_0() { return cContainmentContainmentKeyword_0_0; }
+                public Keyword getPOWCircumflexAccentKeyword_0() { return cPOWCircumflexAccentKeyword_0; }
+        }
+        public class UnaryOpElements extends AbstractEnumRuleElementFinder {
+                private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.UnaryOp");
+                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final EnumLiteralDeclaration cNEGEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
+                private final Keyword cNEGExclamationMarkKeyword_0_0 = (Keyword)cNEGEnumLiteralDeclaration_0.eContents().get(0);
+                private final EnumLiteralDeclaration cPLUSEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
+                private final Keyword cPLUSPlusSignKeyword_1_0 = (Keyword)cPLUSEnumLiteralDeclaration_1.eContents().get(0);
+                private final EnumLiteralDeclaration cMINUSEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
+                private final Keyword cMINUSHyphenMinusKeyword_2_0 = (Keyword)cMINUSEnumLiteralDeclaration_2.eContents().get(0);
+                private final EnumLiteralDeclaration cMAYEnumLiteralDeclaration_3 = (EnumLiteralDeclaration)cAlternatives.eContents().get(3);
+                private final Keyword cMAYMayKeyword_3_0 = (Keyword)cMAYEnumLiteralDeclaration_3.eContents().get(0);
+                private final EnumLiteralDeclaration cMUSTEnumLiteralDeclaration_4 = (EnumLiteralDeclaration)cAlternatives.eContents().get(4);
+                private final Keyword cMUSTMustKeyword_4_0 = (Keyword)cMUSTEnumLiteralDeclaration_4.eContents().get(0);
+                private final EnumLiteralDeclaration cCURRENTEnumLiteralDeclaration_5 = (EnumLiteralDeclaration)cAlternatives.eContents().get(5);
+                private final Keyword cCURRENTCurrentKeyword_5_0 = (Keyword)cCURRENTEnumLiteralDeclaration_5.eContents().get(0);
+                
+                //enum UnaryOp:
+                //      NEG="!" | PLUS="+" | MINUS="-" | MAY="may" | MUST="must" | CURRENT="current";
+                public EnumRule getRule() { return rule; }
+                
+                //NEG="!" | PLUS="+" | MINUS="-" | MAY="may" | MUST="must" | CURRENT="current"
+                public Alternatives getAlternatives() { return cAlternatives; }
                
-                //'relation'
+                //NEG="!"
-                public Keyword getRelationKeyword_1() { return cRelationKeyword_1; }
+                public EnumLiteralDeclaration getNEGEnumLiteralDeclaration_0() { return cNEGEnumLiteralDeclaration_0; }
                
-                //symbol=ModelSymbol
+                //"!"
-                public Assignment getSymbolAssignment_2() { return cSymbolAssignment_2; }
+                public Keyword getNEGExclamationMarkKeyword_0_0() { return cNEGExclamationMarkKeyword_0_0; }
                
-                //ModelSymbol
+                //PLUS="+"
-                public RuleCall getSymbolModelSymbolParserRuleCall_2_0() { return cSymbolModelSymbolParserRuleCall_2_0; }
+                public EnumLiteralDeclaration getPLUSEnumLiteralDeclaration_1() { return cPLUSEnumLiteralDeclaration_1; }
                
-                //':'
+                //"+"
-                public Keyword getColonKeyword_3() { return cColonKeyword_3; }
+                public Keyword getPLUSPlusSignKeyword_1_0() { return cPLUSPlusSignKeyword_1_0; }
                
-                //sourceMultiplicity=MultiplicityDefinition?
+                //MINUS="-"
-                public Assignment getSourceMultiplicityAssignment_4() { return cSourceMultiplicityAssignment_4; }
+                public EnumLiteralDeclaration getMINUSEnumLiteralDeclaration_2() { return cMINUSEnumLiteralDeclaration_2; }
                
-                //MultiplicityDefinition
+                //"-"
-                public RuleCall getSourceMultiplicityMultiplicityDefinitionParserRuleCall_4_0() { return cSourceMultiplicityMultiplicityDefinitionParserRuleCall_4_0; }
+                public Keyword getMINUSHyphenMinusKeyword_2_0() { return cMINUSHyphenMinusKeyword_2_0; }
                
-                //source=Symbol
+                //MAY="may"
-                public Assignment getSourceAssignment_5() { return cSourceAssignment_5; }
+                public EnumLiteralDeclaration getMAYEnumLiteralDeclaration_3() { return cMAYEnumLiteralDeclaration_3; }
                
-                //Symbol
+                //"may"
-                public RuleCall getSourceSymbolParserRuleCall_5_0() { return cSourceSymbolParserRuleCall_5_0; }
+                public Keyword getMAYMayKeyword_3_0() { return cMAYMayKeyword_3_0; }
                
-                //targetMultiplicity=MultiplicityDefinition?
+                //MUST="must"
-                public Assignment getTargetMultiplicityAssignment_6() { return cTargetMultiplicityAssignment_6; }
+                public EnumLiteralDeclaration getMUSTEnumLiteralDeclaration_4() { return cMUSTEnumLiteralDeclaration_4; }
                
-                //MultiplicityDefinition
+                //"must"
-                public RuleCall getTargetMultiplicityMultiplicityDefinitionParserRuleCall_6_0() { return cTargetMultiplicityMultiplicityDefinitionParserRuleCall_6_0; }
+                public Keyword getMUSTMustKeyword_4_0() { return cMUSTMustKeyword_4_0; }
                
-                //target=Symbol
+                //CURRENT="current"
-                public Assignment getTargetAssignment_7() { return cTargetAssignment_7; }
+                public EnumLiteralDeclaration getCURRENTEnumLiteralDeclaration_5() { return cCURRENTEnumLiteralDeclaration_5; }
                
-                //Symbol
+                //"current"
-                public RuleCall getTargetSymbolParserRuleCall_7_0() { return cTargetSymbolParserRuleCall_7_0; }
+                public Keyword getCURRENTCurrentKeyword_5_0() { return cCURRENTCurrentKeyword_5_0; }
        }
-        public class MultiplicityDefinitionElements extends AbstractParserRuleElementFinder {
+        public class AggregationOpElements extends AbstractEnumRuleElementFinder {
-                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.MultiplicityDefinition");
+                private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.AggregationOp");
-                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-                private final Assignment cLowerAssignment_0 = (Assignment)cGroup.eContents().get(0);
+                private final EnumLiteralDeclaration cONLYEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
-                private final RuleCall cLowerINTTerminalRuleCall_0_0 = (RuleCall)cLowerAssignment_0.eContents().get(0);
+                private final Keyword cONLYOnlyKeyword_0_0 = (Keyword)cONLYEnumLiteralDeclaration_0.eContents().get(0);
-                private final Keyword cFullStopFullStopKeyword_1 = (Keyword)cGroup.eContents().get(1);
+                private final EnumLiteralDeclaration cSUMEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
-                private final Alternatives cAlternatives_2 = (Alternatives)cGroup.eContents().get(2);
+                private final Keyword cSUMSumKeyword_1_0 = (Keyword)cSUMEnumLiteralDeclaration_1.eContents().get(0);
-                private final Assignment cUpperAssignment_2_0 = (Assignment)cAlternatives_2.eContents().get(0);
+                private final EnumLiteralDeclaration cPRODEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
-                private final RuleCall cUpperINTTerminalRuleCall_2_0_0 = (RuleCall)cUpperAssignment_2_0.eContents().get(0);
+                private final Keyword cPRODProdKeyword_2_0 = (Keyword)cPRODEnumLiteralDeclaration_2.eContents().get(0);
-                private final Assignment cUnlimitedUpperAssignment_2_1 = (Assignment)cAlternatives_2.eContents().get(1);
+                private final EnumLiteralDeclaration cAVGEnumLiteralDeclaration_3 = (EnumLiteralDeclaration)cAlternatives.eContents().get(3);
-                private final Keyword cUnlimitedUpperAsteriskKeyword_2_1_0 = (Keyword)cUnlimitedUpperAssignment_2_1.eContents().get(0);
+                private final Keyword cAVGAvgKeyword_3_0 = (Keyword)cAVGEnumLiteralDeclaration_3.eContents().get(0);
-                
+                private final EnumLiteralDeclaration cMINEnumLiteralDeclaration_4 = (EnumLiteralDeclaration)cAlternatives.eContents().get(4);
-                //MultiplicityDefinition:
+                private final Keyword cMINMinKeyword_4_0 = (Keyword)cMINEnumLiteralDeclaration_4.eContents().get(0);
-                //      lower=INT '..' (upper=INT | unlimitedUpper?='*');
+                private final EnumLiteralDeclaration cMAXEnumLiteralDeclaration_5 = (EnumLiteralDeclaration)cAlternatives.eContents().get(5);
-                @Override public ParserRule getRule() { return rule; }
+                private final Keyword cMAXMaxKeyword_5_0 = (Keyword)cMAXEnumLiteralDeclaration_5.eContents().get(0);
+                
+                //enum AggregationOp:
+                //      ONLY="only" | SUM="sum" | PROD="prod" | AVG="avg" | MIN="min" | MAX="max";
+                public EnumRule getRule() { return rule; }
+                
+                //ONLY="only" | SUM="sum" | PROD="prod" | AVG="avg" | MIN="min" | MAX="max"
+                public Alternatives getAlternatives() { return cAlternatives; }
                
-                //lower=INT '..' (upper=INT | unlimitedUpper?='*')
+                //ONLY="only"
-                public Group getGroup() { return cGroup; }
+                public EnumLiteralDeclaration getONLYEnumLiteralDeclaration_0() { return cONLYEnumLiteralDeclaration_0; }
                
-                //lower=INT
+                //"only"
-                public Assignment getLowerAssignment_0() { return cLowerAssignment_0; }
+                public Keyword getONLYOnlyKeyword_0_0() { return cONLYOnlyKeyword_0_0; }
                
-                //INT
+                //SUM="sum"
-                public RuleCall getLowerINTTerminalRuleCall_0_0() { return cLowerINTTerminalRuleCall_0_0; }
+                public EnumLiteralDeclaration getSUMEnumLiteralDeclaration_1() { return cSUMEnumLiteralDeclaration_1; }
                
-                //'..'
+                //"sum"
-                public Keyword getFullStopFullStopKeyword_1() { return cFullStopFullStopKeyword_1; }
+                public Keyword getSUMSumKeyword_1_0() { return cSUMSumKeyword_1_0; }
                
-                //upper=INT | unlimitedUpper?='*'
+                //PROD="prod"
-                public Alternatives getAlternatives_2() { return cAlternatives_2; }
+                public EnumLiteralDeclaration getPRODEnumLiteralDeclaration_2() { return cPRODEnumLiteralDeclaration_2; }
                
-                //upper=INT
+                //"prod"
-                public Assignment getUpperAssignment_2_0() { return cUpperAssignment_2_0; }
+                public Keyword getPRODProdKeyword_2_0() { return cPRODProdKeyword_2_0; }
                
-                //INT
+                //AVG="avg"
-                public RuleCall getUpperINTTerminalRuleCall_2_0_0() { return cUpperINTTerminalRuleCall_2_0_0; }
+                public EnumLiteralDeclaration getAVGEnumLiteralDeclaration_3() { return cAVGEnumLiteralDeclaration_3; }
+                
+                //"avg"
+                public Keyword getAVGAvgKeyword_3_0() { return cAVGAvgKeyword_3_0; }
+                
+                //MIN="min"
+                public EnumLiteralDeclaration getMINEnumLiteralDeclaration_4() { return cMINEnumLiteralDeclaration_4; }
                
-                //unlimitedUpper?='*'
+                //"min"
-                public Assignment getUnlimitedUpperAssignment_2_1() { return cUnlimitedUpperAssignment_2_1; }
+                public Keyword getMINMinKeyword_4_0() { return cMINMinKeyword_4_0; }
                
-                //'*'
+                //MAX="max"
-                public Keyword getUnlimitedUpperAsteriskKeyword_2_1_0() { return cUnlimitedUpperAsteriskKeyword_2_1_0; }
+                public EnumLiteralDeclaration getMAXEnumLiteralDeclaration_5() { return cMAXEnumLiteralDeclaration_5; }
+                
+                //"max"
+                public Keyword getMAXMaxKeyword_5_0() { return cMAXMaxKeyword_5_0; }
+        }
+        public class LogicValueElements extends AbstractEnumRuleElementFinder {
+                private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.LogicValue");
+                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final EnumLiteralDeclaration cTRUEEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
+                private final Keyword cTRUETrueKeyword_0_0 = (Keyword)cTRUEEnumLiteralDeclaration_0.eContents().get(0);
+                private final EnumLiteralDeclaration cFALSEEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
+                private final Keyword cFALSEFalseKeyword_1_0 = (Keyword)cFALSEEnumLiteralDeclaration_1.eContents().get(0);
+                private final EnumLiteralDeclaration cUNKNOWNEnumLiteralDeclaration_2 = (EnumLiteralDeclaration)cAlternatives.eContents().get(2);
+                private final Keyword cUNKNOWNUnknownKeyword_2_0 = (Keyword)cUNKNOWNEnumLiteralDeclaration_2.eContents().get(0);
+                private final EnumLiteralDeclaration cERROREnumLiteralDeclaration_3 = (EnumLiteralDeclaration)cAlternatives.eContents().get(3);
+                private final Keyword cERRORErrorKeyword_3_0 = (Keyword)cERROREnumLiteralDeclaration_3.eContents().get(0);
+                
+                //enum LogicValue:
+                //      TRUE="true" | FALSE="false" | UNKNOWN="unknown" | ERROR="error";
+                public EnumRule getRule() { return rule; }
+                
+                //TRUE="true" | FALSE="false" | UNKNOWN="unknown" | ERROR="error"
+                public Alternatives getAlternatives() { return cAlternatives; }
+                
+                //TRUE="true"
+                public EnumLiteralDeclaration getTRUEEnumLiteralDeclaration_0() { return cTRUEEnumLiteralDeclaration_0; }
+                
+                //"true"
+                public Keyword getTRUETrueKeyword_0_0() { return cTRUETrueKeyword_0_0; }
+                
+                //FALSE="false"
+                public EnumLiteralDeclaration getFALSEEnumLiteralDeclaration_1() { return cFALSEEnumLiteralDeclaration_1; }
+                
+                //"false"
+                public Keyword getFALSEFalseKeyword_1_0() { return cFALSEFalseKeyword_1_0; }
+                
+                //UNKNOWN="unknown"
+                public EnumLiteralDeclaration getUNKNOWNEnumLiteralDeclaration_2() { return cUNKNOWNEnumLiteralDeclaration_2; }
+                
+                //"unknown"
+                public Keyword getUNKNOWNUnknownKeyword_2_0() { return cUNKNOWNUnknownKeyword_2_0; }
+                
+                //ERROR="error"
+                public EnumLiteralDeclaration getERROREnumLiteralDeclaration_3() { return cERROREnumLiteralDeclaration_3; }
+                
+                //"error"
+                public Keyword getERRORErrorKeyword_3_0() { return cERRORErrorKeyword_3_0; }
+        }
+        public class ObjectiveKindElements extends AbstractEnumRuleElementFinder {
+                private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.ObjectiveKind");
+                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final EnumLiteralDeclaration cMINIMIZEEnumLiteralDeclaration_0 = (EnumLiteralDeclaration)cAlternatives.eContents().get(0);
+                private final Keyword cMINIMIZEMinimizeKeyword_0_0 = (Keyword)cMINIMIZEEnumLiteralDeclaration_0.eContents().get(0);
+                private final EnumLiteralDeclaration cMAXIMIZEEnumLiteralDeclaration_1 = (EnumLiteralDeclaration)cAlternatives.eContents().get(1);
+                private final Keyword cMAXIMIZEMaximizeKeyword_1_0 = (Keyword)cMAXIMIZEEnumLiteralDeclaration_1.eContents().get(0);
+                
+                //enum ObjectiveKind:
+                //      MINIMIZE="minimize" | MAXIMIZE="maximize";
+                public EnumRule getRule() { return rule; }
+                
+                //MINIMIZE="minimize" | MAXIMIZE="maximize"
+                public Alternatives getAlternatives() { return cAlternatives; }
+                
+                //MINIMIZE="minimize"
+                public EnumLiteralDeclaration getMINIMIZEEnumLiteralDeclaration_0() { return cMINIMIZEEnumLiteralDeclaration_0; }
+                
+                //"minimize"
+                public Keyword getMINIMIZEMinimizeKeyword_0_0() { return cMINIMIZEMinimizeKeyword_0_0; }
+                
+                //MAXIMIZE="maximize"
+                public EnumLiteralDeclaration getMAXIMIZEEnumLiteralDeclaration_1() { return cMAXIMIZEEnumLiteralDeclaration_1; }
+                
+                //"maximize"
+                public Keyword getMAXIMIZEMaximizeKeyword_1_0() { return cMAXIMIZEMaximizeKeyword_1_0; }
        }
-        
        
        private final ProblemElements pProblem;
        private final StatementElements pStatement;
-        private final TerminalRule tSTRING;
+        private final AssertionOrDefinitionElements pAssertionOrDefinition;
-        private final REALLiteralElements pREALLiteral;
+        private final PredicateDefinitionElements pPredicateDefinition;
-        private final INTLiteralElements pINTLiteral;
+        private final UnnamedErrorPrediateDefinitionElements pUnnamedErrorPrediateDefinition;
-        private final BooleanValueElements pBooleanValue;
+        private final DefaultDefinitionElements pDefaultDefinition;
-        private final TruthValueElements pTruthValue;
+        private final ExternPredicateDefinitionElements pExternPredicateDefinition;
-        private final InterpretationElements pInterpretation;
+        private final MetricTypeElements eMetricType;
-        private final BasicInterpretationElements pBasicInterpretation;
+        private final MetricDefinitionElements pMetricDefinition;
-        private final SymbolElements pSymbol;
+        private final ExternMetricDefinitionElements pExternMetricDefinition;
-        private final ModelSymbolElements pModelSymbol;
+        private final ExpressionElements pExpression;
-        private final PartialitySymbolElements pPartialitySymbol;
+        private final IfElseElements pIfElse;
-        private final ExistSymbolElements pExistSymbol;
+        private final DisjunctiveExpressionElements pDisjunctiveExpression;
-        private final EqualsSymbolElements pEqualsSymbol;
+        private final CaseElements pCase;
-        private final DataSymbolElements pDataSymbol;
+        private final ConjunctiveExpressionElements pConjunctiveExpression;
-        private final BooleanSymbolElements pBooleanSymbol;
+        private final BinaryOperatorElements eBinaryOperator;
-        private final IntegerSymbolElements pIntegerSymbol;
+        private final ComparisonOperatorElements eComparisonOperator;
-        private final RealSymbolElements pRealSymbol;
+        private final ComparisonExpressionElements pComparisonExpression;
-        private final StringSymbolElements pStringSymbol;
+        private final AdditiveBinaryOperatorElements eAdditiveBinaryOperator;
-        private final ComplexObjectElements pComplexObject;
+        private final AdditiveExpressionElements pAdditiveExpression;
-        private final ObjectElements pObject;
+        private final MultiplicativeBinaryOperatorElements eMultiplicativeBinaryOperator;
-        private final NamedObjectElements pNamedObject;
+        private final MultiplicativeExpressionElements pMultiplicativeExpression;
-        private final UnnamedObjectElements pUnnamedObject;
+        private final ExponentialOpElements eExponentialOp;
-        private final DataObjectElements pDataObject;
+        private final ExponentialExpressionElements pExponentialExpression;
-        private final BooleanObjectElements pBooleanObject;
+        private final UnaryOpElements eUnaryOp;
-        private final IntObjectElements pIntObject;
+        private final UnaryExpressionElements pUnaryExpression;
-        private final RealObjectElements pRealObject;
+        private final AggregationExpressionElements pAggregationExpression;
-        private final StringObjectElements pStringObject;
+        private final CountElements pCount;
-        private final PredicateElements pPredicate;
+        private final AggregationOpElements eAggregationOp;
-        private final ParameterElements pParameter;
+        private final AggregationElements pAggregation;
-        private final PatternBodyElements pPatternBody;
+        private final AtomicExpressionElements pAtomicExpression;
-        private final PolarityElements pPolarity;
+        private final CallElements pCall;
-        private final ConstraintElements pConstraint;
+        private final ArgumentListElements pArgumentList;
-        private final ClosureTypeElements pClosureType;
+        private final ArgumentElements pArgument;
+        private final ExpressionArgumentElements pExpressionArgument;
+        private final StarArgumentElements pStarArgument;
+        private final TypedArgumentElements pTypedArgument;
+        private final TypedStarArgumentElements pTypedStarArgument;
+        private final ReferenceElements pReference;
+        private final IntervalElements pInterval;
        private final LiteralElements pLiteral;
-        private final VariableElements pVariable;
+        private final LogicValueElements eLogicValue;
-        private final AllInstancesElements pAllInstances;
+        private final LogicLiteralElements pLogicLiteral;
-        private final AllObjectsElements pAllObjects;
+        private final NumericLiteralElements pNumericLiteral;
-        private final DefaultInterpretationElements pDefaultInterpretation;
+        private final InfinityLiteralElements pInfinityLiteral;
-        private final CDInterpretationElements pCDInterpretation;
+        private final EmptyIntervalLiteralElements pEmptyIntervalLiteral;
-        private final ClassInterpretationElements pClassInterpretation;
+        private final StringLiteralElements pStringLiteral;
-        private final EnumInterpretationElements pEnumInterpretation;
+        private final ClassDefinitionElements pClassDefinition;
-        private final FieldRelationInterpretationElements pFieldRelationInterpretation;
+        private final MemberDefinitionElements pMemberDefinition;
-        private final GlobalRelationInterpretationElements pGlobalRelationInterpretation;
+        private final MultiplicityElements pMultiplicity;
-        private final MultiplicityDefinitionElements pMultiplicityDefinition;
+        private final ManyMultiplicityElements pManyMultiplicity;
+        private final ExactMultiplicityElements pExactMultiplicity;
+        private final BoundedMultiplicityElements pBoundedMultiplicity;
+        private final ScopeDefinitionElements pScopeDefinition;
+        private final ExactScopeDefinitionElements pExactScopeDefinition;
+        private final BoundedScopeDefinitionElements pBoundedScopeDefinition;
+        private final LowerBoundedScopeDefinitionElements pLowerBoundedScopeDefinition;
+        private final ObjectiveKindElements eObjectiveKind;
+        private final ObjectiveDefinitionElements pObjectiveDefinition;
+        private final UpperMultiplictyElements pUpperMultiplicty;
+        private final RealElements pReal;
+        private final QualifiedNameElements pQualifiedName;
+        private final TerminalRule tSTRING;
+        private final TerminalRule tQUOTED_ID;
+        private final TerminalRule tSL_COMMENT;
+        private final TerminalRule tTRANSITIVE_CLOSURE;
+        private final TerminalRule tREFLEXIVE_TRANSITIVE_CLOSURE;
+        private final TerminalRule tFULL_STOP;
+        private final NamedElementElements pNamedElement;
        
        private final Grammar grammar;
        
@@ -1490,49 +2574,73 @@ public class SolverLanguageGrammarAccess extends AbstractGrammarElementFinder {
                this.gaTerminals = gaTerminals;
                this.pProblem = new ProblemElements();
                this.pStatement = new StatementElements();
-                this.tSTRING = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.STRING");
+                this.pAssertionOrDefinition = new AssertionOrDefinitionElements();
-                this.pREALLiteral = new REALLiteralElements();
+                this.pPredicateDefinition = new PredicateDefinitionElements();
-                this.pINTLiteral = new INTLiteralElements();
+                this.pUnnamedErrorPrediateDefinition = new UnnamedErrorPrediateDefinitionElements();
-                this.pBooleanValue = new BooleanValueElements();
+                this.pDefaultDefinition = new DefaultDefinitionElements();
-                this.pTruthValue = new TruthValueElements();
+                this.pExternPredicateDefinition = new ExternPredicateDefinitionElements();
-                this.pInterpretation = new InterpretationElements();
+                this.eMetricType = new MetricTypeElements();
-                this.pBasicInterpretation = new BasicInterpretationElements();
+                this.pMetricDefinition = new MetricDefinitionElements();
-                this.pSymbol = new SymbolElements();
+                this.pExternMetricDefinition = new ExternMetricDefinitionElements();
-                this.pModelSymbol = new ModelSymbolElements();
+                this.pExpression = new ExpressionElements();
-                this.pPartialitySymbol = new PartialitySymbolElements();
+                this.pIfElse = new IfElseElements();
-                this.pExistSymbol = new ExistSymbolElements();
+                this.pDisjunctiveExpression = new DisjunctiveExpressionElements();
-                this.pEqualsSymbol = new EqualsSymbolElements();
+                this.pCase = new CaseElements();
-                this.pDataSymbol = new DataSymbolElements();
+                this.pConjunctiveExpression = new ConjunctiveExpressionElements();
-                this.pBooleanSymbol = new BooleanSymbolElements();
+                this.eBinaryOperator = new BinaryOperatorElements();
-                this.pIntegerSymbol = new IntegerSymbolElements();
+                this.eComparisonOperator = new ComparisonOperatorElements();
-                this.pRealSymbol = new RealSymbolElements();
+                this.pComparisonExpression = new ComparisonExpressionElements();
-                this.pStringSymbol = new StringSymbolElements();
+                this.eAdditiveBinaryOperator = new AdditiveBinaryOperatorElements();
-                this.pComplexObject = new ComplexObjectElements();
+                this.pAdditiveExpression = new AdditiveExpressionElements();
-                this.pObject = new ObjectElements();
+                this.eMultiplicativeBinaryOperator = new MultiplicativeBinaryOperatorElements();
-                this.pNamedObject = new NamedObjectElements();
+                this.pMultiplicativeExpression = new MultiplicativeExpressionElements();
-                this.pUnnamedObject = new UnnamedObjectElements();
+                this.eExponentialOp = new ExponentialOpElements();
-                this.pDataObject = new DataObjectElements();
+                this.pExponentialExpression = new ExponentialExpressionElements();
-                this.pBooleanObject = new BooleanObjectElements();
+                this.eUnaryOp = new UnaryOpElements();
-                this.pIntObject = new IntObjectElements();
+                this.pUnaryExpression = new UnaryExpressionElements();
-                this.pRealObject = new RealObjectElements();
+                this.pAggregationExpression = new AggregationExpressionElements();
-                this.pStringObject = new StringObjectElements();
+                this.pCount = new CountElements();
-                this.pPredicate = new PredicateElements();
+                this.eAggregationOp = new AggregationOpElements();
-                this.pParameter = new ParameterElements();
+                this.pAggregation = new AggregationElements();
-                this.pPatternBody = new PatternBodyElements();
+                this.pAtomicExpression = new AtomicExpressionElements();
-                this.pPolarity = new PolarityElements();
+                this.pCall = new CallElements();
-                this.pConstraint = new ConstraintElements();
+                this.pArgumentList = new ArgumentListElements();
-                this.pClosureType = new ClosureTypeElements();
+                this.pArgument = new ArgumentElements();
+                this.pExpressionArgument = new ExpressionArgumentElements();
+                this.pStarArgument = new StarArgumentElements();
+                this.pTypedArgument = new TypedArgumentElements();
+                this.pTypedStarArgument = new TypedStarArgumentElements();
+                this.pReference = new ReferenceElements();
+                this.pInterval = new IntervalElements();
                this.pLiteral = new LiteralElements();
-                this.pVariable = new VariableElements();
+                this.eLogicValue = new LogicValueElements();
-                this.pAllInstances = new AllInstancesElements();
+                this.pLogicLiteral = new LogicLiteralElements();
-                this.pAllObjects = new AllObjectsElements();
+                this.pNumericLiteral = new NumericLiteralElements();
-                this.pDefaultInterpretation = new DefaultInterpretationElements();
+                this.pInfinityLiteral = new InfinityLiteralElements();
-                this.pCDInterpretation = new CDInterpretationElements();
+                this.pEmptyIntervalLiteral = new EmptyIntervalLiteralElements();
-                this.pClassInterpretation = new ClassInterpretationElements();
+                this.pStringLiteral = new StringLiteralElements();
-                this.pEnumInterpretation = new EnumInterpretationElements();
+                this.pClassDefinition = new ClassDefinitionElements();
-                this.pFieldRelationInterpretation = new FieldRelationInterpretationElements();
+                this.pMemberDefinition = new MemberDefinitionElements();
-                this.pGlobalRelationInterpretation = new GlobalRelationInterpretationElements();
+                this.pMultiplicity = new MultiplicityElements();
-                this.pMultiplicityDefinition = new MultiplicityDefinitionElements();
+                this.pManyMultiplicity = new ManyMultiplicityElements();
+                this.pExactMultiplicity = new ExactMultiplicityElements();
+                this.pBoundedMultiplicity = new BoundedMultiplicityElements();
+                this.pScopeDefinition = new ScopeDefinitionElements();
+                this.pExactScopeDefinition = new ExactScopeDefinitionElements();
+                this.pBoundedScopeDefinition = new BoundedScopeDefinitionElements();
+                this.pLowerBoundedScopeDefinition = new LowerBoundedScopeDefinitionElements();
+                this.eObjectiveKind = new ObjectiveKindElements();
+                this.pObjectiveDefinition = new ObjectiveDefinitionElements();
+                this.pUpperMultiplicty = new UpperMultiplictyElements();
+                this.pReal = new RealElements();
+                this.pQualifiedName = new QualifiedNameElements();
+                this.tSTRING = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.STRING");
+                this.tQUOTED_ID = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.QUOTED_ID");
+                this.tSL_COMMENT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.SL_COMMENT");
+                this.tTRANSITIVE_CLOSURE = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.TRANSITIVE_CLOSURE");
+                this.tREFLEXIVE_TRANSITIVE_CLOSURE = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.REFLEXIVE_TRANSITIVE_CLOSURE");
+                this.tFULL_STOP = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.SolverLanguage.FULL_STOP");
+                this.pNamedElement = new NamedElementElements();
        }
        
        protected Grammar internalFindGrammar(GrammarProvider grammarProvider) {
@@ -1573,7 +2681,9 @@ public class SolverLanguageGrammarAccess extends AbstractGrammarElementFinder {
        }
        
        //Statement:
-        //      Interpretation | Predicate;
+        //      (AssertionOrDefinition | PredicateDefinition | UnnamedErrorPrediateDefinition | DefaultDefinition |
+        //      ExternPredicateDefinition | MetricDefinition | ExternMetricDefinition | ClassDefinition | ScopeDefinition |
+        //      ObjectiveDefinition) FULL_STOP;
        public StatementElements getStatementAccess() {
                return pStatement;
        }
@@ -1582,333 +2692,391 @@ public class SolverLanguageGrammarAccess extends AbstractGrammarElementFinder {
                return getStatementAccess().getRule();
        }
        
-        //@Override
+        //AssertionOrDefinition Statement:
-        //terminal STRING:
+        //      Expression ({Assertion.body=current} (":" range=Expression)? | {PredicateDefinition.head=current} ":-"
-        //      '"' ('\\' . | !('\\' | '"'))* '"';
+        //      body=Expression | {MetricDefinition.head=current} "=" body=Expression);
-        public TerminalRule getSTRINGRule() {
+        public AssertionOrDefinitionElements getAssertionOrDefinitionAccess() {
-                return tSTRING;
+                return pAssertionOrDefinition;
        }
        
-        //REALLiteral ecore::EBigDecimal:
+        public ParserRule getAssertionOrDefinitionRule() {
-        //      '-'? INT '.' INT;
+                return getAssertionOrDefinitionAccess().getRule();
-        public REALLiteralElements getREALLiteralAccess() {
-                return pREALLiteral;
        }
        
-        public ParserRule getREALLiteralRule() {
+        //PredicateDefinition:
-                return getREALLiteralAccess().getRule();
+        //      (functional?="functional" error?="error"? | error?="error" functional?="functional"?) head=Call ":-" body=Expression;
+        public PredicateDefinitionElements getPredicateDefinitionAccess() {
+                return pPredicateDefinition;
        }
        
-        //INTLiteral ecore::EInt:
+        public ParserRule getPredicateDefinitionRule() {
-        //      '-'? INT;
+                return getPredicateDefinitionAccess().getRule();
-        public INTLiteralElements getINTLiteralAccess() {
-                return pINTLiteral;
        }
        
-        public ParserRule getINTLiteralRule() {
+        //UnnamedErrorPrediateDefinition:
-                return getINTLiteralAccess().getRule();
+        //      "error" argumentList=ArgumentList ":-" body=Expression;
+        public UnnamedErrorPrediateDefinitionElements getUnnamedErrorPrediateDefinitionAccess() {
+                return pUnnamedErrorPrediateDefinition;
        }
        
-        //BooleanValue:
+        public ParserRule getUnnamedErrorPrediateDefinitionRule() {
-        //      {BooleanTrue} 'true' | 'false' {BooleanFalse};
+                return getUnnamedErrorPrediateDefinitionAccess().getRule();
-        public BooleanValueElements getBooleanValueAccess() {
-                return pBooleanValue;
        }
        
-        public ParserRule getBooleanValueRule() {
+        //DefaultDefinition:
-                return getBooleanValueAccess().getRule();
+        //      "default" head=Call ":" range=Expression;
+        public DefaultDefinitionElements getDefaultDefinitionAccess() {
+                return pDefaultDefinition;
        }
        
-        //TruthValue:
+        public ParserRule getDefaultDefinitionRule() {
-        //      {True} 'true' | {False} 'false' | {Unknown} 'unknown' | {Error} 'error';
+                return getDefaultDefinitionAccess().getRule();
-        public TruthValueElements getTruthValueAccess() {
-                return pTruthValue;
        }
        
-        public ParserRule getTruthValueRule() {
+        //ExternPredicateDefinition:
-                return getTruthValueAccess().getRule();
+        //      "extern" head=Call;
+        public ExternPredicateDefinitionElements getExternPredicateDefinitionAccess() {
+                return pExternPredicateDefinition;
        }
        
-        /////////////////////
+        public ParserRule getExternPredicateDefinitionRule() {
-        //// Core grammar
+                return getExternPredicateDefinitionAccess().getRule();
-        // ///////////////////
-        //Interpretation:
-        //      BasicInterpretation | DefaultInterpretation | CDInterpretation;
-        public InterpretationElements getInterpretationAccess() {
-                return pInterpretation;
        }
        
-        public ParserRule getInterpretationRule() {
+        //enum MetricType:
-                return getInterpretationAccess().getRule();
+        //      INT="int" | REAL="real";
+        public MetricTypeElements getMetricTypeAccess() {
+                return eMetricType;
        }
        
-        //BasicInterpretation:
+        public EnumRule getMetricTypeRule() {
-        //      symbol=Symbol ('(' (objects+=ComplexObject (',' objects+=ComplexObject)*)? ')')? ':' value=TruthValue;
+                return getMetricTypeAccess().getRule();
-        public BasicInterpretationElements getBasicInterpretationAccess() {
-                return pBasicInterpretation;
        }
        
-        public ParserRule getBasicInterpretationRule() {
+        //MetricDefinition:
-                return getBasicInterpretationAccess().getRule();
+        //      type=MetricType head=Expression "=" body=Expression;
+        public MetricDefinitionElements getMetricDefinitionAccess() {
+                return pMetricDefinition;
        }
        
-        //Symbol:
+        public ParserRule getMetricDefinitionRule() {
-        //      ModelSymbol | PartialitySymbol | DataSymbol;
+                return getMetricDefinitionAccess().getRule();
-        public SymbolElements getSymbolAccess() {
-                return pSymbol;
        }
        
-        public ParserRule getSymbolRule() {
+        //ExternMetricDefinition:
-                return getSymbolAccess().getRule();
+        //      "extern" type=MetricType head=Call;
+        public ExternMetricDefinitionElements getExternMetricDefinitionAccess() {
+                return pExternMetricDefinition;
        }
        
-        //ModelSymbol:
+        public ParserRule getExternMetricDefinitionRule() {
-        //      name=ID;
+                return getExternMetricDefinitionAccess().getRule();
-        public ModelSymbolElements getModelSymbolAccess() {
-                return pModelSymbol;
        }
        
-        public ParserRule getModelSymbolRule() {
+        //Expression:
-                return getModelSymbolAccess().getRule();
+        //      IfElse | DisjunctiveExpression;
+        public ExpressionElements getExpressionAccess() {
+                return pExpression;
        }
        
-        //PartialitySymbol:
+        public ParserRule getExpressionRule() {
-        //      ExistSymbol | EqualsSymbol;
+                return getExpressionAccess().getRule();
-        public PartialitySymbolElements getPartialitySymbolAccess() {
-                return pPartialitySymbol;
        }
        
-        public ParserRule getPartialitySymbolRule() {
+        //IfElse:
-                return getPartialitySymbolAccess().getRule();
+        //      "if" condition=Expression "then" then=Expression "else" else=Expression;
+        public IfElseElements getIfElseAccess() {
+                return pIfElse;
        }
        
-        //ExistSymbol:
+        public ParserRule getIfElseRule() {
-        //      'exists' {ExistSymbol};
+                return getIfElseAccess().getRule();
-        public ExistSymbolElements getExistSymbolAccess() {
-                return pExistSymbol;
        }
        
-        public ParserRule getExistSymbolRule() {
+        //DisjunctiveExpression Expression:
-                return getExistSymbolAccess().getRule();
+        //      ConjunctiveExpression ({Disjunction.children+=current} (";" children+=ConjunctiveExpression)+ |
+        //      {Case.condition=current} "->" body=ConjunctiveExpression {Switch.cases+=current} (";" cases+=Case)*)?;
+        public DisjunctiveExpressionElements getDisjunctiveExpressionAccess() {
+                return pDisjunctiveExpression;
        }
        
-        //EqualsSymbol:
+        public ParserRule getDisjunctiveExpressionRule() {
-        //      'equals' {EqualsSymbol};
+                return getDisjunctiveExpressionAccess().getRule();
-        public EqualsSymbolElements getEqualsSymbolAccess() {
-                return pEqualsSymbol;
        }
        
-        public ParserRule getEqualsSymbolRule() {
+        //Case:
-                return getEqualsSymbolAccess().getRule();
+        //      condition=ConjunctiveExpression "->" body=ConjunctiveExpression;
+        public CaseElements getCaseAccess() {
+                return pCase;
        }
        
-        //DataSymbol:
+        public ParserRule getCaseRule() {
-        //      BooleanSymbol | IntegerSymbol | RealSymbol | StringSymbol;
+                return getCaseAccess().getRule();
-        public DataSymbolElements getDataSymbolAccess() {
-                return pDataSymbol;
        }
        
-        public ParserRule getDataSymbolRule() {
+        //ConjunctiveExpression Expression:
-                return getDataSymbolAccess().getRule();
+        //      ComparisonExpression ({Conjunction.children+=current} ("," children+=ComparisonExpression)+)?;
+        public ConjunctiveExpressionElements getConjunctiveExpressionAccess() {
+                return pConjunctiveExpression;
        }
        
-        //BooleanSymbol:
+        public ParserRule getConjunctiveExpressionRule() {
-        //      'bool' {BooleanSymbol};
+                return getConjunctiveExpressionAccess().getRule();
-        public BooleanSymbolElements getBooleanSymbolAccess() {
-                return pBooleanSymbol;
        }
        
-        public ParserRule getBooleanSymbolRule() {
+        //enum BinaryOperator:
-                return getBooleanSymbolAccess().getRule();
+        //      EQ | NOT_EQ | LESS | LESS_EQ | GREATER | GREATER_EQ | IN | ADD | SUB | MUL | DIV | POW;
+        public BinaryOperatorElements getBinaryOperatorAccess() {
+                return eBinaryOperator;
        }
        
-        //IntegerSymbol:
+        public EnumRule getBinaryOperatorRule() {
-        //      'int' {IntegerSymbol};
+                return getBinaryOperatorAccess().getRule();
-        public IntegerSymbolElements getIntegerSymbolAccess() {
-                return pIntegerSymbol;
        }
        
-        public ParserRule getIntegerSymbolRule() {
+        //enum ComparisonOperator returns BinaryOperator:
-                return getIntegerSymbolAccess().getRule();
+        //      EQ="==" | NOT_EQ="!=" | LESS="<" | LESS_EQ="<=" | GREATER=">" | GREATER_EQ=">=" | IN="in";
+        public ComparisonOperatorElements getComparisonOperatorAccess() {
+                return eComparisonOperator;
        }
        
-        //RealSymbol:
+        public EnumRule getComparisonOperatorRule() {
-        //      'real' {RealSymbol};
+                return getComparisonOperatorAccess().getRule();
-        public RealSymbolElements getRealSymbolAccess() {
-                return pRealSymbol;
        }
        
-        public ParserRule getRealSymbolRule() {
+        //ComparisonExpression Expression:
-                return getRealSymbolAccess().getRule();
+        //      AdditiveExpression ({Comparison.left=current} op=ComparisonOperator right=AdditiveExpression)?;
+        public ComparisonExpressionElements getComparisonExpressionAccess() {
+                return pComparisonExpression;
        }
        
-        //StringSymbol:
+        public ParserRule getComparisonExpressionRule() {
-        //      'string' {StringSymbol};
+                return getComparisonExpressionAccess().getRule();
-        public StringSymbolElements getStringSymbolAccess() {
-                return pStringSymbol;
        }
        
-        public ParserRule getStringSymbolRule() {
+        //enum AdditiveBinaryOperator returns BinaryOperator:
-                return getStringSymbolAccess().getRule();
+        //      ADD="+" | SUB="-";
+        public AdditiveBinaryOperatorElements getAdditiveBinaryOperatorAccess() {
+                return eAdditiveBinaryOperator;
        }
        
-        //ComplexObject:
+        public EnumRule getAdditiveBinaryOperatorRule() {
-        //      Object | AllInstances | AllObjects;
+                return getAdditiveBinaryOperatorAccess().getRule();
-        public ComplexObjectElements getComplexObjectAccess() {
-                return pComplexObject;
        }
        
-        public ParserRule getComplexObjectRule() {
+        //AdditiveExpression Expression:
-                return getComplexObjectAccess().getRule();
+        //      MultiplicativeExpression ({BinaryExpression.left=current} op=AdditiveBinaryOperator right=MultiplicativeExpression)*;
+        public AdditiveExpressionElements getAdditiveExpressionAccess() {
+                return pAdditiveExpression;
        }
        
-        //Object:
+        public ParserRule getAdditiveExpressionRule() {
-        //      NamedObject | UnnamedObject | DataObject;
+                return getAdditiveExpressionAccess().getRule();
-        public ObjectElements getObjectAccess() {
-                return pObject;
        }
        
-        public ParserRule getObjectRule() {
+        //enum MultiplicativeBinaryOperator returns BinaryOperator:
-                return getObjectAccess().getRule();
+        //      MUL="*" | DIV="/";
+        public MultiplicativeBinaryOperatorElements getMultiplicativeBinaryOperatorAccess() {
+                return eMultiplicativeBinaryOperator;
        }
        
-        //NamedObject:
+        public EnumRule getMultiplicativeBinaryOperatorRule() {
-        //      "'" name=ID "'";
+                return getMultiplicativeBinaryOperatorAccess().getRule();
-        public NamedObjectElements getNamedObjectAccess() {
-                return pNamedObject;
        }
        
-        public ParserRule getNamedObjectRule() {
+        //MultiplicativeExpression Expression:
-                return getNamedObjectAccess().getRule();
+        //      ExponentialExpression ({BinaryExpression.left=current} op=MultiplicativeBinaryOperator right=ExponentialExpression)*;
+        public MultiplicativeExpressionElements getMultiplicativeExpressionAccess() {
+                return pMultiplicativeExpression;
        }
        
-        //UnnamedObject:
+        public ParserRule getMultiplicativeExpressionRule() {
-        //      name=ID;
+                return getMultiplicativeExpressionAccess().getRule();
-        public UnnamedObjectElements getUnnamedObjectAccess() {
-                return pUnnamedObject;
        }
        
-        public ParserRule getUnnamedObjectRule() {
+        //enum ExponentialOp returns BinaryOperator:
-                return getUnnamedObjectAccess().getRule();
+        //      POW="^";
+        public ExponentialOpElements getExponentialOpAccess() {
+                return eExponentialOp;
        }
        
-        //DataObject:
+        public EnumRule getExponentialOpRule() {
-        //      BooleanObject | IntObject | RealObject | StringObject;
+                return getExponentialOpAccess().getRule();
-        public DataObjectElements getDataObjectAccess() {
-                return pDataObject;
        }
        
-        public ParserRule getDataObjectRule() {
+        //ExponentialExpression Expression:
-                return getDataObjectAccess().getRule();
+        //      UnaryExpression ({BinaryExpression.left=current} op=ExponentialOp right=ExponentialExpression)?;
+        public ExponentialExpressionElements getExponentialExpressionAccess() {
+                return pExponentialExpression;
        }
        
-        //BooleanObject:
+        public ParserRule getExponentialExpressionRule() {
-        //      value=BooleanValue;
+                return getExponentialExpressionAccess().getRule();
-        public BooleanObjectElements getBooleanObjectAccess() {
-                return pBooleanObject;
        }
        
-        public ParserRule getBooleanObjectRule() {
+        //enum UnaryOp:
-                return getBooleanObjectAccess().getRule();
+        //      NEG="!" | PLUS="+" | MINUS="-" | MAY="may" | MUST="must" | CURRENT="current";
+        public UnaryOpElements getUnaryOpAccess() {
+                return eUnaryOp;
        }
        
-        //IntObject:
+        public EnumRule getUnaryOpRule() {
-        //      value=INTLiteral;
+                return getUnaryOpAccess().getRule();
-        public IntObjectElements getIntObjectAccess() {
-                return pIntObject;
        }
        
-        public ParserRule getIntObjectRule() {
+        //UnaryExpression Expression:
-                return getIntObjectAccess().getRule();
+        //      AggregationExpression | {UnaryExpression} op=UnaryOp body=AggregationExpression;
+        public UnaryExpressionElements getUnaryExpressionAccess() {
+                return pUnaryExpression;
        }
        
-        //RealObject:
+        public ParserRule getUnaryExpressionRule() {
-        //      value=REALLiteral;
+                return getUnaryExpressionAccess().getRule();
-        public RealObjectElements getRealObjectAccess() {
-                return pRealObject;
        }
        
-        public ParserRule getRealObjectRule() {
+        //AggregationExpression Expression:
-                return getRealObjectAccess().getRule();
+        //      AtomicExpression | Count | Aggregation;
+        public AggregationExpressionElements getAggregationExpressionAccess() {
+                return pAggregationExpression;
        }
        
-        //StringObject:
+        public ParserRule getAggregationExpressionRule() {
-        //      value=STRING;
+                return getAggregationExpressionAccess().getRule();
-        public StringObjectElements getStringObjectAccess() {
+        }
-                return pStringObject;
+        
+        //Count:
+        //      "count" "{" body=Expression "}";
+        public CountElements getCountAccess() {
+                return pCount;
+        }
+        
+        public ParserRule getCountRule() {
+                return getCountAccess().getRule();
+        }
+        
+        //enum AggregationOp:
+        //      ONLY="only" | SUM="sum" | PROD="prod" | AVG="avg" | MIN="min" | MAX="max";
+        public AggregationOpElements getAggregationOpAccess() {
+                return eAggregationOp;
+        }
+        
+        public EnumRule getAggregationOpRule() {
+                return getAggregationOpAccess().getRule();
+        }
+        
+        //Aggregation:
+        //      op=AggregationOp "{" body=Expression "|" condition=Expression "}";
+        public AggregationElements getAggregationAccess() {
+                return pAggregation;
+        }
+        
+        public ParserRule getAggregationRule() {
+                return getAggregationAccess().getRule();
+        }
+        
+        //AtomicExpression Expression:
+        //      Reference | Call | Interval | Literal | "(" Expression ")";
+        public AtomicExpressionElements getAtomicExpressionAccess() {
+                return pAtomicExpression;
+        }
+        
+        public ParserRule getAtomicExpressionRule() {
+                return getAtomicExpressionAccess().getRule();
        }
        
-        public ParserRule getStringObjectRule() {
+        //Call:
-                return getStringObjectAccess().getRule();
+        //      functor=Reference (transitiveClosure?=TRANSITIVE_CLOSURE | reflexiveTransitiveClosure?=REFLEXIVE_TRANSITIVE_CLOSURE)?
+        //      argumentList=ArgumentList;
+        public CallElements getCallAccess() {
+                return pCall;
        }
        
-        /////////////////////
+        public ParserRule getCallRule() {
-        //// Predicte grammar
+                return getCallAccess().getRule();
-        /////////////////////
-        //Predicate:
-        //      isError?='error'? symbol=ModelSymbol ('(' (parameters+=Parameter (',' parameters+=Parameter)*)? ')')? ':-' ('false' |
-        //      bodies+=PatternBody ('|' bodies+=PatternBody)*) '.';
-        public PredicateElements getPredicateAccess() {
-                return pPredicate;
        }
        
-        public ParserRule getPredicateRule() {
+        //ArgumentList:
-                return getPredicateAccess().getRule();
+        //      {ArgumentList} "(" (arguments+=Argument ("," arguments+=Argument)*)? ")";
+        public ArgumentListElements getArgumentListAccess() {
+                return pArgumentList;
        }
        
-        //Parameter:
+        public ParserRule getArgumentListRule() {
-        //      variable=Variable (':' type=Symbol)?;
+                return getArgumentListAccess().getRule();
-        public ParameterElements getParameterAccess() {
-                return pParameter;
        }
        
-        public ParserRule getParameterRule() {
+        //Argument:
-                return getParameterAccess().getRule();
+        //      ExpressionArgument | StarArgument | TypedArgument | TypedStarArgument;
+        public ArgumentElements getArgumentAccess() {
+                return pArgument;
        }
        
-        //PatternBody:
+        public ParserRule getArgumentRule() {
-        //      {PatternBody} ('true' | constraints+=Constraint*);
+                return getArgumentAccess().getRule();
-        public PatternBodyElements getPatternBodyAccess() {
-                return pPatternBody;
        }
        
-        public ParserRule getPatternBodyRule() {
+        //ExpressionArgument:
-                return getPatternBodyAccess().getRule();
+        //      body=ComparisonExpression;
+        public ExpressionArgumentElements getExpressionArgumentAccess() {
+                return pExpressionArgument;
        }
        
-        //Polarity:
+        public ParserRule getExpressionArgumentRule() {
-        //      {Positive} '+' | {Negative} '-';
+                return getExpressionArgumentAccess().getRule();
-        public PolarityElements getPolarityAccess() {
-                return pPolarity;
        }
        
-        public ParserRule getPolarityRule() {
+        //StarArgument:
-                return getPolarityAccess().getRule();
+        //      {StarArgument} "*";
+        public StarArgumentElements getStarArgumentAccess() {
+                return pStarArgument;
        }
        
-        //Constraint:
+        public ParserRule getStarArgumentRule() {
-        //      polarity=Polarity? symbol=ModelSymbol ('(' params+=Literal? (',' params+=Literal)* ')')? | closureType=ClosureType
+                return getStarArgumentAccess().getRule();
-        //      '(' params+=Literal? (',' params+=Literal)* ')';
-        public ConstraintElements getConstraintAccess() {
-                return pConstraint;
        }
        
-        public ParserRule getConstraintRule() {
+        //TypedArgument:
-                return getConstraintAccess().getRule();
+        //      type=[NamedElement|QualifiedName] variable=[NamedElement|QualifiedName];
+        public TypedArgumentElements getTypedArgumentAccess() {
+                return pTypedArgument;
        }
        
-        //ClosureType:
+        public ParserRule getTypedArgumentRule() {
-        //      {ReflexiveClosure} '*' | {IrreflexiveClosure} '+';
+                return getTypedArgumentAccess().getRule();
-        public ClosureTypeElements getClosureTypeAccess() {
-                return pClosureType;
        }
        
-        public ParserRule getClosureTypeRule() {
+        //TypedStarArgument:
-                return getClosureTypeAccess().getRule();
+        //      type=[NamedElement|QualifiedName] "*";
+        public TypedStarArgumentElements getTypedStarArgumentAccess() {
+                return pTypedStarArgument;
+        }
+        
+        public ParserRule getTypedStarArgumentRule() {
+                return getTypedStarArgumentAccess().getRule();
+        }
+        
+        //Reference:
+        //      referred=[NamedElement|QualifiedName];
+        public ReferenceElements getReferenceAccess() {
+                return pReference;
+        }
+        
+        public ParserRule getReferenceRule() {
+                return getReferenceAccess().getRule();
+        }
+        
+        //Interval:
+        //      "[" lowerBound=Expression ".." upperBound=Expression "]";
+        public IntervalElements getIntervalAccess() {
+                return pInterval;
+        }
+        
+        public ParserRule getIntervalRule() {
+                return getIntervalAccess().getRule();
        }
        
        //Literal:
-        //      Variable | DataObject | NamedObject;
+        //      LogicLiteral | NumericLiteral | InfinityLiteral | EmptyIntervalLiteral | StringLiteral;
        public LiteralElements getLiteralAccess() {
                return pLiteral;
        }
@@ -1917,116 +3085,267 @@ public class SolverLanguageGrammarAccess extends AbstractGrammarElementFinder {
                return getLiteralAccess().getRule();
        }
        
-        //Variable:
+        //enum LogicValue:
-        //      name=ID;
+        //      TRUE="true" | FALSE="false" | UNKNOWN="unknown" | ERROR="error";
-        public VariableElements getVariableAccess() {
+        public LogicValueElements getLogicValueAccess() {
-                return pVariable;
+                return eLogicValue;
+        }
+        
+        public EnumRule getLogicValueRule() {
+                return getLogicValueAccess().getRule();
+        }
+        
+        //LogicLiteral:
+        //      value=LogicValue;
+        public LogicLiteralElements getLogicLiteralAccess() {
+                return pLogicLiteral;
+        }
+        
+        public ParserRule getLogicLiteralRule() {
+                return getLogicLiteralAccess().getRule();
+        }
+        
+        //NumericLiteral:
+        //      value=Real;
+        public NumericLiteralElements getNumericLiteralAccess() {
+                return pNumericLiteral;
+        }
+        
+        public ParserRule getNumericLiteralRule() {
+                return getNumericLiteralAccess().getRule();
+        }
+        
+        //InfinityLiteral:
+        //      {InfinityLiteral} "inf";
+        public InfinityLiteralElements getInfinityLiteralAccess() {
+                return pInfinityLiteral;
+        }
+        
+        public ParserRule getInfinityLiteralRule() {
+                return getInfinityLiteralAccess().getRule();
        }
        
-        public ParserRule getVariableRule() {
+        //EmptyIntervalLiteral:
-                return getVariableAccess().getRule();
+        //      {EmptyIntervalLiteral} "empty";
+        public EmptyIntervalLiteralElements getEmptyIntervalLiteralAccess() {
+                return pEmptyIntervalLiteral;
        }
        
-        /////////////////////
+        public ParserRule getEmptyIntervalLiteralRule() {
-        //// Complex Interpretation grammar
+                return getEmptyIntervalLiteralAccess().getRule();
-        /////////////////////
+        }
-        //AllInstances:
+        
-        //      ':' symbol=Symbol;
+        //StringLiteral:
-        public AllInstancesElements getAllInstancesAccess() {
+        //      value=STRING;
-                return pAllInstances;
+        public StringLiteralElements getStringLiteralAccess() {
+                return pStringLiteral;
        }
        
-        public ParserRule getAllInstancesRule() {
+        public ParserRule getStringLiteralRule() {
-                return getAllInstancesAccess().getRule();
+                return getStringLiteralAccess().getRule();
        }
        
-        //AllObjects:
+        //ClassDefinition:
-        //      {AllObjects} '*';
+        //      abstract?="abstract"? "class" name=ID ("extends" superclasses+=[NamedElement|QualifiedName] (","
-        public AllObjectsElements getAllObjectsAccess() {
+        //      superclasses+=[NamedElement|QualifiedName])*)?
-                return pAllObjects;
+        //      "{" members+=MemberDefinition* "}";
+        public ClassDefinitionElements getClassDefinitionAccess() {
+                return pClassDefinition;
        }
        
-        public ParserRule getAllObjectsRule() {
+        public ParserRule getClassDefinitionRule() {
-                return getAllObjectsAccess().getRule();
+                return getClassDefinitionAccess().getRule();
        }
        
-        /////////////////////
+        //MemberDefinition:
-        //// Defaul Interpretation grammar
+        //      containment?="contains"? type=[NamedElement|QualifiedName] multiplicity=Multiplicity? name=ID ("opposite"
-        /////////////////////
+        //      opposite=[NamedElement|QualifiedName])? ";"?;
-        //DefaultInterpretation:
+        public MemberDefinitionElements getMemberDefinitionAccess() {
-        //      'default' interpretation=BasicInterpretation;
+                return pMemberDefinition;
-        public DefaultInterpretationElements getDefaultInterpretationAccess() {
-                return pDefaultInterpretation;
        }
        
-        public ParserRule getDefaultInterpretationRule() {
+        public ParserRule getMemberDefinitionRule() {
-                return getDefaultInterpretationAccess().getRule();
+                return getMemberDefinitionAccess().getRule();
        }
        
-        /////////////////////
+        //Multiplicity:
-        //// Advanced Class-Diagram interpretations
+        //      ManyMultiplicity | ExactMultiplicity | BoundedMultiplicity;
-        /////////////////////
+        public MultiplicityElements getMultiplicityAccess() {
-        //CDInterpretation:
+                return pMultiplicity;
-        //      ClassInterpretation | EnumInterpretation | GlobalRelationInterpretation;
-        public CDInterpretationElements getCDInterpretationAccess() {
-                return pCDInterpretation;
        }
        
-        public ParserRule getCDInterpretationRule() {
+        public ParserRule getMultiplicityRule() {
-                return getCDInterpretationAccess().getRule();
+                return getMultiplicityAccess().getRule();
        }
        
-        //ClassInterpretation:
+        //ManyMultiplicity:
-        //      abstract?='abstract'? 'class' symbol=ModelSymbol ('extends' supertypes+=ModelSymbol+)? '{'
+        //      {ManyMultiplicity} "[" "]";
-        //      fielt+=FieldRelationInterpretation*
+        public ManyMultiplicityElements getManyMultiplicityAccess() {
-        //      '}';
+                return pManyMultiplicity;
-        public ClassInterpretationElements getClassInterpretationAccess() {
-                return pClassInterpretation;
        }
        
-        public ParserRule getClassInterpretationRule() {
+        public ParserRule getManyMultiplicityRule() {
-                return getClassInterpretationAccess().getRule();
+                return getManyMultiplicityAccess().getRule();
        }
        
-        //EnumInterpretation:
+        //ExactMultiplicity:
-        //      'enum' Symbol=ModelSymbol '{' objects+=NamedObject+ '}';
+        //      "[" multiplicity=UpperMultiplicty "]";
-        public EnumInterpretationElements getEnumInterpretationAccess() {
+        public ExactMultiplicityElements getExactMultiplicityAccess() {
-                return pEnumInterpretation;
+                return pExactMultiplicity;
        }
        
-        public ParserRule getEnumInterpretationRule() {
+        public ParserRule getExactMultiplicityRule() {
-                return getEnumInterpretationAccess().getRule();
+                return getExactMultiplicityAccess().getRule();
        }
        
-        //FieldRelationInterpretation:
+        //BoundedMultiplicity:
-        //      containment?='containment'? symbol=ModelSymbol ':' multiplicity=MultiplicityDefinition? target=Symbol;
+        //      "[" lowerBound=INT ".." upperBound=UpperMultiplicty "]";
-        public FieldRelationInterpretationElements getFieldRelationInterpretationAccess() {
+        public BoundedMultiplicityElements getBoundedMultiplicityAccess() {
-                return pFieldRelationInterpretation;
+                return pBoundedMultiplicity;
        }
        
-        public ParserRule getFieldRelationInterpretationRule() {
+        public ParserRule getBoundedMultiplicityRule() {
-                return getFieldRelationInterpretationAccess().getRule();
+                return getBoundedMultiplicityAccess().getRule();
        }
        
-        //GlobalRelationInterpretation:
+        //ScopeDefinition:
-        //      containment?='containment'? 'relation' symbol=ModelSymbol ':' sourceMultiplicity=MultiplicityDefinition?
+        //      ExactScopeDefinition | BoundedScopeDefinition | LowerBoundedScopeDefinition;
-        //      source=Symbol targetMultiplicity=MultiplicityDefinition? target=Symbol;
+        public ScopeDefinitionElements getScopeDefinitionAccess() {
-        public GlobalRelationInterpretationElements getGlobalRelationInterpretationAccess() {
+                return pScopeDefinition;
-                return pGlobalRelationInterpretation;
        }
        
-        public ParserRule getGlobalRelationInterpretationRule() {
+        public ParserRule getScopeDefinitionRule() {
-                return getGlobalRelationInterpretationAccess().getRule();
+                return getScopeDefinitionAccess().getRule();
        }
        
-        //MultiplicityDefinition:
+        //ExactScopeDefinition:
-        //      lower=INT '..' (upper=INT | unlimitedUpper?='*');
+        //      "scope" type=[NamedElement|QualifiedName] "==" exactScope=INT;
-        public MultiplicityDefinitionElements getMultiplicityDefinitionAccess() {
+        public ExactScopeDefinitionElements getExactScopeDefinitionAccess() {
-                return pMultiplicityDefinition;
+                return pExactScopeDefinition;
        }
        
-        public ParserRule getMultiplicityDefinitionRule() {
+        public ParserRule getExactScopeDefinitionRule() {
-                return getMultiplicityDefinitionAccess().getRule();
+                return getExactScopeDefinitionAccess().getRule();
+        }
+        
+        //BoundedScopeDefinition:
+        //      "scope" ((lowerBound=INT "<=")? type=[NamedElement|QualifiedName] "<=" upperBound=INT | upperBound=INT ">="
+        //      type=[NamedElement|QualifiedName] (">=" lowerBound=INT)?);
+        public BoundedScopeDefinitionElements getBoundedScopeDefinitionAccess() {
+                return pBoundedScopeDefinition;
+        }
+        
+        public ParserRule getBoundedScopeDefinitionRule() {
+                return getBoundedScopeDefinitionAccess().getRule();
+        }
+        
+        //LowerBoundedScopeDefinition:
+        //      "scope" (lowerBound=INT "<=" type=[NamedElement|QualifiedName] | type=[NamedElement|QualifiedName] ">="
+        //      lowerBound=INT);
+        public LowerBoundedScopeDefinitionElements getLowerBoundedScopeDefinitionAccess() {
+                return pLowerBoundedScopeDefinition;
+        }
+        
+        public ParserRule getLowerBoundedScopeDefinitionRule() {
+                return getLowerBoundedScopeDefinitionAccess().getRule();
+        }
+        
+        //enum ObjectiveKind:
+        //      MINIMIZE="minimize" | MAXIMIZE="maximize";
+        public ObjectiveKindElements getObjectiveKindAccess() {
+                return eObjectiveKind;
+        }
+        
+        public EnumRule getObjectiveKindRule() {
+                return getObjectiveKindAccess().getRule();
+        }
+        
+        //ObjectiveDefinition:
+        //      kind=ObjectiveKind objective=Expression;
+        public ObjectiveDefinitionElements getObjectiveDefinitionAccess() {
+                return pObjectiveDefinition;
+        }
+        
+        public ParserRule getObjectiveDefinitionRule() {
+                return getObjectiveDefinitionAccess().getRule();
+        }
+        
+        //UpperMultiplicty ecore::EInt:
+        //      INT | "*";
+        public UpperMultiplictyElements getUpperMultiplictyAccess() {
+                return pUpperMultiplicty;
+        }
+        
+        public ParserRule getUpperMultiplictyRule() {
+                return getUpperMultiplictyAccess().getRule();
+        }
+        
+        //Real ecore::EBigDecimal hidden():
+        //      INT ("." INT)?;
+        public RealElements getRealAccess() {
+                return pReal;
+        }
+        
+        public ParserRule getRealRule() {
+                return getRealAccess().getRule();
+        }
+        
+        //QualifiedName hidden():
+        //      ID ("." ID)* | QUOTED_ID;
+        public QualifiedNameElements getQualifiedNameAccess() {
+                return pQualifiedName;
+        }
+        
+        public ParserRule getQualifiedNameRule() {
+                return getQualifiedNameAccess().getRule();
+        }
+        
+        //@Override
+        //terminal STRING:
+        //      '"' ('\\' . | !('\\' | '"'))* '"';
+        public TerminalRule getSTRINGRule() {
+                return tSTRING;
+        }
+        
+        //terminal QUOTED_ID:
+        //      '\'' ('\\' . | !('\\' | '\''))* '\'';
+        public TerminalRule getQUOTED_IDRule() {
+                return tQUOTED_ID;
+        }
+        
+        //@Override
+        //terminal SL_COMMENT:
+        //      ('%' | '//') !('\n' | '\r')* ('\r'? '\n')?;
+        public TerminalRule getSL_COMMENTRule() {
+                return tSL_COMMENT;
+        }
+        
+        //terminal TRANSITIVE_CLOSURE:
+        //      "synthetic:TRANSITIVE_CLOSURE";
+        public TerminalRule getTRANSITIVE_CLOSURERule() {
+                return tTRANSITIVE_CLOSURE;
+        }
+        
+        //terminal REFLEXIVE_TRANSITIVE_CLOSURE:
+        //      "synthetic:REFLEXIVE_TRANSITIVE_CLOSURE";
+        public TerminalRule getREFLEXIVE_TRANSITIVE_CLOSURERule() {
+                return tREFLEXIVE_TRANSITIVE_CLOSURE;
+        }
+        
+        //terminal FULL_STOP:
+        //      "synthetic:FULL_STOP";
+        public TerminalRule getFULL_STOPRule() {
+                return tFULL_STOP;
+        }
+        
+        //NamedElement:
+        //      name=QualifiedName;
+        public NamedElementElements getNamedElementAccess() {
+                return pNamedElement;
+        }
+        
+        public ParserRule getNamedElementRule() {
+                return getNamedElementAccess().getRule();
        }
        
        //terminal ID:
@@ -2047,12 +3366,6 @@ public class SolverLanguageGrammarAccess extends AbstractGrammarElementFinder {
                return gaTerminals.getML_COMMENTRule();
        }
        
-        //terminal SL_COMMENT:
-        //      '//' !('\n' | '\r')* ('\r'? '\n')?;
-        public TerminalRule getSL_COMMENTRule() {
-                return gaTerminals.getSL_COMMENTRule();
-        }
-        
        //terminal WS:
        //      ' ' | '\t' | '\r' | '\n'+;
        public TerminalRule getWSRule() {