Must unit propagation

61 files changed, 2357 insertions, 7029 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
index 1e457bb2..e697e27d 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
index 6ad24fc0..ddbe1979 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticHighlightCalculator.xtendbin b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticHighlightCalculator.xtendbin
index 18c9aee3..e1e21292 100644
--- a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticHighlightCalculator.xtendbin
+++ b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticHighlightCalculator.xtendbin
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticTextAttributeProvider.xtendbin b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticTextAttributeProvider.xtendbin
index 0ebd4493..b967ea7c 100644
--- a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticTextAttributeProvider.xtendbin
+++ b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/ui/syntaxcoloring/.SolverSemanticTextAttributeProvider.xtendbin
diff --git a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.SolverLanguageValidator.xtendbin b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.SolverLanguageValidator.xtendbin
index bb484ba1..2c271c98 100644
--- a/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.SolverLanguageValidator.xtendbin
+++ b/Application/org.eclipse.viatra.solver.language.ui/xtend-gen/org/eclipse/viatra/solver/language/validation/.SolverLanguageValidator.xtendbin
diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.SolverLanguageTokenDefInjectingParser.xtendbin b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.SolverLanguageTokenDefInjectingParser.xtendbin
index 61448536..40f87b4c 100644
--- a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.SolverLanguageTokenDefInjectingParser.xtendbin
+++ b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/parser/antlr/.SolverLanguageTokenDefInjectingParser.xtendbin
diff --git a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.SolverLanguageSyntheticTokenSyntacticSequencer.xtendbin b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.SolverLanguageSyntheticTokenSyntacticSequencer.xtendbin
index 9af9309d..d0715440 100644
--- a/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.SolverLanguageSyntheticTokenSyntacticSequencer.xtendbin
+++ b/Application/org.eclipse.viatra.solver.language/xtend-gen/org/eclipse/viatra/solver/language/serializer/.SolverLanguageSyntheticTokenSyntacticSequencer.xtendbin
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/.gitignore b/Domains/ca.mcgill.rtgmrt.example.modes3/.gitignore
index ae3c1726..6cef8ea6 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/.gitignore
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/.gitignore
@@ -1 +1,2 @@
 /bin/
+output/
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/META-INF/MANIFEST.MF b/Domains/ca.mcgill.rtgmrt.example.modes3/META-INF/MANIFEST.MF
index 53e4a39c..96bd2113 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/META-INF/MANIFEST.MF
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/META-INF/MANIFEST.MF
@@ -3,6 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: ca.mcgill.rtgmrt.example.modes3;singleton:=true
 Bundle-Version: 0.1.0.qualifier
+Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: modes3,
@@ -28,7 +29,7 @@ Require-Bundle: org.eclipse.viatra.query.runtime,
  org.eclipse.emf.ecore.xmi;bundle-version="2.16.0",
  hu.bme.mit.inf.dslreasoner.visualisation;bundle-version="1.0.0",
  org.eclipse.viatra.query.patternlanguage.emf;bundle-version="2.4.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
 Import-Package: org.apache.log4j
 Automatic-Module-Name: ca.mcgill.rtgmrt.example.modes3
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Modes3Factory.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Modes3Factory.java
index 73188db1..10ce47a1 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Modes3Factory.java
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Modes3Factory.java
@@ -58,6 +58,15 @@ public interface Modes3Factory extends EFactory {
         Train createTrain();
 
         /**
+         * Returns a new object of class '<em>Simple Segment</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Simple Segment</em>'.
+         * @generated
+         */
+        SimpleSegment createSimpleSegment();
+
+        /**
          * Returns the package supported by this factory.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Modes3ModelRoot.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Modes3ModelRoot.java
index 4f925b7a..d46ee305 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Modes3ModelRoot.java
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Modes3ModelRoot.java
@@ -62,7 +62,7 @@ public interface Modes3ModelRoot extends EObject {
 
         /**
          * Returns the value of the '<em><b>Segments</b></em>' containment reference list.
-         * The list contents are of type {@link modes3.Segment}.
+         * The list contents are of type {@link modes3.SimpleSegment}.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @return the value of the '<em>Segments</em>' containment reference list.
@@ -70,7 +70,7 @@ public interface Modes3ModelRoot extends EObject {
          * @model containment="true"
          * @generated
          */
-        EList<Segment> getSegments();
+        EList<SimpleSegment> getSegments();
 
         /**
          * Returns the value of the '<em><b>Turnouts</b></em>' containment reference list.
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Modes3Package.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Modes3Package.java
index 4760af9d..a19c1955 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Modes3Package.java
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Modes3Package.java
@@ -305,6 +305,62 @@ public interface Modes3Package extends EPackage {
 
 
         /**
+         * The meta object id for the '{@link modes3.impl.SimpleSegmentImpl <em>Simple Segment</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see modes3.impl.SimpleSegmentImpl
+         * @see modes3.impl.Modes3PackageImpl#getSimpleSegment()
+         * @generated
+         */
+        int SIMPLE_SEGMENT = 4;
+
+        /**
+         * The feature id for the '<em><b>Connected To</b></em>' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int SIMPLE_SEGMENT__CONNECTED_TO = SEGMENT__CONNECTED_TO;
+
+        /**
+         * The feature id for the '<em><b>Occupied By</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int SIMPLE_SEGMENT__OCCUPIED_BY = SEGMENT__OCCUPIED_BY;
+
+        /**
+         * The feature id for the '<em><b>Id</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int SIMPLE_SEGMENT__ID = SEGMENT__ID;
+
+        /**
+         * The number of structural features of the '<em>Simple Segment</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int SIMPLE_SEGMENT_FEATURE_COUNT = SEGMENT_FEATURE_COUNT + 0;
+
+        /**
+         * The number of operations of the '<em>Simple Segment</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int SIMPLE_SEGMENT_OPERATION_COUNT = SEGMENT_OPERATION_COUNT + 0;
+
+
+        /**
          * Returns the meta object for class '{@link modes3.Segment <em>Segment</em>}'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -477,6 +533,16 @@ public interface Modes3Package extends EPackage {
         EAttribute getTrain_Speed();
 
         /**
+         * Returns the meta object for class '{@link modes3.SimpleSegment <em>Simple Segment</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Simple Segment</em>'.
+         * @see modes3.SimpleSegment
+         * @generated
+         */
+        EClass getSimpleSegment();
+
+        /**
          * Returns the factory that creates the instances of the model.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -635,6 +701,16 @@ public interface Modes3Package extends EPackage {
                  */
                 EAttribute TRAIN__SPEED = eINSTANCE.getTrain_Speed();
 
+                /**
+                 * The meta object literal for the '{@link modes3.impl.SimpleSegmentImpl <em>Simple Segment</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see modes3.impl.SimpleSegmentImpl
+                 * @see modes3.impl.Modes3PackageImpl#getSimpleSegment()
+                 * @generated
+                 */
+                EClass SIMPLE_SEGMENT = eINSTANCE.getSimpleSegment();
+
         }
 
 } //Modes3Package
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/SimpleSegment.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/SimpleSegment.java
new file mode 100644
index 00000000..da77510f
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/SimpleSegment.java
@@ -0,0 +1,17 @@
+/**
+ */
+package modes3;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Simple Segment</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see modes3.Modes3Package#getSimpleSegment()
+ * @model
+ * @generated
+ */
+public interface SimpleSegment extends Segment {
+} // SimpleSegment
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3FactoryImpl.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3FactoryImpl.java
index 6ec86cb6..60947533 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3FactoryImpl.java
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3FactoryImpl.java
@@ -60,6 +60,7 @@ public class Modes3FactoryImpl extends EFactoryImpl implements Modes3Factory {
                         case Modes3Package.MODES3_MODEL_ROOT: return createModes3ModelRoot();
                         case Modes3Package.TURNOUT: return createTurnout();
                         case Modes3Package.TRAIN: return createTrain();
+                        case Modes3Package.SIMPLE_SEGMENT: return createSimpleSegment();
                         default:
                                 throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
                 }
@@ -110,6 +111,16 @@ public class Modes3FactoryImpl extends EFactoryImpl implements Modes3Factory {
          * <!-- end-user-doc -->
          * @generated
          */
+        public SimpleSegment createSimpleSegment() {
+                SimpleSegmentImpl simpleSegment = new SimpleSegmentImpl();
+                return simpleSegment;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
         public Modes3Package getModes3Package() {
                 return (Modes3Package)getEPackage();
         }
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3ModelRootImpl.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3ModelRootImpl.java
index d1ee25ff..ccab1f29 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3ModelRootImpl.java
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3ModelRootImpl.java
@@ -6,7 +6,7 @@ import java.util.Collection;
 
 import modes3.Modes3ModelRoot;
 import modes3.Modes3Package;
-import modes3.Segment;
+import modes3.SimpleSegment;
 import modes3.Train;
 import modes3.Turnout;
 
@@ -79,7 +79,7 @@ public class Modes3ModelRootImpl extends MinimalEObjectImpl.Container implements
          * @generated
          * @ordered
          */
-        protected EList<Segment> segments;
+        protected EList<SimpleSegment> segments;
 
         /**
          * The cached value of the '{@link #getTurnouts() <em>Turnouts</em>}' containment reference list.
@@ -148,9 +148,9 @@ public class Modes3ModelRootImpl extends MinimalEObjectImpl.Container implements
          * <!-- end-user-doc -->
          * @generated
          */
-        public EList<Segment> getSegments() {
+        public EList<SimpleSegment> getSegments() {
                 if (segments == null) {
-                        segments = new EObjectContainmentEList<Segment>(Segment.class, this, Modes3Package.MODES3_MODEL_ROOT__SEGMENTS);
+                        segments = new EObjectContainmentEList<SimpleSegment>(SimpleSegment.class, this, Modes3Package.MODES3_MODEL_ROOT__SEGMENTS);
                 }
                 return segments;
         }
@@ -223,7 +223,7 @@ public class Modes3ModelRootImpl extends MinimalEObjectImpl.Container implements
                                 return;
                         case Modes3Package.MODES3_MODEL_ROOT__SEGMENTS:
                                 getSegments().clear();
-                                getSegments().addAll((Collection<? extends Segment>)newValue);
+                                getSegments().addAll((Collection<? extends SimpleSegment>)newValue);
                                 return;
                         case Modes3Package.MODES3_MODEL_ROOT__TURNOUTS:
                                 getTurnouts().clear();
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3PackageImpl.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3PackageImpl.java
index 2b9e828c..557da4c1 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3PackageImpl.java
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3PackageImpl.java
@@ -6,6 +6,7 @@ import modes3.Modes3Factory;
 import modes3.Modes3ModelRoot;
 import modes3.Modes3Package;
 import modes3.Segment;
+import modes3.SimpleSegment;
 import modes3.Train;
 import modes3.Turnout;
 
@@ -52,6 +53,13 @@ public class Modes3PackageImpl extends EPackageImpl implements Modes3Package {
         private EClass trainEClass = null;
 
         /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass simpleSegmentEClass = null;
+
+        /**
          * Creates an instance of the model <b>Package</b>, registered with
          * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
          * package URI value.
@@ -261,6 +269,15 @@ public class Modes3PackageImpl extends EPackageImpl implements Modes3Package {
          * <!-- end-user-doc -->
          * @generated
          */
+        public EClass getSimpleSegment() {
+                return simpleSegmentEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
         public Modes3Factory getModes3Factory() {
                 return (Modes3Factory)getEFactoryInstance();
         }
@@ -303,6 +320,8 @@ public class Modes3PackageImpl extends EPackageImpl implements Modes3Package {
                 createEReference(trainEClass, TRAIN__LOCATION);
                 createEAttribute(trainEClass, TRAIN__ID);
                 createEAttribute(trainEClass, TRAIN__SPEED);
+
+                simpleSegmentEClass = createEClass(SIMPLE_SEGMENT);
         }
 
         /**
@@ -334,6 +353,7 @@ public class Modes3PackageImpl extends EPackageImpl implements Modes3Package {
 
                 // Add supertypes to classes
                 turnoutEClass.getESuperTypes().add(this.getSegment());
+                simpleSegmentEClass.getESuperTypes().add(this.getSegment());
 
                 // Initialize classes, features, and operations; add parameters
                 initEClass(segmentEClass, Segment.class, "Segment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -344,7 +364,7 @@ public class Modes3PackageImpl extends EPackageImpl implements Modes3Package {
                 initEClass(modes3ModelRootEClass, Modes3ModelRoot.class, "Modes3ModelRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
                 initEAttribute(getModes3ModelRoot_Id(), ecorePackage.getEInt(), "id", null, 0, 1, Modes3ModelRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEReference(getModes3ModelRoot_Trains(), this.getTrain(), null, "trains", null, 0, -1, Modes3ModelRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-                initEReference(getModes3ModelRoot_Segments(), this.getSegment(), null, "segments", null, 0, -1, Modes3ModelRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getModes3ModelRoot_Segments(), this.getSimpleSegment(), null, "segments", null, 0, -1, Modes3ModelRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEReference(getModes3ModelRoot_Turnouts(), this.getTurnout(), null, "turnouts", null, 0, -1, Modes3ModelRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
                 initEClass(turnoutEClass, Turnout.class, "Turnout", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -356,6 +376,8 @@ public class Modes3PackageImpl extends EPackageImpl implements Modes3Package {
                 initEAttribute(getTrain_Id(), ecorePackage.getEInt(), "id", null, 0, 1, Train.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEAttribute(getTrain_Speed(), ecorePackage.getEDouble(), "speed", null, 0, 1, Train.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+                initEClass(simpleSegmentEClass, SimpleSegment.class, "SimpleSegment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
                 // Create resource
                 createResource(eNS_URI);
         }
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/SimpleSegmentImpl.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/SimpleSegmentImpl.java
new file mode 100644
index 00000000..e3fd6c34
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/SimpleSegmentImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package modes3.impl;
+
+import modes3.Modes3Package;
+import modes3.SimpleSegment;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Simple Segment</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class SimpleSegmentImpl extends SegmentImpl implements SimpleSegment {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected SimpleSegmentImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return Modes3Package.Literals.SIMPLE_SEGMENT;
+        }
+
+} //SimpleSegmentImpl
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/util/Modes3AdapterFactory.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/util/Modes3AdapterFactory.java
index 86568e9d..9c5c8d2d 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/util/Modes3AdapterFactory.java
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/util/Modes3AdapterFactory.java
@@ -84,6 +84,10 @@ public class Modes3AdapterFactory extends AdapterFactoryImpl {
                                 return createTrainAdapter();
                         }
                         @Override
+                        public Adapter caseSimpleSegment(SimpleSegment object) {
+                                return createSimpleSegmentAdapter();
+                        }
+                        @Override
                         public Adapter defaultCase(EObject object) {
                                 return createEObjectAdapter();
                         }
@@ -160,6 +164,20 @@ public class Modes3AdapterFactory extends AdapterFactoryImpl {
         }
 
         /**
+         * Creates a new adapter for an object of class '{@link modes3.SimpleSegment <em>Simple Segment</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see modes3.SimpleSegment
+         * @generated
+         */
+        public Adapter createSimpleSegmentAdapter() {
+                return null;
+        }
+
+        /**
          * Creates a new adapter for the default case.
          * <!-- begin-user-doc -->
          * This default implementation returns null.
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/util/Modes3Switch.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/util/Modes3Switch.java
index 5dab272b..0c28861a 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/util/Modes3Switch.java
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/util/Modes3Switch.java
@@ -91,6 +91,13 @@ public class Modes3Switch<T> extends Switch<T> {
                                 if (result == null) result = defaultCase(theEObject);
                                 return result;
                         }
+                        case Modes3Package.SIMPLE_SEGMENT: {
+                                SimpleSegment simpleSegment = (SimpleSegment)theEObject;
+                                T result = caseSimpleSegment(simpleSegment);
+                                if (result == null) result = caseSegment(simpleSegment);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
                         default: return defaultCase(theEObject);
                 }
         }
@@ -156,6 +163,21 @@ public class Modes3Switch<T> extends Switch<T> {
         }
 
         /**
+         * Returns the result of interpreting the object as an instance of '<em>Simple Segment</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Simple Segment</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseSimpleSegment(SimpleSegment object) {
+                return null;
+        }
+
+        /**
          * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
          * <!-- begin-user-doc -->
          * This implementation returns null;
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/model/modes3.aird_deactivated b/Domains/ca.mcgill.rtgmrt.example.modes3/model/modes3.aird_deactivated
deleted file mode 100644
index f5400732..00000000
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/model/modes3.aird_deactivated
+++ /dev/null
@@ -1,1531 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">
-  <viewpoint:DAnalysis uid="_R4-4YA7_Eee1dfpzdcS6YA" selectedViews="_R6jlsA7_Eee1dfpzdcS6YA _OHrasBFUEeeHWeeZwj2u8w _OH-VoBFUEeeHWeeZwj2u8w _OIvxsBFUEeeHWeeZwj2u8w" version="14.3.0.201909031200">
-    <semanticResources>http://www.eclipse.org/emf/2002/Ecore</semanticResources>
-    <semanticResources>modes3.ecore</semanticResources>
-    <semanticResources>modes3.genmodel</semanticResources>
-    <semanticResources>../src/modes3/queries/Modes3Queries.vql</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Object</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.HotSpotIntrinsicCandidate</semanticResources>
-    <semanticResources>java:/Objects/java.lang.annotation.Target</semanticResources>
-    <semanticResources>java:/Objects/java.lang.annotation.ElementType</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Enum</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Comparable</semanticResources>
-    <semanticResources>java:/Primitives</semanticResources>
-    <semanticResources>java:/Objects/java.lang.CloneNotSupportedException</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Exception</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Throwable</semanticResources>
-    <semanticResources>java:/Objects/java.io.Serializable</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Deprecated</semanticResources>
-    <semanticResources>java:/Objects/java.lang.annotation.Retention</semanticResources>
-    <semanticResources>java:/Objects/java.lang.annotation.RetentionPolicy</semanticResources>
-    <semanticResources>java:/Objects/java.lang.String</semanticResources>
-    <semanticResources>java:/Objects/java.lang.CharSequence</semanticResources>
-    <semanticResources>java:/Objects/java.util.stream.IntStream</semanticResources>
-    <semanticResources>java:/Objects/java.util.stream.BaseStream</semanticResources>
-    <semanticResources>java:/Objects/java.lang.AutoCloseable</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Class</semanticResources>
-    <semanticResources>java:/Objects/java.lang.reflect.GenericDeclaration</semanticResources>
-    <semanticResources>java:/Objects/java.lang.reflect.AnnotatedElement</semanticResources>
-    <semanticResources>java:/Objects/java.lang.annotation.Annotation</semanticResources>
-    <semanticResources>java:/Objects/java.lang.InterruptedException</semanticResources>
-    <semanticResources>java:/Objects/java.lang.StackTraceElement</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Module</semanticResources>
-    <semanticResources>java:/Objects/java.lang.WeakPairMap</semanticResources>
-    <semanticResources>java:/Objects/java.lang.ref.ReferenceQueue</semanticResources>
-    <semanticResources>java:/Objects/java.lang.ref.Reference</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Thread</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Runnable</semanticResources>
-    <semanticResources>java:/Objects/java.lang.FunctionalInterface</semanticResources>
-    <semanticResources>java:/Objects/java.lang.annotation.Documented</semanticResources>
-    <semanticResources>java:/Objects/java.io.ObjectInputStream</semanticResources>
-    <semanticResources>java:/Objects/java.io.InputStream</semanticResources>
-    <semanticResources>java:/Objects/java.io.Closeable</semanticResources>
-    <semanticResources>java:/Objects/java.io.IOException</semanticResources>
-    <semanticResources>java:/Objects/java.util.Comparator</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.Function</semanticResources>
-    <semanticResources>java:/Objects/java.lang.ClassNotFoundException</semanticResources>
-    <semanticResources>java:/Objects/java.lang.ReflectiveOperationException</semanticResources>
-    <semanticResources>java:/Objects/java.lang.StringBuffer</semanticResources>
-    <semanticResources>java:/Objects/java.lang.AbstractStringBuilder</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Appendable</semanticResources>
-    <semanticResources>java:/Objects/java.io.ObjectStreamException</semanticResources>
-    <semanticResources>java:/Objects/java.io.PrintStream</semanticResources>
-    <semanticResources>java:/Objects/java.io.FilterOutputStream</semanticResources>
-    <semanticResources>java:/Objects/java.io.OutputStream</semanticResources>
-    <semanticResources>java:/Objects/java.io.Flushable</semanticResources>
-    <semanticResources>java:/Objects/java.io.ObjectInput</semanticResources>
-    <semanticResources>java:/Objects/java.io.DataInput</semanticResources>
-    <semanticResources>java:/Objects/java.io.ObjectStreamConstants</semanticResources>
-    <semanticResources>java:/Objects/java.io.SerializablePermission</semanticResources>
-    <semanticResources>java:/Objects/java.security.BasicPermission</semanticResources>
-    <semanticResources>java:/Objects/java.security.Permission</semanticResources>
-    <semanticResources>java:/Objects/java.security.Guard</semanticResources>
-    <semanticResources>java:/Objects/java.lang.SecurityException</semanticResources>
-    <semanticResources>java:/Objects/java.lang.RuntimeException</semanticResources>
-    <semanticResources>java:/Objects/java.lang.StringBuilder</semanticResources>
-    <semanticResources>java:/Objects/java.io.ObjectOutputStream</semanticResources>
-    <semanticResources>java:/Objects/java.io.ObjectOutput</semanticResources>
-    <semanticResources>java:/Objects/java.io.DataOutput</semanticResources>
-    <semanticResources>java:/Objects/java.io.DataInputStream</semanticResources>
-    <semanticResources>java:/Objects/java.io.FilterInputStream</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.ConcurrentMap</semanticResources>
-    <semanticResources>java:/Objects/java.util.Map</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.BiFunction</semanticResources>
-    <semanticResources>java:/Objects/java.io.PrintWriter</semanticResources>
-    <semanticResources>java:/Objects/java.io.Writer</semanticResources>
-    <semanticResources>java:/Objects/java.io.ObjectStreamClass</semanticResources>
-    <semanticResources>java:/Objects/java.io.InvalidClassException</semanticResources>
-    <semanticResources>java:/Objects/java.util.Set</semanticResources>
-    <semanticResources>java:/Objects/java.util.Collection</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Iterable</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.Consumer</semanticResources>
-    <semanticResources>java:/Objects/java.util.List</semanticResources>
-    <semanticResources>java:/Objects/java.util.Iterator</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Boolean</semanticResources>
-    <semanticResources>java:/Objects/java.lang.StackFrameInfo</semanticResources>
-    <semanticResources>java:/Objects/java.lang.StackWalker</semanticResources>
-    <semanticResources>java:/Objects/java.lang.invoke.MethodType</semanticResources>
-    <semanticResources>java:/Objects/java.lang.ref.WeakReference</semanticResources>
-    <semanticResources>java:/Objects/java.lang.ThreadGroup</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Void</semanticResources>
-    <semanticResources>java:/Objects/java.io.ObjectInputFilter</semanticResources>
-    <semanticResources>java:/Objects/java.lang.IllegalArgumentException</semanticResources>
-    <semanticResources>java:/Objects/java.io.UnsupportedEncodingException</semanticResources>
-    <semanticResources>java:/Objects/java.lang.reflect.Type</semanticResources>
-    <semanticResources>java:/Objects/java.lang.System</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.Supplier</semanticResources>
-    <semanticResources>java:/Objects/java.lang.ClassLoader</semanticResources>
-    <semanticResources>java:/Objects/java.util.Deque</semanticResources>
-    <semanticResources>java:/Objects/java.util.Queue</semanticResources>
-    <semanticResources>java:/Objects/java.util.stream.Stream</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.Predicate</semanticResources>
-    <semanticResources>java:/Objects/java.lang.module.ModuleDescriptor</semanticResources>
-    <semanticResources>java:/Objects/java.util.Optional</semanticResources>
-    <semanticResources>java:/Objects/java.io.ObjectInputValidation</semanticResources>
-    <semanticResources>java:/Objects/java.io.InvalidObjectException</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.annotation.AnnotationType</semanticResources>
-    <semanticResources>java:/Objects/java.lang.reflect.Method</semanticResources>
-    <semanticResources>java:/Objects/java.lang.reflect.Executable</semanticResources>
-    <semanticResources>java:/Objects/java.lang.reflect.AccessibleObject</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.reflect.CallerSensitive</semanticResources>
-    <semanticResources>java:/Objects/java.lang.ModuleLayer</semanticResources>
-    <semanticResources>java:/Objects/java.lang.module.Configuration</semanticResources>
-    <semanticResources>java:/Objects/java.lang.module.Resolver</semanticResources>
-    <semanticResources>java:/Objects/java.lang.module.ModuleFinder</semanticResources>
-    <semanticResources>java:/Objects/java.lang.module.ModuleReference</semanticResources>
-    <semanticResources>java:/Objects/java.net.URI</semanticResources>
-    <semanticResources>java:/Objects/java.net.URISyntaxException</semanticResources>
-    <semanticResources>java:/Objects/java.lang.ref.SoftReference</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.vm.annotation.ForceInline</semanticResources>
-    <semanticResources>java:/Objects/java.lang.module.ResolvedModule</semanticResources>
-    <semanticResources>java:/Objects/java.security.AccessControlContext</semanticResources>
-    <semanticResources>java:/Objects/java.security.ProtectionDomain</semanticResources>
-    <semanticResources>java:/Objects/sun.security.util.Debug</semanticResources>
-    <semanticResources>java:/Objects/java.math.BigInteger</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Number</semanticResources>
-    <semanticResources>java:/Objects/java.io.StreamCorruptedException</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.misc.Unsafe</semanticResources>
-    <semanticResources>java:/Objects/java.lang.InstantiationException</semanticResources>
-    <semanticResources>java:/Objects/java.lang.reflect.Constructor</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.reflect.ConstructorAccessor</semanticResources>
-    <semanticResources>java:/Objects/java.lang.reflect.InvocationTargetException</semanticResources>
-    <semanticResources>java:/Objects/java.lang.reflect.Field</semanticResources>
-    <semanticResources>java:/Objects/java.lang.reflect.Member</semanticResources>
-    <semanticResources>java:/Objects/java.io.Externalizable</semanticResources>
-    <semanticResources>java:/Objects/java.io.NotActiveException</semanticResources>
-    <semanticResources>java:/Objects/java.lang.SecurityManager</semanticResources>
-    <semanticResources>java:/Objects/java.net.InetAddress</semanticResources>
-    <semanticResources>java:/Objects/java.net.UnknownHostException</semanticResources>
-    <semanticResources>java:/Objects/java.lang.reflect.AnnotatedType</semanticResources>
-    <semanticResources>java:/Objects/java.io.SerialCallbackContext</semanticResources>
-    <semanticResources>java:/Objects/java.security.PermissionCollection</semanticResources>
-    <semanticResources>java:/Objects/java.util.Enumeration</semanticResources>
-    <semanticResources>java:/Objects/java.util.stream.Collector</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.BiConsumer</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.ConcurrentHashMap</semanticResources>
-    <semanticResources>java:/Objects/java.util.AbstractMap</semanticResources>
-    <semanticResources>java:/Objects/java.util.stream.DoubleStream</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Double</semanticResources>
-    <semanticResources>java:/Objects/java.lang.NumberFormatException</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.reflect.ConstantPool</semanticResources>
-    <semanticResources>java:/Objects/sun.nio.ch.Interruptible</semanticResources>
-    <semanticResources>java:/Objects/java.util.stream.LongStream</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Long</semanticResources>
-    <semanticResources>java:/Objects/java.lang.ThreadLocal</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.atomic.AtomicInteger</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.IntBinaryOperator</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.vm.annotation.Contended</semanticResources>
-    <semanticResources>java:/Objects/java.security.DomainCombiner</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.UnaryOperator</semanticResources>
-    <semanticResources>java:/Objects/java.security.AccessControlException</semanticResources>
-    <semanticResources>java:/Objects/java.lang.NoSuchMethodException</semanticResources>
-    <semanticResources>java:/Objects/java.lang.NoSuchFieldException</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.factory.GenericsFactory</semanticResources>
-    <semanticResources>java:/Objects/java.lang.reflect.TypeVariable</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.ToDoubleFunction</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.misc.JavaSecurityAccess</semanticResources>
-    <semanticResources>java:/Objects/java.security.PrivilegedAction</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.ToIntFunction</semanticResources>
-    <semanticResources>java:/Objects/java.security.CodeSource</semanticResources>
-    <semanticResources>java:/Objects/java.net.URL</semanticResources>
-    <semanticResources>java:/Objects/java.net.URLStreamHandlerFactory</semanticResources>
-    <semanticResources>java:/Objects/java.net.URLStreamHandler</semanticResources>
-    <semanticResources>java:/Objects/java.net.URLConnection</semanticResources>
-    <semanticResources>java:/Objects/java.net.UnknownServiceException</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.repository.ClassRepository</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.repository.GenericDeclRepository</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.repository.AbstractRepository</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.visitor.Reifier</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.visitor.TypeTreeVisitor</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.ArrayTypeSignature</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.FieldTypeSignature</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.BaseType</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.TypeSignature</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.ReturnType</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.TypeTree</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.Tree</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.ToLongFunction</semanticResources>
-    <semanticResources>java:/Objects/java.security.Principal</semanticResources>
-    <semanticResources>java:/Objects/javax.security.auth.Subject</semanticResources>
-    <semanticResources>java:/Objects/javax.security.auth.AuthPermission</semanticResources>
-    <semanticResources>java:/Objects/java.security.cert.Certificate</semanticResources>
-    <semanticResources>java:/Objects/java.security.cert.CertificateEncodingException</semanticResources>
-    <semanticResources>java:/Objects/java.security.cert.CertificateException</semanticResources>
-    <semanticResources>java:/Objects/java.security.GeneralSecurityException</semanticResources>
-    <semanticResources>java:/Objects/java.nio.charset.Charset</semanticResources>
-    <semanticResources>java:/Objects/java.nio.charset.spi.CharsetProvider</semanticResources>
-    <semanticResources>java:/Objects/java.lang.SafeVarargs</semanticResources>
-    <semanticResources>java:/Objects/java.security.CodeSigner</semanticResources>
-    <semanticResources>java:/Objects/java.security.cert.CertPath</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.BinaryOperator</semanticResources>
-    <semanticResources>java:/Objects/java.security.cert.CertificateFactory</semanticResources>
-    <semanticResources>java:/Objects/java.security.cert.CertificateFactorySpi</semanticResources>
-    <semanticResources>java:/Objects/java.security.cert.CRLException</semanticResources>
-    <semanticResources>java:/Objects/java.util.Locale</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Cloneable</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.IntFunction</semanticResources>
-    <semanticResources>java:/Objects/java.net.SocketPermission</semanticResources>
-    <semanticResources>java:/Objects/java.net.MalformedURLException</semanticResources>
-    <semanticResources>java:/Objects/java.lang.PublicMethods</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.reflect.ReflectionFactory</semanticResources>
-    <semanticResources>java:/Objects/java.lang.invoke.MethodHandle</semanticResources>
-    <semanticResources>java:/Objects/java.lang.invoke.LambdaForm</semanticResources>
-    <semanticResources>java:/Objects/sun.invoke.util.Wrapper</semanticResources>
-    <semanticResources>java:/Objects/java.lang.ClassCastException</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Package</semanticResources>
-    <semanticResources>java:/Objects/java.lang.NamedPackage</semanticResources>
-    <semanticResources>java:/Objects/java.util.Spliterator</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.DoubleConsumer</semanticResources>
-    <semanticResources>java:/Objects/java.net.Proxy</semanticResources>
-    <semanticResources>java:/Objects/java.net.SocketAddress</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Integer</semanticResources>
-    <semanticResources>java:/Objects/java.net.spi.URLStreamHandlerProvider</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.IntConsumer</semanticResources>
-    <semanticResources>java:/Objects/java.util.Hashtable</semanticResources>
-    <semanticResources>java:/Objects/java.util.Dictionary</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.LongConsumer</semanticResources>
-    <semanticResources>java:/Objects/java.io.ObjectStreamField</semanticResources>
-    <semanticResources>java:/Objects/java.util.Random</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.atomic.AtomicLong</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.LongBinaryOperator</semanticResources>
-    <semanticResources>java:/Objects/java.net.UrlDeserializedState</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.LongUnaryOperator</semanticResources>
-    <semanticResources>java:/Objects/java.io.FileDescriptor</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.ref.PhantomCleanable</semanticResources>
-    <semanticResources>java:/Objects/java.lang.ref.PhantomReference</semanticResources>
-    <semanticResources>java:/Objects/java.io.DataOutputStream</semanticResources>
-    <semanticResources>java:/Objects/java.util.ListIterator</semanticResources>
-    <semanticResources>java:/Objects/java.io.SyncFailedException</semanticResources>
-    <semanticResources>java:/Objects/java.lang.IllegalAccessException</semanticResources>
-    <semanticResources>java:/Objects/java.lang.ClassValue</semanticResources>
-    <semanticResources>java:/Objects/java.util.WeakHashMap</semanticResources>
-    <semanticResources>java:/Objects/java.util.AbstractSet</semanticResources>
-    <semanticResources>java:/Objects/java.util.AbstractCollection</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.reflect.FieldAccessor</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.repository.FieldRepository</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.reflect.MethodAccessor</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.reflect.LangReflectAccess</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.DoublePredicate</semanticResources>
-    <semanticResources>java:/Objects/java.lang.ref.Cleaner</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.ThreadFactory</semanticResources>
-    <semanticResources>java:/Objects/java.io.OptionalDataException</semanticResources>
-    <semanticResources>java:/Objects/java.util.OptionalDouble</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.DoubleSupplier</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.ref.CleanerImpl</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.ref.SoftCleanable</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.repository.ConstructorRepository</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.MethodTypeSignature</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.Signature</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.FormalTypeParameter</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.TypeArgument</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.BooleanSignature</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.BottomSignature</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.ByteSignature</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.CharSignature</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.ClassTypeSignature</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.SimpleClassTypeSignature</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.DoubleSignature</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.FloatSignature</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.IntSignature</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.LongSignature</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.ShortSignature</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.TypeVariableSignature</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.VoidDescriptor</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.Wildcard</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.visitor.Visitor</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.tree.ClassSignature</semanticResources>
-    <semanticResources>java:/Objects/sun.reflect.generics.repository.MethodRepository</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.ref.WeakCleanable</semanticResources>
-    <semanticResources>java:/Objects/java.lang.invoke.BoundMethodHandle</semanticResources>
-    <semanticResources>java:/Objects/java.lang.invoke.ClassSpecializer</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.org.objectweb.asm.MethodVisitor</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.org.objectweb.asm.AnnotationVisitor</semanticResources>
-    <semanticResources>java:/Objects/java.lang.invoke.MemberName</semanticResources>
-    <semanticResources>java:/Objects/java.lang.invoke.ResolvedMethodName</semanticResources>
-    <semanticResources>java:/Objects/java.lang.invoke.MethodHandleImpl</semanticResources>
-    <semanticResources>java:/Objects/java.lang.invoke.DelegatingMethodHandle</semanticResources>
-    <semanticResources>java:/Objects/java.lang.reflect.Parameter</semanticResources>
-    <semanticResources>java:/Objects/java.lang.invoke.MethodTypeForm</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.vm.annotation.Stable</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.IntUnaryOperator</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.IntPredicate</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.ObjIntConsumer</semanticResources>
-    <semanticResources>java:/Objects/java.util.OptionalInt</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.IntSupplier</semanticResources>
-    <semanticResources>java:/Objects/java.util.PrimitiveIterator</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.IntToDoubleFunction</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.IntToLongFunction</semanticResources>
-    <semanticResources>java:/Objects/java.util.IntSummaryStatistics</semanticResources>
-    <semanticResources>java:/Objects/java.lang.TypeNotPresentException</semanticResources>
-    <semanticResources>java:/Objects/java.lang.UnsupportedOperationException</semanticResources>
-    <semanticResources>java:/Objects/java.io.FileNotFoundException</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.ObjDoubleConsumer</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.DoubleFunction</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.DoubleUnaryOperator</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.DoubleToIntFunction</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.DoubleToLongFunction</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.DoubleBinaryOperator</semanticResources>
-    <semanticResources>java:/Objects/java.util.DoubleSummaryStatistics</semanticResources>
-    <semanticResources>java:/Objects/java.lang.invoke.Invokers</semanticResources>
-    <semanticResources>java:/Objects/java.lang.invoke.VarHandle</semanticResources>
-    <semanticResources>java:/Objects/java.lang.invoke.VarForm</semanticResources>
-    <semanticResources>java:/Objects/java.lang.invoke.LambdaFormEditor</semanticResources>
-    <semanticResources>java:/Objects/java.lang.invoke.LambdaFormBuffer</semanticResources>
-    <semanticResources>java:/Objects/java.util.ArrayList</semanticResources>
-    <semanticResources>java:/Objects/java.util.AbstractList</semanticResources>
-    <semanticResources>java:/Objects/java.util.RandomAccess</semanticResources>
-    <semanticResources>java:/Objects/java.lang.IndexOutOfBoundsException</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.LongPredicate</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.ObjLongConsumer</semanticResources>
-    <semanticResources>java:/Objects/java.util.OptionalLong</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.LongSupplier</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.LongFunction</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.LongToDoubleFunction</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.LongToIntFunction</semanticResources>
-    <semanticResources>java:/Objects/java.util.LongSummaryStatistics</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.CountedCompleter</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.ForkJoinTask</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.Future</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.ExecutionException</semanticResources>
-    <semanticResources>java:/Objects/java.io.File</semanticResources>
-    <semanticResources>java:/Objects/java.security.SecureRandom</semanticResources>
-    <semanticResources>java:/Objects/java.util.regex.Pattern</semanticResources>
-    <semanticResources>java:/Objects/java.util.regex.Matcher</semanticResources>
-    <semanticResources>java:/Objects/java.util.regex.MatchResult</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.ToDoubleBiFunction</semanticResources>
-    <semanticResources>java:/Objects/java.lang.invoke.CallSite</semanticResources>
-    <semanticResources>java:/Objects/java.lang.invoke.WrongMethodTypeException</semanticResources>
-    <semanticResources>java:/Objects/java.io.OutputStreamWriter</semanticResources>
-    <semanticResources>java:/Objects/java.nio.charset.CharsetEncoder</semanticResources>
-    <semanticResources>java:/Objects/java.nio.CharBuffer</semanticResources>
-    <semanticResources>java:/Objects/java.nio.Buffer</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.ToIntBiFunction</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.vm.annotation.DontInline</semanticResources>
-    <semanticResources>java:/Objects/java.lang.ArrayIndexOutOfBoundsException</semanticResources>
-    <semanticResources>java:/Objects/java.lang.ClassFormatError</semanticResources>
-    <semanticResources>java:/Objects/java.lang.LinkageError</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Error</semanticResources>
-    <semanticResources>java:/Objects/java.nio.ByteBuffer</semanticResources>
-    <semanticResources>java:/Objects/java.nio.DoubleBuffer</semanticResources>
-    <semanticResources>java:/Objects/java.nio.ByteOrder</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.ToLongBiFunction</semanticResources>
-    <semanticResources>java:/Objects/java.lang.invoke.MethodHandleNatives</semanticResources>
-    <semanticResources>java:/Objects/java.lang.NoSuchMethodError</semanticResources>
-    <semanticResources>java:/Objects/java.lang.IncompatibleClassChangeError</semanticResources>
-    <semanticResources>java:/Objects/java.lang.AssertionStatusDirectives</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.atomic.AtomicReference</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.locks.ReentrantLock</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.locks.Lock</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.locks.Condition</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.TimeUnit</semanticResources>
-    <semanticResources>java:/Objects/java.time.Duration</semanticResources>
-    <semanticResources>java:/Objects/java.time.temporal.TemporalAmount</semanticResources>
-    <semanticResources>java:/Objects/java.time.temporal.Temporal</semanticResources>
-    <semanticResources>java:/Objects/java.time.temporal.TemporalAccessor</semanticResources>
-    <semanticResources>java:/Objects/java.time.temporal.TemporalField</semanticResources>
-    <semanticResources>java:/Objects/java.time.temporal.TemporalUnit</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.RunnableFuture</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.perf.PerfCounter</semanticResources>
-    <semanticResources>java:/Objects/java.nio.LongBuffer</semanticResources>
-    <semanticResources>java:/Objects/java.net.ContentHandler</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.Callable</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.misc.JavaLangInvokeAccess</semanticResources>
-    <semanticResources>java:/Objects/java.util.HashMap</semanticResources>
-    <semanticResources>java:/Objects/java.util.LinkedHashMap</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.perf.Perf</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.TimeoutException</semanticResources>
-    <semanticResources>java:/Objects/java.util.Vector</semanticResources>
-    <semanticResources>java:/Objects/java.nio.FloatBuffer</semanticResources>
-    <semanticResources>java:/Objects/java.net.FileNameMap</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.ForkJoinPool</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.AbstractExecutorService</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.ExecutorService</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.Executor</semanticResources>
-    <semanticResources>java:/Objects/java.time.temporal.ChronoUnit</semanticResources>
-    <semanticResources>java:/Objects/java.nio.IntBuffer</semanticResources>
-    <semanticResources>java:/Objects/java.net.ContentHandlerFactory</semanticResources>
-    <semanticResources>java:/Objects/java.math.BigDecimal</semanticResources>
-    <semanticResources>java:/Objects/java.math.MathContext</semanticResources>
-    <semanticResources>java:/Objects/java.math.RoundingMode</semanticResources>
-    <semanticResources>java:/Objects/java.nio.ShortBuffer</semanticResources>
-    <semanticResources>java:/Objects/sun.net.www.MessageHeader</semanticResources>
-    <semanticResources>java:/Objects/java.util.regex.PatternSyntaxException</semanticResources>
-    <semanticResources>java:/Objects/java.security.Timestamp</semanticResources>
-    <semanticResources>java:/Objects/java.util.Date</semanticResources>
-    <semanticResources>java:/Objects/java.time.Instant</semanticResources>
-    <semanticResources>java:/Objects/java.time.temporal.TemporalAdjuster</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Readable</semanticResources>
-    <semanticResources>java:/Objects/java.util.regex.IntHashSet</semanticResources>
-    <semanticResources>java:/Objects/java.time.temporal.TemporalQuery</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.org.objectweb.asm.Attribute</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.org.objectweb.asm.ClassReader</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.org.objectweb.asm.ClassVisitor</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.org.objectweb.asm.FieldVisitor</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.org.objectweb.asm.TypePath</semanticResources>
-    <semanticResources>java:/Objects/java.time.temporal.ValueRange</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.org.objectweb.asm.Handle</semanticResources>
-    <semanticResources>java:/Objects/java.time.format.ResolverStyle</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.org.objectweb.asm.Label</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.org.objectweb.asm.MethodWriter</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.org.objectweb.asm.ClassWriter</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.org.objectweb.asm.Item</semanticResources>
-    <semanticResources>java:/Objects/sun.util.locale.InternalLocaleBuilder</semanticResources>
-    <semanticResources>java:/Objects/sun.util.locale.LocaleSyntaxException</semanticResources>
-    <semanticResources>java:/Objects/sun.util.calendar.BaseCalendar</semanticResources>
-    <semanticResources>java:/Objects/sun.util.calendar.AbstractCalendar</semanticResources>
-    <semanticResources>java:/Objects/sun.util.calendar.CalendarSystem</semanticResources>
-    <semanticResources>java:/Objects/sun.util.calendar.CalendarDate</semanticResources>
-    <semanticResources>java:/Objects/java.util.TimeZone</semanticResources>
-    <semanticResources>java:/Objects/java.time.ZoneId</semanticResources>
-    <semanticResources>java:/Objects/java.time.format.TextStyle</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.org.objectweb.asm.ByteVector</semanticResources>
-    <semanticResources>java:/Objects/sun.util.locale.LocaleObjectCache</semanticResources>
-    <semanticResources>java:/Objects/sun.util.locale.BaseLocale</semanticResources>
-    <semanticResources>java:/Objects/sun.util.locale.LocaleExtensions</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Character</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.org.objectweb.asm.Context</semanticResources>
-    <semanticResources>java:/Objects/sun.util.locale.provider.LocaleServiceProviderPool</semanticResources>
-    <semanticResources>java:/Objects/java.util.spi.LocaleServiceProvider</semanticResources>
-    <semanticResources>java:/Objects/java.math.MutableBigInteger</semanticResources>
-    <semanticResources>java:/Objects/java.util.spi.LocaleNameProvider</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.ForkJoinWorkerThread</semanticResources>
-    <semanticResources>java:/Objects/java.util.ResourceBundle</semanticResources>
-    <semanticResources>java:/Objects/java.util.ServiceLoader</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.module.ServicesCatalog</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.loader.ClassLoaderValue</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.loader.AbstractClassLoaderValue</semanticResources>
-    <semanticResources>java:/Objects/java.lang.IllegalStateException</semanticResources>
-    <semanticResources>java:/Objects/java.util.Formatter</semanticResources>
-    <semanticResources>java:/Objects/java.util.Calendar</semanticResources>
-    <semanticResources>java:/Objects/java.text.DateFormatSymbols</semanticResources>
-    <semanticResources>java:/Objects/java.lang.RuntimePermission</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.org.objectweb.asm.ModuleVisitor</semanticResources>
-    <semanticResources>java:/Objects/sun.util.locale.provider.LocaleResources</semanticResources>
-    <semanticResources>java:/Objects/sun.util.locale.provider.ResourceBundleBasedAdapter</semanticResources>
-    <semanticResources>java:/Objects/sun.util.resources.LocaleData</semanticResources>
-    <semanticResources>java:/Objects/java.util.spi.ResourceBundleProvider</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.vm.annotation.ReservedStackAccess</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.org.objectweb.asm.AnnotationWriter</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.org.objectweb.asm.FieldWriter</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.org.objectweb.asm.ModuleWriter</semanticResources>
-    <semanticResources>java:/Objects/java.util.MissingResourceException</semanticResources>
-    <semanticResources>java:/Objects/java.io.BufferedWriter</semanticResources>
-    <semanticResources>java:/Objects/sun.util.locale.LanguageTag</semanticResources>
-    <semanticResources>java:/Objects/sun.util.locale.ParseStatus</semanticResources>
-    <semanticResources>java:/Objects/sun.util.locale.StringTokenIterator</semanticResources>
-    <semanticResources>java:/Objects/sun.util.locale.Extension</semanticResources>
-    <semanticResources>java:/Objects/java.util.SortedMap</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.org.objectweb.asm.Frame</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.org.objectweb.asm.Type</semanticResources>
-    <semanticResources>java:/Objects/sun.util.locale.provider.LocaleProviderAdapter</semanticResources>
-    <semanticResources>java:/Objects/sun.util.locale.provider.FallbackLocaleProviderAdapter</semanticResources>
-    <semanticResources>java:/Objects/sun.util.locale.provider.JRELocaleProviderAdapter</semanticResources>
-    <semanticResources>java:/Objects/java.text.spi.BreakIteratorProvider</semanticResources>
-    <semanticResources>java:/Objects/java.text.BreakIterator</semanticResources>
-    <semanticResources>java:/Objects/java.text.CharacterIterator</semanticResources>
-    <semanticResources>java:/Objects/sun.util.calendar.Era</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.locks.AbstractQueuedSynchronizer</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.locks.AbstractOwnableSynchronizer</semanticResources>
-    <semanticResources>java:/Objects/java.io.FilenameFilter</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.org.objectweb.asm.Handler</semanticResources>
-    <semanticResources>java:/Objects/sun.util.calendar.Gregorian</semanticResources>
-    <semanticResources>java:/Objects/java.time.ZoneOffset</semanticResources>
-    <semanticResources>java:/Objects/java.time.zone.ZoneRules</semanticResources>
-    <semanticResources>java:/Objects/java.time.zone.ZoneOffsetTransition</semanticResources>
-    <semanticResources>java:/Objects/java.time.LocalDateTime</semanticResources>
-    <semanticResources>java:/Objects/java.time.chrono.ChronoLocalDateTime</semanticResources>
-    <semanticResources>java:/Objects/java.time.chrono.ChronoZonedDateTime</semanticResources>
-    <semanticResources>java:/Objects/java.time.format.DateTimeFormatter</semanticResources>
-    <semanticResources>java:/Objects/java.text.Format</semanticResources>
-    <semanticResources>java:/Objects/java.text.AttributedCharacterIterator</semanticResources>
-    <semanticResources>java:/Objects/java.time.zone.ZoneOffsetTransitionRule</semanticResources>
-    <semanticResources>java:/Objects/java.time.Month</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.org.objectweb.asm.Edge</semanticResources>
-    <semanticResources>java:/Objects/java.time.DayOfWeek</semanticResources>
-    <semanticResources>java:/Objects/sun.invoke.empty.Empty</semanticResources>
-    <semanticResources>java:/Objects/java.time.LocalTime</semanticResources>
-    <semanticResources>java:/Objects/java.time.LocalDate</semanticResources>
-    <semanticResources>java:/Objects/java.time.chrono.ChronoLocalDate</semanticResources>
-    <semanticResources>java:/Objects/java.time.chrono.Chronology</semanticResources>
-    <semanticResources>java:/Objects/java.time.chrono.Era</semanticResources>
-    <semanticResources>java:/Objects/java.lang.InternalError</semanticResources>
-    <semanticResources>java:/Objects/java.lang.VirtualMachineError</semanticResources>
-    <semanticResources>java:/Objects/java.io.FileFilter</semanticResources>
-    <semanticResources>java:/Objects/java.lang.reflect.ParameterizedType</semanticResources>
-    <semanticResources>java:/Objects/java.time.OffsetTime</semanticResources>
-    <semanticResources>java:/Objects/java.time.OffsetDateTime</semanticResources>
-    <semanticResources>java:/Objects/java.time.ZonedDateTime</semanticResources>
-    <semanticResources>java:/Objects/java.time.Clock</semanticResources>
-    <semanticResources>java:/Objects/java.lang.reflect.WildcardType</semanticResources>
-    <semanticResources>java:/Objects/java.time.Period</semanticResources>
-    <semanticResources>java:/Objects/java.time.chrono.ChronoPeriod</semanticResources>
-    <semanticResources>java:/Objects/java.net.NetworkInterface</semanticResources>
-    <semanticResources>java:/Objects/java.net.SocketException</semanticResources>
-    <semanticResources>java:/Objects/java.util.spi.ResourceBundleControlProvider</semanticResources>
-    <semanticResources>java:/Objects/java.time.chrono.IsoChronology</semanticResources>
-    <semanticResources>java:/Objects/java.time.chrono.AbstractChronology</semanticResources>
-    <semanticResources>java:/Objects/java.time.temporal.ChronoField</semanticResources>
-    <semanticResources>java:/Objects/java.net.InetAddressImpl</semanticResources>
-    <semanticResources>java:/Objects/java.time.chrono.IsoEra</semanticResources>
-    <semanticResources>java:/Objects/java.util.NavigableSet</semanticResources>
-    <semanticResources>java:/Objects/java.util.SortedSet</semanticResources>
-    <semanticResources>java:/Objects/java.net.InterfaceAddress</semanticResources>
-    <semanticResources>java:/Objects/java.net.Inet4Address</semanticResources>
-    <semanticResources>java:/Objects/java.security.PublicKey</semanticResources>
-    <semanticResources>java:/Objects/java.security.Key</semanticResources>
-    <semanticResources>java:/Objects/java.text.FieldPosition</semanticResources>
-    <semanticResources>java:/Objects/java.text.ParseException</semanticResources>
-    <semanticResources>java:/Objects/java.util.ServiceConfigurationError</semanticResources>
-    <semanticResources>java:/Objects/java.nio.file.Path</semanticResources>
-    <semanticResources>java:/Objects/java.nio.file.Watchable</semanticResources>
-    <semanticResources>java:/Objects/java.nio.file.WatchService</semanticResources>
-    <semanticResources>java:/Objects/java.nio.file.WatchKey</semanticResources>
-    <semanticResources>java:/Objects/java.nio.file.WatchEvent</semanticResources>
-    <semanticResources>java:/Objects/java.text.ParsePosition</semanticResources>
-    <semanticResources>java:/Objects/java.time.format.DateTimeFormatterBuilder</semanticResources>
-    <semanticResources>java:/Objects/java.time.format.DateTimePrintContext</semanticResources>
-    <semanticResources>java:/Objects/java.time.format.DecimalStyle</semanticResources>
-    <semanticResources>java:/Objects/java.time.format.DateTimeParseException</semanticResources>
-    <semanticResources>java:/Objects/java.time.DateTimeException</semanticResources>
-    <semanticResources>java:/Objects/java.io.FileSystem</semanticResources>
-    <semanticResources>java:/Objects/java.time.format.FormatStyle</semanticResources>
-    <semanticResources>java:/Objects/java.security.NoSuchAlgorithmException</semanticResources>
-    <semanticResources>java:/Objects/java.security.SecureRandomSpi</semanticResources>
-    <semanticResources>java:/Objects/java.security.SecureRandomParameters</semanticResources>
-    <semanticResources>java:/Objects/java.time.format.DateTimeParseContext</semanticResources>
-    <semanticResources>java:/Objects/java.time.format.Parsed</semanticResources>
-    <semanticResources>java:/Objects/java.io.BufferedReader</semanticResources>
-    <semanticResources>java:/Objects/java.io.Reader</semanticResources>
-    <semanticResources>java:/Objects/java.time.format.SignStyle</semanticResources>
-    <semanticResources>java:/Objects/java.security.InvalidKeyException</semanticResources>
-    <semanticResources>java:/Objects/java.security.KeyException</semanticResources>
-    <semanticResources>java:/Objects/java.security.Provider</semanticResources>
-    <semanticResources>java:/Objects/java.util.Properties</semanticResources>
-    <semanticResources>java:/Objects/java.util.InvalidPropertiesFormatException</semanticResources>
-    <semanticResources>java:/Objects/java.io.NotSerializableException</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.misc.JavaLangAccess</semanticResources>
-    <semanticResources>java:/Objects/java.nio.charset.CharacterCodingException</semanticResources>
-    <semanticResources>java:/Objects/java.security.NoSuchProviderException</semanticResources>
-    <semanticResources>java:/Objects/java.lang.LayerInstantiationException</semanticResources>
-    <semanticResources>java:/Objects/java.security.MessageDigest</semanticResources>
-    <semanticResources>java:/Objects/java.security.MessageDigestSpi</semanticResources>
-    <semanticResources>java:/Objects/java.security.DigestException</semanticResources>
-    <semanticResources>java:/Objects/java.time.format.DateTimeTextProvider</semanticResources>
-    <semanticResources>java:/Objects/sun.security.util.MessageDigestSpi2</semanticResources>
-    <semanticResources>java:/Objects/javax.crypto.SecretKey</semanticResources>
-    <semanticResources>java:/Objects/javax.security.auth.Destroyable</semanticResources>
-    <semanticResources>java:/Objects/javax.security.auth.DestroyFailedException</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.module.ModuleTarget</semanticResources>
-    <semanticResources>java:/Objects/java.nio.file.FileSystem</semanticResources>
-    <semanticResources>java:/Objects/java.nio.file.FileStore</semanticResources>
-    <semanticResources>java:/Objects/java.nio.file.attribute.FileStoreAttributeView</semanticResources>
-    <semanticResources>java:/Objects/java.nio.file.attribute.AttributeView</semanticResources>
-    <semanticResources>java:/Objects/java.nio.file.LinkOption</semanticResources>
-    <semanticResources>java:/Objects/java.nio.file.OpenOption</semanticResources>
-    <semanticResources>java:/Objects/java.nio.file.PathMatcher</semanticResources>
-    <semanticResources>java:/Objects/java.security.SignatureException</semanticResources>
-    <semanticResources>java:/Objects/java.nio.file.attribute.UserPrincipalLookupService</semanticResources>
-    <semanticResources>java:/Objects/java.nio.file.attribute.GroupPrincipal</semanticResources>
-    <semanticResources>java:/Objects/java.nio.file.attribute.UserPrincipal</semanticResources>
-    <semanticResources>java:/Objects/java.nio.file.spi.FileSystemProvider</semanticResources>
-    <semanticResources>java:/Objects/java.nio.file.AccessMode</semanticResources>
-    <semanticResources>java:/Objects/java.nio.charset.CharsetDecoder</semanticResources>
-    <semanticResources>java:/Objects/java.nio.charset.CoderResult</semanticResources>
-    <semanticResources>java:/Objects/java.nio.file.attribute.FileAttributeView</semanticResources>
-    <semanticResources>java:/Objects/java.util.LinkedList</semanticResources>
-    <semanticResources>java:/Objects/java.util.AbstractSequentialList</semanticResources>
-    <semanticResources>java:/Objects/sun.util.resources.Bundles</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.misc.JavaUtilResourceBundleAccess</semanticResources>
-    <semanticResources>java:/Objects/java.util.EnumSet</semanticResources>
-    <semanticResources>java:/Objects/java.security.cert.CRL</semanticResources>
-    <semanticResources>java:/Objects/java.security.PrivilegedExceptionAction</semanticResources>
-    <semanticResources>java:/Objects/java.security.PrivilegedActionException</semanticResources>
-    <semanticResources>java:/Objects/java.lang.module.ModuleReader</semanticResources>
-    <semanticResources>java:/Objects/java.nio.file.CopyOption</semanticResources>
-    <semanticResources>java:/Objects/java.nio.file.attribute.FileAttribute</semanticResources>
-    <semanticResources>java:/Objects/java.nio.channels.AsynchronousFileChannel</semanticResources>
-    <semanticResources>java:/Objects/java.nio.channels.AsynchronousChannel</semanticResources>
-    <semanticResources>java:/Objects/java.nio.channels.Channel</semanticResources>
-    <semanticResources>java:/Objects/java.nio.channels.SeekableByteChannel</semanticResources>
-    <semanticResources>java:/Objects/java.nio.channels.ByteChannel</semanticResources>
-    <semanticResources>java:/Objects/java.nio.channels.ReadableByteChannel</semanticResources>
-    <semanticResources>java:/Objects/java.nio.file.DirectoryStream</semanticResources>
-    <semanticResources>java:/Objects/sun.util.resources.OpenListResourceBundle</semanticResources>
-    <semanticResources>java:/Objects/java.nio.channels.FileChannel</semanticResources>
-    <semanticResources>java:/Objects/java.nio.channels.spi.AbstractInterruptibleChannel</semanticResources>
-    <semanticResources>java:/Objects/java.nio.channels.InterruptibleChannel</semanticResources>
-    <semanticResources>java:/Objects/java.nio.file.attribute.BasicFileAttributes</semanticResources>
-    <semanticResources>java:/Objects/java.nio.file.attribute.FileTime</semanticResources>
-    <semanticResources>java:/Objects/java.nio.channels.FileLock</semanticResources>
-    <semanticResources>java:/Objects/java.nio.channels.WritableByteChannel</semanticResources>
-    <semanticResources>java:/Objects/java.nio.channels.CompletionHandler</semanticResources>
-    <semanticResources>java:/Objects/java.nio.channels.GatheringByteChannel</semanticResources>
-    <semanticResources>java:/Objects/java.nio.channels.ScatteringByteChannel</semanticResources>
-    <semanticResources>java:/Objects/java.nio.MappedByteBuffer</semanticResources>
-    <semanticResources>java:/Objects/sun.util.resources.TimeZoneNamesBundle</semanticResources>
-    <semanticResources>java:/Objects/java.nio.channels.AsynchronousCloseException</semanticResources>
-    <semanticResources>java:/Objects/java.nio.channels.ClosedChannelException</semanticResources>
-    <semanticResources>java:/Objects/sun.nio.cs.StreamEncoder</semanticResources>
-    <semanticResources>java:/Objects/sun.util.resources.ParallelListResourceBundle</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.atomic.AtomicMarkableReference</semanticResources>
-    <semanticResources>java:/Objects/java.nio.charset.CodingErrorAction</semanticResources>
-    <semanticResources>java:/Objects/java.util.spi.CalendarDataProvider</semanticResources>
-    <semanticResources>java:/Objects/java.io.Console</semanticResources>
-    <semanticResources>java:/Objects/java.util.spi.CalendarNameProvider</semanticResources>
-    <semanticResources>java:/Objects/java.io.FileOutputStream</semanticResources>
-    <semanticResources>java:/Objects/jdk.internal.misc.JavaIOFileDescriptorAccess</semanticResources>
-    <semanticResources>java:/Objects/sun.util.spi.CalendarProvider</semanticResources>
-    <semanticResources>java:/Objects/java.text.spi.CollatorProvider</semanticResources>
-    <semanticResources>java:/Objects/java.text.Collator</semanticResources>
-    <semanticResources>java:/Objects/java.text.CollationKey</semanticResources>
-    <semanticResources>java:/Objects/java.util.spi.CurrencyNameProvider</semanticResources>
-    <semanticResources>java:/Objects/java.text.spi.DateFormatProvider</semanticResources>
-    <semanticResources>java:/Objects/java.text.DateFormat</semanticResources>
-    <semanticResources>java:/Objects/java.text.NumberFormat</semanticResources>
-    <semanticResources>java:/Objects/java.util.Currency</semanticResources>
-    <semanticResources>java:/Objects/java.util.HashSet</semanticResources>
-    <semanticResources>java:/Objects/java.text.spi.DateFormatSymbolsProvider</semanticResources>
-    <semanticResources>java:/Objects/java.text.spi.DecimalFormatSymbolsProvider</semanticResources>
-    <semanticResources>java:/Objects/java.text.DecimalFormatSymbols</semanticResources>
-    <semanticResources>java:/Objects/sun.text.spi.JavaTimeDateTimePatternProvider</semanticResources>
-    <semanticResources>java:/Objects/java.text.spi.NumberFormatProvider</semanticResources>
-    <semanticResources>java:/Objects/java.util.spi.TimeZoneNameProvider</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.api.IPatternMatch</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.api.IQuerySpecification</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQueryHeader</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.context.IInputKey</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.psystem.PTraceable</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.psystem.queries.PDisjunction</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.psystem.PBody</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.psystem.PVariable</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.psystem.PConstraint</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.context.IQueryMetaContext</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.context.InputKeyImplication</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.context.IPosetComparator</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.tuple.Tuple</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.tuple.AbstractTuple</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.tuple.ITuple</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.psystem.TypeJudgement</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.psystem.VariableDeferredPConstraint</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.psystem.DeferredPConstraint</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.psystem.BasePConstraint</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.backend.QueryHintOption</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.backend.IQueryBackendFactory</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.backend.IMatcherCapability</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.context.IQueryBackendContext</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.backend.IQueryBackendHintProvider</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.psystem.queries.PProblem</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.planning.QueryProcessingException</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.ViatraQueryRuntimeException</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.planning.SubPlan</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.planning.operations.POperation</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.backend.IQueryBackend</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.backend.IQueryResultProvider</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.backend.IUpdateable</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.tuple.TupleMask</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.tuple.IModifiableTuple</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.util.Accuracy</semanticResources>
-    <semanticResources>java:/Objects/org.apache.log4j.Logger</semanticResources>
-    <semanticResources>java:/Objects/org.apache.log4j.Category</semanticResources>
-    <semanticResources>java:/Objects/org.apache.log4j.spi.AppenderAttachable</semanticResources>
-    <semanticResources>java:/Objects/org.apache.log4j.Appender</semanticResources>
-    <semanticResources>java:/Objects/org.apache.log4j.spi.Filter</semanticResources>
-    <semanticResources>java:/Objects/org.apache.log4j.spi.OptionHandler</semanticResources>
-    <semanticResources>java:/Objects/org.apache.log4j.spi.LoggingEvent</semanticResources>
-    <semanticResources>java:/Objects/org.apache.log4j.Priority</semanticResources>
-    <semanticResources>java:/Objects/org.apache.log4j.Level</semanticResources>
-    <semanticResources>java:/Objects/org.apache.log4j.spi.ThrowableInformation</semanticResources>
-    <semanticResources>java:/Objects/org.apache.log4j.spi.LocationInfo</semanticResources>
-    <semanticResources>java:/Objects/java.io.StringWriter</semanticResources>
-    <semanticResources>java:/Objects/org.apache.log4j.spi.LoggerRepository</semanticResources>
-    <semanticResources>java:/Objects/org.apache.log4j.spi.HierarchyEventListener</semanticResources>
-    <semanticResources>java:/Objects/org.apache.log4j.helpers.AppenderAttachableImpl</semanticResources>
-    <semanticResources>java:/Objects/org.apache.log4j.spi.ErrorHandler</semanticResources>
-    <semanticResources>java:/Objects/org.apache.log4j.spi.LoggerFactory</semanticResources>
-    <semanticResources>java:/Objects/org.apache.log4j.Layout</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.psystem.analysis.QueryAnalyzer</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.context.IQueryCacheContext</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.context.IQueryResultProviderAccess</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContext</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContextListener</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.context.IndexingService</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.api.ViatraQueryEngine</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.api.scope.IBaseIndex</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.api.scope.ViatraBaseIndexChangeListener</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.api.scope.IIndexingErrorListener</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.api.scope.IInstanceObserver</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.api.scope.QueryScope</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.internal.apiimpl.EngineContextFactory</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.api.scope.IEngineContext</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.api.ViatraQueryEngineOptions</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.api.impl.BaseMatcher</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.internal.apiimpl.QueryResultWrapper</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.api.impl.BaseQuerySpecification</semanticResources>
-    <semanticResources>java:/Objects/java.lang.ExceptionInInitializerError</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.exception.ViatraQueryException</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.psystem.queries.QueryInitializationException</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedPatternGroup</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.api.impl.BaseQueryGroup</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.api.IQueryGroup</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.api.AdvancedViatraQueryEngine</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.api.ViatraQueryEngineLifecycleListener</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.api.IMatchUpdateListener</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.api.ViatraQueryModelUpdateListener</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Override</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.viatra.query.runtime.matchers.psystem.queries.BasePQuery</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.EClassifier</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.ENamedElement</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.EModelElement</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.EObject</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.common.notify.Notifier</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.common.util.EList</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.common.notify.Adapter</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.common.notify.Notification</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.common.util.TreeIterator</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.EClass</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.EAttribute</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.EStructuralFeature</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.ETypedElement</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.EGenericType</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.ETypeParameter</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.EAnnotation</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.common.util.EMap</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.EReference</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.InternalEObject</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.common.notify.NotificationChain</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.resource.Resource</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.common.util.URI</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.common.util.Pool</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.common.util.WeakInterningHashSet</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.common.util.InterningSet</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.locks.ReentrantReadWriteLock</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.locks.ReadWriteLock</semanticResources>
-    <semanticResources>java:/Objects/java.lang.IllegalMonitorStateException</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.common.util.SegmentSequence</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.common.util.CommonUtil</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.resource.ResourceSet</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.common.notify.AdapterFactory</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.EPackage</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.EFactory</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.EDataType</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.common.CommonPlugin</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.common.EMFPlugin</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.common.util.DelegatingResourceLocator</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.common.util.ResourceLocator</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.common.util.Logger</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.core.runtime.Plugin</semanticResources>
-    <semanticResources>java:/Objects/org.osgi.framework.BundleActivator</semanticResources>
-    <semanticResources>java:/Objects/org.osgi.framework.BundleContext</semanticResources>
-    <semanticResources>java:/Objects/org.osgi.framework.BundleReference</semanticResources>
-    <semanticResources>java:/Objects/org.osgi.framework.Bundle</semanticResources>
-    <semanticResources>java:/Objects/org.osgi.framework.ServiceReference</semanticResources>
-    <semanticResources>java:/Objects/java.security.cert.X509Certificate</semanticResources>
-    <semanticResources>java:/Objects/java.security.cert.X509Extension</semanticResources>
-    <semanticResources>java:/Objects/java.security.cert.CertificateExpiredException</semanticResources>
-    <semanticResources>java:/Objects/java.security.cert.CertificateNotYetValidException</semanticResources>
-    <semanticResources>java:/Objects/java.security.cert.CertificateParsingException</semanticResources>
-    <semanticResources>java:/Objects/javax.security.auth.x500.X500Principal</semanticResources>
-    <semanticResources>java:/Objects/sun.security.x509.X500Name</semanticResources>
-    <semanticResources>java:/Objects/sun.security.x509.GeneralNameInterface</semanticResources>
-    <semanticResources>java:/Objects/sun.security.util.DerOutputStream</semanticResources>
-    <semanticResources>java:/Objects/java.io.ByteArrayOutputStream</semanticResources>
-    <semanticResources>java:/Objects/sun.security.util.DerEncoder</semanticResources>
-    <semanticResources>java:/Objects/sun.security.util.DerValue</semanticResources>
-    <semanticResources>java:/Objects/sun.security.util.DerInputBuffer</semanticResources>
-    <semanticResources>java:/Objects/java.io.ByteArrayInputStream</semanticResources>
-    <semanticResources>java:/Objects/sun.security.util.BitArray</semanticResources>
-    <semanticResources>java:/Objects/sun.security.util.DerInputStream</semanticResources>
-    <semanticResources>java:/Objects/sun.security.util.ObjectIdentifier</semanticResources>
-    <semanticResources>java:/Objects/sun.security.util.ByteArrayLexOrder</semanticResources>
-    <semanticResources>java:/Objects/sun.security.util.ByteArrayTagOrder</semanticResources>
-    <semanticResources>java:/Objects/sun.security.x509.RDN</semanticResources>
-    <semanticResources>java:/Objects/sun.security.x509.AVA</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Byte</semanticResources>
-    <semanticResources>java:/Objects/org.osgi.framework.Version</semanticResources>
-    <semanticResources>java:/Objects/org.osgi.framework.BundleException</semanticResources>
-    <semanticResources>java:/Objects/org.osgi.framework.BundleListener</semanticResources>
-    <semanticResources>java:/Objects/java.util.EventListener</semanticResources>
-    <semanticResources>java:/Objects/org.osgi.framework.BundleEvent</semanticResources>
-    <semanticResources>java:/Objects/java.util.EventObject</semanticResources>
-    <semanticResources>java:/Objects/org.osgi.framework.FrameworkListener</semanticResources>
-    <semanticResources>java:/Objects/org.osgi.framework.FrameworkEvent</semanticResources>
-    <semanticResources>java:/Objects/org.osgi.framework.ServiceListener</semanticResources>
-    <semanticResources>java:/Objects/org.osgi.framework.ServiceEvent</semanticResources>
-    <semanticResources>java:/Objects/org.osgi.framework.InvalidSyntaxException</semanticResources>
-    <semanticResources>java:/Objects/org.osgi.framework.Filter</semanticResources>
-    <semanticResources>java:/Objects/org.osgi.framework.ServiceObjects</semanticResources>
-    <semanticResources>java:/Objects/org.osgi.framework.ServiceRegistration</semanticResources>
-    <semanticResources>java:/Objects/org.osgi.framework.ServiceFactory</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.core.runtime.IPath</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.osgi.service.debug.DebugOptions</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.osgi.service.debug.DebugTrace</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.core.runtime.ILog</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.core.runtime.ILogListener</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.core.runtime.IStatus</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.core.runtime.Preferences</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.core.runtime.CoreException</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.core.runtime.ListenerList</semanticResources>
-    <semanticResources>java:/Objects/org.osgi.util.tracker.ServiceTracker</semanticResources>
-    <semanticResources>java:/Objects/org.osgi.util.tracker.ServiceTrackerCustomizer</semanticResources>
-    <semanticResources>java:/Objects/org.osgi.framework.AllServiceListener</semanticResources>
-    <semanticResources>java:/Objects/org.osgi.util.tracker.AbstractTracked</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.EOperation</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.EParameter</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.util.FeatureMap</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.util.InternalEList</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.util.EContentsEList</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.util.AbstractSequentialInternalEList</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.resource.URIConverter</semanticResources>
-    <semanticResources>java:/Objects/java.io.InputStreamReader</semanticResources>
-    <semanticResources>java:/Objects/sun.nio.cs.StreamDecoder</semanticResources>
-    <semanticResources>java:/Objects/java.io.FileInputStream</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.resource.ContentHandler</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.resource.URIHandler</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.EEnumLiteral</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.common.util.Enumerator</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.emf.ecore.EEnum</semanticResources>
-    <semanticResources>java:/Objects/modes3.Segment</semanticResources>
-    <semanticResources>java:/Objects/modes3.Train</semanticResources>
-    <semanticResources>java:/Objects/java.lang.SuppressWarnings</semanticResources>
-    <semanticResources>java:/Objects/modes3.Turnout</semanticResources>
-    <semanticResources>../src/modes3/run/Modes3ModelGenerator.xtend</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.annotations.FinalFieldsConstructor</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.Active</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.annotations.Beta</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.annotations.GwtCompatible</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.annotations.FinalFieldsConstructorProcessor</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.TransformationParticipant</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.Extension</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.TransformationContext</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.services.Tracability</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.Element</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.services.ProblemSupport</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.services.Problem</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.Procedures</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.services.TypeReferenceProvider</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.TypeReference</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.ResolvedMethod</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.ResolvedExecutable</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.ExecutableDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.TypeParameterDeclarator</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.MemberDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.Declaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.AnnotationTarget</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.NamedElement</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.CompilationUnit</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.file.Path</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.ImmutableList</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.ImmutableCollection</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.UnmodifiableIterator</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.annotations.VisibleForTesting</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.UnmodifiableListIterator</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.base.Splitter</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.base.AbstractIterator</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.base.CharMatcher</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.base.Predicate</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.annotations.GwtIncompatible</semanticResources>
-    <semanticResources>java:/Objects/java.util.BitSet</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.base.CommonPattern</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.base.CommonMatcher</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.TypeDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.Type</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.AnnotationReference</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.AnnotationTypeDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.AnnotationTypeElementDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.expression.Expression</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.Modifier</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.Visibility</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.EnumerationValueDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.EnumerationTypeDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.ConstructorDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.ParameterDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.FieldDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.MethodDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.TypeParameterDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.ClassDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.InterfaceDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.ResolvedConstructor</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.ResolvedParameter</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.ResolvedTypeParameter</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.services.TypeLookup</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.services.GlobalTypeLookup</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.MutableAnnotationTypeDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.MutableTypeDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.MutableMemberDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.MutableDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.MutableAnnotationTarget</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.MutableNamedElement</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.MutableElement</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.MutableConstructorDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.MutableExecutableDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.MutableTypeParameterDeclarator</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.MutableTypeParameterDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.MutableFieldDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.CompilationStrategy</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend2.lib.StringConcatenationClient</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.MutableMethodDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.MutableParameterDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.MutableClassDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.MutableEnumerationTypeDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.MutableEnumerationValueDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.MutableInterfaceDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.declaration.MutableAnnotationTypeElementDeclaration</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.file.FileSystemSupport</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.file.FileLocations</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.services.AnnotationReferenceProvider</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.services.AnnotationReferenceBuildContext</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.services.Associator</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.annotations.Data</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.annotations.DataProcessor</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.AbstractClassProcessor</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.RegisterGlobalsParticipant</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.RegisterGlobalsContext</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.services.UpstreamTypeLookup</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.services.SourceTypeLookup</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.CodeGenerationParticipant</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.CodeGenerationContext</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.file.MutableFileSystemSupport</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.ValidationParticipant</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.macro.ValidationContext</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.annotations.Accessors</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.annotations.AccessorsProcessor</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtend.lib.annotations.AccessorType</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.ArrayLiterals</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.Pure</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.Inline</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.CollectionLiterals</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.Pair</semanticResources>
-    <semanticResources>java:/Objects/java.util.LinkedHashSet</semanticResources>
-    <semanticResources>java:/Objects/java.util.TreeMap</semanticResources>
-    <semanticResources>java:/Objects/java.util.NavigableMap</semanticResources>
-    <semanticResources>java:/Objects/java.util.TreeSet</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.InputOutput</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.ArrayExtensions</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.BigDecimalExtensions</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.BigIntegerExtensions</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.BooleanExtensions</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.primitives.Booleans</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.ByteExtensions</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Math</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.CharacterExtensions</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.CollectionExtensions</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.Iterables</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.FluentIterable</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.base.Function</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.base.Optional</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.base.Supplier</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.ImmutableListMultimap</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.ImmutableMultimap</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.BaseImmutableMultimap</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.AbstractMultimap</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.Multimap</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.Multiset</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.Multimaps</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.Maps</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.ImmutableMap</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.ImmutableSet</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.ImmutableSetMultimap</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.SetMultimap</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.Serialization</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.ImmutableMultiset</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.ImmutableMultisetGwtSerializationDependencies</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.IndexedImmutableSet</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.AbstractListMultimap</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.AbstractMapBasedMultimap</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.AbstractSetMultimap</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.AbstractSortedSetMultimap</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.SortedSetMultimap</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.AbstractMultiset</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.Multisets</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.Sets</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.ForwardingCollection</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.ForwardingObject</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.CartesianList</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.ForwardingNavigableSet</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.ForwardingSortedSet</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.ForwardingSet</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.Ordering</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.Collections2</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.AbstractIterator</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.CopyOnWriteArraySet</semanticResources>
-    <semanticResources>java:/Objects/java.util.concurrent.CopyOnWriteArrayList</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.Range</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.RangeGwtSerializationDependencies</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.Cut</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.DiscreteDomain</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.BoundType</semanticResources>
-    <semanticResources>java:/Objects/java.util.EnumMap</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.ListMultimap</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.ForwardingMultimap</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.FilteredMultimap</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.FilteredSetMultimap</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.base.Converter</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.BiMap</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.ForwardingMap</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.AbstractNavigableMap</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.MapDifference</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.SortedMapDifference</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.ForwardingSortedMap</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.base.Equivalence</semanticResources>
-    <semanticResources>java:/Objects/java.util.function.BiPredicate</semanticResources>
-    <semanticResources>java:/Objects/java.util.IdentityHashMap</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.ForwardingMultiset</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.SortedMultiset</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.SortedMultisetBridge</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.SortedIterable</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.base.Joiner</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.ImmutableSortedSet</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.ImmutableSortedSetFauxverideShim</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.RegularImmutableSortedSet</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.ImmutableSortedMap</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.ImmutableSortedMapFauxverideShim</semanticResources>
-    <semanticResources>java:/Objects/java.util.Collections</semanticResources>
-    <semanticResources>java:/Objects/java.util.AbstractQueue</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.ComparableExtensions</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.DoubleExtensions</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.FloatExtensions</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Float</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.FunctionExtensions</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.Functions</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.IntegerExtensions</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.ExclusiveRange</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.IntegerRange</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.IterableExtensions</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.IteratorExtensions</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.Iterators</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.AbstractIndexedListIterator</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.collect.PeekingIterator</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.ListExtensions</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.LongExtensions</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.MapExtensions</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.internal.UnmodifiableMergingMapView</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.ObjectExtensions</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.base.Objects</semanticResources>
-    <semanticResources>java:/Objects/com.google.common.base.ExtraObjectsMethodsForWeb</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.ProcedureExtensions</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.ShortExtensions</semanticResources>
-    <semanticResources>java:/Objects/java.lang.Short</semanticResources>
-    <semanticResources>java:/Objects/org.eclipse.xtext.xbase.lib.StringExtensions</semanticResources>
-    <ownedViews xmi:type="viewpoint:DView" uid="_R6jlsA7_Eee1dfpzdcS6YA">
-      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_WlTx4R3XEeeQBfI0hkDaPg" name="modes3-domain" repPath="#_QqO3ABFUEeeHWeeZwj2u8w" changeId="5336d6ad-0418-43b4-b439-053a489228c4">
-        <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
-        <target xmi:type="ecore:EPackage" href="modes3.ecore#/"/>
-      </ownedRepresentationDescriptors>
-    </ownedViews>
-    <ownedViews xmi:type="viewpoint:DView" uid="_OHrasBFUEeeHWeeZwj2u8w">
-      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']"/>
-    </ownedViews>
-    <ownedViews xmi:type="viewpoint:DView" uid="_OH-VoBFUEeeHWeeZwj2u8w">
-      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']"/>
-    </ownedViews>
-    <ownedViews xmi:type="viewpoint:DView" uid="_OIvxsBFUEeeHWeeZwj2u8w">
-      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Generation']"/>
-    </ownedViews>
-  </viewpoint:DAnalysis>
-  <diagram:DSemanticDiagram uid="_QqO3ABFUEeeHWeeZwj2u8w">
-    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_QqO3ARFUEeeHWeeZwj2u8w" source="DANNOTATION_CUSTOMIZATION_KEY">
-      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_QqO3AhFUEeeHWeeZwj2u8w">
-        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_4vAR4GrPEeqC0oOqPAS8qg" sourceArrow="FillDiamond" routingStyle="manhattan">
-          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_4vAR4WrPEeqC0oOqPAS8qg" showIcon="false" labelExpression="service:render">
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          </centerLabelStyleDescription>
-          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_4vAR4mrPEeqC0oOqPAS8qg" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-          </endLabelStyleDescription>
-        </computedStyleDescriptions>
-        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_vpT04NGqEeqNWYR5K-zBag" routingStyle="manhattan">
-          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_vpT04dGqEeqNWYR5K-zBag" showIcon="false" labelExpression="service:render">
-            <labelFormat>bold</labelFormat>
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-          </centerLabelStyleDescription>
-          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_vpT04tGqEeqNWYR5K-zBag" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
-          </endLabelStyleDescription>
-        </computedStyleDescriptions>
-      </data>
-    </ownedAnnotationEntries>
-    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_QqZPEBFUEeeHWeeZwj2u8w" source="GMF_DIAGRAMS">
-      <data xmi:type="notation:Diagram" xmi:id="_QqZPERFUEeeHWeeZwj2u8w" type="Sirius" element="_QqO3ABFUEeeHWeeZwj2u8w" measurementUnit="Pixel">
-        <children xmi:type="notation:Node" xmi:id="_u0Dbcx9kEee278vFHA2N9A" type="2003" element="_uyq7YB9kEee278vFHA2N9A">
-          <children xmi:type="notation:Node" xmi:id="_u0Dbdh9kEee278vFHA2N9A" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_u0ECgB9kEee278vFHA2N9A" type="7004">
-            <children xmi:type="notation:Node" xmi:id="_sGnOAGrPEeqC0oOqPAS8qg" type="3010" element="_sFw5cGrPEeqC0oOqPAS8qg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_sGnOAWrPEeqC0oOqPAS8qg" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_sGnOAmrPEeqC0oOqPAS8qg"/>
-            </children>
-            <styles xmi:type="notation:SortingStyle" xmi:id="_u0ECgR9kEee278vFHA2N9A"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_u0ECgh9kEee278vFHA2N9A"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_u0DbdB9kEee278vFHA2N9A" fontColor="2697711" fontName="Droid Sans" fontHeight="8" fillColor="16250871"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u0DbdR9kEee278vFHA2N9A" x="108" y="144" width="151" height="51"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_HaIZUB9lEee278vFHA2N9A" type="2003" element="_HZ5IwB9lEee278vFHA2N9A">
-          <children xmi:type="notation:Node" xmi:id="_HaIZUx9lEee278vFHA2N9A" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_HaIZVB9lEee278vFHA2N9A" type="7004">
-            <children xmi:type="notation:Node" xmi:id="_4SIysL8WEeebfIyBIV4aqw" type="3010" element="_4R8lcL8WEeebfIyBIV4aqw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_4SIysb8WEeebfIyBIV4aqw" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_4SIysr8WEeebfIyBIV4aqw"/>
-            </children>
-            <styles xmi:type="notation:SortingStyle" xmi:id="_HaIZVR9lEee278vFHA2N9A"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_HaIZVh9lEee278vFHA2N9A"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_HaIZUR9lEee278vFHA2N9A" fontName="Droid Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HaIZUh9lEee278vFHA2N9A" x="256" y="60" width="126" height="62"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_I1qRkCB1EeeUF8d36bwwGg" type="2003" element="_I1kK8CB1EeeUF8d36bwwGg">
-          <children xmi:type="notation:Node" xmi:id="_I1qRkyB1EeeUF8d36bwwGg" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_I1qRlCB1EeeUF8d36bwwGg" type="7004">
-            <styles xmi:type="notation:SortingStyle" xmi:id="_I1qRlSB1EeeUF8d36bwwGg"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_I1qRliB1EeeUF8d36bwwGg"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_I1qRkSB1EeeUF8d36bwwGg" fontName="Droid Sans" fontHeight="8" fillColor="16250871"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_I1qRkiB1EeeUF8d36bwwGg" x="108" y="228" width="151" height="51"/>
-        </children>
-        <children xmi:type="notation:Node" xmi:id="_fHXZECB1EeeUF8d36bwwGg" type="2003" element="_fHIIgCB1EeeUF8d36bwwGg">
-          <children xmi:type="notation:Node" xmi:id="_fHXZEyB1EeeUF8d36bwwGg" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_fHXZFCB1EeeUF8d36bwwGg" type="7004">
-            <children xmi:type="notation:Node" xmi:id="_t3c5gGrPEeqC0oOqPAS8qg" type="3010" element="_t28jMGrPEeqC0oOqPAS8qg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_t3c5gWrPEeqC0oOqPAS8qg" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_t3c5gmrPEeqC0oOqPAS8qg"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_0lh7EGrPEeqC0oOqPAS8qg" type="3010" element="_0lKusGrPEeqC0oOqPAS8qg">
-              <styles xmi:type="notation:FontStyle" xmi:id="_0lh7EWrPEeqC0oOqPAS8qg" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_0lh7EmrPEeqC0oOqPAS8qg"/>
-            </children>
-            <styles xmi:type="notation:SortingStyle" xmi:id="_fHXZFSB1EeeUF8d36bwwGg"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_fHXZFiB1EeeUF8d36bwwGg"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_fHXZESB1EeeUF8d36bwwGg" fontName="Droid Sans" fontHeight="8" fillColor="16250871"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fHXZEiB1EeeUF8d36bwwGg" x="360" y="168" width="159" height="76"/>
-        </children>
-        <styles xmi:type="notation:DiagramStyle" xmi:id="_QqZPEhFUEeeHWeeZwj2u8w">
-          <horizontalGuides xmi:type="notation:Guide" xmi:id="_9p7HcBFWEeeHWeeZwj2u8w" position="-3"/>
-          <horizontalGuides xmi:type="notation:Guide" xmi:id="__YY0YBFWEeeHWeeZwj2u8w" position="188"/>
-          <horizontalGuides xmi:type="notation:Guide" xmi:id="_G_Ya8BFXEeeHWeeZwj2u8w" position="264"/>
-          <horizontalGuides xmi:type="notation:Guide" xmi:id="_MV83ABFXEeeHWeeZwj2u8w" position="341"/>
-          <horizontalGuides xmi:type="notation:Guide" xmi:id="_YR8u8BFXEeeHWeeZwj2u8w" position="491"/>
-          <horizontalGuides xmi:type="notation:Guide" xmi:id="_5rK9cBFXEeeHWeeZwj2u8w" position="604">
-            <nodeMap xmi:type="notation:NodeEntry" xmi:id="_6OVU4BFXEeeHWeeZwj2u8w"/>
-          </horizontalGuides>
-          <horizontalGuides xmi:type="notation:Guide" xmi:id="_Dzs6YBPOEeeca8alBUq9TA" position="716"/>
-          <verticalGuides xmi:type="notation:Guide" xmi:id="_WIJw4BFXEeeHWeeZwj2u8w" position="1170">
-            <nodeMap xmi:type="notation:NodeEntry" xmi:id="_Wx0Y8RFXEeeHWeeZwj2u8w"/>
-            <nodeMap xmi:type="notation:NodeEntry" xmi:id="_YxACcRFXEeeHWeeZwj2u8w"/>
-          </verticalGuides>
-          <verticalGuides xmi:type="notation:Guide" xmi:id="_crsWYBFXEeeHWeeZwj2u8w" position="1438">
-            <nodeMap xmi:type="notation:NodeEntry" xmi:id="_dCqr8RFXEeeHWeeZwj2u8w"/>
-            <nodeMap xmi:type="notation:NodeEntry" xmi:id="_ASJRcBFYEeeHWeeZwj2u8w" value="Left"/>
-            <nodeMap xmi:type="notation:NodeEntry" xmi:id="_f25RoBPJEeeca8alBUq9TA" value="Left"/>
-          </verticalGuides>
-          <verticalGuides xmi:type="notation:Guide" xmi:id="_gf1WYBFXEeeHWeeZwj2u8w" position="1305">
-            <nodeMap xmi:type="notation:NodeEntry" xmi:id="_gyEV4RFXEeeHWeeZwj2u8w"/>
-            <nodeMap xmi:type="notation:NodeEntry" xmi:id="_GzF18RFYEeeHWeeZwj2u8w"/>
-          </verticalGuides>
-          <verticalGuides xmi:type="notation:Guide" xmi:id="_oK8n8BFXEeeHWeeZwj2u8w" position="832">
-            <nodeMap xmi:type="notation:NodeEntry" xmi:id="_pTpVYBFXEeeHWeeZwj2u8w"/>
-            <nodeMap xmi:type="notation:NodeEntry" xmi:id="_uO4Y8BFaEeeHWeeZwj2u8w"/>
-          </verticalGuides>
-          <verticalGuides xmi:type="notation:Guide" xmi:id="_q0VFABFXEeeHWeeZwj2u8w" position="490">
-            <nodeMap xmi:type="notation:NodeEntry" xmi:id="_roqsARFXEeeHWeeZwj2u8w"/>
-          </verticalGuides>
-          <verticalGuides xmi:type="notation:Guide" xmi:id="_twEdYBFXEeeHWeeZwj2u8w" position="659">
-            <nodeMap xmi:type="notation:NodeEntry" xmi:id="_uWEtcBFXEeeHWeeZwj2u8w"/>
-          </verticalGuides>
-          <verticalGuides xmi:type="notation:Guide" xmi:id="_z65n8BFXEeeHWeeZwj2u8w" position="1662">
-            <nodeMap xmi:type="notation:NodeEntry" xmi:id="_6OVU4RFXEeeHWeeZwj2u8w"/>
-            <nodeMap xmi:type="notation:NodeEntry" xmi:id="_BPVScRFYEeeHWeeZwj2u8w" value="Left"/>
-            <nodeMap xmi:type="notation:NodeEntry" xmi:id="_pmIMgBPIEeeca8alBUq9TA" value="Left"/>
-            <nodeMap xmi:type="notation:NodeEntry" xmi:id="_UnN64BPOEeeca8alBUq9TA"/>
-          </verticalGuides>
-          <verticalGuides xmi:type="notation:Guide" xmi:id="_D1WScBFYEeeHWeeZwj2u8w" position="1815">
-            <nodeMap xmi:type="notation:NodeEntry" xmi:id="_FdQEYRFYEeeHWeeZwj2u8w"/>
-            <nodeMap xmi:type="notation:NodeEntry" xmi:id="_85-0ERPOEeeca8alBUq9TA"/>
-          </verticalGuides>
-          <verticalGuides xmi:type="notation:Guide" xmi:id="_iXt2UBPOEeeca8alBUq9TA" position="1890">
-            <nodeMap xmi:type="notation:NodeEntry" xmi:id="_ji_9sRPOEeeca8alBUq9TA"/>
-            <nodeMap xmi:type="notation:NodeEntry" xmi:id="_vBqZYRPOEeeca8alBUq9TA"/>
-          </verticalGuides>
-          <verticalGuides xmi:type="notation:Guide" xmi:id="_srmEcBPPEeeca8alBUq9TA" position="1739">
-            <nodeMap xmi:type="notation:NodeEntry" xmi:id="_zs6LEBPPEeeca8alBUq9TA"/>
-          </verticalGuides>
-          <verticalGuides xmi:type="notation:Guide" xmi:id="_6e7RcBPPEeeca8alBUq9TA" position="1966">
-            <nodeMap xmi:type="notation:NodeEntry" xmi:id="_7DL1ERPPEeeca8alBUq9TA"/>
-          </verticalGuides>
-        </styles>
-        <edges xmi:type="notation:Edge" xmi:id="_59dRwCB1EeeUF8d36bwwGg" type="4001" element="_59UH0CB1EeeUF8d36bwwGg" source="_I1qRkCB1EeeUF8d36bwwGg" target="_u0Dbcx9kEee278vFHA2N9A">
-          <children xmi:type="notation:Node" xmi:id="_59dRxCB1EeeUF8d36bwwGg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_59dRxSB1EeeUF8d36bwwGg" y="48"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_59dRxiB1EeeUF8d36bwwGg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_59dRxyB1EeeUF8d36bwwGg" x="8"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_59dRyCB1EeeUF8d36bwwGg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_59dRySB1EeeUF8d36bwwGg" x="-10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_59dRwSB1EeeUF8d36bwwGg" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_59dRwiB1EeeUF8d36bwwGg" fontColor="7490599" fontName="Droid Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_59dRwyB1EeeUF8d36bwwGg" points="[-34, 0, 24, 32]$[-34, -35, 24, -3]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_59dRyiB1EeeUF8d36bwwGg" id="(0.469910514541387,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_59dRyyB1EeeUF8d36bwwGg" id="(0.08713738976094071,1.0670553935860059)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_9vKBwCB1EeeUF8d36bwwGg" type="4001" element="_9vA30CB1EeeUF8d36bwwGg" source="_I1qRkCB1EeeUF8d36bwwGg" target="_u0Dbcx9kEee278vFHA2N9A">
-          <children xmi:type="notation:Node" xmi:id="_9vKo0CB1EeeUF8d36bwwGg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9vKo0SB1EeeUF8d36bwwGg" x="5" y="-54" width="85" height="27"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_9vKo0iB1EeeUF8d36bwwGg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9vKo0yB1EeeUF8d36bwwGg" x="2"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_9vKo1CB1EeeUF8d36bwwGg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9vKo1SB1EeeUF8d36bwwGg" x="-10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_9vKBwSB1EeeUF8d36bwwGg" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_9vKBwiB1EeeUF8d36bwwGg" fontColor="7490599" fontName="Droid Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9vKBwyB1EeeUF8d36bwwGg" points="[-14, -24, -8, 63]$[-14, -59, -8, 28]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9vKo1iB1EeeUF8d36bwwGg" id="(0.1796100990731863,0.49426020408163257)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9vKo1yB1EeeUF8d36bwwGg" id="(0.13994120583504355,0.4347262714609653)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_h9HE4CB6EeeUF8d36bwwGg" type="4001" element="_h9BlUCB6EeeUF8d36bwwGg" source="_u0Dbcx9kEee278vFHA2N9A" target="_u0Dbcx9kEee278vFHA2N9A">
-          <children xmi:type="notation:Node" xmi:id="_h9HE5CB6EeeUF8d36bwwGg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_h9HE5SB6EeeUF8d36bwwGg" x="-12" y="-12"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_h9Hr8CB6EeeUF8d36bwwGg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_h9Hr8SB6EeeUF8d36bwwGg" x="5"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_h9Hr8iB6EeeUF8d36bwwGg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_h9Hr8yB6EeeUF8d36bwwGg" x="-2" y="-10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_h9HE4SB6EeeUF8d36bwwGg" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_h9HE4iB6EeeUF8d36bwwGg" fontColor="7490599" fontName="Droid Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_h9HE4yB6EeeUF8d36bwwGg" points="[-31, -11, -46, -30]$[-31, -29, -46, -48]$[15, -29, 0, -48]$[15, -11, 0, -30]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_h9Hr9CB6EeeUF8d36bwwGg" id="(0.3775583781685063,0.23712342079689017)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XjizcCIDEeeSweRcnMPZRQ" id="(0.4798657718120805,0.6224489795918368)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_O0izYDGjEeePY54_4mjBmA" type="4001" element="_OyqkEDGjEeePY54_4mjBmA" source="_u0Dbcx9kEee278vFHA2N9A" target="_fHXZECB1EeeUF8d36bwwGg">
-          <children xmi:type="notation:Node" xmi:id="_O0jacDGjEeePY54_4mjBmA" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O0jacTGjEeePY54_4mjBmA" x="-32" y="14"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_O0kBgDGjEeePY54_4mjBmA" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O0kBgTGjEeePY54_4mjBmA" x="25" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_O0kBgjGjEeePY54_4mjBmA" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O0kBgzGjEeePY54_4mjBmA" x="-30" y="12"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_O0izYTGjEeePY54_4mjBmA" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_O0izYjGjEeePY54_4mjBmA" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_O0izYzGjEeePY54_4mjBmA" points="[1, 0, -104, -26]$[44, 0, -61, -26]$[44, 26, -61, 0]$[104, 26, -1, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O0kokDGjEeePY54_4mjBmA" id="(0.9932885906040269,0.5714285714285714)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_O0kokTGjEeePY54_4mjBmA" id="(0.006369426751592357,0.40540540540540543)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_4vdk4GrPEeqC0oOqPAS8qg" type="4001" element="_4u-ctmrPEeqC0oOqPAS8qg" source="_HaIZUB9lEee278vFHA2N9A" target="_fHXZECB1EeeUF8d36bwwGg">
-          <children xmi:type="notation:Node" xmi:id="_4vnV4GrPEeqC0oOqPAS8qg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4vnV4WrPEeqC0oOqPAS8qg" x="44" y="38"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_4vokAGrPEeqC0oOqPAS8qg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4vokAWrPEeqC0oOqPAS8qg" x="33" y="8"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_4vqZMGrPEeqC0oOqPAS8qg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4vqZMWrPEeqC0oOqPAS8qg" x="-36"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_4vdk4WrPEeqC0oOqPAS8qg" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_4vdk4mrPEeqC0oOqPAS8qg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4vdk42rPEeqC0oOqPAS8qg" points="[0, 33, -76, -61]$[59, 33, -17, -61]$[59, 94, -17, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4vv4wGrPEeqC0oOqPAS8qg" id="(1.0,0.24266609145815363)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4vv4wWrPEeqC0oOqPAS8qg" id="(0.6114649681528662,0.0)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_-NwZkGrPEeqC0oOqPAS8qg" type="4001" element="_-NSfgGrPEeqC0oOqPAS8qg" source="_HaIZUB9lEee278vFHA2N9A" target="_u0Dbcx9kEee278vFHA2N9A">
-          <children xmi:type="notation:Node" xmi:id="_-NxAoGrPEeqC0oOqPAS8qg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-NxAoWrPEeqC0oOqPAS8qg" x="-49" y="-29"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_-NxAomrPEeqC0oOqPAS8qg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-NxAo2rPEeqC0oOqPAS8qg" x="10" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_-NxApGrPEeqC0oOqPAS8qg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-NxApWrPEeqC0oOqPAS8qg"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_-NwZkWrPEeqC0oOqPAS8qg" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_-NwZkmrPEeqC0oOqPAS8qg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-NwZk2rPEeqC0oOqPAS8qg" points="[-62, -14, 52, -36]$[-102, -14, 12, -36]$[-102, 22, 12, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-NxnsGrPEeqC0oOqPAS8qg" id="(0.5,1.0353753235547887)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-NxnsWrPEeqC0oOqPAS8qg" id="(0.6442953020134228,0.0)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_AwsQYGrQEeqC0oOqPAS8qg" type="4001" element="_AwjGgmrQEeqC0oOqPAS8qg" source="_HaIZUB9lEee278vFHA2N9A" target="_I1qRkCB1EeeUF8d36bwwGg">
-          <children xmi:type="notation:Node" xmi:id="_AwsQZGrQEeqC0oOqPAS8qg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AwsQZWrQEeqC0oOqPAS8qg" x="150" y="-48"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_Aws3cGrQEeqC0oOqPAS8qg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Aws3cWrQEeqC0oOqPAS8qg" x="26" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_Aws3cmrQEeqC0oOqPAS8qg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Aws3c2rQEeqC0oOqPAS8qg" x="71" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_AwsQYWrQEeqC0oOqPAS8qg" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_AwsQYmrQEeqC0oOqPAS8qg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AwsQY2rQEeqC0oOqPAS8qg" points="[-84, -33, 40, -139]$[-316, -33, -192, -139]$[-316, 142, -192, 36]$[-232, 142, -108, 36]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Aws3dGrQEeqC0oOqPAS8qg" id="(0.6774193548387096,1.0353753235547887)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Aws3dWrQEeqC0oOqPAS8qg" id="(0.7248322147651006,0.0)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_Z0Ta0Gr8EeqC0oOqPAS8qg" type="4001" element="_Z0H0oGr8EeqC0oOqPAS8qg" source="_I1qRkCB1EeeUF8d36bwwGg" target="_u0Dbcx9kEee278vFHA2N9A">
-          <children xmi:type="notation:Node" xmi:id="_Z0UB4Gr8EeqC0oOqPAS8qg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z0UB4Wr8EeqC0oOqPAS8qg" x="-10" y="2"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_Z0UB4mr8EeqC0oOqPAS8qg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z0UB42r8EeqC0oOqPAS8qg" x="14" y="2"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_Z0UB5Gr8EeqC0oOqPAS8qg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z0UB5Wr8EeqC0oOqPAS8qg" x="-18"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z0Ta0Wr8EeqC0oOqPAS8qg" routing="Tree"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_Z0Ta0mr8EeqC0oOqPAS8qg" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z0Ta02r8EeqC0oOqPAS8qg" points="[0, 0, 70, 60]$[0, 0, 70, 60]$[-12, 0, 58, 60]$[-12, -35, 58, 25]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z0UB5mr8EeqC0oOqPAS8qg" id="(0.9664429530201343,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z0UB52r8EeqC0oOqPAS8qg" id="(0.5,0.5)"/>
-        </edges>
-      </data>
-    </ownedAnnotationEntries>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_uyq7YB9kEee278vFHA2N9A" name="Segment" tooltipText="" outgoingEdges="_h9BlUCB6EeeUF8d36bwwGg _OyqkEDGjEeePY54_4mjBmA" incomingEdges="_59UH0CB1EeeUF8d36bwwGg _9vA30CB1EeeUF8d36bwwGg _h9BlUCB6EeeUF8d36bwwGg _-NSfgGrPEeqC0oOqPAS8qg _Z0H0oGr8EeqC0oOqPAS8qg" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="modes3.ecore#//Segment"/>
-      <semanticElements xmi:type="ecore:EClass" href="modes3.ecore#//Segment"/>
-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_srHpQWrPEeqC0oOqPAS8qg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" backgroundColor="247,247,247" foregroundColor="247,247,247">
-        <customFeatures>backgroundColor</customFeatures>
-        <customFeatures>foregroundColor</customFeatures>
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_sFw5cGrPEeqC0oOqPAS8qg" name="id : EInt" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="modes3.ecore#//Segment/id"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="modes3.ecore#//Segment/id"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_srKskWrPEeqC0oOqPAS8qg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_HZ5IwB9lEee278vFHA2N9A" name="Modes3ModelRoot" tooltipText="" outgoingEdges="_4u-ctmrPEeqC0oOqPAS8qg _-NSfgGrPEeqC0oOqPAS8qg _AwjGgmrQEeqC0oOqPAS8qg" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="modes3.ecore#//Modes3ModelRoot"/>
-      <semanticElements xmi:type="ecore:EClass" href="modes3.ecore#//Modes3ModelRoot"/>
-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_40AwsL8WEeebfIyBIV4aqw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,255,255">
-        <customFeatures>labelColor</customFeatures>
-        <customFeatures>backgroundColor</customFeatures>
-        <customFeatures>foregroundColor</customFeatures>
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_4R8lcL8WEeebfIyBIV4aqw" name="id : EInt" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="modes3.ecore#//Modes3ModelRoot/id"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="modes3.ecore#//Modes3ModelRoot/id"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_40B-0L8WEeebfIyBIV4aqw" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_I1kK8CB1EeeUF8d36bwwGg" name="Turnout" tooltipText="" outgoingEdges="_59UH0CB1EeeUF8d36bwwGg _9vA30CB1EeeUF8d36bwwGg _Z0H0oGr8EeqC0oOqPAS8qg" incomingEdges="_AwjGgmrQEeqC0oOqPAS8qg" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="modes3.ecore#//Turnout"/>
-      <semanticElements xmi:type="ecore:EClass" href="modes3.ecore#//Turnout"/>
-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_I1kyACB1EeeUF8d36bwwGg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" backgroundColor="247,247,247" foregroundColor="247,247,247">
-        <customFeatures>backgroundColor</customFeatures>
-        <customFeatures>foregroundColor</customFeatures>
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_fHIIgCB1EeeUF8d36bwwGg" name="Train" tooltipText="" incomingEdges="_OyqkEDGjEeePY54_4mjBmA _4u-ctmrPEeqC0oOqPAS8qg" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="modes3.ecore#//Train"/>
-      <semanticElements xmi:type="ecore:EClass" href="modes3.ecore#//Train"/>
-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_1pOzwWrPEeqC0oOqPAS8qg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" backgroundColor="247,247,247" foregroundColor="247,247,247">
-        <customFeatures>backgroundColor</customFeatures>
-        <customFeatures>foregroundColor</customFeatures>
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_t28jMGrPEeqC0oOqPAS8qg" name="id : EInt" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="modes3.ecore#//Train/id"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="modes3.ecore#//Train/id"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_uh_rUWrPEeqC0oOqPAS8qg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_0lKusGrPEeqC0oOqPAS8qg" name="speed : EDouble = 0.0" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="modes3.ecore#//Train/speed"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="modes3.ecore#//Train/speed"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_1pR3EmrPEeqC0oOqPAS8qg" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_59UH0CB1EeeUF8d36bwwGg" name="[1..1] straight" sourceNode="_I1kK8CB1EeeUF8d36bwwGg" targetNode="_uyq7YB9kEee278vFHA2N9A">
-      <target xmi:type="ecore:EReference" href="modes3.ecore#//Turnout/straight"/>
-      <semanticElements xmi:type="ecore:EReference" href="modes3.ecore#//Turnout/straight"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_wkfDsNGqEeqNWYR5K-zBag" description="_vpT04NGqEeqNWYR5K-zBag" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_wkfDstGqEeqNWYR5K-zBag" showIcon="false">
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_wkfDsdGqEeqNWYR5K-zBag" labelSize="6" showIcon="false" labelColor="39,76,114"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_9vA30CB1EeeUF8d36bwwGg" name="[1..1] divergent" sourceNode="_I1kK8CB1EeeUF8d36bwwGg" targetNode="_uyq7YB9kEee278vFHA2N9A">
-      <target xmi:type="ecore:EReference" href="modes3.ecore#//Turnout/divergent"/>
-      <semanticElements xmi:type="ecore:EReference" href="modes3.ecore#//Turnout/divergent"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_vpT049GqEeqNWYR5K-zBag" description="_vpT04NGqEeqNWYR5K-zBag" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_vpT05dGqEeqNWYR5K-zBag" showIcon="false">
-          <labelFormat>bold</labelFormat>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_vpT05NGqEeqNWYR5K-zBag" labelSize="6" showIcon="false" labelColor="39,76,114"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_h9BlUCB6EeeUF8d36bwwGg" name="[0..2] connectedTo" sourceNode="_uyq7YB9kEee278vFHA2N9A" targetNode="_uyq7YB9kEee278vFHA2N9A">
-      <target xmi:type="ecore:EReference" href="modes3.ecore#//Segment/connectedTo"/>
-      <semanticElements xmi:type="ecore:EReference" href="modes3.ecore#//Segment/connectedTo"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_h9CMYCB6EeeUF8d36bwwGg" routingStyle="manhattan" strokeColor="0,0,0">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_h9CMYSB6EeeUF8d36bwwGg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_h9CMYiB6EeeUF8d36bwwGg" showIcon="false" labelColor="39,76,114">
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_OyqkEDGjEeePY54_4mjBmA" sourceNode="_uyq7YB9kEee278vFHA2N9A" targetNode="_fHIIgCB1EeeUF8d36bwwGg" beginLabel="[1..1] location" endLabel="[0..1] occupiedBy">
-      <target xmi:type="ecore:EReference" href="modes3.ecore#//Segment/occupiedBy"/>
-      <semanticElements xmi:type="ecore:EReference" href="modes3.ecore#//Train/location"/>
-      <semanticElements xmi:type="ecore:EReference" href="modes3.ecore#//Segment/occupiedBy"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_O0DEIDGjEeePY54_4mjBmA" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_O0DEITGjEeePY54_4mjBmA" showIcon="false"/>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_O0DEIjGjEeePY54_4mjBmA" showIcon="false"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_4u-ctmrPEeqC0oOqPAS8qg" name="[0..*] trains" sourceNode="_HZ5IwB9lEee278vFHA2N9A" targetNode="_fHIIgCB1EeeUF8d36bwwGg">
-      <target xmi:type="ecore:EReference" href="modes3.ecore#//Modes3ModelRoot/trains"/>
-      <semanticElements xmi:type="ecore:EReference" href="modes3.ecore#//Modes3ModelRoot/trains"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_4vA48GrPEeqC0oOqPAS8qg" description="_4vAR4GrPEeqC0oOqPAS8qg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_4vA48mrPEeqC0oOqPAS8qg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_4vA48WrPEeqC0oOqPAS8qg" showIcon="false" labelColor="39,76,114">
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_-NSfgGrPEeqC0oOqPAS8qg" name="[0..*] segments" sourceNode="_HZ5IwB9lEee278vFHA2N9A" targetNode="_uyq7YB9kEee278vFHA2N9A">
-      <target xmi:type="ecore:EReference" href="modes3.ecore#//Modes3ModelRoot/segments"/>
-      <semanticElements xmi:type="ecore:EReference" href="modes3.ecore#//Modes3ModelRoot/segments"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_-NTtoGrPEeqC0oOqPAS8qg" description="_4vAR4GrPEeqC0oOqPAS8qg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_-NTtomrPEeqC0oOqPAS8qg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_-NTtoWrPEeqC0oOqPAS8qg" showIcon="false" labelColor="39,76,114">
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_AwjGgmrQEeqC0oOqPAS8qg" name="[0..*] turnouts" sourceNode="_HZ5IwB9lEee278vFHA2N9A" targetNode="_I1kK8CB1EeeUF8d36bwwGg">
-      <target xmi:type="ecore:EReference" href="modes3.ecore#//Modes3ModelRoot/turnouts"/>
-      <semanticElements xmi:type="ecore:EReference" href="modes3.ecore#//Modes3ModelRoot/turnouts"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_AwjtgGrQEeqC0oOqPAS8qg" description="_4vAR4GrPEeqC0oOqPAS8qg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_AwjtgmrQEeqC0oOqPAS8qg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_AwjtgWrQEeqC0oOqPAS8qg" showIcon="false" labelColor="39,76,114">
-          <customFeatures>labelSize</customFeatures>
-        </endLabelStyle>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
-    </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_Z0H0oGr8EeqC0oOqPAS8qg" sourceNode="_I1kK8CB1EeeUF8d36bwwGg" targetNode="_uyq7YB9kEee278vFHA2N9A">
-      <target xmi:type="ecore:EClass" href="modes3.ecore#//Turnout"/>
-      <semanticElements xmi:type="ecore:EClass" href="modes3.ecore#//Turnout"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Z0H0oWr8EeqC0oOqPAS8qg" targetArrow="InputClosedArrow" routingStyle="tree">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_Z0H0omr8EeqC0oOqPAS8qg" showIcon="false">
-          <labelFormat>italic</labelFormat>
-        </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_Z0H0o2r8EeqC0oOqPAS8qg" showIcon="false"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
-    </ownedDiagramElements>
-    <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
-    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_QqO3BRFUEeeHWeeZwj2u8w"/>
-    <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
-    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
-    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Validation']"/>
-    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']/@ownedRepresentationExtensions[name='Entities%20With%20Archetypes']/@layers[name='Archetypes']"/>
-    <target xmi:type="ecore:EPackage" href="modes3.ecore#/"/>
-  </diagram:DSemanticDiagram>
-</xmi:XMI>
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/model/modes3.ecore b/Domains/ca.mcgill.rtgmrt.example.modes3/model/modes3.ecore
index aa50b778..f7cb28be 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/model/modes3.ecore
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/model/modes3.ecore
@@ -13,7 +13,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="trains" upperBound="-1"
         eType="#//Train" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="segments" upperBound="-1"
-        eType="#//Segment" containment="true"/>
+        eType="#//SimpleSegment" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="turnouts" upperBound="-1"
         eType="#//Turnout" containment="true"/>
   </eClassifiers>
@@ -29,4 +29,5 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="speed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="SimpleSegment" eSuperTypes="#//Segment"/>
 </ecore:EPackage>
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/model/modes3.genmodel b/Domains/ca.mcgill.rtgmrt.example.modes3/model/modes3.genmodel
index 1a6c7a84..1cd4ac41 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/model/modes3.genmodel
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/model/modes3.genmodel
@@ -26,5 +26,6 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute modes3.ecore#//Train/id"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute modes3.ecore#//Train/speed"/>
     </genClasses>
+    <genClasses ecoreClass="modes3.ecore#//SimpleSegment"/>
   </genPackages>
 </genmodel:GenModel>
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/output/solution.partialinterpretation b/Domains/ca.mcgill.rtgmrt.example.modes3/output/solution.partialinterpretation
deleted file mode 100644
index bbf46091..00000000
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/output/solution.partialinterpretation
+++ /dev/null
@@ -1,1068 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<language:LogicProblem xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore2logicannotations="http://www.bme.hu/mit/inf/dslreasoner/logic/model/language/ecore2logicannotation" xmlns:language="http://www.bme.hu/mit/inf/dslreasoner/logic/model/problem" xmlns:language_1="http://www.bme.hu/mit/inf/dslreasoner/logic/model/language" xmlns:viatra2logicannotations="http://www.bme.hu/mit/inf/dslreasoner/logic/model/language/viatra2logicannotation">
-  <types xsi:type="language_1:TypeDeclaration" name="Segment class" subtypes="//@types.2"/>
-  <types xsi:type="language_1:TypeDeclaration" name="Modes3ModelRoot class" subtypes="//@types.4 //@types.5" isAbstract="true"/>
-  <types xsi:type="language_1:TypeDeclaration" name="Turnout class" supertypes="//@types.0"/>
-  <types xsi:type="language_1:TypeDeclaration" name="Train class"/>
-  <types xsi:type="language_1:TypeDefinition" name="Modes3ModelRoot class DefinedPart" supertypes="//@types.1" elements="//@elements.0"/>
-  <types xsi:type="language_1:TypeDeclaration" name="Modes3ModelRoot class UndefinedPart" supertypes="//@types.1"/>
-  <assertions name="upperMultiplicity connectedTo Segment" annotations="//@annotations.0">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="src">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="trg 1">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="trg 2">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="trg 3">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Impl">
-        <leftOperand xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.0">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.0/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.0/@value/@quantifiedVariables.1"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.0">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.0/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.0/@value/@quantifiedVariables.2"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.0">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.0/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.0/@value/@quantifiedVariables.3"/>
-          </operands>
-        </leftOperand>
-        <rightOperand xsi:type="language_1:Not">
-          <operand xsi:type="language_1:Distinct">
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.0/@value/@quantifiedVariables.1"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.0/@value/@quantifiedVariables.2"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.0/@value/@quantifiedVariables.3"/>
-          </operand>
-        </rightOperand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="upperMultiplicity occupiedBy Segment" annotations="//@annotations.1">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="src">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="trg 1">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.3"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="trg 2">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.3"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Impl">
-        <leftOperand xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.1">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.1/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.1/@value/@quantifiedVariables.1"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.1">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.1/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.1/@value/@quantifiedVariables.2"/>
-          </operands>
-        </leftOperand>
-        <rightOperand xsi:type="language_1:Not">
-          <operand xsi:type="language_1:Distinct">
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.1/@value/@quantifiedVariables.1"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.1/@value/@quantifiedVariables.2"/>
-          </operand>
-        </rightOperand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="lowerMultiplicity straight Turnout" annotations="//@annotations.2">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="src">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Exists">
-        <quantifiedVariables name="trg 1">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </quantifiedVariables>
-        <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.2/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.2/@value/@expression/@quantifiedVariables.0"/>
-          </operands>
-        </expression>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="upperMultiplicity straight Turnout" annotations="//@annotations.3">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="src">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="trg 1">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="trg 2">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Impl">
-        <leftOperand xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.3/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.3/@value/@quantifiedVariables.1"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.3/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.3/@value/@quantifiedVariables.2"/>
-          </operands>
-        </leftOperand>
-        <rightOperand xsi:type="language_1:Not">
-          <operand xsi:type="language_1:Distinct">
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.3/@value/@quantifiedVariables.1"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.3/@value/@quantifiedVariables.2"/>
-          </operand>
-        </rightOperand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="lowerMultiplicity divergent Turnout" annotations="//@annotations.4">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="src">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Exists">
-        <quantifiedVariables name="trg 1">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </quantifiedVariables>
-        <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.4/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.4/@value/@expression/@quantifiedVariables.0"/>
-          </operands>
-        </expression>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="upperMultiplicity divergent Turnout" annotations="//@annotations.5">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="src">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="trg 1">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="trg 2">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Impl">
-        <leftOperand xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.5/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.5/@value/@quantifiedVariables.1"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.5/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.5/@value/@quantifiedVariables.2"/>
-          </operands>
-        </leftOperand>
-        <rightOperand xsi:type="language_1:Not">
-          <operand xsi:type="language_1:Distinct">
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.5/@value/@quantifiedVariables.1"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.5/@value/@quantifiedVariables.2"/>
-          </operand>
-        </rightOperand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="lowerMultiplicity location Train" annotations="//@annotations.6">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="src">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.3"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Exists">
-        <quantifiedVariables name="trg 1">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </quantifiedVariables>
-        <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.6/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.6/@value/@expression/@quantifiedVariables.0"/>
-          </operands>
-        </expression>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="upperMultiplicity location Train" annotations="//@annotations.7">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="src">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.3"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="trg 1">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="trg 2">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Impl">
-        <leftOperand xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.7/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.7/@value/@quantifiedVariables.1"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.7/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.7/@value/@quantifiedVariables.2"/>
-          </operands>
-        </leftOperand>
-        <rightOperand xsi:type="language_1:Not">
-          <operand xsi:type="language_1:Distinct">
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.7/@value/@quantifiedVariables.1"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.7/@value/@quantifiedVariables.2"/>
-          </operand>
-        </rightOperand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="oppositeReference occupiedBy Segment" annotations="//@annotations.8">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="src">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="trg">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.3"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Iff">
-        <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.1">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.8/@value/@quantifiedVariables.0"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.8/@value/@quantifiedVariables.1"/>
-        </leftOperand>
-        <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.7">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.8/@value/@quantifiedVariables.1"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.8/@value/@quantifiedVariables.0"/>
-        </rightOperand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="oppositeReference connectedTo reference Segment connectedTo reference Segment" annotations="//@annotations.9">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="src">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="trg">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Iff">
-        <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.0">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.9/@value/@quantifiedVariables.0"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.9/@value/@quantifiedVariables.1"/>
-        </leftOperand>
-        <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.0">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.9/@value/@quantifiedVariables.1"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.9/@value/@quantifiedVariables.0"/>
-        </rightOperand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="errorpattern modes3 queries turnoutInSegments" annotations="//@annotations.29">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.10/@value/@quantifiedVariables.0"/>
-        </operand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="errorpattern modes3 queries unreachable" annotations="//@annotations.30">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="p1">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.11/@value/@quantifiedVariables.0"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.11/@value/@quantifiedVariables.1"/>
-        </operand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="errorpattern modes3 queries turnoutOutputsAreSame" annotations="//@annotations.31">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.12/@value/@quantifiedVariables.0"/>
-        </operand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="errorpattern modes3 queries turnoutConnectedToBothOutputs" annotations="//@annotations.32">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.13/@value/@quantifiedVariables.0"/>
-        </operand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="errorpattern modes3 queries tooManyExtraInputsOfTurnout" annotations="//@annotations.33">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.14/@value/@quantifiedVariables.0"/>
-        </operand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="errorpattern modes3 queries connectedToReflexive" annotations="//@annotations.34">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.15/@value/@quantifiedVariables.0"/>
-        </operand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="errorpattern modes3 queries outputReflexive" annotations="//@annotations.35">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.16/@value/@quantifiedVariables.0"/>
-        </operand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="errorpattern modes3 queries tooManyInputsOfSegment" annotations="//@annotations.36">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.17/@value/@quantifiedVariables.0"/>
-        </operand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="errorpattern modes3 queries noExtraInputOfTurnout" annotations="//@annotations.37">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.18/@value/@quantifiedVariables.0"/>
-        </operand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="errorpattern modes3 queries turnoutNotConnectedToOutput" annotations="//@annotations.38">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.19/@value/@quantifiedVariables.0"/>
-        </operand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="errorpattern modes3 queries connectedToNotSymmetric" annotations="//@annotations.39">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-      </quantifiedVariables>
-      <quantifiedVariables name="p1">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.20/@value/@quantifiedVariables.0"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.20/@value/@quantifiedVariables.1"/>
-        </operand>
-      </expression>
-    </value>
-  </assertions>
-  <assertions name="errorpattern modes3 queries noInputOfSegment" annotations="//@annotations.40">
-    <value xsi:type="language_1:Forall">
-      <quantifiedVariables name="p0">
-        <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-      </quantifiedVariables>
-      <expression xsi:type="language_1:Not">
-        <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@assertions.21/@value/@quantifiedVariables.0"/>
-        </operand>
-      </expression>
-    </value>
-  </assertions>
-  <relations xsi:type="language_1:RelationDeclaration" name="connectedTo reference Segment">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-  </relations>
-  <relations xsi:type="language_1:RelationDeclaration" name="occupiedBy reference Segment">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.3"/>
-  </relations>
-  <relations xsi:type="language_1:RelationDeclaration" name="trains reference Modes3ModelRoot">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.3"/>
-  </relations>
-  <relations xsi:type="language_1:RelationDeclaration" name="segments reference Modes3ModelRoot">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-  </relations>
-  <relations xsi:type="language_1:RelationDeclaration" name="turnouts reference Modes3ModelRoot">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-  </relations>
-  <relations xsi:type="language_1:RelationDeclaration" name="straight reference Turnout">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-  </relations>
-  <relations xsi:type="language_1:RelationDeclaration" name="divergent reference Turnout">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-  </relations>
-  <relations xsi:type="language_1:RelationDeclaration" name="location reference Train">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.3"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-  </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern modes3 queries turnoutInSegments" annotations="//@annotations.10">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    <variables name="parameter T">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    </variables>
-    <value xsi:type="language_1:Or">
-      <operands xsi:type="language_1:Exists">
-        <quantifiedVariables name="variable 0">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.1"/>
-        </quantifiedVariables>
-        <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8/@variables.0"/>
-            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.3">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8/@value/@operands.0/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.8/@variables.0"/>
-          </operands>
-        </expression>
-      </operands>
-    </value>
-  </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern modes3 queries unreachable" annotations="//@annotations.11">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    <variables name="parameter S1">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    </variables>
-    <variables name="parameter S2">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    </variables>
-    <value xsi:type="language_1:Or">
-      <operands xsi:type="language_1:And">
-        <operands xsi:type="language_1:InstanceOf">
-          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9/@variables.0"/>
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </operands>
-        <operands xsi:type="language_1:InstanceOf">
-          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9/@variables.1"/>
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </operands>
-        <operands xsi:type="language_1:Not">
-          <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.21">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.9/@variables.1"/>
-          </operand>
-        </operands>
-      </operands>
-    </value>
-  </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern modes3 queries turnout" annotations="//@annotations.12">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    <variables name="parameter T">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    </variables>
-    <value xsi:type="language_1:Or">
-      <operands xsi:type="language_1:And">
-        <operands xsi:type="language_1:InstanceOf">
-          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10/@variables.0"/>
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-        </operands>
-      </operands>
-    </value>
-  </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern modes3 queries turnoutOutputsAreSame" annotations="//@annotations.13">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    <variables name="parameter T">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    </variables>
-    <value xsi:type="language_1:Or">
-      <operands xsi:type="language_1:Exists">
-        <quantifiedVariables name="variable S">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </quantifiedVariables>
-        <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@value/@operands.0/@quantifiedVariables.0"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@value/@operands.0/@quantifiedVariables.0"/>
-          </operands>
-          <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.11/@value/@operands.0/@quantifiedVariables.0"/>
-            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-          </operands>
-        </expression>
-      </operands>
-    </value>
-  </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern modes3 queries extraInputOfTurnout" annotations="//@annotations.14">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    <variables name="parameter T">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    </variables>
-    <variables name="parameter S">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    </variables>
-    <value xsi:type="language_1:Or">
-      <operands xsi:type="language_1:Exists">
-        <quantifiedVariables name="variable Straight">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </quantifiedVariables>
-        <quantifiedVariables name="variable Divergent">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </quantifiedVariables>
-        <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@value/@operands.0/@quantifiedVariables.0"/>
-          </operands>
-          <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@value/@operands.0/@quantifiedVariables.0"/>
-            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@value/@operands.0/@quantifiedVariables.1"/>
-          </operands>
-          <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@value/@operands.0/@quantifiedVariables.1"/>
-            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@variables.1"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@variables.0"/>
-          </operands>
-          <operands xsi:type="language_1:Distinct">
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@variables.1"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@value/@operands.0/@quantifiedVariables.0"/>
-          </operands>
-          <operands xsi:type="language_1:Distinct">
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@variables.1"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12/@value/@operands.0/@quantifiedVariables.1"/>
-          </operands>
-        </expression>
-      </operands>
-    </value>
-  </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern modes3 queries turnoutConnectedToBothOutputs" annotations="//@annotations.15">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    <variables name="parameter T">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    </variables>
-    <value xsi:type="language_1:Or">
-      <operands xsi:type="language_1:Exists">
-        <quantifiedVariables name="variable Straight">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </quantifiedVariables>
-        <quantifiedVariables name="variable Divergent">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </quantifiedVariables>
-        <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@value/@operands.0/@quantifiedVariables.0"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@value/@operands.0/@quantifiedVariables.1"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.0">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@value/@operands.0/@quantifiedVariables.0"/>
-          </operands>
-          <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@value/@operands.0/@quantifiedVariables.0"/>
-            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.0">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@value/@operands.0/@quantifiedVariables.1"/>
-          </operands>
-          <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.13/@value/@operands.0/@quantifiedVariables.1"/>
-            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-          </operands>
-        </expression>
-      </operands>
-    </value>
-  </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern modes3 queries tooManyExtraInputsOfTurnout" annotations="//@annotations.16">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    <variables name="parameter T">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    </variables>
-    <value xsi:type="language_1:Or">
-      <operands xsi:type="language_1:Exists">
-        <quantifiedVariables name="variable I1">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </quantifiedVariables>
-        <quantifiedVariables name="variable I2">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </quantifiedVariables>
-        <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@value/@operands.0/@quantifiedVariables.0"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@value/@operands.0/@quantifiedVariables.1"/>
-          </operands>
-          <operands xsi:type="language_1:Distinct">
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@value/@operands.0/@quantifiedVariables.0"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.14/@value/@operands.0/@quantifiedVariables.1"/>
-          </operands>
-        </expression>
-      </operands>
-    </value>
-  </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern modes3 queries connectedToReflexive" annotations="//@annotations.17">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    <variables name="parameter S">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    </variables>
-    <value xsi:type="language_1:Or">
-      <operands xsi:type="language_1:And">
-        <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.0">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15/@variables.0"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.15/@variables.0"/>
-        </operands>
-      </operands>
-    </value>
-  </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern modes3 queries turnoutOutput" annotations="//@annotations.18">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    <variables name="parameter T">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    </variables>
-    <variables name="parameter S">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    </variables>
-    <value xsi:type="language_1:Or">
-      <operands xsi:type="language_1:And">
-        <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16/@variables.0"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16/@variables.1"/>
-        </operands>
-        <operands xsi:type="language_1:InstanceOf">
-          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16/@variables.1"/>
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </operands>
-      </operands>
-      <operands xsi:type="language_1:And">
-        <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16/@variables.0"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16/@variables.1"/>
-        </operands>
-        <operands xsi:type="language_1:InstanceOf">
-          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16/@variables.1"/>
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </operands>
-      </operands>
-    </value>
-  </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern modes3 queries connectedTo" annotations="//@annotations.19">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    <variables name="parameter S1">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    </variables>
-    <variables name="parameter S2">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    </variables>
-    <value xsi:type="language_1:Or">
-      <operands xsi:type="language_1:And">
-        <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.0">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.0"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.1"/>
-        </operands>
-        <operands xsi:type="language_1:InstanceOf">
-          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17/@variables.1"/>
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </operands>
-      </operands>
-    </value>
-  </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern modes3 queries outputReflexive" annotations="//@annotations.20">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    <variables name="parameter T">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    </variables>
-    <value xsi:type="language_1:Or">
-      <operands xsi:type="language_1:And">
-        <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@variables.0"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.18/@variables.0"/>
-        </operands>
-      </operands>
-    </value>
-  </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern modes3 queries tooManyInputsOfSegment" annotations="//@annotations.21">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    <variables name="parameter S">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    </variables>
-    <value xsi:type="language_1:Or">
-      <operands xsi:type="language_1:Exists">
-        <quantifiedVariables name="variable I1">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </quantifiedVariables>
-        <quantifiedVariables name="variable I2">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </quantifiedVariables>
-        <quantifiedVariables name="variable I3">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </quantifiedVariables>
-        <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:Not">
-            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10">
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@variables.0"/>
-            </operand>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@value/@operands.0/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@variables.0"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@value/@operands.0/@quantifiedVariables.1"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@variables.0"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@value/@operands.0/@quantifiedVariables.2"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@variables.0"/>
-          </operands>
-          <operands xsi:type="language_1:Distinct">
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@value/@operands.0/@quantifiedVariables.0"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@value/@operands.0/@quantifiedVariables.1"/>
-          </operands>
-          <operands xsi:type="language_1:Distinct">
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@value/@operands.0/@quantifiedVariables.0"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@value/@operands.0/@quantifiedVariables.2"/>
-          </operands>
-          <operands xsi:type="language_1:Distinct">
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@value/@operands.0/@quantifiedVariables.1"/>
-            <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.19/@value/@operands.0/@quantifiedVariables.2"/>
-          </operands>
-        </expression>
-      </operands>
-    </value>
-  </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern modes3 queries noExtraInputOfTurnout" annotations="//@annotations.22">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    <variables name="parameter T">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    </variables>
-    <value xsi:type="language_1:Or">
-      <operands xsi:type="language_1:Forall">
-        <quantifiedVariables name="variable 0">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </quantifiedVariables>
-        <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@variables.0"/>
-            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-          </operands>
-          <operands xsi:type="language_1:Not">
-            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.12">
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@variables.0"/>
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.20/@value/@operands.0/@quantifiedVariables.0"/>
-            </operand>
-          </operands>
-        </expression>
-      </operands>
-    </value>
-  </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern modes3 queries reachable" annotations="//@annotations.23">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    <variables name="parameter S1">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    </variables>
-    <variables name="parameter S2">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    </variables>
-    <value xsi:type="language_1:Or">
-      <operands xsi:type="language_1:And">
-        <operands xsi:type="language_1:InstanceOf">
-          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.21/@variables.1"/>
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </operands>
-      </operands>
-      <operands xsi:type="language_1:And">
-        <operands xsi:type="language_1:TransitiveClosure" relation="//@relations.23">
-          <leftOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.21/@variables.0"/>
-          <rightOperand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.21/@variables.1"/>
-        </operands>
-      </operands>
-    </value>
-  </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern modes3 queries turnoutNotConnectedToOutput" annotations="//@annotations.24">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    <variables name="parameter T">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.2"/>
-    </variables>
-    <value xsi:type="language_1:Or">
-      <operands xsi:type="language_1:Exists">
-        <quantifiedVariables name="variable Straight">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </quantifiedVariables>
-        <quantifiedVariables name="variable Divergent">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </quantifiedVariables>
-        <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.5">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@value/@operands.0/@quantifiedVariables.0"/>
-          </operands>
-          <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@value/@operands.0/@quantifiedVariables.0"/>
-            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-          </operands>
-          <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.6">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@variables.0"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@value/@operands.0/@quantifiedVariables.1"/>
-          </operands>
-          <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@value/@operands.0/@quantifiedVariables.1"/>
-            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-          </operands>
-          <operands xsi:type="language_1:Not">
-            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17">
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@variables.0"/>
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@value/@operands.0/@quantifiedVariables.0"/>
-            </operand>
-          </operands>
-          <operands xsi:type="language_1:Not">
-            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17">
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@variables.0"/>
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.22/@value/@operands.0/@quantifiedVariables.1"/>
-            </operand>
-          </operands>
-        </expression>
-      </operands>
-    </value>
-  </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern modes3 queries adjacent" annotations="//@annotations.25">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    <variables name="parameter S1">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    </variables>
-    <variables name="parameter S2">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    </variables>
-    <value xsi:type="language_1:Or">
-      <operands xsi:type="language_1:And">
-        <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@variables.0"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@variables.1"/>
-        </operands>
-      </operands>
-      <operands xsi:type="language_1:And">
-        <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@variables.1"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.23/@variables.0"/>
-        </operands>
-      </operands>
-    </value>
-  </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern modes3 queries connectedToNotSymmetric" annotations="//@annotations.26">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    <variables name="parameter S1">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    </variables>
-    <variables name="parameter S2">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    </variables>
-    <value xsi:type="language_1:Or">
-      <operands xsi:type="language_1:And">
-        <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.0">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24/@variables.0"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24/@variables.1"/>
-        </operands>
-        <operands xsi:type="language_1:InstanceOf">
-          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24/@variables.1"/>
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </operands>
-        <operands xsi:type="language_1:Not">
-          <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.17">
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24/@variables.1"/>
-            <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.24/@variables.0"/>
-          </operand>
-        </operands>
-      </operands>
-    </value>
-  </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern modes3 queries output" annotations="//@annotations.27">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    <variables name="parameter S1">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    </variables>
-    <variables name="parameter S2">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    </variables>
-    <value xsi:type="language_1:Or">
-      <operands xsi:type="language_1:And">
-        <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.0">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@variables.0"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@variables.1"/>
-        </operands>
-        <operands xsi:type="language_1:InstanceOf">
-          <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@variables.1"/>
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </operands>
-      </operands>
-      <operands xsi:type="language_1:And">
-        <operands xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.16">
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@variables.0"/>
-          <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25/@variables.1"/>
-        </operands>
-      </operands>
-    </value>
-  </relations>
-  <relations xsi:type="language_1:RelationDefinition" name="pattern modes3 queries noInputOfSegment" annotations="//@annotations.28">
-    <parameters xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    <variables name="parameter S">
-      <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-    </variables>
-    <value xsi:type="language_1:Or">
-      <operands xsi:type="language_1:Forall">
-        <quantifiedVariables name="variable 0">
-          <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-        </quantifiedVariables>
-        <expression xsi:type="language_1:And">
-          <operands xsi:type="language_1:InstanceOf">
-            <value xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26/@variables.0"/>
-            <range xsi:type="language_1:ComplexTypeReference" referred="//@types.0"/>
-          </operands>
-          <operands xsi:type="language_1:Not">
-            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.10">
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26/@variables.0"/>
-            </operand>
-          </operands>
-          <operands xsi:type="language_1:Not">
-            <operand xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.25">
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26/@value/@operands.0/@quantifiedVariables.0"/>
-              <parameterSubstitutions xsi:type="language_1:SymbolicValue" symbolicReference="//@relations.26/@variables.0"/>
-            </operand>
-          </operands>
-        </expression>
-      </operands>
-    </value>
-  </relations>
-  <elements name="o 1" definedInType="//@types.4"/>
-  <containmentHierarchies typesOrderedInHierarchy="//@types.0 //@types.2 //@types.3 //@types.1 //@types.4 //@types.5" containmentRelations="//@relations.2 //@relations.3 //@relations.4"/>
-  <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.0" relation="//@relations.0" upper="2"/>
-  <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.1" relation="//@relations.1" upper="1"/>
-  <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.2" relation="//@relations.5" lower="1"/>
-  <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.3" relation="//@relations.5" upper="1"/>
-  <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.4" relation="//@relations.6" lower="1"/>
-  <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.5" relation="//@relations.6" upper="1"/>
-  <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.6" relation="//@relations.7" lower="1"/>
-  <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.7" relation="//@relations.7" upper="1"/>
-  <annotations xsi:type="ecore2logicannotations:InverseRelationAssertion" target="//@assertions.8" inverseA="//@relations.1" inverseB="//@relations.7"/>
-  <annotations xsi:type="ecore2logicannotations:InverseRelationAssertion" target="//@assertions.9" inverseA="//@relations.0" inverseB="//@relations.0"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.8" patternFullyQualifiedName="modes3.queries.turnoutInSegments">
-    <variableTrace targetLogicVariable="//@relations.8/@value/@operands.0/@quantifiedVariables.0"/>
-  </annotations>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.9" patternFullyQualifiedName="modes3.queries.unreachable"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.10" patternFullyQualifiedName="modes3.queries.turnout"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.11" patternFullyQualifiedName="modes3.queries.turnoutOutputsAreSame">
-    <variableTrace targetLogicVariable="//@relations.11/@value/@operands.0/@quantifiedVariables.0"/>
-  </annotations>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.12" patternFullyQualifiedName="modes3.queries.extraInputOfTurnout">
-    <variableTrace targetLogicVariable="//@relations.12/@value/@operands.0/@quantifiedVariables.0"/>
-    <variableTrace targetLogicVariable="//@relations.12/@value/@operands.0/@quantifiedVariables.1"/>
-  </annotations>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.13" patternFullyQualifiedName="modes3.queries.turnoutConnectedToBothOutputs">
-    <variableTrace targetLogicVariable="//@relations.13/@value/@operands.0/@quantifiedVariables.0"/>
-    <variableTrace targetLogicVariable="//@relations.13/@value/@operands.0/@quantifiedVariables.1"/>
-  </annotations>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.14" patternFullyQualifiedName="modes3.queries.tooManyExtraInputsOfTurnout">
-    <variableTrace targetLogicVariable="//@relations.14/@value/@operands.0/@quantifiedVariables.0"/>
-    <variableTrace targetLogicVariable="//@relations.14/@value/@operands.0/@quantifiedVariables.1"/>
-  </annotations>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.15" patternFullyQualifiedName="modes3.queries.connectedToReflexive"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.16" patternFullyQualifiedName="modes3.queries.turnoutOutput"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.17" patternFullyQualifiedName="modes3.queries.connectedTo"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.18" patternFullyQualifiedName="modes3.queries.outputReflexive"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.19" patternFullyQualifiedName="modes3.queries.tooManyInputsOfSegment">
-    <variableTrace targetLogicVariable="//@relations.19/@value/@operands.0/@quantifiedVariables.0"/>
-    <variableTrace targetLogicVariable="//@relations.19/@value/@operands.0/@quantifiedVariables.1"/>
-    <variableTrace targetLogicVariable="//@relations.19/@value/@operands.0/@quantifiedVariables.2"/>
-  </annotations>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.20" patternFullyQualifiedName="modes3.queries.noExtraInputOfTurnout">
-    <variableTrace targetLogicVariable="//@relations.20/@value/@operands.0/@quantifiedVariables.0"/>
-  </annotations>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.21" patternFullyQualifiedName="modes3.queries.reachable"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.22" patternFullyQualifiedName="modes3.queries.turnoutNotConnectedToOutput">
-    <variableTrace targetLogicVariable="//@relations.22/@value/@operands.0/@quantifiedVariables.0"/>
-    <variableTrace targetLogicVariable="//@relations.22/@value/@operands.0/@quantifiedVariables.1"/>
-  </annotations>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.23" patternFullyQualifiedName="modes3.queries.adjacent"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.24" patternFullyQualifiedName="modes3.queries.connectedToNotSymmetric"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.25" patternFullyQualifiedName="modes3.queries.output"/>
-  <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@relations.26" patternFullyQualifiedName="modes3.queries.noInputOfSegment">
-    <variableTrace targetLogicVariable="//@relations.26/@value/@operands.0/@quantifiedVariables.0"/>
-  </annotations>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.10" query="//@annotations.10"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.11" query="//@annotations.11"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.12" query="//@annotations.13"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.13" query="//@annotations.15"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.14" query="//@annotations.16"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.15" query="//@annotations.17"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.16" query="//@annotations.20"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.17" query="//@annotations.21"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.18" query="//@annotations.22"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.19" query="//@annotations.24"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.20" query="//@annotations.26"/>
-  <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@assertions.21" query="//@annotations.28"/>
-</language:LogicProblem>
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/output/solution1.gml b/Domains/ca.mcgill.rtgmrt.example.modes3/output/solution1.gml
deleted file mode 100644
index 66b57d1a..00000000
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/output/solution1.gml
+++ /dev/null
@@ -1,1191 +0,0 @@
-graph
-[
-        node
-                [
-                        id      0
-                        graphics
-                        [
-                                w       269.5
-                                h       54
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "o 1"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        Modes3ModelRoot class DefinedPart
-        Modes3ModelRoot class
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      1
-                        graphics
-                        [
-                                w       41.800000000000004
-                                h       26
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "true"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      2
-                        graphics
-                        [
-                                w       50.6
-                                h       26
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "false"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      3
-                        graphics
-                        [
-                                w       115.50000000000001
-                                h       54
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "null"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        Segment class
-        Turnout class
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      4
-                        graphics
-                        [
-                                w       100.10000000000001
-                                h       40
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "null"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        Train class
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      5
-                        graphics
-                        [
-                                w       115.50000000000001
-                                h       40
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "null"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        Segment class
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      6
-                        graphics
-                        [
-                                w       100.10000000000001
-                                h       40
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "null"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        Train class
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      7
-                        graphics
-                        [
-                                w       115.50000000000001
-                                h       40
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "null"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        Segment class
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      8
-                        graphics
-                        [
-                                w       100.10000000000001
-                                h       40
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "null"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        Train class
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      9
-                        graphics
-                        [
-                                w       115.50000000000001
-                                h       40
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "null"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        Segment class
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      10
-                        graphics
-                        [
-                                w       100.10000000000001
-                                h       40
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "null"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        Train class
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      11
-                        graphics
-                        [
-                                w       115.50000000000001
-                                h       40
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "null"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        Segment class
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      12
-                        graphics
-                        [
-                                w       100.10000000000001
-                                h       40
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "null"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        Train class
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      13
-                        graphics
-                        [
-                                w       15.400000000000002
-                                h       26
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "?"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      14
-                        graphics
-                        [
-                                w       15.400000000000002
-                                h       26
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "?"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      15
-                        graphics
-                        [
-                                w       15.400000000000002
-                                h       26
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "?"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        
-        node
-                [
-                        id      16
-                        graphics
-                        [
-                                w       103.4
-                                h       26
-                                type    "rectangle"
-                                fill    "#FFFFFF"
-                                fill2   "#FFFFFF"
-                                outline "#000000"
-                        ]
-                        LabelGraphics
-                        [
-                                text    "New Objects"
-                                outline "#000000"
-                                fill    "#FFFFFF"
-                                fontSize        16
-                                fontName        "Monospace"
-                                autoSizePolicy  "node_width"
-                                anchor  "t"
-                                borderDistance  0.0
-                        ]
-                        LabelGraphics
-                        [
-                                text    "
-        "
-                                fontSize        14
-                                fontName        "Consolas"
-                                alignment       "left"
-                                anchor  "tl"
-                                borderDistance  6
-                        ]
-                ]
-        edge
-        [
-                source  5
-                target  3
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "connectedTo reference Segment"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  3
-                target  5
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "connectedTo reference Segment"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  7
-                target  3
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "connectedTo reference Segment"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  3
-                target  7
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "connectedTo reference Segment"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  7
-                target  9
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "connectedTo reference Segment"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  9
-                target  7
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "connectedTo reference Segment"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  11
-                target  5
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "connectedTo reference Segment"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  5
-                target  11
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "connectedTo reference Segment"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  5
-                target  6
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "occupiedBy reference Segment"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  3
-                target  4
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "occupiedBy reference Segment"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  7
-                target  8
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "occupiedBy reference Segment"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  9
-                target  10
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "occupiedBy reference Segment"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  11
-                target  12
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "occupiedBy reference Segment"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  0
-                target  4
-                graphics
-                [
-                        fill    "#000000"
-                        width   3
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "trains reference Modes3ModelRoot"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  0
-                target  6
-                graphics
-                [
-                        fill    "#000000"
-                        width   3
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "trains reference Modes3ModelRoot"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  0
-                target  8
-                graphics
-                [
-                        fill    "#000000"
-                        width   3
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "trains reference Modes3ModelRoot"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  0
-                target  10
-                graphics
-                [
-                        fill    "#000000"
-                        width   3
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "trains reference Modes3ModelRoot"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  0
-                target  12
-                graphics
-                [
-                        fill    "#000000"
-                        width   3
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "trains reference Modes3ModelRoot"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  0
-                target  5
-                graphics
-                [
-                        fill    "#000000"
-                        width   3
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "segments reference Modes3ModelRoot"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  0
-                target  7
-                graphics
-                [
-                        fill    "#000000"
-                        width   3
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "segments reference Modes3ModelRoot"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  0
-                target  9
-                graphics
-                [
-                        fill    "#000000"
-                        width   3
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "segments reference Modes3ModelRoot"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  0
-                target  11
-                graphics
-                [
-                        fill    "#000000"
-                        width   3
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "segments reference Modes3ModelRoot"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  0
-                target  3
-                graphics
-                [
-                        fill    "#000000"
-                        width   3
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "turnouts reference Modes3ModelRoot"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  3
-                target  9
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "straight reference Turnout"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  3
-                target  5
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "divergent reference Turnout"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  6
-                target  5
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "location reference Train"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  4
-                target  3
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "location reference Train"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  8
-                target  7
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "location reference Train"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  10
-                target  9
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "location reference Train"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-        edge
-        [
-                source  12
-                target  11
-                graphics
-                [
-                        fill    "#000000"
-                        targetArrow     "standard"
-                ]
-                LabelGraphics
-                [
-                        text    "location reference Train"
-                        fontSize        14
-                        fontName        "Consolas"
-                        configuration   "AutoFlippingLabel"
-                        model   "six_pos"
-                        position        "thead"
-                ]
-        ]
-]
-
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/output/solution1.partialinterpretation b/Domains/ca.mcgill.rtgmrt.example.modes3/output/solution1.partialinterpretation
deleted file mode 100644
index 8b50e17f..00000000
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/output/solution1.partialinterpretation
+++ /dev/null
@@ -1,1037 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<partialinterpretation:PartialInterpretation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore2logicannotations="http://www.bme.hu/mit/inf/dslreasoner/logic/model/language/ecore2logicannotation" xmlns:language="http://www.bme.hu/mit/inf/dslreasoner/logic/model/language" xmlns:partialinterpretation="http://www.bme.hu/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage" xmlns:viatra2logicannotations="http://www.bme.hu/mit/inf/dslreasoner/logic/model/language/viatra2logicannotation" problem="//@problemConainer" maxNewElements="0">
-  <partialrelationinterpretation interpretationOf="//@problemConainer/@relations.0" param1="//@problemConainer/@relations.0/@parameters.0" param2="//@problemConainer/@relations.0/@parameters.1">
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@newElements.4" param2="//@newElements.2"/>
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@newElements.2" param2="//@newElements.4"/>
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@newElements.6" param2="//@newElements.2"/>
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@newElements.2" param2="//@newElements.6"/>
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@newElements.6" param2="//@newElements.8"/>
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@newElements.8" param2="//@newElements.6"/>
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@newElements.10" param2="//@newElements.4"/>
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@newElements.4" param2="//@newElements.10"/>
-  </partialrelationinterpretation>
-  <partialrelationinterpretation interpretationOf="//@problemConainer/@relations.1" param1="//@problemConainer/@relations.1/@parameters.0" param2="//@problemConainer/@relations.1/@parameters.1">
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@newElements.4" param2="//@newElements.5"/>
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@newElements.2" param2="//@newElements.3"/>
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@newElements.6" param2="//@newElements.7"/>
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@newElements.8" param2="//@newElements.9"/>
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@newElements.10" param2="//@newElements.11"/>
-  </partialrelationinterpretation>
-  <partialrelationinterpretation interpretationOf="//@problemConainer/@relations.2" param1="//@problemConainer/@relations.2/@parameters.0" param2="//@problemConainer/@relations.2/@parameters.1">
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@problemConainer/@elements.0" param2="//@newElements.3"/>
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@problemConainer/@elements.0" param2="//@newElements.5"/>
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@problemConainer/@elements.0" param2="//@newElements.7"/>
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@problemConainer/@elements.0" param2="//@newElements.9"/>
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@problemConainer/@elements.0" param2="//@newElements.11"/>
-  </partialrelationinterpretation>
-  <partialrelationinterpretation interpretationOf="//@problemConainer/@relations.3" param1="//@problemConainer/@relations.3/@parameters.0" param2="//@problemConainer/@relations.3/@parameters.1">
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@problemConainer/@elements.0" param2="//@newElements.4"/>
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@problemConainer/@elements.0" param2="//@newElements.6"/>
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@problemConainer/@elements.0" param2="//@newElements.8"/>
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@problemConainer/@elements.0" param2="//@newElements.10"/>
-  </partialrelationinterpretation>
-  <partialrelationinterpretation interpretationOf="//@problemConainer/@relations.4" param1="//@problemConainer/@relations.4/@parameters.0" param2="//@problemConainer/@relations.4/@parameters.1">
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@problemConainer/@elements.0" param2="//@newElements.2"/>
-  </partialrelationinterpretation>
-  <partialrelationinterpretation interpretationOf="//@problemConainer/@relations.5" param1="//@problemConainer/@relations.5/@parameters.0" param2="//@problemConainer/@relations.5/@parameters.1">
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@newElements.2" param2="//@newElements.8"/>
-  </partialrelationinterpretation>
-  <partialrelationinterpretation interpretationOf="//@problemConainer/@relations.6" param1="//@problemConainer/@relations.6/@parameters.0" param2="//@problemConainer/@relations.6/@parameters.1">
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@newElements.2" param2="//@newElements.4"/>
-  </partialrelationinterpretation>
-  <partialrelationinterpretation interpretationOf="//@problemConainer/@relations.7" param1="//@problemConainer/@relations.7/@parameters.0" param2="//@problemConainer/@relations.7/@parameters.1">
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@newElements.5" param2="//@newElements.4"/>
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@newElements.3" param2="//@newElements.2"/>
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@newElements.7" param2="//@newElements.6"/>
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@newElements.9" param2="//@newElements.8"/>
-    <relationlinks xsi:type="partialinterpretation:BinaryElementRelationLink" param1="//@newElements.11" param2="//@newElements.10"/>
-  </partialrelationinterpretation>
-  <newElements xsi:type="partialinterpretation:BooleanElement" name="true" valueSet="true" value="true"/>
-  <newElements xsi:type="partialinterpretation:BooleanElement" name="false" valueSet="true"/>
-  <newElements/>
-  <newElements/>
-  <newElements/>
-  <newElements/>
-  <newElements/>
-  <newElements/>
-  <newElements/>
-  <newElements/>
-  <newElements/>
-  <newElements/>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialBooleanInterpretation" elements="//@newElements.0 //@newElements.1"/>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialIntegerInterpretation" elements="//@openWorldElements.0"/>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialRealInterpretation" elements="//@openWorldElements.1"/>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialStringInterpretation" elements="//@openWorldElements.2"/>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" elements="//@newElements.2 //@newElements.4 //@newElements.6 //@newElements.8 //@newElements.10" scopes="//@scopes.0" interpretationOf="//@problemConainer/@types.0"/>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" elements="//@problemConainer/@elements.0" scopes="//@scopes.1" interpretationOf="//@problemConainer/@types.1"/>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" elements="//@newElements.2" scopes="//@scopes.2" supertypeInterpretation="//@partialtypeinterpratation.4" interpretationOf="//@problemConainer/@types.2"/>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" elements="//@newElements.3 //@newElements.5 //@newElements.7 //@newElements.9 //@newElements.11" scopes="//@scopes.3" interpretationOf="//@problemConainer/@types.3"/>
-  <partialtypeinterpratation xsi:type="partialinterpretation:PartialComplexTypeInterpretation" scopes="//@scopes.4" supertypeInterpretation="//@partialtypeinterpratation.5" interpretationOf="//@problemConainer/@types.5"/>
-  <openWorldElements xsi:type="partialinterpretation:IntegerElement" name="New Integers"/>
-  <openWorldElements xsi:type="partialinterpretation:RealElement" name="New Reals"/>
-  <openWorldElements xsi:type="partialinterpretation:StringElement" name="New Strings"/>
-  <openWorldElements name="New Objects"/>
-  <problemConainer>
-    <types xsi:type="language:TypeDeclaration" name="Segment class" subtypes="//@problemConainer/@types.2"/>
-    <types xsi:type="language:TypeDeclaration" name="Modes3ModelRoot class" subtypes="//@problemConainer/@types.4 //@problemConainer/@types.5" isAbstract="true"/>
-    <types xsi:type="language:TypeDeclaration" name="Turnout class" supertypes="//@problemConainer/@types.0"/>
-    <types xsi:type="language:TypeDeclaration" name="Train class"/>
-    <types xsi:type="language:TypeDefinition" name="Modes3ModelRoot class DefinedPart" supertypes="//@problemConainer/@types.1" elements="//@problemConainer/@elements.0"/>
-    <types xsi:type="language:TypeDeclaration" name="Modes3ModelRoot class UndefinedPart" supertypes="//@problemConainer/@types.1"/>
-    <assertions name="upperMultiplicity connectedTo Segment" annotations="//@problemConainer/@annotations.0">
-      <value xsi:type="language:Forall">
-        <quantifiedVariables name="src">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-        </quantifiedVariables>
-        <quantifiedVariables name="trg 1">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-        </quantifiedVariables>
-        <quantifiedVariables name="trg 2">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-        </quantifiedVariables>
-        <quantifiedVariables name="trg 3">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-        </quantifiedVariables>
-        <expression xsi:type="language:Impl">
-          <leftOperand xsi:type="language:And">
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.0">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.0/@value/@quantifiedVariables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.0/@value/@quantifiedVariables.1"/>
-            </operands>
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.0">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.0/@value/@quantifiedVariables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.0/@value/@quantifiedVariables.2"/>
-            </operands>
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.0">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.0/@value/@quantifiedVariables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.0/@value/@quantifiedVariables.3"/>
-            </operands>
-          </leftOperand>
-          <rightOperand xsi:type="language:Not">
-            <operand xsi:type="language:Distinct">
-              <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.0/@value/@quantifiedVariables.1"/>
-              <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.0/@value/@quantifiedVariables.2"/>
-              <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.0/@value/@quantifiedVariables.3"/>
-            </operand>
-          </rightOperand>
-        </expression>
-      </value>
-    </assertions>
-    <assertions name="upperMultiplicity occupiedBy Segment" annotations="//@problemConainer/@annotations.1">
-      <value xsi:type="language:Forall">
-        <quantifiedVariables name="src">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-        </quantifiedVariables>
-        <quantifiedVariables name="trg 1">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.3"/>
-        </quantifiedVariables>
-        <quantifiedVariables name="trg 2">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.3"/>
-        </quantifiedVariables>
-        <expression xsi:type="language:Impl">
-          <leftOperand xsi:type="language:And">
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.1">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.1/@value/@quantifiedVariables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.1/@value/@quantifiedVariables.1"/>
-            </operands>
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.1">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.1/@value/@quantifiedVariables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.1/@value/@quantifiedVariables.2"/>
-            </operands>
-          </leftOperand>
-          <rightOperand xsi:type="language:Not">
-            <operand xsi:type="language:Distinct">
-              <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.1/@value/@quantifiedVariables.1"/>
-              <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.1/@value/@quantifiedVariables.2"/>
-            </operand>
-          </rightOperand>
-        </expression>
-      </value>
-    </assertions>
-    <assertions name="lowerMultiplicity straight Turnout" annotations="//@problemConainer/@annotations.2">
-      <value xsi:type="language:Forall">
-        <quantifiedVariables name="src">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-        </quantifiedVariables>
-        <expression xsi:type="language:Exists">
-          <quantifiedVariables name="trg 1">
-            <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-          </quantifiedVariables>
-          <expression xsi:type="language:And">
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.5">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.2/@value/@quantifiedVariables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.2/@value/@expression/@quantifiedVariables.0"/>
-            </operands>
-          </expression>
-        </expression>
-      </value>
-    </assertions>
-    <assertions name="upperMultiplicity straight Turnout" annotations="//@problemConainer/@annotations.3">
-      <value xsi:type="language:Forall">
-        <quantifiedVariables name="src">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-        </quantifiedVariables>
-        <quantifiedVariables name="trg 1">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-        </quantifiedVariables>
-        <quantifiedVariables name="trg 2">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-        </quantifiedVariables>
-        <expression xsi:type="language:Impl">
-          <leftOperand xsi:type="language:And">
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.5">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.3/@value/@quantifiedVariables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.3/@value/@quantifiedVariables.1"/>
-            </operands>
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.5">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.3/@value/@quantifiedVariables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.3/@value/@quantifiedVariables.2"/>
-            </operands>
-          </leftOperand>
-          <rightOperand xsi:type="language:Not">
-            <operand xsi:type="language:Distinct">
-              <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.3/@value/@quantifiedVariables.1"/>
-              <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.3/@value/@quantifiedVariables.2"/>
-            </operand>
-          </rightOperand>
-        </expression>
-      </value>
-    </assertions>
-    <assertions name="lowerMultiplicity divergent Turnout" annotations="//@problemConainer/@annotations.4">
-      <value xsi:type="language:Forall">
-        <quantifiedVariables name="src">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-        </quantifiedVariables>
-        <expression xsi:type="language:Exists">
-          <quantifiedVariables name="trg 1">
-            <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-          </quantifiedVariables>
-          <expression xsi:type="language:And">
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.6">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.4/@value/@quantifiedVariables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.4/@value/@expression/@quantifiedVariables.0"/>
-            </operands>
-          </expression>
-        </expression>
-      </value>
-    </assertions>
-    <assertions name="upperMultiplicity divergent Turnout" annotations="//@problemConainer/@annotations.5">
-      <value xsi:type="language:Forall">
-        <quantifiedVariables name="src">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-        </quantifiedVariables>
-        <quantifiedVariables name="trg 1">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-        </quantifiedVariables>
-        <quantifiedVariables name="trg 2">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-        </quantifiedVariables>
-        <expression xsi:type="language:Impl">
-          <leftOperand xsi:type="language:And">
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.6">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.5/@value/@quantifiedVariables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.5/@value/@quantifiedVariables.1"/>
-            </operands>
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.6">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.5/@value/@quantifiedVariables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.5/@value/@quantifiedVariables.2"/>
-            </operands>
-          </leftOperand>
-          <rightOperand xsi:type="language:Not">
-            <operand xsi:type="language:Distinct">
-              <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.5/@value/@quantifiedVariables.1"/>
-              <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.5/@value/@quantifiedVariables.2"/>
-            </operand>
-          </rightOperand>
-        </expression>
-      </value>
-    </assertions>
-    <assertions name="lowerMultiplicity location Train" annotations="//@problemConainer/@annotations.6">
-      <value xsi:type="language:Forall">
-        <quantifiedVariables name="src">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.3"/>
-        </quantifiedVariables>
-        <expression xsi:type="language:Exists">
-          <quantifiedVariables name="trg 1">
-            <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-          </quantifiedVariables>
-          <expression xsi:type="language:And">
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.7">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.6/@value/@quantifiedVariables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.6/@value/@expression/@quantifiedVariables.0"/>
-            </operands>
-          </expression>
-        </expression>
-      </value>
-    </assertions>
-    <assertions name="upperMultiplicity location Train" annotations="//@problemConainer/@annotations.7">
-      <value xsi:type="language:Forall">
-        <quantifiedVariables name="src">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.3"/>
-        </quantifiedVariables>
-        <quantifiedVariables name="trg 1">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-        </quantifiedVariables>
-        <quantifiedVariables name="trg 2">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-        </quantifiedVariables>
-        <expression xsi:type="language:Impl">
-          <leftOperand xsi:type="language:And">
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.7">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.7/@value/@quantifiedVariables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.7/@value/@quantifiedVariables.1"/>
-            </operands>
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.7">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.7/@value/@quantifiedVariables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.7/@value/@quantifiedVariables.2"/>
-            </operands>
-          </leftOperand>
-          <rightOperand xsi:type="language:Not">
-            <operand xsi:type="language:Distinct">
-              <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.7/@value/@quantifiedVariables.1"/>
-              <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.7/@value/@quantifiedVariables.2"/>
-            </operand>
-          </rightOperand>
-        </expression>
-      </value>
-    </assertions>
-    <assertions name="oppositeReference occupiedBy Segment" annotations="//@problemConainer/@annotations.8">
-      <value xsi:type="language:Forall">
-        <quantifiedVariables name="src">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-        </quantifiedVariables>
-        <quantifiedVariables name="trg">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.3"/>
-        </quantifiedVariables>
-        <expression xsi:type="language:Iff">
-          <leftOperand xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.1">
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.8/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.8/@value/@quantifiedVariables.1"/>
-          </leftOperand>
-          <rightOperand xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.7">
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.8/@value/@quantifiedVariables.1"/>
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.8/@value/@quantifiedVariables.0"/>
-          </rightOperand>
-        </expression>
-      </value>
-    </assertions>
-    <assertions name="oppositeReference connectedTo reference Segment connectedTo reference Segment" annotations="//@problemConainer/@annotations.9">
-      <value xsi:type="language:Forall">
-        <quantifiedVariables name="src">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-        </quantifiedVariables>
-        <quantifiedVariables name="trg">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-        </quantifiedVariables>
-        <expression xsi:type="language:Iff">
-          <leftOperand xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.0">
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.9/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.9/@value/@quantifiedVariables.1"/>
-          </leftOperand>
-          <rightOperand xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.0">
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.9/@value/@quantifiedVariables.1"/>
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.9/@value/@quantifiedVariables.0"/>
-          </rightOperand>
-        </expression>
-      </value>
-    </assertions>
-    <assertions name="errorpattern modes3 queries turnoutInSegments" annotations="//@problemConainer/@annotations.27">
-      <value xsi:type="language:Forall">
-        <quantifiedVariables name="p0">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-        </quantifiedVariables>
-        <expression xsi:type="language:Not">
-          <operand xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.8">
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.10/@value/@quantifiedVariables.0"/>
-          </operand>
-        </expression>
-      </value>
-    </assertions>
-    <assertions name="errorpattern modes3 queries tooManyInputsOfSegment" annotations="//@problemConainer/@annotations.28">
-      <value xsi:type="language:Forall">
-        <quantifiedVariables name="p0">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-        </quantifiedVariables>
-        <expression xsi:type="language:Not">
-          <operand xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.9">
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.11/@value/@quantifiedVariables.0"/>
-          </operand>
-        </expression>
-      </value>
-    </assertions>
-    <assertions name="errorpattern modes3 queries turnoutConnectedToBothOutputs" annotations="//@problemConainer/@annotations.29">
-      <value xsi:type="language:Forall">
-        <quantifiedVariables name="p0">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-        </quantifiedVariables>
-        <expression xsi:type="language:Not">
-          <operand xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.10">
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.12/@value/@quantifiedVariables.0"/>
-          </operand>
-        </expression>
-      </value>
-    </assertions>
-    <assertions name="errorpattern modes3 queries turnoutOutputsAreSame" annotations="//@problemConainer/@annotations.30">
-      <value xsi:type="language:Forall">
-        <quantifiedVariables name="p0">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-        </quantifiedVariables>
-        <expression xsi:type="language:Not">
-          <operand xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.12">
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.13/@value/@quantifiedVariables.0"/>
-          </operand>
-        </expression>
-      </value>
-    </assertions>
-    <assertions name="errorpattern modes3 queries tooManyExtraInputsOfTurnout" annotations="//@problemConainer/@annotations.31">
-      <value xsi:type="language:Forall">
-        <quantifiedVariables name="p0">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-        </quantifiedVariables>
-        <expression xsi:type="language:Not">
-          <operand xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.13">
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.14/@value/@quantifiedVariables.0"/>
-          </operand>
-        </expression>
-      </value>
-    </assertions>
-    <assertions name="errorpattern modes3 queries unreachable" annotations="//@problemConainer/@annotations.32">
-      <value xsi:type="language:Forall">
-        <quantifiedVariables name="p0">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-        </quantifiedVariables>
-        <quantifiedVariables name="p1">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-        </quantifiedVariables>
-        <expression xsi:type="language:Not">
-          <operand xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.14">
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.15/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.15/@value/@quantifiedVariables.1"/>
-          </operand>
-        </expression>
-      </value>
-    </assertions>
-    <assertions name="errorpattern modes3 queries connectedToReflexive" annotations="//@problemConainer/@annotations.33">
-      <value xsi:type="language:Forall">
-        <quantifiedVariables name="p0">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-        </quantifiedVariables>
-        <expression xsi:type="language:Not">
-          <operand xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.15">
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.16/@value/@quantifiedVariables.0"/>
-          </operand>
-        </expression>
-      </value>
-    </assertions>
-    <assertions name="errorpattern modes3 queries outputReflexive" annotations="//@problemConainer/@annotations.34">
-      <value xsi:type="language:Forall">
-        <quantifiedVariables name="p0">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-        </quantifiedVariables>
-        <expression xsi:type="language:Not">
-          <operand xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.18">
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.17/@value/@quantifiedVariables.0"/>
-          </operand>
-        </expression>
-      </value>
-    </assertions>
-    <assertions name="errorpattern modes3 queries noExtraInputOfTurnout" annotations="//@problemConainer/@annotations.35">
-      <value xsi:type="language:Forall">
-        <quantifiedVariables name="p0">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-        </quantifiedVariables>
-        <expression xsi:type="language:Not">
-          <operand xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.22">
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.18/@value/@quantifiedVariables.0"/>
-          </operand>
-        </expression>
-      </value>
-    </assertions>
-    <assertions name="errorpattern modes3 queries connectedToNotSymmetric" annotations="//@problemConainer/@annotations.36">
-      <value xsi:type="language:Forall">
-        <quantifiedVariables name="p0">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-        </quantifiedVariables>
-        <quantifiedVariables name="p1">
-          <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-        </quantifiedVariables>
-        <expression xsi:type="language:Not">
-          <operand xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.23">
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.19/@value/@quantifiedVariables.0"/>
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@assertions.19/@value/@quantifiedVariables.1"/>
-          </operand>
-        </expression>
-      </value>
-    </assertions>
-    <relations xsi:type="language:RelationDeclaration" name="connectedTo reference Segment">
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-    </relations>
-    <relations xsi:type="language:RelationDeclaration" name="occupiedBy reference Segment">
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.3"/>
-    </relations>
-    <relations xsi:type="language:RelationDeclaration" name="trains reference Modes3ModelRoot">
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.1"/>
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.3"/>
-    </relations>
-    <relations xsi:type="language:RelationDeclaration" name="segments reference Modes3ModelRoot">
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.1"/>
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-    </relations>
-    <relations xsi:type="language:RelationDeclaration" name="turnouts reference Modes3ModelRoot">
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.1"/>
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-    </relations>
-    <relations xsi:type="language:RelationDeclaration" name="straight reference Turnout">
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-    </relations>
-    <relations xsi:type="language:RelationDeclaration" name="divergent reference Turnout">
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-    </relations>
-    <relations xsi:type="language:RelationDeclaration" name="location reference Train">
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.3"/>
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-    </relations>
-    <relations xsi:type="language:RelationDefinition" name="pattern modes3 queries turnoutInSegments" annotations="//@problemConainer/@annotations.10">
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-      <variables name="parameter T">
-        <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-      </variables>
-      <value xsi:type="language:Or">
-        <operands xsi:type="language:Exists">
-          <quantifiedVariables name="variable 0">
-            <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.1"/>
-          </quantifiedVariables>
-          <expression xsi:type="language:And">
-            <operands xsi:type="language:InstanceOf">
-              <value xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.8/@variables.0"/>
-              <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-            </operands>
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.3">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.8/@value/@operands.0/@quantifiedVariables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.8/@variables.0"/>
-            </operands>
-          </expression>
-        </operands>
-      </value>
-    </relations>
-    <relations xsi:type="language:RelationDefinition" name="pattern modes3 queries tooManyInputsOfSegment" annotations="//@problemConainer/@annotations.11">
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      <variables name="parameter S">
-        <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      </variables>
-      <value xsi:type="language:Or">
-        <operands xsi:type="language:Exists">
-          <quantifiedVariables name="variable I1">
-            <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-          </quantifiedVariables>
-          <quantifiedVariables name="variable I2">
-            <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-          </quantifiedVariables>
-          <quantifiedVariables name="variable I3">
-            <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-          </quantifiedVariables>
-          <expression xsi:type="language:And">
-            <operands xsi:type="language:Not">
-              <operand xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.11">
-                <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.9/@variables.0"/>
-              </operand>
-            </operands>
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.24">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.9/@value/@operands.0/@quantifiedVariables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.9/@variables.0"/>
-            </operands>
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.24">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.9/@value/@operands.0/@quantifiedVariables.1"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.9/@variables.0"/>
-            </operands>
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.24">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.9/@value/@operands.0/@quantifiedVariables.2"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.9/@variables.0"/>
-            </operands>
-            <operands xsi:type="language:Distinct">
-              <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.9/@value/@operands.0/@quantifiedVariables.0"/>
-              <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.9/@value/@operands.0/@quantifiedVariables.1"/>
-            </operands>
-            <operands xsi:type="language:Distinct">
-              <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.9/@value/@operands.0/@quantifiedVariables.0"/>
-              <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.9/@value/@operands.0/@quantifiedVariables.2"/>
-            </operands>
-            <operands xsi:type="language:Distinct">
-              <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.9/@value/@operands.0/@quantifiedVariables.1"/>
-              <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.9/@value/@operands.0/@quantifiedVariables.2"/>
-            </operands>
-          </expression>
-        </operands>
-      </value>
-    </relations>
-    <relations xsi:type="language:RelationDefinition" name="pattern modes3 queries turnoutConnectedToBothOutputs" annotations="//@problemConainer/@annotations.12">
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-      <variables name="parameter T">
-        <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-      </variables>
-      <value xsi:type="language:Or">
-        <operands xsi:type="language:Exists">
-          <quantifiedVariables name="variable Straight">
-            <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-          </quantifiedVariables>
-          <quantifiedVariables name="variable Divergent">
-            <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-          </quantifiedVariables>
-          <expression xsi:type="language:And">
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.5">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.10/@variables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.10/@value/@operands.0/@quantifiedVariables.0"/>
-            </operands>
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.6">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.10/@variables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.10/@value/@operands.0/@quantifiedVariables.1"/>
-            </operands>
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.0">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.10/@variables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.10/@value/@operands.0/@quantifiedVariables.0"/>
-            </operands>
-            <operands xsi:type="language:InstanceOf">
-              <value xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.10/@value/@operands.0/@quantifiedVariables.0"/>
-              <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-            </operands>
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.0">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.10/@variables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.10/@value/@operands.0/@quantifiedVariables.1"/>
-            </operands>
-            <operands xsi:type="language:InstanceOf">
-              <value xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.10/@value/@operands.0/@quantifiedVariables.1"/>
-              <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-            </operands>
-          </expression>
-        </operands>
-      </value>
-    </relations>
-    <relations xsi:type="language:RelationDefinition" name="pattern modes3 queries turnout" annotations="//@problemConainer/@annotations.13">
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-      <variables name="parameter T">
-        <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-      </variables>
-      <value xsi:type="language:Or">
-        <operands xsi:type="language:And">
-          <operands xsi:type="language:InstanceOf">
-            <value xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.11/@variables.0"/>
-            <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-          </operands>
-        </operands>
-      </value>
-    </relations>
-    <relations xsi:type="language:RelationDefinition" name="pattern modes3 queries turnoutOutputsAreSame" annotations="//@problemConainer/@annotations.14">
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-      <variables name="parameter T">
-        <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-      </variables>
-      <value xsi:type="language:Or">
-        <operands xsi:type="language:Exists">
-          <quantifiedVariables name="variable S">
-            <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-          </quantifiedVariables>
-          <expression xsi:type="language:And">
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.5">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.12/@variables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.12/@value/@operands.0/@quantifiedVariables.0"/>
-            </operands>
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.6">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.12/@variables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.12/@value/@operands.0/@quantifiedVariables.0"/>
-            </operands>
-            <operands xsi:type="language:InstanceOf">
-              <value xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.12/@value/@operands.0/@quantifiedVariables.0"/>
-              <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-            </operands>
-          </expression>
-        </operands>
-      </value>
-    </relations>
-    <relations xsi:type="language:RelationDefinition" name="pattern modes3 queries tooManyExtraInputsOfTurnout" annotations="//@problemConainer/@annotations.15">
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-      <variables name="parameter T">
-        <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-      </variables>
-      <value xsi:type="language:Or">
-        <operands xsi:type="language:Exists">
-          <quantifiedVariables name="variable I1">
-            <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-          </quantifiedVariables>
-          <quantifiedVariables name="variable I2">
-            <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-          </quantifiedVariables>
-          <expression xsi:type="language:And">
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.20">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.13/@variables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.13/@value/@operands.0/@quantifiedVariables.0"/>
-            </operands>
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.20">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.13/@variables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.13/@value/@operands.0/@quantifiedVariables.1"/>
-            </operands>
-            <operands xsi:type="language:Distinct">
-              <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.13/@value/@operands.0/@quantifiedVariables.0"/>
-              <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.13/@value/@operands.0/@quantifiedVariables.1"/>
-            </operands>
-          </expression>
-        </operands>
-      </value>
-    </relations>
-    <relations xsi:type="language:RelationDefinition" name="pattern modes3 queries unreachable" annotations="//@problemConainer/@annotations.16">
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      <variables name="parameter S1">
-        <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      </variables>
-      <variables name="parameter S2">
-        <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      </variables>
-      <value xsi:type="language:Or">
-        <operands xsi:type="language:And">
-          <operands xsi:type="language:InstanceOf">
-            <value xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.14/@variables.0"/>
-            <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-          </operands>
-          <operands xsi:type="language:InstanceOf">
-            <value xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.14/@variables.1"/>
-            <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-          </operands>
-          <operands xsi:type="language:Not">
-            <operand xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.21">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.14/@variables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.14/@variables.1"/>
-            </operand>
-          </operands>
-        </operands>
-      </value>
-    </relations>
-    <relations xsi:type="language:RelationDefinition" name="pattern modes3 queries connectedToReflexive" annotations="//@problemConainer/@annotations.17">
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      <variables name="parameter S">
-        <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      </variables>
-      <value xsi:type="language:Or">
-        <operands xsi:type="language:And">
-          <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.0">
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.15/@variables.0"/>
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.15/@variables.0"/>
-          </operands>
-        </operands>
-      </value>
-    </relations>
-    <relations xsi:type="language:RelationDefinition" name="pattern modes3 queries turnoutOutput" annotations="//@problemConainer/@annotations.18">
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      <variables name="parameter T">
-        <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-      </variables>
-      <variables name="parameter S">
-        <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      </variables>
-      <value xsi:type="language:Or">
-        <operands xsi:type="language:And">
-          <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.5">
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.16/@variables.0"/>
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.16/@variables.1"/>
-          </operands>
-          <operands xsi:type="language:InstanceOf">
-            <value xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.16/@variables.1"/>
-            <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-          </operands>
-        </operands>
-        <operands xsi:type="language:And">
-          <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.6">
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.16/@variables.0"/>
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.16/@variables.1"/>
-          </operands>
-          <operands xsi:type="language:InstanceOf">
-            <value xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.16/@variables.1"/>
-            <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-          </operands>
-        </operands>
-      </value>
-    </relations>
-    <relations xsi:type="language:RelationDefinition" name="pattern modes3 queries connectedTo" annotations="//@problemConainer/@annotations.19">
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      <variables name="parameter S1">
-        <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      </variables>
-      <variables name="parameter S2">
-        <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      </variables>
-      <value xsi:type="language:Or">
-        <operands xsi:type="language:And">
-          <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.0">
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.17/@variables.0"/>
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.17/@variables.1"/>
-          </operands>
-          <operands xsi:type="language:InstanceOf">
-            <value xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.17/@variables.1"/>
-            <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-          </operands>
-        </operands>
-      </value>
-    </relations>
-    <relations xsi:type="language:RelationDefinition" name="pattern modes3 queries outputReflexive" annotations="//@problemConainer/@annotations.20">
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-      <variables name="parameter T">
-        <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-      </variables>
-      <value xsi:type="language:Or">
-        <operands xsi:type="language:And">
-          <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.16">
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.18/@variables.0"/>
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.18/@variables.0"/>
-          </operands>
-        </operands>
-      </value>
-    </relations>
-    <relations xsi:type="language:RelationDefinition" name="pattern modes3 queries adjacent" annotations="//@problemConainer/@annotations.21">
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      <variables name="parameter S1">
-        <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      </variables>
-      <variables name="parameter S2">
-        <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      </variables>
-      <value xsi:type="language:Or">
-        <operands xsi:type="language:And">
-          <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.24">
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.19/@variables.0"/>
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.19/@variables.1"/>
-          </operands>
-        </operands>
-        <operands xsi:type="language:And">
-          <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.16">
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.19/@variables.1"/>
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.19/@variables.0"/>
-          </operands>
-        </operands>
-      </value>
-    </relations>
-    <relations xsi:type="language:RelationDefinition" name="pattern modes3 queries extraInputOfTurnout" annotations="//@problemConainer/@annotations.22">
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      <variables name="parameter T">
-        <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-      </variables>
-      <variables name="parameter S">
-        <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      </variables>
-      <value xsi:type="language:Or">
-        <operands xsi:type="language:Exists">
-          <quantifiedVariables name="variable Straight">
-            <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-          </quantifiedVariables>
-          <quantifiedVariables name="variable Divergent">
-            <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-          </quantifiedVariables>
-          <expression xsi:type="language:And">
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.5">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.20/@variables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.20/@value/@operands.0/@quantifiedVariables.0"/>
-            </operands>
-            <operands xsi:type="language:InstanceOf">
-              <value xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.20/@value/@operands.0/@quantifiedVariables.0"/>
-              <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-            </operands>
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.6">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.20/@variables.0"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.20/@value/@operands.0/@quantifiedVariables.1"/>
-            </operands>
-            <operands xsi:type="language:InstanceOf">
-              <value xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.20/@value/@operands.0/@quantifiedVariables.1"/>
-              <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-            </operands>
-            <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.24">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.20/@variables.1"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.20/@variables.0"/>
-            </operands>
-            <operands xsi:type="language:Distinct">
-              <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.20/@variables.1"/>
-              <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.20/@value/@operands.0/@quantifiedVariables.0"/>
-            </operands>
-            <operands xsi:type="language:Distinct">
-              <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.20/@variables.1"/>
-              <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.20/@value/@operands.0/@quantifiedVariables.1"/>
-            </operands>
-          </expression>
-        </operands>
-      </value>
-    </relations>
-    <relations xsi:type="language:RelationDefinition" name="pattern modes3 queries reachable" annotations="//@problemConainer/@annotations.23">
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      <variables name="parameter S1">
-        <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      </variables>
-      <variables name="parameter S2">
-        <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      </variables>
-      <value xsi:type="language:Or">
-        <operands xsi:type="language:And">
-          <operands xsi:type="language:InstanceOf">
-            <value xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.21/@variables.1"/>
-            <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-          </operands>
-        </operands>
-        <operands xsi:type="language:And">
-          <operands xsi:type="language:TransitiveClosure" relation="//@problemConainer/@relations.19">
-            <leftOperand xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.21/@variables.0"/>
-            <rightOperand xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.21/@variables.1"/>
-          </operands>
-        </operands>
-      </value>
-    </relations>
-    <relations xsi:type="language:RelationDefinition" name="pattern modes3 queries noExtraInputOfTurnout" annotations="//@problemConainer/@annotations.24">
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-      <variables name="parameter T">
-        <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-      </variables>
-      <value xsi:type="language:Or">
-        <operands xsi:type="language:Forall">
-          <quantifiedVariables name="variable 0">
-            <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-          </quantifiedVariables>
-          <expression xsi:type="language:And">
-            <operands xsi:type="language:InstanceOf">
-              <value xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.22/@variables.0"/>
-              <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.2"/>
-            </operands>
-            <operands xsi:type="language:Not">
-              <operand xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.20">
-                <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.22/@variables.0"/>
-                <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.22/@value/@operands.0/@quantifiedVariables.0"/>
-              </operand>
-            </operands>
-          </expression>
-        </operands>
-      </value>
-    </relations>
-    <relations xsi:type="language:RelationDefinition" name="pattern modes3 queries connectedToNotSymmetric" annotations="//@problemConainer/@annotations.25">
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      <variables name="parameter S1">
-        <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      </variables>
-      <variables name="parameter S2">
-        <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      </variables>
-      <value xsi:type="language:Or">
-        <operands xsi:type="language:And">
-          <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.0">
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.23/@variables.0"/>
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.23/@variables.1"/>
-          </operands>
-          <operands xsi:type="language:InstanceOf">
-            <value xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.23/@variables.1"/>
-            <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-          </operands>
-          <operands xsi:type="language:Not">
-            <operand xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.17">
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.23/@variables.1"/>
-              <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.23/@variables.0"/>
-            </operand>
-          </operands>
-        </operands>
-      </value>
-    </relations>
-    <relations xsi:type="language:RelationDefinition" name="pattern modes3 queries output" annotations="//@problemConainer/@annotations.26">
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      <parameters xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      <variables name="parameter S1">
-        <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      </variables>
-      <variables name="parameter S2">
-        <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-      </variables>
-      <value xsi:type="language:Or">
-        <operands xsi:type="language:And">
-          <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.0">
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.24/@variables.0"/>
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.24/@variables.1"/>
-          </operands>
-          <operands xsi:type="language:InstanceOf">
-            <value xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.24/@variables.1"/>
-            <range xsi:type="language:ComplexTypeReference" referred="//@problemConainer/@types.0"/>
-          </operands>
-        </operands>
-        <operands xsi:type="language:And">
-          <operands xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.16">
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.24/@variables.0"/>
-            <parameterSubstitutions xsi:type="language:SymbolicValue" symbolicReference="//@problemConainer/@relations.24/@variables.1"/>
-          </operands>
-        </operands>
-      </value>
-    </relations>
-    <elements name="o 1" definedInType="//@problemConainer/@types.4"/>
-    <containmentHierarchies typesOrderedInHierarchy="//@problemConainer/@types.0 //@problemConainer/@types.2 //@problemConainer/@types.3 //@problemConainer/@types.1 //@problemConainer/@types.4 //@problemConainer/@types.5" containmentRelations="//@problemConainer/@relations.2 //@problemConainer/@relations.3 //@problemConainer/@relations.4"/>
-    <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@problemConainer/@assertions.0" relation="//@problemConainer/@relations.0" upper="2"/>
-    <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@problemConainer/@assertions.1" relation="//@problemConainer/@relations.1" upper="1"/>
-    <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@problemConainer/@assertions.2" relation="//@problemConainer/@relations.5" lower="1"/>
-    <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@problemConainer/@assertions.3" relation="//@problemConainer/@relations.5" upper="1"/>
-    <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@problemConainer/@assertions.4" relation="//@problemConainer/@relations.6" lower="1"/>
-    <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@problemConainer/@assertions.5" relation="//@problemConainer/@relations.6" upper="1"/>
-    <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@problemConainer/@assertions.6" relation="//@problemConainer/@relations.7" lower="1"/>
-    <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@problemConainer/@assertions.7" relation="//@problemConainer/@relations.7" upper="1"/>
-    <annotations xsi:type="ecore2logicannotations:InverseRelationAssertion" target="//@problemConainer/@assertions.8" inverseA="//@problemConainer/@relations.1" inverseB="//@problemConainer/@relations.7"/>
-    <annotations xsi:type="ecore2logicannotations:InverseRelationAssertion" target="//@problemConainer/@assertions.9" inverseA="//@problemConainer/@relations.0" inverseB="//@problemConainer/@relations.0"/>
-    <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@problemConainer/@relations.8" patternFullyQualifiedName="modes3.queries.turnoutInSegments">
-      <variableTrace targetLogicVariable="//@problemConainer/@relations.8/@value/@operands.0/@quantifiedVariables.0"/>
-    </annotations>
-    <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@problemConainer/@relations.9" patternFullyQualifiedName="modes3.queries.tooManyInputsOfSegment">
-      <variableTrace targetLogicVariable="//@problemConainer/@relations.9/@value/@operands.0/@quantifiedVariables.0"/>
-      <variableTrace targetLogicVariable="//@problemConainer/@relations.9/@value/@operands.0/@quantifiedVariables.1"/>
-      <variableTrace targetLogicVariable="//@problemConainer/@relations.9/@value/@operands.0/@quantifiedVariables.2"/>
-    </annotations>
-    <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@problemConainer/@relations.10" patternFullyQualifiedName="modes3.queries.turnoutConnectedToBothOutputs">
-      <variableTrace targetLogicVariable="//@problemConainer/@relations.10/@value/@operands.0/@quantifiedVariables.0"/>
-      <variableTrace targetLogicVariable="//@problemConainer/@relations.10/@value/@operands.0/@quantifiedVariables.1"/>
-    </annotations>
-    <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@problemConainer/@relations.11" patternFullyQualifiedName="modes3.queries.turnout"/>
-    <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@problemConainer/@relations.12" patternFullyQualifiedName="modes3.queries.turnoutOutputsAreSame">
-      <variableTrace targetLogicVariable="//@problemConainer/@relations.12/@value/@operands.0/@quantifiedVariables.0"/>
-    </annotations>
-    <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@problemConainer/@relations.13" patternFullyQualifiedName="modes3.queries.tooManyExtraInputsOfTurnout">
-      <variableTrace targetLogicVariable="//@problemConainer/@relations.13/@value/@operands.0/@quantifiedVariables.0"/>
-      <variableTrace targetLogicVariable="//@problemConainer/@relations.13/@value/@operands.0/@quantifiedVariables.1"/>
-    </annotations>
-    <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@problemConainer/@relations.14" patternFullyQualifiedName="modes3.queries.unreachable"/>
-    <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@problemConainer/@relations.15" patternFullyQualifiedName="modes3.queries.connectedToReflexive"/>
-    <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@problemConainer/@relations.16" patternFullyQualifiedName="modes3.queries.turnoutOutput"/>
-    <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@problemConainer/@relations.17" patternFullyQualifiedName="modes3.queries.connectedTo"/>
-    <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@problemConainer/@relations.18" patternFullyQualifiedName="modes3.queries.outputReflexive"/>
-    <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@problemConainer/@relations.19" patternFullyQualifiedName="modes3.queries.adjacent"/>
-    <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@problemConainer/@relations.20" patternFullyQualifiedName="modes3.queries.extraInputOfTurnout">
-      <variableTrace targetLogicVariable="//@problemConainer/@relations.20/@value/@operands.0/@quantifiedVariables.0"/>
-      <variableTrace targetLogicVariable="//@problemConainer/@relations.20/@value/@operands.0/@quantifiedVariables.1"/>
-    </annotations>
-    <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@problemConainer/@relations.21" patternFullyQualifiedName="modes3.queries.reachable"/>
-    <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@problemConainer/@relations.22" patternFullyQualifiedName="modes3.queries.noExtraInputOfTurnout">
-      <variableTrace targetLogicVariable="//@problemConainer/@relations.22/@value/@operands.0/@quantifiedVariables.0"/>
-    </annotations>
-    <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@problemConainer/@relations.23" patternFullyQualifiedName="modes3.queries.connectedToNotSymmetric"/>
-    <annotations xsi:type="viatra2logicannotations:TransfomedViatraQuery" target="//@problemConainer/@relations.24" patternFullyQualifiedName="modes3.queries.output"/>
-    <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@problemConainer/@assertions.10" query="//@problemConainer/@annotations.10"/>
-    <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@problemConainer/@assertions.11" query="//@problemConainer/@annotations.11"/>
-    <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@problemConainer/@assertions.12" query="//@problemConainer/@annotations.12"/>
-    <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@problemConainer/@assertions.13" query="//@problemConainer/@annotations.14"/>
-    <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@problemConainer/@assertions.14" query="//@problemConainer/@annotations.15"/>
-    <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@problemConainer/@assertions.15" query="//@problemConainer/@annotations.16"/>
-    <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@problemConainer/@assertions.16" query="//@problemConainer/@annotations.17"/>
-    <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@problemConainer/@assertions.17" query="//@problemConainer/@annotations.20"/>
-    <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@problemConainer/@assertions.18" query="//@problemConainer/@annotations.24"/>
-    <annotations xsi:type="viatra2logicannotations:TransformedViatraWellformednessConstraint" target="//@problemConainer/@assertions.19" query="//@problemConainer/@annotations.25"/>
-  </problemConainer>
-  <scopes maxNewElements="0" targetTypeInterpretation="//@partialtypeinterpratation.4"/>
-  <scopes maxNewElements="0" targetTypeInterpretation="//@partialtypeinterpratation.5"/>
-  <scopes maxNewElements="0" targetTypeInterpretation="//@partialtypeinterpratation.6"/>
-  <scopes maxNewElements="0" targetTypeInterpretation="//@partialtypeinterpratation.7"/>
-  <scopes maxNewElements="0" targetTypeInterpretation="//@partialtypeinterpratation.8"/>
-</partialinterpretation:PartialInterpretation>
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/output/solution1.png b/Domains/ca.mcgill.rtgmrt.example.modes3/output/solution1.png
deleted file mode 100644
index b6fa6e4e..00000000
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/output/solution1.png
+++ /dev/null
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/plugin.xml b/Domains/ca.mcgill.rtgmrt.example.modes3/plugin.xml
index 7341e19c..a105a729 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/plugin.xml
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/plugin.xml
@@ -6,21 +6,19 @@
   </extension>
   <extension id="modes3.queries.Modes3Queries" point="org.eclipse.viatra.query.runtime.queryspecification">
     <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:modes3.queries.Modes3Queries" id="modes3.queries.Modes3Queries">
-      <query-specification fqn="modes3.queries.turnoutInSegments"/>
       <query-specification fqn="modes3.queries.connectedTo"/>
       <query-specification fqn="modes3.queries.connectedToNotSymmetric"/>
       <query-specification fqn="modes3.queries.connectedToReflexive"/>
       <query-specification fqn="modes3.queries.turnoutOutput"/>
       <query-specification fqn="modes3.queries.outputReflexive"/>
       <query-specification fqn="modes3.queries.turnoutOutputsAreSame"/>
-      <query-specification fqn="modes3.queries.turnout"/>
       <query-specification fqn="modes3.queries.output"/>
       <query-specification fqn="modes3.queries.tooManyInputsOfSegment"/>
       <query-specification fqn="modes3.queries.turnoutConnectedToBothOutputs"/>
-      <query-specification fqn="modes3.queries.extraInputOfTurnout"/>
-      <query-specification fqn="modes3.queries.noExtraInputOfTurnout"/>
-      <query-specification fqn="modes3.queries.tooManyExtraInputsOfTurnout"/>
       <query-specification fqn="modes3.queries.adjacent"/>
+      <query-specification fqn="modes3.queries.tooManyInputsOfTurnout"/>
+      <query-specification fqn="modes3.queries.inputsOfTurnout"/>
+      <query-specification fqn="modes3.queries.tooFewInputsOfTurnout"/>
       <query-specification fqn="modes3.queries.reachable"/>
       <query-specification fqn="modes3.queries.unreachable"/>
     </group>
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
index 982e6cec..b8841928 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
@@ -2,11 +2,6 @@ package modes3.queries
 
 import "http://www.ece.mcgill.ca/wcet/modes3"
 
-@Constraint(message = "turnoutInSegments", severity = "error", key = { T })
-pattern turnoutInSegments(T : Turnout) {
-        Modes3ModelRoot.segments(_, T);
-}
-
 pattern connectedTo(S1 : Segment, S2 : Segment) {
         Segment.connectedTo(S1, S2);
 }
@@ -39,10 +34,6 @@ pattern turnoutOutputsAreSame(T : Turnout) {
         Turnout.divergent(T, S);
 }
 
-pattern turnout(T : Turnout) {
-        Turnout(T);
-}
-
 pattern output(S1 : Segment, S2 : Segment) {
         Segment.connectedTo(S1, S2);
 } or {
@@ -56,8 +47,7 @@ pattern output(S1 : Segment, S2 : Segment) {
 //}
 
 @Constraint(message = "tooManyInputsOfSegment", severity = "error", key = { S })
-pattern tooManyInputsOfSegment(S : Segment) {
-        neg find turnout(S);
+pattern tooManyInputsOfSegment(S : SimpleSegment) {
         find output(I1, S);
         find output(I2, S);
         find output(I3, S);
@@ -74,30 +64,38 @@ pattern turnoutConnectedToBothOutputs(T : Turnout) {
         Segment.connectedTo(T, Divergent);
 }
 
-pattern extraInputOfTurnout(T : Turnout, S : Segment) {
-        Turnout.straight(T, Straight);
-        Turnout.divergent(T, Divergent);
-        find output(S, T);
-        S != Straight;
-        S != Divergent;
+pattern adjacent(S1 : Segment, S2 : Segment) {
+        find output(S1, S2);
+} or {
+        find turnoutOutput(S2, S1);
 }
 
-@Constraint(message = "noExtraInputOfTurnout", severity = "error", key = { T })
-pattern noExtraInputOfTurnout(T : Turnout) {
-        neg find extraInputOfTurnout(T, _);
+@Constraint(message = "turnoutConnectedToBothOutputs", severity = "error", key = { T })
+pattern tooManyInputsOfTurnout(T : Turnout) {
+        find adjacent(I1, T);
+        find adjacent(I2, T);
+        find adjacent(I3, T);
+        find adjacent(I4, T);
+        I1 != I2;
+        I1 != I3;
+        I1 != I4;
+        I2 != I3;
+        I2 != I4;
+        I3 != I4;
 }
 
-@Constraint(message = "tooManyExtraInputsOfTurnout", severity = "error", key = { T })
-pattern tooManyExtraInputsOfTurnout(T : Turnout) {
-        find extraInputOfTurnout(T, I1);
-        find extraInputOfTurnout(T, I2);
+pattern inputsOfTurnout(T : Turnout) {
+        find adjacent(I1, T);
+        find adjacent(I2, T);
+        find adjacent(I3, T);
         I1 != I2;
+        I1 != I3;
+        I2 != I3;
 }
 
-pattern adjacent(S1 : Segment, S2 : Segment) {
-        find output(S1, S2);
-} or {
-        find turnoutOutput(S2, S1);
+@Constraint(message = "tooFewInputsOfTurnout", severity = "error", key = { T })
+pattern tooFewInputsOfTurnout(T : Turnout) {
+        neg find inputsOfTurnout(T);
 }
 
 pattern reachable(S1 : Segment, S2 : Segment) {
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/Modes3ModelGenerator.xtend b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/Modes3ModelGenerator.xtend
index 71d1798f..fac7c496 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/Modes3ModelGenerator.xtend
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/Modes3ModelGenerator.xtend
@@ -8,6 +8,7 @@ import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration
 import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor
 import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.Ecore2logicannotationsFactory
 import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.Ecore2logicannotationsPackage
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel
 import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicProblemBuilder
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDefinition
@@ -22,6 +23,7 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.Polyhedr
 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.PolyhedralScopePropagatorSolver
 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ScopePropagatorStrategy
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.BinaryElementRelationLink
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialComplexTypeInterpretation
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage
@@ -44,8 +46,6 @@ import org.eclipse.viatra.query.runtime.api.ViatraQueryEngineOptions
 import org.eclipse.viatra.query.runtime.localsearch.matcher.integration.LocalSearchEMFBackendFactory
 import org.eclipse.viatra.query.runtime.rete.matcher.ReteBackendFactory
 import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor
-import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDefinition
-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.BinaryElementRelationLink
 
 @FinalFieldsConstructor
 class Modes3ModelGenerator {
@@ -92,22 +92,32 @@ class Modes3ModelGenerator {
                                 minNewElements = modelSize
                                 maxNewElements = modelSize
                                 minNewElementsByType => [
-                                        put(ecore2Logic.TypeofEClass(metamodelLogic.trace, Modes3Package.eINSTANCE.turnout), 1)
+//                                      put(ecore2Logic.TypeofEClass(metamodelLogic.trace, Modes3Package.eINSTANCE.turnout), 5)
                                 ]
                                 maxNewElementsByType => [
                                         put(ecore2Logic.TypeofEClass(metamodelLogic.trace, Modes3Package.eINSTANCE.train), 5)
+                                        put(ecore2Logic.TypeofEClass(metamodelLogic.trace, Modes3Package.eINSTANCE.turnout), 5)
                                 ]
                         ]
-                        solutionScope.numberOfRequiredSolutions = 1
+                        solutionScope => [
+                                numberOfRequiredSolutions = 1
+                        ]
+                        scopeWeight = 5
                         nameNewElements = false
                         typeInferenceMethod = TypeInferenceMethod.PreliminaryAnalysis
-                        stateCoderStrategy = StateCoderStrategy::Neighbourhood
+                        stateCoderStrategy = StateCoderStrategy.PairwiseNeighbourhood
                         scopePropagatorStrategy = new ScopePropagatorStrategy.Polyhedral(
                                 PolyhedralScopePropagatorConstraints.Relational, PolyhedralScopePropagatorSolver.Clp)
-//                      unitPropagationPatternGenerators += new Modes3UnitPropagationGenerator(ecore2Logic, metamodelLogic.trace)
-                        debugConfiguration.partialInterpretatioVisualiser = null
+                        hints += new Modes3TypeScopeHint(ecore2Logic, metamodelLogic.trace)
+                        unitPropagationPatternGenerators += new Modes3UnitPropagationGenerator(ecore2Logic, metamodelLogic.trace)
+                        debugConfiguration => [
+                                partialInterpretatioVisualiser = new GraphvizVisualiser
+//                              partalInterpretationVisualisationFrequency = 50
+                        ]
+                        documentationLevel = DocumentationLevel.NORMAL
                 ]
                 val workspace = new FileSystemWorkspace("output/", "")
+                workspace.writeModel(logic.output, "problem.logicproblem")
                 val solution = solver.solve(logic.output, config, workspace)
                 if (solution instanceof ModelResult) {
                         println("Saving generated solutions")
@@ -122,7 +132,6 @@ class Modes3ModelGenerator {
                                         workspace.writeText('''solution«representationNumber».gml''', gml)
                                         if (representation.newElements.size < 160) {
                                                 if (representation instanceof PartialInterpretation) {
-                                                        representation.problem.types.forEach[println(name)]
                                                         val rootType = (representation.problem.types.findFirst [
                                                                 name == "Modes3ModelRoot class DefinedPart"
                                                         ] as TypeDefinition)
@@ -198,10 +207,7 @@ class Modes3ModelGenerator {
                 PartialinterpretationPackage.eINSTANCE.class
                 Ecore2logicannotationsPackage.eINSTANCE.class
                 Viatra2LogicAnnotationsPackage.eINSTANCE.class
-                Resource.Factory.Registry.INSTANCE.extensionToFactoryMap.put("ecore", new XMIResourceFactoryImpl)
-                Resource.Factory.Registry.INSTANCE.extensionToFactoryMap.put("logicproblem", new XMIResourceFactoryImpl)
-                Resource.Factory.Registry.INSTANCE.extensionToFactoryMap.put("partialinterpretation",
-                        new XMIResourceFactoryImpl)
+                Resource.Factory.Registry.INSTANCE.extensionToFactoryMap.put("*", new XMIResourceFactoryImpl)
         }
 
         def static void main(String[] args) {
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/Modes3TypeScopeHint.xtend b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/Modes3TypeScopeHint.xtend
new file mode 100644
index 00000000..94e5eb08
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/Modes3TypeScopeHint.xtend
@@ -0,0 +1,79 @@
+package modes3.run
+
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.Modality
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeConstraintHint
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeExpressionBuilderFactory
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternGenerator
+import java.util.Map
+import modes3.Modes3Package
+import modes3.queries.Adjacent
+import org.eclipse.viatra.query.runtime.api.IPatternMatch
+import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
+
+class Modes3TypeScopeHint implements LinearTypeConstraintHint {
+        static val TURNOUT_NEIGHBOR_COUNT = "turnoutNeighborCount"
+
+        val Type segmentType
+        val Type turnoutType
+
+        new(extension Ecore2Logic ecore2Logic, Ecore2Logic_Trace ecore2LogicTrace) {
+                extension val Modes3Package = Modes3Package.eINSTANCE
+                segmentType = ecore2LogicTrace.TypeofEClass(segment)
+                turnoutType = ecore2LogicTrace.TypeofEClass(turnout)
+        }
+
+        override getAdditionalPatterns(extension PatternGenerator patternGenerator, Map<String, PQuery> fqnToPQuery) {
+                '''
+                        pattern «TURNOUT_NEIGHBOR_COUNT»_helper(problem: LogicProblem, interpretation: PartialInterpretation, source: DefinedElement, target: DefinedElement) {
+                                find interpretation(problem, interpretation);
+                                find mustExist(problem, interpretation, source);
+                                find mustExist(problem, interpretation, target);
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MUST, "source")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "target")»
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Adjacent.instance.fullyQualifiedName), #["source", "target"], Modality.MUST, true, false)»
+                        }
+                
+                        pattern «TURNOUT_NEIGHBOR_COUNT»(problem: LogicProblem, interpretation: PartialInterpretation, element: DefinedElement, N) {
+                                find interpretation(problem, interpretation);
+                                find mustExist(problem, interpretation, element);
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MUST, "element")»
+                                N == count find «TURNOUT_NEIGHBOR_COUNT»_helper(problem, interpretation, element, _);
+                        }
+                '''
+        }
+
+        override createConstraintUpdater(LinearTypeExpressionBuilderFactory builderFactory) {
+                val turnoutNeighborCountMatcher = builderFactory.createMatcher(TURNOUT_NEIGHBOR_COUNT)
+                val newNeighbors = builderFactory.createBuilder.add(1, segmentType).build
+
+                return [ partialInterpretation |
+                        val requiredNeighbbors = turnoutNeighborCountMatcher.getRemainingCount(partialInterpretation, 3)
+                        newNeighbors.tightenLowerBound(requiredNeighbbors)
+                ]
+        }
+
+        private static def <T extends IPatternMatch> getRemainingCount(ViatraQueryMatcher<T> matcher,
+                PartialInterpretation partialInterpretation, int capacity) {
+                val partialMatch = matcher.newEmptyMatch
+                partialMatch.set(0, partialInterpretation.problem)
+                partialMatch.set(1, partialInterpretation)
+                val iterator = matcher.streamAllMatches(partialMatch).iterator
+                var int max = 0
+                while (iterator.hasNext) {
+                        val match = iterator.next
+                        val n = (match.get(3) as Integer).intValue
+                        if (n < capacity) {
+                                val required = capacity - n
+                                if (max < required) {
+                                        max = required
+                                }
+                        }
+                }
+                max
+        }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/Modes3UnitPropagationGenerator.xtend b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/Modes3UnitPropagationGenerator.xtend
index 61bd2814..953a21d4 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/Modes3UnitPropagationGenerator.xtend
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/Modes3UnitPropagationGenerator.xtend
@@ -9,20 +9,21 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternGene
 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.UnitPropagationPatternGenerator
 import java.util.Map
 import modes3.Modes3Package
-import modes3.queries.ExtraInputOfTurnout
+import modes3.queries.Adjacent
 import modes3.queries.Output
-import modes3.queries.TurnoutOutput
 import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery
 import org.eclipse.xtend2.lib.StringConcatenationClient
 
 class Modes3UnitPropagationGenerator implements UnitPropagationPatternGenerator {
         static val MUST_NOT_CONNECTED_TO = "mustNotConnectedTo"
-        static val MUST_NOT_CONNECTED_TO_HELPER = "mustNotConnectedTo_helper"
-        static val MUST_NOT_TURNOUT_OUTPUT = "mustNotTurnoutOutput"
         static val MUST_NOT_STRAIGHT = "mustNotStraight"
         static val MUST_NOT_DIVERGENT = "mustNotDivergent"
+        static val MUST_CONNECTED_TO = "mustConnectedTo"
+        static val MUST_STRAIGHT = "mustStraight"
+        static val MUST_DIVERGENT = "mustDivergent"
 
         val Type segmentType
+        val Type simpleSegmentType
         val Type turnoutType
         val Relation connectedToRelation
         val Relation straightRelation
@@ -31,6 +32,7 @@ class Modes3UnitPropagationGenerator implements UnitPropagationPatternGenerator
         new(extension Ecore2Logic ecore2Logic, Ecore2Logic_Trace ecore2LogicTrace) {
                 extension val Modes3Package = Modes3Package.eINSTANCE
                 segmentType = ecore2LogicTrace.TypeofEClass(segment)
+                simpleSegmentType = ecore2LogicTrace.TypeofEClass(simpleSegment)
                 turnoutType = ecore2LogicTrace.TypeofEClass(turnout)
                 connectedToRelation = ecore2LogicTrace.relationOfReference(segment_ConnectedTo)
                 straightRelation = ecore2LogicTrace.relationOfReference(turnout_Straight)
@@ -38,7 +40,11 @@ class Modes3UnitPropagationGenerator implements UnitPropagationPatternGenerator
         }
 
         override getMustPatterns() {
-                emptyMap
+                #{
+                        connectedToRelation -> MUST_CONNECTED_TO,
+                        straightRelation -> MUST_STRAIGHT,
+                        divergentRelation -> MUST_DIVERGENT
+                }
         }
 
         override getMustNotPatterns() {
@@ -55,150 +61,356 @@ class Modes3UnitPropagationGenerator implements UnitPropagationPatternGenerator
                         source: DefinedElement, target: DefinedElement
                 '''
                 
-                val StringConcatenationClient commonParameterConstraints = '''
+                val StringConcatenationClient commonMustParameterConstraints = '''
                         find interpretation(problem, interpretation);
                         find mustExist(problem, interpretation, source);
                         find mustExist(problem, interpretation, target);
                 '''
+                
+                val StringConcatenationClient commonMayParameterConstraints = '''
+                        find interpretation(problem, interpretation);
+                        find mayExist(problem, interpretation, source);
+                        find mayExist(problem, interpretation, target);
+                '''
 
                 '''
-                        pattern «MUST_NOT_CONNECTED_TO_HELPER»(«parameters») {
-                                // connectedToReflexive unit propagation
-                                «commonParameterConstraints»
-                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "source")»
-                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "target")»
-                                source == target;
+                        pattern mayInput(«parameters») {
+                                «commonMayParameterConstraints»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Adjacent.instance.fullyQualifiedName), #["target", "source"], Modality.MAY, true, false)»
+                                neg «referRelation(straightRelation, "target", "source", Modality.MUST, fqnToPQuery)»
+                                neg «referRelation(straightRelation, "target", "source", Modality.MUST, fqnToPQuery)»
+                        }
+                        
+                        pattern multipleMayInput(problem: LogicProblem, interpretation: PartialInterpretation,
+                                                target: DefinedElement) {
+                                find interpretation(problem, interpretation);
+                                find mustExist(problem, interpretation, target);
+                                find mayInput(problem, interpretaton, source1, target);
+                                find mayInput(problem, interpretaton, source2, target);
+                                neg find mustEquivalent(problem, interpretation, source1, source2);
+                        }
+                        
+                        pattern multipleMayStraight(problem: LogicProblem, interpretation: PartialInterpretation,
+                                                source: DefinedElement) {
+                                find interpretation(problem, interpretation);
+                                find mustExist(problem, interpretation, source);
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MAY, "source")»
+                                «referRelation(straightRelation, "source", "target1", Modality.MAY, fqnToPQuery)»
+                                «referRelation(straightRelation, "source", "target2", Modality.MAY, fqnToPQuery)»
+                                neg find mustEquivalent(problem, interpretation, target1, target2);
+                        }
+                        
+                        pattern multipleMayDivergent(problem: LogicProblem, interpretation: PartialInterpretation,
+                                                source: DefinedElement) {
+                                find interpretation(problem, interpretation);
+                                find mustExist(problem, interpretation, source);
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MAY, "source")»
+                                «referRelation(divergentRelation, "source", "target1", Modality.MAY, fqnToPQuery)»
+                                «referRelation(divergentRelation, "source", "target2", Modality.MAY, fqnToPQuery)»
+                                neg find mustEquivalent(problem, interpretation, target1, target2);
+                        }
+                        
+                        pattern «MUST_CONNECTED_TO»(«parameters») {
+                                «commonMustParameterConstraints»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                find mayInput(problem, interpretaton, source, target);
+                                neg find multipleMayInput(problem, interpretaton, target);
+                                «referRelation(connectedToRelation, "source", "target", Modality.MAY, fqnToPQuery)»
+                                neg «referRelation(connectedToRelation, "source", "target", Modality.MUST, fqnToPQuery)»
+                                neg «referRelation(straightRelation, "source", "target", Modality.MAY, fqnToPQuery)»
+                                neg «referRelation(divergentRelation, "source", "target", Modality.MAY, fqnToPQuery)»
+                        }
+                        
+                        pattern «MUST_STRAIGHT»(«parameters») {
+                                «commonMustParameterConstraints»
+                                neg «referRelation(straightRelation, "source", "_", Modality.MUST, fqnToPQuery)»
+                                neg find multipleMayStraight(problem, interpretation, source);
+                                «referRelation(straightRelation, "source", "target", Modality.MAY, fqnToPQuery)»
+                                neg «referRelation(straightRelation, "source", "target", Modality.MUST, fqnToPQuery)»
                         } or {
-                                // tooManyInputsOfSegment unit propagation
-                                «commonParameterConstraints»
+                                «commonMustParameterConstraints»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                find mayInput(problem, interpretaton, source, target);
+                                neg find multipleMayInput(problem, interpretaton, target);
+                                neg «referRelation(connectedToRelation, "source", "target", Modality.MAY, fqnToPQuery)»
+                                «referRelation(straightRelation, "source", "target", Modality.MAY, fqnToPQuery)»
+                                neg «referRelation(straightRelation, "source", "target", Modality.MUST, fqnToPQuery)»
+                                neg «referRelation(divergentRelation, "source", "target", Modality.MAY, fqnToPQuery)»
+                        }
+                        
+                        pattern «MUST_DIVERGENT»(«parameters») {
+                                «commonMustParameterConstraints»
+                                neg «referRelation(divergentRelation, "source", "_", Modality.MUST, fqnToPQuery)»
+                                neg find multipleMayDivergent(problem, interpretation, source);
+                                «referRelation(divergentRelation, "source", "target", Modality.MAY, fqnToPQuery)»
+                                neg «referRelation(divergentRelation, "source", "target", Modality.MUST, fqnToPQuery)»
+                        } or {
+                                «commonMustParameterConstraints»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                find mayInput(problem, interpretaton, source, target);
+                                neg find multipleMayInput(problem, interpretaton, target);
+                                neg «referRelation(connectedToRelation, "source", "target", Modality.MAY, fqnToPQuery)»
+                                neg «referRelation(straightRelation, "source", "target", Modality.MAY, fqnToPQuery)»
+                                «referRelation(divergentRelation, "source", "target", Modality.MAY, fqnToPQuery)»
+                                neg «referRelation(divergentRelation, "source", "target", Modality.MUST, fqnToPQuery)»
+                        }
+                        
+                        pattern turnoutOutput_must_to_true_by_straight(«parameters», T : DefinedElement, S : DefinedElement) {
+                                «commonMayParameterConstraints»
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MAY, "source")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                T == source;
+                                S == target;
+                        }
+                        
+                        pattern turnoutOutput_must_to_true_by_divergent(«parameters», T : DefinedElement, S : DefinedElement) {
+                                «commonMayParameterConstraints»
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MAY, "source")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                T == source;
+                                S == target;
+                        }
+                        
+                        pattern output_must_to_true_by_connectedTo(«parameters», S1 : DefinedElement, S2 : DefinedElement) {
+                                «commonMayParameterConstraints»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "source")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                S1 == source;
+                                S2 == target;
+                        }
+                        
+                        pattern output_must_to_true_by_straight(«parameters», S1 : DefinedElement, S2 : DefinedElement) {
+                                find turnoutOutput_must_to_true_by_straight(problem, interpretation, source, target, S1, S2);
+                        }
+                        
+                        pattern output_must_to_true_by_divergent(«parameters», S1 : DefinedElement, S2 : DefinedElement) {
+                                find turnoutOutput_must_to_true_by_divergent(problem, interpretation, source, target, S1, S2);
+                        }
+                        
+                        pattern adjacent_must_to_true_by_connectedTo(«parameters», S1 : DefinedElement, S2 : DefinedElement) {
+                                find output_must_to_true_by_connectedTo(problem, interpretation, source, target, S1, S2);
+                        }
+                        
+                        pattern adjacent_must_to_true_by_straight(«parameters», S1 : DefinedElement, S2 : DefinedElement) {
+                                find output_must_to_true_by_straight(problem, interpretation, source, target, S1, S2);
+                        } or {
+                                find turnoutOutput_must_to_true_by_straight(problem, interpretation, source, target, S2, S1);
+                        }
+                        
+                        pattern adjacent_must_to_true_by_divergent(«parameters», S1 : DefinedElement, S2 : DefinedElement) {
+                                find output_must_to_true_by_divergent(problem, interpretation, source, target, S1, S2);
+                        } or {
+                                find turnoutOutput_must_to_true_by_divergent(problem, interpretation, source, target, S2, S1);
+                        }
+                        
+                        pattern connectedToReflexive_must_to_true_by_connectedTo(«parameters», S : DefinedElement) {
+                                find mustExist(problem, interpretation, source);
                                 «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "source")»
-                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "target")»
-                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "input1")»
-                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "input2")»
-                                neg «typeIndexer.referInstanceOf(turnoutType, Modality.MAY, "source")»
-                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Output.instance.fullyQualifiedName), #["input1", "source"], Modality.MUST, true, false)»
-                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Output.instance.fullyQualifiedName), #["input2", "source"], Modality.MUST, true, false)»
-                                input1 != input2;
-                                input1 != target;
-                                input2 != target;
-                        } or {
-                                // turnoutConnectedToBothOutputs unit propagation 1
-                                «commonParameterConstraints»
-                                «typeIndexer.referInstanceOf(turnoutType, Modality.MUST, "source")»
-                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "target")»
-                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "divergent")»
-                                «referRelation(straightRelation, "source", "target", Modality.MUST, fqnToPQuery)»
-                                «referRelation(divergentRelation, "source", "divergent", Modality.MUST, fqnToPQuery)»
-                                «referRelation(connectedToRelation, "source", "divergent", Modality.MUST, fqnToPQuery)»
-                        } or {
-                                // turnoutConnectedToBothOutputs unit propagation 2
-                                «commonParameterConstraints»
-                                «typeIndexer.referInstanceOf(turnoutType, Modality.MUST, "source")»
-                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "target")»
-                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "straight")»
-                                «referRelation(straightRelation, "source", "straight", Modality.MUST, fqnToPQuery)»
-                                «referRelation(divergentRelation, "source", "target", Modality.MUST, fqnToPQuery)»
-                                «referRelation(connectedToRelation, "source", "straight", Modality.MUST, fqnToPQuery)»
-                        } or {
-                                // tooManyExtraInputsOfTurnout unit propagation
-                                «commonParameterConstraints»
-                                «typeIndexer.referInstanceOf(turnoutType, Modality.MUST, "source")»
-                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "target")»
-                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "extraInput")»
-                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(TurnoutOutput.instance.fullyQualifiedName), #["source", "target"], Modality.MAY, false, false)»
-                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(ExtraInputOfTurnout.instance.fullyQualifiedName), #["source", "extraInput"], Modality.MUST, true, false)»
-                                target != extraInput;
+                                S == source;
+                                S == target;
                         }
                         
-                        pattern «MUST_NOT_CONNECTED_TO»(«parameters») {
-                                find «MUST_NOT_CONNECTED_TO_HELPER»(problem, interpretation, source, target);
+                        pattern outputReflexive_must_to_true_by_straight(«parameters», T : DefinedElement) {
+                                find turnoutOutput_must_to_true_by_straight(problem, interpretation, source, target, T, T);
+                        }
+                        
+                        pattern outputReflexive_must_to_true_by_divergent(«parameters», T : DefinedElement) {
+                                find turnoutOutput_must_to_true_by_divergent(problem, interpretation, source, target, T, T);
+                        }
+                        
+                        pattern turnoutOutputsAreSame_must_to_true_by_straight(«parameters», T : DefinedElement) {
+                                «commonMayParameterConstraints»
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MAY, "source")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                T == source;
+                                S == target;
+                                «referRelation(divergentRelation, "T", "S", Modality.MUST, fqnToPQuery)»
+                        }
+                        
+                        pattern turnoutOutputsAreSame_must_to_true_by_divergent(«parameters», T : DefinedElement) {
+                                «commonMayParameterConstraints»
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MAY, "source")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                T == source;
+                                S == target;
+                                «referRelation(straightRelation, "T", "S", Modality.MUST, fqnToPQuery)»
+                        }
+                        
+                        pattern tooManyInputsOfSegment_must_to_true_by_connectedTo(«parameters», S : DefinedElement) {
+                                find mustExist(problem, interpretation, S);
+                                «typeIndexer.referInstanceOf(simpleSegmentType, Modality.MUST, "S")»
+                                find output_must_to_true_by_connectedTo(problem, interpretation, source, target, I1, S);
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Output.instance.fullyQualifiedName), #["I2", "S"], Modality.MUST, true, false)»
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Output.instance.fullyQualifiedName), #["I3", "S"], Modality.MUST, true, false)»
+                                I1 != I2;
+                                I1 != I3;
+                                I2 != I3;
+                        }
+                        
+                        pattern tooManyInputsOfSegment_must_to_true_by_straight(«parameters», S : DefinedElement) {
+                                find mustExist(problem, interpretation, S);
+                                «typeIndexer.referInstanceOf(simpleSegmentType, Modality.MUST, "S")»
+                                find output_must_to_true_by_straight(problem, interpretation, source, target, I1, S);
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Output.instance.fullyQualifiedName), #["I2", "S"], Modality.MUST, true, false)»
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Output.instance.fullyQualifiedName), #["I3", "S"], Modality.MUST, true, false)»
+                                I1 != I2;
+                                I1 != I3;
+                                I2 != I3;
+                        }
+                        
+                        pattern tooManyInputsOfSegment_must_to_true_by_divergent(«parameters», S : DefinedElement) {
+                                find mustExist(problem, interpretation, S);
+                                «typeIndexer.referInstanceOf(simpleSegmentType, Modality.MUST, "S")»
+                                find output_must_to_true_by_divergent(problem, interpretation, source, target, I1, S);
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Output.instance.fullyQualifiedName), #["I2", "S"], Modality.MUST, true, false)»
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Output.instance.fullyQualifiedName), #["I3", "S"], Modality.MUST, true, false)»
+                                I1 != I2;
+                                I1 != I3;
+                                I2 != I3;
+                        }
+                        
+                        pattern turnoutConnectedToBothOutputs_must_to_true_by_connectedTo(«parameters», T : DefinedElement) {
+                                «commonMayParameterConstraints»
+                                find mustExist(problem, interpretation, Straight);
+                                find mustExist(problem, interpretation, Divergent);
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MAY, "source")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "Straight")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "Divergent")»
+                                «referRelation(straightRelation, "T", "Straight", Modality.MUST, fqnToPQuery)»
+                                «referRelation(divergentRelation, "T", "Divergent", Modality.MUST, fqnToPQuery)»
+                                T == source;
+                                Straight == target;
+                                «referRelation(connectedToRelation, "T", "Divergent", Modality.MUST, fqnToPQuery)»
                         } or {
-                                find «MUST_NOT_CONNECTED_TO_HELPER»(problem, interpretation, target, source);
+                                «commonMayParameterConstraints»
+                                find mustExist(problem, interpretation, Straight);
+                                find mustExist(problem, interpretation, Divergent);
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MAY, "source")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "Straight")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "Divergent")»
+                                «referRelation(straightRelation, "T", "Straight", Modality.MUST, fqnToPQuery)»
+                                «referRelation(divergentRelation, "T", "Divergent", Modality.MUST, fqnToPQuery)»
+                                «referRelation(connectedToRelation, "T", "Straight", Modality.MUST, fqnToPQuery)»
+                                T == source;
+                                Straight == target;
                         }
                         
-                        pattern «MUST_NOT_TURNOUT_OUTPUT»(«parameters») {
-                                // outputReflexive unit propagation
-                                «commonParameterConstraints»
-                                «typeIndexer.referInstanceOf(turnoutType, Modality.MUST, "source")»
-                                «typeIndexer.referInstanceOf(turnoutType, Modality.MUST, "target")»
-                                source == target;
+                        pattern turnoutConnectedToBothOutputs_must_to_true_by_straight(«parameters», T : DefinedElement) {
+                                «commonMayParameterConstraints»
+                                find mustExist(problem, interpretation, Straight);
+                                find mustExist(problem, interpretation, Divergent);
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MAY, "source")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "Straight")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "Divergent")»
+                                T == source;
+                                Straight == target;
+                                «referRelation(divergentRelation, "T", "Divergent", Modality.MUST, fqnToPQuery)»
+                                «referRelation(connectedToRelation, "T", "Straight", Modality.MUST, fqnToPQuery)»
+                                «referRelation(connectedToRelation, "T", "Divergent", Modality.MUST, fqnToPQuery)»
+                        }
+                        
+                        pattern turnoutConnectedToBothOutputs_must_to_true_by_divergent(«parameters», T : DefinedElement) {
+                                «commonMayParameterConstraints»
+                                find mustExist(problem, interpretation, Straight);
+                                find mustExist(problem, interpretation, Divergent);
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MAY, "source")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "Straight")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "Divergent")»
+                                «referRelation(straightRelation, "T", "Straight", Modality.MUST, fqnToPQuery)»
+                                T == source;
+                                Divergent == target;
+                                «referRelation(connectedToRelation, "T", "Straight", Modality.MUST, fqnToPQuery)»
+                                «referRelation(connectedToRelation, "T", "Divergent", Modality.MUST, fqnToPQuery)»
+                        }
+                        
+                        pattern tooManyInputsOfTurnout_must_to_true_by_connectedTo(«parameters», T : DefinedElement) {
+                                find mustExist(problem, interpretation, S);
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MUST, "S")»
+                                find adjacent_must_to_true_by_connectedTo(problem, interpretation, source, target, I1, S);
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Adjacent.instance.fullyQualifiedName), #["I2", "S"], Modality.MUST, true, false)»
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Adjacent.instance.fullyQualifiedName), #["I3", "S"], Modality.MUST, true, false)»
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Adjacent.instance.fullyQualifiedName), #["I4", "S"], Modality.MUST, true, false)»
+                                I1 != I2;
+                                I1 != I3;
+                                I1 != I4;
+                                I2 != I3;
+                                I2 != I4;
+                                I3 != I4;
+                        }
+                        
+                        pattern tooManyInputsOfTurnout_must_to_true_by_straight(«parameters», T : DefinedElement) {
+                                find mustExist(problem, interpretation, S);
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MUST, "S")»
+                                find adjacent_must_to_true_by_straight(problem, interpretation, source, target, I1, S);
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Adjacent.instance.fullyQualifiedName), #["I2", "S"], Modality.MUST, true, false)»
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Adjacent.instance.fullyQualifiedName), #["I3", "S"], Modality.MUST, true, false)»
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Adjacent.instance.fullyQualifiedName), #["I4", "S"], Modality.MUST, true, false)»
+                                I1 != I2;
+                                I1 != I3;
+                                I1 != I4;
+                                I2 != I3;
+                                I2 != I4;
+                                I3 != I4;
+                        }
+                        
+                        pattern tooManyInputsOfTurnout_must_to_true_by_divergent(«parameters», T : DefinedElement) {
+                                find mustExist(problem, interpretation, S);
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MUST, "S")»
+                                find adjacent_must_to_true_by_divergent(problem, interpretation, source, target, I1, S);
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Adjacent.instance.fullyQualifiedName), #["I2", "S"], Modality.MUST, true, false)»
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Adjacent.instance.fullyQualifiedName), #["I3", "S"], Modality.MUST, true, false)»
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Adjacent.instance.fullyQualifiedName), #["I4", "S"], Modality.MUST, true, false)»
+                                I1 != I2;
+                                I1 != I3;
+                                I1 != I4;
+                                I2 != I3;
+                                I2 != I4;
+                                I3 != I4;
+                        }
+                        
+                        pattern «MUST_NOT_CONNECTED_TO»_helper(«parameters») {
+                                find connectedToReflexive_must_to_true_by_connectedTo(problem, interpretation, source, target, _);
                         } or {
-                                // tooManyInputsOfSegment unit propagation
-                                «commonParameterConstraints»
-                                «typeIndexer.referInstanceOf(turnoutType, Modality.MUST, "source")»
-                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "target")»
-                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "input1")»
-                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "input2")»
-                                neg «typeIndexer.referInstanceOf(turnoutType, Modality.MAY, "target")»
-                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Output.instance.fullyQualifiedName), #["input1", "target"], Modality.MUST, true, false)»
-                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Output.instance.fullyQualifiedName), #["input2", "target"], Modality.MUST, true, false)»
-                                input1 != input2;
-                                input1 != source;
-                                input2 != source;
+                                find tooManyInputsOfSegment_must_to_true_by_connectedTo(problem, interpretation, source, target, _);
+                        } or {
+                                find turnoutConnectedToBothOutputs_must_to_true_by_connectedTo(problem, interpretation, source, target, _);
+                        } or {
+                                find tooManyInputsOfTurnout_must_to_true_by_connectedTo(problem, interpretation, source, target, _);
+                        }
+                        
+                        pattern «MUST_NOT_CONNECTED_TO»(«parameters») {
+                                find «MUST_NOT_CONNECTED_TO»_helper(problem, interpretation, source, target);
+                        } or {
+                                find «MUST_NOT_CONNECTED_TO»_helper(problem, interpretation, target, source);
                         }
                         
                         pattern «MUST_NOT_STRAIGHT»(«parameters») {
-                                find «MUST_NOT_TURNOUT_OUTPUT»(problem, interpretation, source, target);
-                        } or {
-                                // turnoutOutputsAreSame unit propagation
-                                «commonParameterConstraints»
-                                «typeIndexer.referInstanceOf(turnoutType, Modality.MUST, "source")»
-                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "target")»
-                                «referRelation(divergentRelation, "source", "target", Modality.MUST, fqnToPQuery)»
-                        } or {
-                                // turnoutConnectedToBothOutputs unit propagation
-                                «commonParameterConstraints»
-                                «typeIndexer.referInstanceOf(turnoutType, Modality.MUST, "source")»
-                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "target")»
-                                «typeIndexer.referInstanceOf(turnoutType, Modality.MUST, "divergent")»
-                                «referRelation(connectedToRelation, "source", "target", Modality.MUST, fqnToPQuery)»
-                                «referRelation(divergentRelation, "source", "divergent", Modality.MUST, fqnToPQuery)»
-                                «referRelation(connectedToRelation, "source", "divergent", Modality.MUST, fqnToPQuery)»
-                        } or {
-                                // tooManyExtraInputsOfTurnout unit propagation
-                                «commonParameterConstraints»
-                                «typeIndexer.referInstanceOf(turnoutType, Modality.MUST, "source")»
-                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "target")»
-                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "extraInput")»
-                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "potentialExtraInput")»
-                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(ExtraInputOfTurnout.instance.fullyQualifiedName), #["source", "extraInput"], Modality.MUST, true, false)»
-                                «referRelation(connectedToRelation, "source", "potentialExtraInput", Modality.MUST, fqnToPQuery)»
-                                neg «referRelation(divergentRelation, "source", "potentialExtraInput", Modality.MAY, fqnToPQuery)»
-                                extraInput != potentialExtraInput;
-                                extraInput != target;
-                                potentialExtraInput != target;
+                                find outputReflexive_must_to_true_by_straight(problem, interpretation, source, target, _);
+                        } or {
+                                find turnoutOutputsAreSame_must_to_true_by_straight(problem, interpretation, source, target, _);
+                        } or {
+                                find tooManyInputsOfSegment_must_to_true_by_straight(problem, interpretation, source, target, _);
+                        } or {
+                                find turnoutConnectedToBothOutputs_must_to_true_by_straight(problem, interpretation, source, target, _);
+                        } or {
+                                find tooManyInputsOfTurnout_must_to_true_by_straight(problem, interpretation, source, target, _);
                         }
                         
                         pattern «MUST_NOT_DIVERGENT»(«parameters») {
-                                find «MUST_NOT_TURNOUT_OUTPUT»(problem, interpretation, source, target);
-                        } or {
-                                // turnoutOutputsAreSame unit propagation
-                                «commonParameterConstraints»
-                                «typeIndexer.referInstanceOf(turnoutType, Modality.MUST, "source")»
-                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "target")»
-                                «referRelation(straightRelation, "source", "target", Modality.MUST, fqnToPQuery)»
-                        } or {
-                                // turnoutConnectedToBothOutputs unit propagation
-                                «commonParameterConstraints»
-                                «typeIndexer.referInstanceOf(turnoutType, Modality.MUST, "source")»
-                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "target")»
-                                «typeIndexer.referInstanceOf(turnoutType, Modality.MUST, "straight")»
-                                «referRelation(connectedToRelation, "source", "target", Modality.MUST, fqnToPQuery)»
-                                «referRelation(straightRelation, "source", "straight", Modality.MUST, fqnToPQuery)»
-                                «referRelation(connectedToRelation, "source", "straight", Modality.MUST, fqnToPQuery)»
-                        } or {
-                                // tooManyExtraInputsOfTurnout unit propagation
-                                «commonParameterConstraints»
-                                «typeIndexer.referInstanceOf(turnoutType, Modality.MUST, "source")»
-                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "target")»
-                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "extraInput")»
-                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "potentialExtraInput")»
-                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(ExtraInputOfTurnout.instance.fullyQualifiedName), #["source", "extraInput"], Modality.MUST, true, false)»
-                                «referRelation(connectedToRelation, "source", "potentialExtraInput", Modality.MUST, fqnToPQuery)»
-                                neg «referRelation(straightRelation, "source", "potentialExtraInput", Modality.MAY, fqnToPQuery)»
-                                extraInput != potentialExtraInput;
-                                extraInput != target;
-                                potentialExtraInput != target;
+                                find outputReflexive_must_to_true_by_divergent(problem, interpretation, source, target, _);
+                        } or {
+                                find turnoutOutputsAreSame_must_to_true_by_divergent(problem, interpretation, source, target, _);
+                        } or {
+                                find tooManyInputsOfSegment_must_to_true_by_divergent(problem, interpretation, source, target, _);
+                        } or {
+                                find turnoutConnectedToBothOutputs_must_to_true_by_divergent(problem, interpretation, source, target, _);
+                        } or {
+                                find tooManyInputsOfTurnout_must_to_true_by_divergent(problem, interpretation, source, target, _);
                         }
                 '''
         }
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/.gitignore b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/.gitignore
index e3a0ad7e..b3e38571 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/.gitignore
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/.gitignore
@@ -24,3 +24,10 @@
 /.ExtraInputOfTurnout.java._trace
 /.NoExtraInputOfTurnout.java._trace
 /.TooManyExtraInputsOfTurnout.java._trace
+/.TooManyInputsOfTurnout.java._trace
+/.NonDivergentInputOfTurnout.java._trace
+/.NonStraightInputOfTurnout.java._trace
+/.TooManyNonDivergentInputsOfTurnout.java._trace
+/.TooManyNonStraightInputsOfTurnout.java._trace
+/.InputsOfTurnout.java._trace
+/.TooFewInputsOfTurnout.java._trace
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/ExtraInputOfTurnout.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/ExtraInputOfTurnout.java
deleted file mode 100644
index 62e2a54d..00000000
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/ExtraInputOfTurnout.java
+++ /dev/null
@@ -1,730 +0,0 @@
-/**
- * Generated from platform:/resource/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
- */
-package modes3.queries;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import modes3.Segment;
-import modes3.Turnout;
-import modes3.queries.Output;
-import org.apache.log4j.Logger;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.query.runtime.api.IPatternMatch;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Inequality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-
-/**
- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         pattern extraInputOfTurnout(T : Turnout, S : Segment) {
- *              Turnout.straight(T, Straight);
- *              Turnout.divergent(T, Divergent);
- *              find output(S, T);
- *              S != Straight;
- *              S != Divergent;
- *         }
- * </pre></code>
- * 
- * @see Matcher
- * @see Match
- * 
- */
-@SuppressWarnings("all")
-public final class ExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecification<ExtraInputOfTurnout.Matcher> {
-  /**
-   * Pattern-specific match representation of the modes3.queries.extraInputOfTurnout pattern,
-   * to be used in conjunction with {@link Matcher}.
-   * 
-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
-   * Each instance is a (possibly partial) substitution of pattern parameters,
-   * usable to represent a match of the pattern in the result of a query,
-   * or to specify the bound (fixed) input parameters when issuing a query.
-   * 
-   * @see Matcher
-   * 
-   */
-  public static abstract class Match extends BasePatternMatch {
-    private Turnout fT;
-    
-    private Segment fS;
-    
-    private static List<String> parameterNames = makeImmutableList("T", "S");
-    
-    private Match(final Turnout pT, final Segment pS) {
-      this.fT = pT;
-      this.fS = pS;
-    }
-    
-    @Override
-    public Object get(final String parameterName) {
-      switch(parameterName) {
-          case "T": return this.fT;
-          case "S": return this.fS;
-          default: return null;
-      }
-    }
-    
-    @Override
-    public Object get(final int index) {
-      switch(index) {
-          case 0: return this.fT;
-          case 1: return this.fS;
-          default: return null;
-      }
-    }
-    
-    public Turnout getT() {
-      return this.fT;
-    }
-    
-    public Segment getS() {
-      return this.fS;
-    }
-    
-    @Override
-    public boolean set(final String parameterName, final Object newValue) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      if ("T".equals(parameterName) ) {
-          this.fT = (Turnout) newValue;
-          return true;
-      }
-      if ("S".equals(parameterName) ) {
-          this.fS = (Segment) newValue;
-          return true;
-      }
-      return false;
-    }
-    
-    public void setT(final Turnout pT) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      this.fT = pT;
-    }
-    
-    public void setS(final Segment pS) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      this.fS = pS;
-    }
-    
-    @Override
-    public String patternName() {
-      return "modes3.queries.extraInputOfTurnout";
-    }
-    
-    @Override
-    public List<String> parameterNames() {
-      return ExtraInputOfTurnout.Match.parameterNames;
-    }
-    
-    @Override
-    public Object[] toArray() {
-      return new Object[]{fT, fS};
-    }
-    
-    @Override
-    public ExtraInputOfTurnout.Match toImmutable() {
-      return isMutable() ? newMatch(fT, fS) : this;
-    }
-    
-    @Override
-    public String prettyPrint() {
-      StringBuilder result = new StringBuilder();
-      result.append("\"T\"=" + prettyPrintValue(fT) + ", ");
-      result.append("\"S\"=" + prettyPrintValue(fS));
-      return result.toString();
-    }
-    
-    @Override
-    public int hashCode() {
-      return Objects.hash(fT, fS);
-    }
-    
-    @Override
-    public boolean equals(final Object obj) {
-      if (this == obj)
-          return true;
-      if (obj == null) {
-          return false;
-      }
-      if ((obj instanceof ExtraInputOfTurnout.Match)) {
-          ExtraInputOfTurnout.Match other = (ExtraInputOfTurnout.Match) obj;
-          return Objects.equals(fT, other.fT) && Objects.equals(fS, other.fS);
-      } else {
-          // this should be infrequent
-          if (!(obj instanceof IPatternMatch)) {
-              return false;
-          }
-          IPatternMatch otherSig  = (IPatternMatch) obj;
-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
-      }
-    }
-    
-    @Override
-    public ExtraInputOfTurnout specification() {
-      return ExtraInputOfTurnout.instance();
-    }
-    
-    /**
-     * Returns an empty, mutable match.
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-     * 
-     * @return the empty match.
-     * 
-     */
-    public static ExtraInputOfTurnout.Match newEmptyMatch() {
-      return new Mutable(null, null);
-    }
-    
-    /**
-     * Returns a mutable (partial) match.
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-     * 
-     * @param pT the fixed value of pattern parameter T, or null if not bound.
-     * @param pS the fixed value of pattern parameter S, or null if not bound.
-     * @return the new, mutable (partial) match object.
-     * 
-     */
-    public static ExtraInputOfTurnout.Match newMutableMatch(final Turnout pT, final Segment pS) {
-      return new Mutable(pT, pS);
-    }
-    
-    /**
-     * Returns a new (partial) match.
-     * This can be used e.g. to call the matcher with a partial match.
-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-     * @param pT the fixed value of pattern parameter T, or null if not bound.
-     * @param pS the fixed value of pattern parameter S, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public static ExtraInputOfTurnout.Match newMatch(final Turnout pT, final Segment pS) {
-      return new Immutable(pT, pS);
-    }
-    
-    private static final class Mutable extends ExtraInputOfTurnout.Match {
-      Mutable(final Turnout pT, final Segment pS) {
-        super(pT, pS);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return true;
-      }
-    }
-    
-    private static final class Immutable extends ExtraInputOfTurnout.Match {
-      Immutable(final Turnout pT, final Segment pS) {
-        super(pT, pS);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return false;
-      }
-    }
-  }
-  
-  /**
-   * Generated pattern matcher API of the modes3.queries.extraInputOfTurnout pattern,
-   * providing pattern-specific query methods.
-   * 
-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
-   * 
-   * <p>Matches of the pattern will be represented as {@link Match}.
-   * 
-   * <p>Original source:
-   * <code><pre>
-   * pattern extraInputOfTurnout(T : Turnout, S : Segment) {
-   *    Turnout.straight(T, Straight);
-   *    Turnout.divergent(T, Divergent);
-   *    find output(S, T);
-   *    S != Straight;
-   *    S != Divergent;
-   * }
-   * </pre></code>
-   * 
-   * @see Match
-   * @see ExtraInputOfTurnout
-   * 
-   */
-  public static class Matcher extends BaseMatcher<ExtraInputOfTurnout.Match> {
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    public static ExtraInputOfTurnout.Matcher on(final ViatraQueryEngine engine) {
-      // check if matcher already exists
-      Matcher matcher = engine.getExistingMatcher(querySpecification());
-      if (matcher == null) {
-          matcher = (Matcher)engine.getMatcher(querySpecification());
-      }
-      return matcher;
-    }
-    
-    /**
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * @return an initialized matcher
-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
-     * 
-     */
-    public static ExtraInputOfTurnout.Matcher create() {
-      return new Matcher();
-    }
-    
-    private static final int POSITION_T = 0;
-    
-    private static final int POSITION_S = 1;
-    
-    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(ExtraInputOfTurnout.Matcher.class);
-    
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    private Matcher() {
-      super(querySpecification());
-    }
-    
-    /**
-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pT the fixed value of pattern parameter T, or null if not bound.
-     * @param pS the fixed value of pattern parameter S, or null if not bound.
-     * @return matches represented as a Match object.
-     * 
-     */
-    public Collection<ExtraInputOfTurnout.Match> getAllMatches(final Turnout pT, final Segment pS) {
-      return rawStreamAllMatches(new Object[]{pT, pS}).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     * @param pT the fixed value of pattern parameter T, or null if not bound.
-     * @param pS the fixed value of pattern parameter S, or null if not bound.
-     * @return a stream of matches represented as a Match object.
-     * 
-     */
-    public Stream<ExtraInputOfTurnout.Match> streamAllMatches(final Turnout pT, final Segment pS) {
-      return rawStreamAllMatches(new Object[]{pT, pS});
-    }
-    
-    /**
-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-     * Neither determinism nor randomness of selection is guaranteed.
-     * @param pT the fixed value of pattern parameter T, or null if not bound.
-     * @param pS the fixed value of pattern parameter S, or null if not bound.
-     * @return a match represented as a Match object, or null if no match is found.
-     * 
-     */
-    public Optional<ExtraInputOfTurnout.Match> getOneArbitraryMatch(final Turnout pT, final Segment pS) {
-      return rawGetOneArbitraryMatch(new Object[]{pT, pS});
-    }
-    
-    /**
-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
-     * under any possible substitution of the unspecified parameters (if any).
-     * @param pT the fixed value of pattern parameter T, or null if not bound.
-     * @param pS the fixed value of pattern parameter S, or null if not bound.
-     * @return true if the input is a valid (partial) match of the pattern.
-     * 
-     */
-    public boolean hasMatch(final Turnout pT, final Segment pS) {
-      return rawHasMatch(new Object[]{pT, pS});
-    }
-    
-    /**
-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pT the fixed value of pattern parameter T, or null if not bound.
-     * @param pS the fixed value of pattern parameter S, or null if not bound.
-     * @return the number of pattern matches found.
-     * 
-     */
-    public int countMatches(final Turnout pT, final Segment pS) {
-      return rawCountMatches(new Object[]{pT, pS});
-    }
-    
-    /**
-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-     * Neither determinism nor randomness of selection is guaranteed.
-     * @param pT the fixed value of pattern parameter T, or null if not bound.
-     * @param pS the fixed value of pattern parameter S, or null if not bound.
-     * @param processor the action that will process the selected match.
-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
-     * 
-     */
-    public boolean forOneArbitraryMatch(final Turnout pT, final Segment pS, final Consumer<? super ExtraInputOfTurnout.Match> processor) {
-      return rawForOneArbitraryMatch(new Object[]{pT, pS}, processor);
-    }
-    
-    /**
-     * Returns a new (partial) match.
-     * This can be used e.g. to call the matcher with a partial match.
-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-     * @param pT the fixed value of pattern parameter T, or null if not bound.
-     * @param pS the fixed value of pattern parameter S, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public ExtraInputOfTurnout.Match newMatch(final Turnout pT, final Segment pS) {
-      return ExtraInputOfTurnout.Match.newMatch(pT, pS);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for T.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    protected Stream<Turnout> rawStreamAllValuesOfT(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_T, parameters).map(Turnout.class::cast);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for T.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<Turnout> getAllValuesOfT() {
-      return rawStreamAllValuesOfT(emptyArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for T.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<Turnout> streamAllValuesOfT() {
-      return rawStreamAllValuesOfT(emptyArray());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for T.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     *      
-     * @return the Stream of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<Turnout> streamAllValuesOfT(final ExtraInputOfTurnout.Match partialMatch) {
-      return rawStreamAllValuesOfT(partialMatch.toArray());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for T.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     *      
-     * @return the Stream of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<Turnout> streamAllValuesOfT(final Segment pS) {
-      return rawStreamAllValuesOfT(new Object[]{null, pS});
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for T.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<Turnout> getAllValuesOfT(final ExtraInputOfTurnout.Match partialMatch) {
-      return rawStreamAllValuesOfT(partialMatch.toArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for T.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<Turnout> getAllValuesOfT(final Segment pS) {
-      return rawStreamAllValuesOfT(new Object[]{null, pS}).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for S.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    protected Stream<Segment> rawStreamAllValuesOfS(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_S, parameters).map(Segment.class::cast);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for S.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<Segment> getAllValuesOfS() {
-      return rawStreamAllValuesOfS(emptyArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for S.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<Segment> streamAllValuesOfS() {
-      return rawStreamAllValuesOfS(emptyArray());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for S.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     *      
-     * @return the Stream of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<Segment> streamAllValuesOfS(final ExtraInputOfTurnout.Match partialMatch) {
-      return rawStreamAllValuesOfS(partialMatch.toArray());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for S.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     *      
-     * @return the Stream of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<Segment> streamAllValuesOfS(final Turnout pT) {
-      return rawStreamAllValuesOfS(new Object[]{pT, null});
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for S.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<Segment> getAllValuesOfS(final ExtraInputOfTurnout.Match partialMatch) {
-      return rawStreamAllValuesOfS(partialMatch.toArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for S.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<Segment> getAllValuesOfS(final Turnout pT) {
-      return rawStreamAllValuesOfS(new Object[]{pT, null}).collect(Collectors.toSet());
-    }
-    
-    @Override
-    protected ExtraInputOfTurnout.Match tupleToMatch(final Tuple t) {
-      try {
-          return ExtraInputOfTurnout.Match.newMatch((Turnout) t.get(POSITION_T), (Segment) t.get(POSITION_S));
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in tuple not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected ExtraInputOfTurnout.Match arrayToMatch(final Object[] match) {
-      try {
-          return ExtraInputOfTurnout.Match.newMatch((Turnout) match[POSITION_T], (Segment) match[POSITION_S]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected ExtraInputOfTurnout.Match arrayToMatchMutable(final Object[] match) {
-      try {
-          return ExtraInputOfTurnout.Match.newMutableMatch((Turnout) match[POSITION_T], (Segment) match[POSITION_S]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    /**
-     * @return the singleton instance of the query specification of this pattern
-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-     * 
-     */
-    public static IQuerySpecification<ExtraInputOfTurnout.Matcher> querySpecification() {
-      return ExtraInputOfTurnout.instance();
-    }
-  }
-  
-  private ExtraInputOfTurnout() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static ExtraInputOfTurnout instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  @Override
-  protected ExtraInputOfTurnout.Matcher instantiate(final ViatraQueryEngine engine) {
-    return ExtraInputOfTurnout.Matcher.on(engine);
-  }
-  
-  @Override
-  public ExtraInputOfTurnout.Matcher instantiate() {
-    return ExtraInputOfTurnout.Matcher.create();
-  }
-  
-  @Override
-  public ExtraInputOfTurnout.Match newEmptyMatch() {
-    return ExtraInputOfTurnout.Match.newEmptyMatch();
-  }
-  
-  @Override
-  public ExtraInputOfTurnout.Match newMatch(final Object... parameters) {
-    return ExtraInputOfTurnout.Match.newMatch((modes3.Turnout) parameters[0], (modes3.Segment) parameters[1]);
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link ExtraInputOfTurnout} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link ExtraInputOfTurnout#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final ExtraInputOfTurnout INSTANCE = new ExtraInputOfTurnout();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final ExtraInputOfTurnout.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_T = new PParameter("T", "modes3.Turnout", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")), PParameterDirection.INOUT);
-    
-    private final PParameter parameter_S = new PParameter("S", "modes3.Segment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Segment")), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_T, parameter_S);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PUBLIC);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "modes3.queries.extraInputOfTurnout";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("T","S");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_T = body.getOrCreateVariableByName("T");
-          PVariable var_S = body.getOrCreateVariableByName("S");
-          PVariable var_Straight = body.getOrCreateVariableByName("Straight");
-          PVariable var_Divergent = body.getOrCreateVariableByName("Divergent");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var_S), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_T, parameter_T),
-             new ExportedParameter(body, var_S, parameter_S)
-          ));
-          //    Turnout.straight(T, Straight)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")));
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_T, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout", "straight")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
-          new Equality(body, var__virtual_0_, var_Straight);
-          //    Turnout.divergent(T, Divergent)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")));
-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_T, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout", "divergent")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
-          new Equality(body, var__virtual_1_, var_Divergent);
-          //    find output(S, T)
-          new PositivePatternCall(body, Tuples.flatTupleOf(var_S, var_T), Output.instance().getInternalQueryRepresentation());
-          //    S != Straight
-          new Inequality(body, var_S, var_Straight);
-          //    S != Divergent
-          new Inequality(body, var_S, var_Divergent);
-          bodies.add(body);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TurnoutInSegments.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/InputsOfTurnout.java
index 9c9a5d18..2f2eea11 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TurnoutInSegments.java
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/InputsOfTurnout.java
@@ -14,6 +14,7 @@ import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import modes3.Turnout;
+import modes3.queries.Adjacent;
 import org.apache.log4j.Logger;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.viatra.query.runtime.api.IPatternMatch;
@@ -24,14 +25,12 @@ import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificat
 import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
 import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
 import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
 import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
 import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
 import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
 import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Inequality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
 import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
 import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
 import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
@@ -45,9 +44,13 @@ import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
  * 
  * <p>Original source:
  *         <code><pre>
- *         {@literal @}Constraint(message = "turnoutInSegments", severity = "error", key = { T })
- *         pattern turnoutInSegments(T : Turnout) {
- *              Modes3ModelRoot.segments(_, T);
+ *         pattern inputsOfTurnout(T : Turnout) {
+ *              find adjacent(I1, T);
+ *              find adjacent(I2, T);
+ *              find adjacent(I3, T);
+ *              I1 != I2;
+ *              I1 != I3;
+ *              I2 != I3;
  *         }
  * </pre></code>
  * 
@@ -56,9 +59,9 @@ import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
  * 
  */
 @SuppressWarnings("all")
-public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<TurnoutInSegments.Matcher> {
+public final class InputsOfTurnout extends BaseGeneratedEMFQuerySpecification<InputsOfTurnout.Matcher> {
   /**
-   * Pattern-specific match representation of the modes3.queries.turnoutInSegments pattern,
+   * Pattern-specific match representation of the modes3.queries.inputsOfTurnout pattern,
    * to be used in conjunction with {@link Matcher}.
    * 
    * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
@@ -115,12 +118,12 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
     
     @Override
     public String patternName() {
-      return "modes3.queries.turnoutInSegments";
+      return "modes3.queries.inputsOfTurnout";
     }
     
     @Override
     public List<String> parameterNames() {
-      return TurnoutInSegments.Match.parameterNames;
+      return InputsOfTurnout.Match.parameterNames;
     }
     
     @Override
@@ -129,7 +132,7 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
     }
     
     @Override
-    public TurnoutInSegments.Match toImmutable() {
+    public InputsOfTurnout.Match toImmutable() {
       return isMutable() ? newMatch(fT) : this;
     }
     
@@ -152,8 +155,8 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
       if (obj == null) {
           return false;
       }
-      if ((obj instanceof TurnoutInSegments.Match)) {
-          TurnoutInSegments.Match other = (TurnoutInSegments.Match) obj;
+      if ((obj instanceof InputsOfTurnout.Match)) {
+          InputsOfTurnout.Match other = (InputsOfTurnout.Match) obj;
           return Objects.equals(fT, other.fT);
       } else {
           // this should be infrequent
@@ -166,8 +169,8 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
     }
     
     @Override
-    public TurnoutInSegments specification() {
-      return TurnoutInSegments.instance();
+    public InputsOfTurnout specification() {
+      return InputsOfTurnout.instance();
     }
     
     /**
@@ -177,7 +180,7 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
      * @return the empty match.
      * 
      */
-    public static TurnoutInSegments.Match newEmptyMatch() {
+    public static InputsOfTurnout.Match newEmptyMatch() {
       return new Mutable(null);
     }
     
@@ -189,7 +192,7 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
      * @return the new, mutable (partial) match object.
      * 
      */
-    public static TurnoutInSegments.Match newMutableMatch(final Turnout pT) {
+    public static InputsOfTurnout.Match newMutableMatch(final Turnout pT) {
       return new Mutable(pT);
     }
     
@@ -201,11 +204,11 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
      * @return the (partial) match object.
      * 
      */
-    public static TurnoutInSegments.Match newMatch(final Turnout pT) {
+    public static InputsOfTurnout.Match newMatch(final Turnout pT) {
       return new Immutable(pT);
     }
     
-    private static final class Mutable extends TurnoutInSegments.Match {
+    private static final class Mutable extends InputsOfTurnout.Match {
       Mutable(final Turnout pT) {
         super(pT);
       }
@@ -216,7 +219,7 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
       }
     }
     
-    private static final class Immutable extends TurnoutInSegments.Match {
+    private static final class Immutable extends InputsOfTurnout.Match {
       Immutable(final Turnout pT) {
         super(pT);
       }
@@ -229,7 +232,7 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
   }
   
   /**
-   * Generated pattern matcher API of the modes3.queries.turnoutInSegments pattern,
+   * Generated pattern matcher API of the modes3.queries.inputsOfTurnout pattern,
    * providing pattern-specific query methods.
    * 
    * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
@@ -239,17 +242,21 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
    * 
    * <p>Original source:
    * <code><pre>
-   * {@literal @}Constraint(message = "turnoutInSegments", severity = "error", key = { T })
-   * pattern turnoutInSegments(T : Turnout) {
-   *    Modes3ModelRoot.segments(_, T);
+   * pattern inputsOfTurnout(T : Turnout) {
+   *    find adjacent(I1, T);
+   *    find adjacent(I2, T);
+   *    find adjacent(I3, T);
+   *    I1 != I2;
+   *    I1 != I3;
+   *    I2 != I3;
    * }
    * </pre></code>
    * 
    * @see Match
-   * @see TurnoutInSegments
+   * @see InputsOfTurnout
    * 
    */
-  public static class Matcher extends BaseMatcher<TurnoutInSegments.Match> {
+  public static class Matcher extends BaseMatcher<InputsOfTurnout.Match> {
     /**
      * Initializes the pattern matcher within an existing VIATRA Query engine.
      * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
@@ -258,7 +265,7 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
      * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
      * 
      */
-    public static TurnoutInSegments.Matcher on(final ViatraQueryEngine engine) {
+    public static InputsOfTurnout.Matcher on(final ViatraQueryEngine engine) {
       // check if matcher already exists
       Matcher matcher = engine.getExistingMatcher(querySpecification());
       if (matcher == null) {
@@ -273,13 +280,13 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
      * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
      * 
      */
-    public static TurnoutInSegments.Matcher create() {
+    public static InputsOfTurnout.Matcher create() {
       return new Matcher();
     }
     
     private static final int POSITION_T = 0;
     
-    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(TurnoutInSegments.Matcher.class);
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(InputsOfTurnout.Matcher.class);
     
     /**
      * Initializes the pattern matcher within an existing VIATRA Query engine.
@@ -299,7 +306,7 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
      * @return matches represented as a Match object.
      * 
      */
-    public Collection<TurnoutInSegments.Match> getAllMatches(final Turnout pT) {
+    public Collection<InputsOfTurnout.Match> getAllMatches(final Turnout pT) {
       return rawStreamAllMatches(new Object[]{pT}).collect(Collectors.toSet());
     }
     
@@ -313,7 +320,7 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
      * @return a stream of matches represented as a Match object.
      * 
      */
-    public Stream<TurnoutInSegments.Match> streamAllMatches(final Turnout pT) {
+    public Stream<InputsOfTurnout.Match> streamAllMatches(final Turnout pT) {
       return rawStreamAllMatches(new Object[]{pT});
     }
     
@@ -324,7 +331,7 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
      * @return a match represented as a Match object, or null if no match is found.
      * 
      */
-    public Optional<TurnoutInSegments.Match> getOneArbitraryMatch(final Turnout pT) {
+    public Optional<InputsOfTurnout.Match> getOneArbitraryMatch(final Turnout pT) {
       return rawGetOneArbitraryMatch(new Object[]{pT});
     }
     
@@ -357,7 +364,7 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
      * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
      * 
      */
-    public boolean forOneArbitraryMatch(final Turnout pT, final Consumer<? super TurnoutInSegments.Match> processor) {
+    public boolean forOneArbitraryMatch(final Turnout pT, final Consumer<? super InputsOfTurnout.Match> processor) {
       return rawForOneArbitraryMatch(new Object[]{pT}, processor);
     }
     
@@ -369,8 +376,8 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
      * @return the (partial) match object.
      * 
      */
-    public TurnoutInSegments.Match newMatch(final Turnout pT) {
-      return TurnoutInSegments.Match.newMatch(pT);
+    public InputsOfTurnout.Match newMatch(final Turnout pT) {
+      return InputsOfTurnout.Match.newMatch(pT);
     }
     
     /**
@@ -401,9 +408,9 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
     }
     
     @Override
-    protected TurnoutInSegments.Match tupleToMatch(final Tuple t) {
+    protected InputsOfTurnout.Match tupleToMatch(final Tuple t) {
       try {
-          return TurnoutInSegments.Match.newMatch((Turnout) t.get(POSITION_T));
+          return InputsOfTurnout.Match.newMatch((Turnout) t.get(POSITION_T));
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in tuple not properly typed!",e);
           return null;
@@ -411,9 +418,9 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
     }
     
     @Override
-    protected TurnoutInSegments.Match arrayToMatch(final Object[] match) {
+    protected InputsOfTurnout.Match arrayToMatch(final Object[] match) {
       try {
-          return TurnoutInSegments.Match.newMatch((Turnout) match[POSITION_T]);
+          return InputsOfTurnout.Match.newMatch((Turnout) match[POSITION_T]);
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in array not properly typed!",e);
           return null;
@@ -421,9 +428,9 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
     }
     
     @Override
-    protected TurnoutInSegments.Match arrayToMatchMutable(final Object[] match) {
+    protected InputsOfTurnout.Match arrayToMatchMutable(final Object[] match) {
       try {
-          return TurnoutInSegments.Match.newMutableMatch((Turnout) match[POSITION_T]);
+          return InputsOfTurnout.Match.newMutableMatch((Turnout) match[POSITION_T]);
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in array not properly typed!",e);
           return null;
@@ -435,12 +442,12 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
      * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
      * 
      */
-    public static IQuerySpecification<TurnoutInSegments.Matcher> querySpecification() {
-      return TurnoutInSegments.instance();
+    public static IQuerySpecification<InputsOfTurnout.Matcher> querySpecification() {
+      return InputsOfTurnout.instance();
     }
   }
   
-  private TurnoutInSegments() {
+  private InputsOfTurnout() {
     super(GeneratedPQuery.INSTANCE);
   }
   
@@ -449,7 +456,7 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
    * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
    * 
    */
-  public static TurnoutInSegments instance() {
+  public static InputsOfTurnout instance() {
     try{
         return LazyHolder.INSTANCE;
     } catch (ExceptionInInitializerError err) {
@@ -458,35 +465,35 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
   }
   
   @Override
-  protected TurnoutInSegments.Matcher instantiate(final ViatraQueryEngine engine) {
-    return TurnoutInSegments.Matcher.on(engine);
+  protected InputsOfTurnout.Matcher instantiate(final ViatraQueryEngine engine) {
+    return InputsOfTurnout.Matcher.on(engine);
   }
   
   @Override
-  public TurnoutInSegments.Matcher instantiate() {
-    return TurnoutInSegments.Matcher.create();
+  public InputsOfTurnout.Matcher instantiate() {
+    return InputsOfTurnout.Matcher.create();
   }
   
   @Override
-  public TurnoutInSegments.Match newEmptyMatch() {
-    return TurnoutInSegments.Match.newEmptyMatch();
+  public InputsOfTurnout.Match newEmptyMatch() {
+    return InputsOfTurnout.Match.newEmptyMatch();
   }
   
   @Override
-  public TurnoutInSegments.Match newMatch(final Object... parameters) {
-    return TurnoutInSegments.Match.newMatch((modes3.Turnout) parameters[0]);
+  public InputsOfTurnout.Match newMatch(final Object... parameters) {
+    return InputsOfTurnout.Match.newMatch((modes3.Turnout) parameters[0]);
   }
   
   /**
-   * Inner class allowing the singleton instance of {@link TurnoutInSegments} to be created 
+   * Inner class allowing the singleton instance of {@link InputsOfTurnout} to be created 
    *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link TurnoutInSegments#instance()}.
+   *     but rather at the first call to {@link InputsOfTurnout#instance()}.
    * 
    * <p> This workaround is required e.g. to support recursion.
    * 
    */
   private static class LazyHolder {
-    private static final TurnoutInSegments INSTANCE = new TurnoutInSegments();
+    private static final InputsOfTurnout INSTANCE = new InputsOfTurnout();
     
     /**
      * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
@@ -504,7 +511,7 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
   }
   
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final TurnoutInSegments.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    private static final InputsOfTurnout.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
     private final PParameter parameter_T = new PParameter("T", "modes3.Turnout", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")), PParameterDirection.INOUT);
     
@@ -516,7 +523,7 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
     
     @Override
     public String getFullyQualifiedName() {
-      return "modes3.queries.turnoutInSegments";
+      return "modes3.queries.inputsOfTurnout";
     }
     
     @Override
@@ -536,28 +543,27 @@ public final class TurnoutInSegments extends BaseGeneratedEMFQuerySpecification<
       {
           PBody body = new PBody(this);
           PVariable var_T = body.getOrCreateVariableByName("T");
-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
+          PVariable var_I1 = body.getOrCreateVariableByName("I1");
+          PVariable var_I2 = body.getOrCreateVariableByName("I2");
+          PVariable var_I3 = body.getOrCreateVariableByName("I3");
           new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")));
           body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
              new ExportedParameter(body, var_T, parameter_T)
           ));
-          //    Modes3ModelRoot.segments(_, T)
-          new TypeConstraint(body, Tuples.flatTupleOf(var___0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Modes3ModelRoot")));
-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
-          new TypeConstraint(body, Tuples.flatTupleOf(var___0_, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Modes3ModelRoot", "segments")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
-          new Equality(body, var__virtual_0_, var_T);
+          //    find adjacent(I1, T)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_I1, var_T), Adjacent.instance().getInternalQueryRepresentation());
+          //    find adjacent(I2, T)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_I2, var_T), Adjacent.instance().getInternalQueryRepresentation());
+          //    find adjacent(I3, T)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_I3, var_T), Adjacent.instance().getInternalQueryRepresentation());
+          //    I1 != I2
+          new Inequality(body, var_I1, var_I2);
+          //    I1 != I3
+          new Inequality(body, var_I1, var_I3);
+          //    I2 != I3
+          new Inequality(body, var_I2, var_I3);
           bodies.add(body);
       }
-      {
-          PAnnotation annotation = new PAnnotation("Constraint");
-          annotation.addAttribute("message", "turnoutInSegments");
-          annotation.addAttribute("severity", "error");
-          annotation.addAttribute("key", Arrays.asList(new Object[] {
-                              new ParameterReference("T")
-                              }));
-          addAnnotation(annotation);
-      }
       return bodies;
     }
   }
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/Modes3Queries.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/Modes3Queries.java
index 01ec77a1..6e244430 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/Modes3Queries.java
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/Modes3Queries.java
@@ -7,16 +7,14 @@ import modes3.queries.Adjacent;
 import modes3.queries.ConnectedTo;
 import modes3.queries.ConnectedToNotSymmetric;
 import modes3.queries.ConnectedToReflexive;
-import modes3.queries.ExtraInputOfTurnout;
-import modes3.queries.NoExtraInputOfTurnout;
+import modes3.queries.InputsOfTurnout;
 import modes3.queries.Output;
 import modes3.queries.OutputReflexive;
 import modes3.queries.Reachable;
-import modes3.queries.TooManyExtraInputsOfTurnout;
+import modes3.queries.TooFewInputsOfTurnout;
 import modes3.queries.TooManyInputsOfSegment;
-import modes3.queries.Turnout;
+import modes3.queries.TooManyInputsOfTurnout;
 import modes3.queries.TurnoutConnectedToBothOutputs;
-import modes3.queries.TurnoutInSegments;
 import modes3.queries.TurnoutOutput;
 import modes3.queries.TurnoutOutputsAreSame;
 import modes3.queries.Unreachable;
@@ -31,21 +29,19 @@ import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedPatternGroup;
  * in order to achieve better performance than one-by-one on-demand matcher initialization.
  * 
  * <p> From package modes3.queries, the group contains the definition of the following patterns: <ul>
- * <li>turnoutInSegments</li>
  * <li>connectedTo</li>
  * <li>connectedToNotSymmetric</li>
  * <li>connectedToReflexive</li>
  * <li>turnoutOutput</li>
  * <li>outputReflexive</li>
  * <li>turnoutOutputsAreSame</li>
- * <li>turnout</li>
  * <li>output</li>
  * <li>tooManyInputsOfSegment</li>
  * <li>turnoutConnectedToBothOutputs</li>
- * <li>extraInputOfTurnout</li>
- * <li>noExtraInputOfTurnout</li>
- * <li>tooManyExtraInputsOfTurnout</li>
  * <li>adjacent</li>
+ * <li>tooManyInputsOfTurnout</li>
+ * <li>inputsOfTurnout</li>
+ * <li>tooFewInputsOfTurnout</li>
  * <li>reachable</li>
  * <li>unreachable</li>
  * </ul>
@@ -72,33 +68,23 @@ public final class Modes3Queries extends BaseGeneratedPatternGroup {
   private static Modes3Queries INSTANCE;
   
   private Modes3Queries() {
-    querySpecifications.add(TurnoutInSegments.instance());
     querySpecifications.add(ConnectedTo.instance());
     querySpecifications.add(ConnectedToNotSymmetric.instance());
     querySpecifications.add(ConnectedToReflexive.instance());
     querySpecifications.add(TurnoutOutput.instance());
     querySpecifications.add(OutputReflexive.instance());
     querySpecifications.add(TurnoutOutputsAreSame.instance());
-    querySpecifications.add(Turnout.instance());
     querySpecifications.add(Output.instance());
     querySpecifications.add(TooManyInputsOfSegment.instance());
     querySpecifications.add(TurnoutConnectedToBothOutputs.instance());
-    querySpecifications.add(ExtraInputOfTurnout.instance());
-    querySpecifications.add(NoExtraInputOfTurnout.instance());
-    querySpecifications.add(TooManyExtraInputsOfTurnout.instance());
     querySpecifications.add(Adjacent.instance());
+    querySpecifications.add(TooManyInputsOfTurnout.instance());
+    querySpecifications.add(InputsOfTurnout.instance());
+    querySpecifications.add(TooFewInputsOfTurnout.instance());
     querySpecifications.add(Reachable.instance());
     querySpecifications.add(Unreachable.instance());
   }
   
-  public TurnoutInSegments getTurnoutInSegments() {
-    return TurnoutInSegments.instance();
-  }
-  
-  public TurnoutInSegments.Matcher getTurnoutInSegments(final ViatraQueryEngine engine) {
-    return TurnoutInSegments.Matcher.on(engine);
-  }
-  
   public ConnectedTo getConnectedTo() {
     return ConnectedTo.instance();
   }
@@ -147,14 +133,6 @@ public final class Modes3Queries extends BaseGeneratedPatternGroup {
     return TurnoutOutputsAreSame.Matcher.on(engine);
   }
   
-  public Turnout getTurnout() {
-    return Turnout.instance();
-  }
-  
-  public Turnout.Matcher getTurnout(final ViatraQueryEngine engine) {
-    return Turnout.Matcher.on(engine);
-  }
-  
   public Output getOutput() {
     return Output.instance();
   }
@@ -179,36 +157,36 @@ public final class Modes3Queries extends BaseGeneratedPatternGroup {
     return TurnoutConnectedToBothOutputs.Matcher.on(engine);
   }
   
-  public ExtraInputOfTurnout getExtraInputOfTurnout() {
-    return ExtraInputOfTurnout.instance();
+  public Adjacent getAdjacent() {
+    return Adjacent.instance();
   }
   
-  public ExtraInputOfTurnout.Matcher getExtraInputOfTurnout(final ViatraQueryEngine engine) {
-    return ExtraInputOfTurnout.Matcher.on(engine);
+  public Adjacent.Matcher getAdjacent(final ViatraQueryEngine engine) {
+    return Adjacent.Matcher.on(engine);
   }
   
-  public NoExtraInputOfTurnout getNoExtraInputOfTurnout() {
-    return NoExtraInputOfTurnout.instance();
+  public TooManyInputsOfTurnout getTooManyInputsOfTurnout() {
+    return TooManyInputsOfTurnout.instance();
   }
   
-  public NoExtraInputOfTurnout.Matcher getNoExtraInputOfTurnout(final ViatraQueryEngine engine) {
-    return NoExtraInputOfTurnout.Matcher.on(engine);
+  public TooManyInputsOfTurnout.Matcher getTooManyInputsOfTurnout(final ViatraQueryEngine engine) {
+    return TooManyInputsOfTurnout.Matcher.on(engine);
   }
   
-  public TooManyExtraInputsOfTurnout getTooManyExtraInputsOfTurnout() {
-    return TooManyExtraInputsOfTurnout.instance();
+  public InputsOfTurnout getInputsOfTurnout() {
+    return InputsOfTurnout.instance();
   }
   
-  public TooManyExtraInputsOfTurnout.Matcher getTooManyExtraInputsOfTurnout(final ViatraQueryEngine engine) {
-    return TooManyExtraInputsOfTurnout.Matcher.on(engine);
+  public InputsOfTurnout.Matcher getInputsOfTurnout(final ViatraQueryEngine engine) {
+    return InputsOfTurnout.Matcher.on(engine);
   }
   
-  public Adjacent getAdjacent() {
-    return Adjacent.instance();
+  public TooFewInputsOfTurnout getTooFewInputsOfTurnout() {
+    return TooFewInputsOfTurnout.instance();
   }
   
-  public Adjacent.Matcher getAdjacent(final ViatraQueryEngine engine) {
-    return Adjacent.Matcher.on(engine);
+  public TooFewInputsOfTurnout.Matcher getTooFewInputsOfTurnout(final ViatraQueryEngine engine) {
+    return TooFewInputsOfTurnout.Matcher.on(engine);
   }
   
   public Reachable getReachable() {
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/NoExtraInputOfTurnout.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TooFewInputsOfTurnout.java
index 621d736f..088640ca 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/NoExtraInputOfTurnout.java
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TooFewInputsOfTurnout.java
@@ -14,7 +14,7 @@ import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import modes3.Turnout;
-import modes3.queries.ExtraInputOfTurnout;
+import modes3.queries.InputsOfTurnout;
 import org.apache.log4j.Logger;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.viatra.query.runtime.api.IPatternMatch;
@@ -45,9 +45,9 @@ import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
  * 
  * <p>Original source:
  *         <code><pre>
- *         {@literal @}Constraint(message = "noExtraInputOfTurnout", severity = "error", key = { T })
- *         pattern noExtraInputOfTurnout(T : Turnout) {
- *              neg find extraInputOfTurnout(T, _);
+ *         {@literal @}Constraint(message = "tooFewInputsOfTurnout", severity = "error", key = { T })
+ *         pattern tooFewInputsOfTurnout(T : Turnout) {
+ *              neg find inputsOfTurnout(T);
  *         }
  * </pre></code>
  * 
@@ -56,9 +56,9 @@ import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
  * 
  */
 @SuppressWarnings("all")
-public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecification<NoExtraInputOfTurnout.Matcher> {
+public final class TooFewInputsOfTurnout extends BaseGeneratedEMFQuerySpecification<TooFewInputsOfTurnout.Matcher> {
   /**
-   * Pattern-specific match representation of the modes3.queries.noExtraInputOfTurnout pattern,
+   * Pattern-specific match representation of the modes3.queries.tooFewInputsOfTurnout pattern,
    * to be used in conjunction with {@link Matcher}.
    * 
    * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
@@ -115,12 +115,12 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
     
     @Override
     public String patternName() {
-      return "modes3.queries.noExtraInputOfTurnout";
+      return "modes3.queries.tooFewInputsOfTurnout";
     }
     
     @Override
     public List<String> parameterNames() {
-      return NoExtraInputOfTurnout.Match.parameterNames;
+      return TooFewInputsOfTurnout.Match.parameterNames;
     }
     
     @Override
@@ -129,7 +129,7 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
     }
     
     @Override
-    public NoExtraInputOfTurnout.Match toImmutable() {
+    public TooFewInputsOfTurnout.Match toImmutable() {
       return isMutable() ? newMatch(fT) : this;
     }
     
@@ -152,8 +152,8 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
       if (obj == null) {
           return false;
       }
-      if ((obj instanceof NoExtraInputOfTurnout.Match)) {
-          NoExtraInputOfTurnout.Match other = (NoExtraInputOfTurnout.Match) obj;
+      if ((obj instanceof TooFewInputsOfTurnout.Match)) {
+          TooFewInputsOfTurnout.Match other = (TooFewInputsOfTurnout.Match) obj;
           return Objects.equals(fT, other.fT);
       } else {
           // this should be infrequent
@@ -166,8 +166,8 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
     }
     
     @Override
-    public NoExtraInputOfTurnout specification() {
-      return NoExtraInputOfTurnout.instance();
+    public TooFewInputsOfTurnout specification() {
+      return TooFewInputsOfTurnout.instance();
     }
     
     /**
@@ -177,7 +177,7 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
      * @return the empty match.
      * 
      */
-    public static NoExtraInputOfTurnout.Match newEmptyMatch() {
+    public static TooFewInputsOfTurnout.Match newEmptyMatch() {
       return new Mutable(null);
     }
     
@@ -189,7 +189,7 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
      * @return the new, mutable (partial) match object.
      * 
      */
-    public static NoExtraInputOfTurnout.Match newMutableMatch(final Turnout pT) {
+    public static TooFewInputsOfTurnout.Match newMutableMatch(final Turnout pT) {
       return new Mutable(pT);
     }
     
@@ -201,11 +201,11 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
      * @return the (partial) match object.
      * 
      */
-    public static NoExtraInputOfTurnout.Match newMatch(final Turnout pT) {
+    public static TooFewInputsOfTurnout.Match newMatch(final Turnout pT) {
       return new Immutable(pT);
     }
     
-    private static final class Mutable extends NoExtraInputOfTurnout.Match {
+    private static final class Mutable extends TooFewInputsOfTurnout.Match {
       Mutable(final Turnout pT) {
         super(pT);
       }
@@ -216,7 +216,7 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
       }
     }
     
-    private static final class Immutable extends NoExtraInputOfTurnout.Match {
+    private static final class Immutable extends TooFewInputsOfTurnout.Match {
       Immutable(final Turnout pT) {
         super(pT);
       }
@@ -229,7 +229,7 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
   }
   
   /**
-   * Generated pattern matcher API of the modes3.queries.noExtraInputOfTurnout pattern,
+   * Generated pattern matcher API of the modes3.queries.tooFewInputsOfTurnout pattern,
    * providing pattern-specific query methods.
    * 
    * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
@@ -239,17 +239,17 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
    * 
    * <p>Original source:
    * <code><pre>
-   * {@literal @}Constraint(message = "noExtraInputOfTurnout", severity = "error", key = { T })
-   * pattern noExtraInputOfTurnout(T : Turnout) {
-   *    neg find extraInputOfTurnout(T, _);
+   * {@literal @}Constraint(message = "tooFewInputsOfTurnout", severity = "error", key = { T })
+   * pattern tooFewInputsOfTurnout(T : Turnout) {
+   *    neg find inputsOfTurnout(T);
    * }
    * </pre></code>
    * 
    * @see Match
-   * @see NoExtraInputOfTurnout
+   * @see TooFewInputsOfTurnout
    * 
    */
-  public static class Matcher extends BaseMatcher<NoExtraInputOfTurnout.Match> {
+  public static class Matcher extends BaseMatcher<TooFewInputsOfTurnout.Match> {
     /**
      * Initializes the pattern matcher within an existing VIATRA Query engine.
      * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
@@ -258,7 +258,7 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
      * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
      * 
      */
-    public static NoExtraInputOfTurnout.Matcher on(final ViatraQueryEngine engine) {
+    public static TooFewInputsOfTurnout.Matcher on(final ViatraQueryEngine engine) {
       // check if matcher already exists
       Matcher matcher = engine.getExistingMatcher(querySpecification());
       if (matcher == null) {
@@ -273,13 +273,13 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
      * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
      * 
      */
-    public static NoExtraInputOfTurnout.Matcher create() {
+    public static TooFewInputsOfTurnout.Matcher create() {
       return new Matcher();
     }
     
     private static final int POSITION_T = 0;
     
-    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(NoExtraInputOfTurnout.Matcher.class);
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(TooFewInputsOfTurnout.Matcher.class);
     
     /**
      * Initializes the pattern matcher within an existing VIATRA Query engine.
@@ -299,7 +299,7 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
      * @return matches represented as a Match object.
      * 
      */
-    public Collection<NoExtraInputOfTurnout.Match> getAllMatches(final Turnout pT) {
+    public Collection<TooFewInputsOfTurnout.Match> getAllMatches(final Turnout pT) {
       return rawStreamAllMatches(new Object[]{pT}).collect(Collectors.toSet());
     }
     
@@ -313,7 +313,7 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
      * @return a stream of matches represented as a Match object.
      * 
      */
-    public Stream<NoExtraInputOfTurnout.Match> streamAllMatches(final Turnout pT) {
+    public Stream<TooFewInputsOfTurnout.Match> streamAllMatches(final Turnout pT) {
       return rawStreamAllMatches(new Object[]{pT});
     }
     
@@ -324,7 +324,7 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
      * @return a match represented as a Match object, or null if no match is found.
      * 
      */
-    public Optional<NoExtraInputOfTurnout.Match> getOneArbitraryMatch(final Turnout pT) {
+    public Optional<TooFewInputsOfTurnout.Match> getOneArbitraryMatch(final Turnout pT) {
       return rawGetOneArbitraryMatch(new Object[]{pT});
     }
     
@@ -357,7 +357,7 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
      * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
      * 
      */
-    public boolean forOneArbitraryMatch(final Turnout pT, final Consumer<? super NoExtraInputOfTurnout.Match> processor) {
+    public boolean forOneArbitraryMatch(final Turnout pT, final Consumer<? super TooFewInputsOfTurnout.Match> processor) {
       return rawForOneArbitraryMatch(new Object[]{pT}, processor);
     }
     
@@ -369,8 +369,8 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
      * @return the (partial) match object.
      * 
      */
-    public NoExtraInputOfTurnout.Match newMatch(final Turnout pT) {
-      return NoExtraInputOfTurnout.Match.newMatch(pT);
+    public TooFewInputsOfTurnout.Match newMatch(final Turnout pT) {
+      return TooFewInputsOfTurnout.Match.newMatch(pT);
     }
     
     /**
@@ -401,9 +401,9 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
     }
     
     @Override
-    protected NoExtraInputOfTurnout.Match tupleToMatch(final Tuple t) {
+    protected TooFewInputsOfTurnout.Match tupleToMatch(final Tuple t) {
       try {
-          return NoExtraInputOfTurnout.Match.newMatch((Turnout) t.get(POSITION_T));
+          return TooFewInputsOfTurnout.Match.newMatch((Turnout) t.get(POSITION_T));
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in tuple not properly typed!",e);
           return null;
@@ -411,9 +411,9 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
     }
     
     @Override
-    protected NoExtraInputOfTurnout.Match arrayToMatch(final Object[] match) {
+    protected TooFewInputsOfTurnout.Match arrayToMatch(final Object[] match) {
       try {
-          return NoExtraInputOfTurnout.Match.newMatch((Turnout) match[POSITION_T]);
+          return TooFewInputsOfTurnout.Match.newMatch((Turnout) match[POSITION_T]);
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in array not properly typed!",e);
           return null;
@@ -421,9 +421,9 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
     }
     
     @Override
-    protected NoExtraInputOfTurnout.Match arrayToMatchMutable(final Object[] match) {
+    protected TooFewInputsOfTurnout.Match arrayToMatchMutable(final Object[] match) {
       try {
-          return NoExtraInputOfTurnout.Match.newMutableMatch((Turnout) match[POSITION_T]);
+          return TooFewInputsOfTurnout.Match.newMutableMatch((Turnout) match[POSITION_T]);
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in array not properly typed!",e);
           return null;
@@ -435,12 +435,12 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
      * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
      * 
      */
-    public static IQuerySpecification<NoExtraInputOfTurnout.Matcher> querySpecification() {
-      return NoExtraInputOfTurnout.instance();
+    public static IQuerySpecification<TooFewInputsOfTurnout.Matcher> querySpecification() {
+      return TooFewInputsOfTurnout.instance();
     }
   }
   
-  private NoExtraInputOfTurnout() {
+  private TooFewInputsOfTurnout() {
     super(GeneratedPQuery.INSTANCE);
   }
   
@@ -449,7 +449,7 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
    * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
    * 
    */
-  public static NoExtraInputOfTurnout instance() {
+  public static TooFewInputsOfTurnout instance() {
     try{
         return LazyHolder.INSTANCE;
     } catch (ExceptionInInitializerError err) {
@@ -458,35 +458,35 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
   }
   
   @Override
-  protected NoExtraInputOfTurnout.Matcher instantiate(final ViatraQueryEngine engine) {
-    return NoExtraInputOfTurnout.Matcher.on(engine);
+  protected TooFewInputsOfTurnout.Matcher instantiate(final ViatraQueryEngine engine) {
+    return TooFewInputsOfTurnout.Matcher.on(engine);
   }
   
   @Override
-  public NoExtraInputOfTurnout.Matcher instantiate() {
-    return NoExtraInputOfTurnout.Matcher.create();
+  public TooFewInputsOfTurnout.Matcher instantiate() {
+    return TooFewInputsOfTurnout.Matcher.create();
   }
   
   @Override
-  public NoExtraInputOfTurnout.Match newEmptyMatch() {
-    return NoExtraInputOfTurnout.Match.newEmptyMatch();
+  public TooFewInputsOfTurnout.Match newEmptyMatch() {
+    return TooFewInputsOfTurnout.Match.newEmptyMatch();
   }
   
   @Override
-  public NoExtraInputOfTurnout.Match newMatch(final Object... parameters) {
-    return NoExtraInputOfTurnout.Match.newMatch((modes3.Turnout) parameters[0]);
+  public TooFewInputsOfTurnout.Match newMatch(final Object... parameters) {
+    return TooFewInputsOfTurnout.Match.newMatch((modes3.Turnout) parameters[0]);
   }
   
   /**
-   * Inner class allowing the singleton instance of {@link NoExtraInputOfTurnout} to be created 
+   * Inner class allowing the singleton instance of {@link TooFewInputsOfTurnout} to be created 
    *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link NoExtraInputOfTurnout#instance()}.
+   *     but rather at the first call to {@link TooFewInputsOfTurnout#instance()}.
    * 
    * <p> This workaround is required e.g. to support recursion.
    * 
    */
   private static class LazyHolder {
-    private static final NoExtraInputOfTurnout INSTANCE = new NoExtraInputOfTurnout();
+    private static final TooFewInputsOfTurnout INSTANCE = new TooFewInputsOfTurnout();
     
     /**
      * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
@@ -504,7 +504,7 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
   }
   
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final NoExtraInputOfTurnout.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    private static final TooFewInputsOfTurnout.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
     private final PParameter parameter_T = new PParameter("T", "modes3.Turnout", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")), PParameterDirection.INOUT);
     
@@ -516,7 +516,7 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
     
     @Override
     public String getFullyQualifiedName() {
-      return "modes3.queries.noExtraInputOfTurnout";
+      return "modes3.queries.tooFewInputsOfTurnout";
     }
     
     @Override
@@ -536,18 +536,17 @@ public final class NoExtraInputOfTurnout extends BaseGeneratedEMFQuerySpecificat
       {
           PBody body = new PBody(this);
           PVariable var_T = body.getOrCreateVariableByName("T");
-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
           new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")));
           body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
              new ExportedParameter(body, var_T, parameter_T)
           ));
-          //    neg find extraInputOfTurnout(T, _)
-          new NegativePatternCall(body, Tuples.flatTupleOf(var_T, var___0_), ExtraInputOfTurnout.instance().getInternalQueryRepresentation());
+          //    neg find inputsOfTurnout(T)
+          new NegativePatternCall(body, Tuples.flatTupleOf(var_T), InputsOfTurnout.instance().getInternalQueryRepresentation());
           bodies.add(body);
       }
       {
           PAnnotation annotation = new PAnnotation("Constraint");
-          annotation.addAttribute("message", "noExtraInputOfTurnout");
+          annotation.addAttribute("message", "tooFewInputsOfTurnout");
           annotation.addAttribute("severity", "error");
           annotation.addAttribute("key", Arrays.asList(new Object[] {
                               new ParameterReference("T")
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TooManyInputsOfSegment.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TooManyInputsOfSegment.java
index e5e8827c..ff82dda1 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TooManyInputsOfSegment.java
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TooManyInputsOfSegment.java
@@ -13,9 +13,8 @@ import java.util.Set;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import modes3.Segment;
+import modes3.SimpleSegment;
 import modes3.queries.Output;
-import modes3.queries.Turnout;
 import org.apache.log4j.Logger;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.viatra.query.runtime.api.IPatternMatch;
@@ -33,7 +32,6 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation
 import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
 import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
 import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Inequality;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
 import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
 import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
 import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
@@ -55,8 +53,7 @@ import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
  *         //}
  *         
  *         {@literal @}Constraint(message = "tooManyInputsOfSegment", severity = "error", key = { S })
- *         pattern tooManyInputsOfSegment(S : Segment) {
- *              neg find turnout(S);
+ *         pattern tooManyInputsOfSegment(S : SimpleSegment) {
  *              find output(I1, S);
  *              find output(I2, S);
  *              find output(I3, S);
@@ -85,11 +82,11 @@ public final class TooManyInputsOfSegment extends BaseGeneratedEMFQuerySpecifica
    * 
    */
   public static abstract class Match extends BasePatternMatch {
-    private Segment fS;
+    private SimpleSegment fS;
     
     private static List<String> parameterNames = makeImmutableList("S");
     
-    private Match(final Segment pS) {
+    private Match(final SimpleSegment pS) {
       this.fS = pS;
     }
     
@@ -109,7 +106,7 @@ public final class TooManyInputsOfSegment extends BaseGeneratedEMFQuerySpecifica
       }
     }
     
-    public Segment getS() {
+    public SimpleSegment getS() {
       return this.fS;
     }
     
@@ -117,13 +114,13 @@ public final class TooManyInputsOfSegment extends BaseGeneratedEMFQuerySpecifica
     public boolean set(final String parameterName, final Object newValue) {
       if (!isMutable()) throw new java.lang.UnsupportedOperationException();
       if ("S".equals(parameterName) ) {
-          this.fS = (Segment) newValue;
+          this.fS = (SimpleSegment) newValue;
           return true;
       }
       return false;
     }
     
-    public void setS(final Segment pS) {
+    public void setS(final SimpleSegment pS) {
       if (!isMutable()) throw new java.lang.UnsupportedOperationException();
       this.fS = pS;
     }
@@ -204,7 +201,7 @@ public final class TooManyInputsOfSegment extends BaseGeneratedEMFQuerySpecifica
      * @return the new, mutable (partial) match object.
      * 
      */
-    public static TooManyInputsOfSegment.Match newMutableMatch(final Segment pS) {
+    public static TooManyInputsOfSegment.Match newMutableMatch(final SimpleSegment pS) {
       return new Mutable(pS);
     }
     
@@ -216,12 +213,12 @@ public final class TooManyInputsOfSegment extends BaseGeneratedEMFQuerySpecifica
      * @return the (partial) match object.
      * 
      */
-    public static TooManyInputsOfSegment.Match newMatch(final Segment pS) {
+    public static TooManyInputsOfSegment.Match newMatch(final SimpleSegment pS) {
       return new Immutable(pS);
     }
     
     private static final class Mutable extends TooManyInputsOfSegment.Match {
-      Mutable(final Segment pS) {
+      Mutable(final SimpleSegment pS) {
         super(pS);
       }
       
@@ -232,7 +229,7 @@ public final class TooManyInputsOfSegment extends BaseGeneratedEMFQuerySpecifica
     }
     
     private static final class Immutable extends TooManyInputsOfSegment.Match {
-      Immutable(final Segment pS) {
+      Immutable(final SimpleSegment pS) {
         super(pS);
       }
       
@@ -261,8 +258,7 @@ public final class TooManyInputsOfSegment extends BaseGeneratedEMFQuerySpecifica
    * //}
    * 
    * {@literal @}Constraint(message = "tooManyInputsOfSegment", severity = "error", key = { S })
-   * pattern tooManyInputsOfSegment(S : Segment) {
-   *    neg find turnout(S);
+   * pattern tooManyInputsOfSegment(S : SimpleSegment) {
    *    find output(I1, S);
    *    find output(I2, S);
    *    find output(I3, S);
@@ -326,7 +322,7 @@ public final class TooManyInputsOfSegment extends BaseGeneratedEMFQuerySpecifica
      * @return matches represented as a Match object.
      * 
      */
-    public Collection<TooManyInputsOfSegment.Match> getAllMatches(final Segment pS) {
+    public Collection<TooManyInputsOfSegment.Match> getAllMatches(final SimpleSegment pS) {
       return rawStreamAllMatches(new Object[]{pS}).collect(Collectors.toSet());
     }
     
@@ -340,7 +336,7 @@ public final class TooManyInputsOfSegment extends BaseGeneratedEMFQuerySpecifica
      * @return a stream of matches represented as a Match object.
      * 
      */
-    public Stream<TooManyInputsOfSegment.Match> streamAllMatches(final Segment pS) {
+    public Stream<TooManyInputsOfSegment.Match> streamAllMatches(final SimpleSegment pS) {
       return rawStreamAllMatches(new Object[]{pS});
     }
     
@@ -351,7 +347,7 @@ public final class TooManyInputsOfSegment extends BaseGeneratedEMFQuerySpecifica
      * @return a match represented as a Match object, or null if no match is found.
      * 
      */
-    public Optional<TooManyInputsOfSegment.Match> getOneArbitraryMatch(final Segment pS) {
+    public Optional<TooManyInputsOfSegment.Match> getOneArbitraryMatch(final SimpleSegment pS) {
       return rawGetOneArbitraryMatch(new Object[]{pS});
     }
     
@@ -362,7 +358,7 @@ public final class TooManyInputsOfSegment extends BaseGeneratedEMFQuerySpecifica
      * @return true if the input is a valid (partial) match of the pattern.
      * 
      */
-    public boolean hasMatch(final Segment pS) {
+    public boolean hasMatch(final SimpleSegment pS) {
       return rawHasMatch(new Object[]{pS});
     }
     
@@ -372,7 +368,7 @@ public final class TooManyInputsOfSegment extends BaseGeneratedEMFQuerySpecifica
      * @return the number of pattern matches found.
      * 
      */
-    public int countMatches(final Segment pS) {
+    public int countMatches(final SimpleSegment pS) {
       return rawCountMatches(new Object[]{pS});
     }
     
@@ -384,7 +380,7 @@ public final class TooManyInputsOfSegment extends BaseGeneratedEMFQuerySpecifica
      * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
      * 
      */
-    public boolean forOneArbitraryMatch(final Segment pS, final Consumer<? super TooManyInputsOfSegment.Match> processor) {
+    public boolean forOneArbitraryMatch(final SimpleSegment pS, final Consumer<? super TooManyInputsOfSegment.Match> processor) {
       return rawForOneArbitraryMatch(new Object[]{pS}, processor);
     }
     
@@ -396,7 +392,7 @@ public final class TooManyInputsOfSegment extends BaseGeneratedEMFQuerySpecifica
      * @return the (partial) match object.
      * 
      */
-    public TooManyInputsOfSegment.Match newMatch(final Segment pS) {
+    public TooManyInputsOfSegment.Match newMatch(final SimpleSegment pS) {
       return TooManyInputsOfSegment.Match.newMatch(pS);
     }
     
@@ -405,8 +401,8 @@ public final class TooManyInputsOfSegment extends BaseGeneratedEMFQuerySpecifica
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    protected Stream<Segment> rawStreamAllValuesOfS(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_S, parameters).map(Segment.class::cast);
+    protected Stream<SimpleSegment> rawStreamAllValuesOfS(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_S, parameters).map(SimpleSegment.class::cast);
     }
     
     /**
@@ -414,7 +410,7 @@ public final class TooManyInputsOfSegment extends BaseGeneratedEMFQuerySpecifica
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    public Set<Segment> getAllValuesOfS() {
+    public Set<SimpleSegment> getAllValuesOfS() {
       return rawStreamAllValuesOfS(emptyArray()).collect(Collectors.toSet());
     }
     
@@ -423,14 +419,14 @@ public final class TooManyInputsOfSegment extends BaseGeneratedEMFQuerySpecifica
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    public Stream<Segment> streamAllValuesOfS() {
+    public Stream<SimpleSegment> streamAllValuesOfS() {
       return rawStreamAllValuesOfS(emptyArray());
     }
     
     @Override
     protected TooManyInputsOfSegment.Match tupleToMatch(final Tuple t) {
       try {
-          return TooManyInputsOfSegment.Match.newMatch((Segment) t.get(POSITION_S));
+          return TooManyInputsOfSegment.Match.newMatch((SimpleSegment) t.get(POSITION_S));
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in tuple not properly typed!",e);
           return null;
@@ -440,7 +436,7 @@ public final class TooManyInputsOfSegment extends BaseGeneratedEMFQuerySpecifica
     @Override
     protected TooManyInputsOfSegment.Match arrayToMatch(final Object[] match) {
       try {
-          return TooManyInputsOfSegment.Match.newMatch((Segment) match[POSITION_S]);
+          return TooManyInputsOfSegment.Match.newMatch((SimpleSegment) match[POSITION_S]);
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in array not properly typed!",e);
           return null;
@@ -450,7 +446,7 @@ public final class TooManyInputsOfSegment extends BaseGeneratedEMFQuerySpecifica
     @Override
     protected TooManyInputsOfSegment.Match arrayToMatchMutable(final Object[] match) {
       try {
-          return TooManyInputsOfSegment.Match.newMutableMatch((Segment) match[POSITION_S]);
+          return TooManyInputsOfSegment.Match.newMutableMatch((SimpleSegment) match[POSITION_S]);
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in array not properly typed!",e);
           return null;
@@ -501,7 +497,7 @@ public final class TooManyInputsOfSegment extends BaseGeneratedEMFQuerySpecifica
   
   @Override
   public TooManyInputsOfSegment.Match newMatch(final Object... parameters) {
-    return TooManyInputsOfSegment.Match.newMatch((modes3.Segment) parameters[0]);
+    return TooManyInputsOfSegment.Match.newMatch((modes3.SimpleSegment) parameters[0]);
   }
   
   /**
@@ -533,7 +529,7 @@ public final class TooManyInputsOfSegment extends BaseGeneratedEMFQuerySpecifica
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final TooManyInputsOfSegment.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_S = new PParameter("S", "modes3.Segment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Segment")), PParameterDirection.INOUT);
+    private final PParameter parameter_S = new PParameter("S", "modes3.SimpleSegment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "SimpleSegment")), PParameterDirection.INOUT);
     
     private final List<PParameter> parameters = Arrays.asList(parameter_S);
     
@@ -566,12 +562,10 @@ public final class TooManyInputsOfSegment extends BaseGeneratedEMFQuerySpecifica
           PVariable var_I1 = body.getOrCreateVariableByName("I1");
           PVariable var_I2 = body.getOrCreateVariableByName("I2");
           PVariable var_I3 = body.getOrCreateVariableByName("I3");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_S), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "SimpleSegment")));
           body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
              new ExportedParameter(body, var_S, parameter_S)
           ));
-          //    neg find turnout(S)
-          new NegativePatternCall(body, Tuples.flatTupleOf(var_S), Turnout.instance().getInternalQueryRepresentation());
           //    find output(I1, S)
           new PositivePatternCall(body, Tuples.flatTupleOf(var_I1, var_S), Output.instance().getInternalQueryRepresentation());
           //    find output(I2, S)
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TooManyExtraInputsOfTurnout.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TooManyInputsOfTurnout.java
index 9f417795..93076cbb 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TooManyExtraInputsOfTurnout.java
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TooManyInputsOfTurnout.java
@@ -14,7 +14,7 @@ import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import modes3.Turnout;
-import modes3.queries.ExtraInputOfTurnout;
+import modes3.queries.Adjacent;
 import org.apache.log4j.Logger;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.viatra.query.runtime.api.IPatternMatch;
@@ -46,11 +46,18 @@ import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
  * 
  * <p>Original source:
  *         <code><pre>
- *         {@literal @}Constraint(message = "tooManyExtraInputsOfTurnout", severity = "error", key = { T })
- *         pattern tooManyExtraInputsOfTurnout(T : Turnout) {
- *              find extraInputOfTurnout(T, I1);
- *              find extraInputOfTurnout(T, I2);
+ *         {@literal @}Constraint(message = "turnoutConnectedToBothOutputs", severity = "error", key = { T })
+ *         pattern tooManyInputsOfTurnout(T : Turnout) {
+ *              find adjacent(I1, T);
+ *              find adjacent(I2, T);
+ *              find adjacent(I3, T);
+ *              find adjacent(I4, T);
  *              I1 != I2;
+ *              I1 != I3;
+ *              I1 != I4;
+ *              I2 != I3;
+ *              I2 != I4;
+ *              I3 != I4;
  *         }
  * </pre></code>
  * 
@@ -59,9 +66,9 @@ import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
  * 
  */
 @SuppressWarnings("all")
-public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpecification<TooManyExtraInputsOfTurnout.Matcher> {
+public final class TooManyInputsOfTurnout extends BaseGeneratedEMFQuerySpecification<TooManyInputsOfTurnout.Matcher> {
   /**
-   * Pattern-specific match representation of the modes3.queries.tooManyExtraInputsOfTurnout pattern,
+   * Pattern-specific match representation of the modes3.queries.tooManyInputsOfTurnout pattern,
    * to be used in conjunction with {@link Matcher}.
    * 
    * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
@@ -118,12 +125,12 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
     
     @Override
     public String patternName() {
-      return "modes3.queries.tooManyExtraInputsOfTurnout";
+      return "modes3.queries.tooManyInputsOfTurnout";
     }
     
     @Override
     public List<String> parameterNames() {
-      return TooManyExtraInputsOfTurnout.Match.parameterNames;
+      return TooManyInputsOfTurnout.Match.parameterNames;
     }
     
     @Override
@@ -132,7 +139,7 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
     }
     
     @Override
-    public TooManyExtraInputsOfTurnout.Match toImmutable() {
+    public TooManyInputsOfTurnout.Match toImmutable() {
       return isMutable() ? newMatch(fT) : this;
     }
     
@@ -155,8 +162,8 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
       if (obj == null) {
           return false;
       }
-      if ((obj instanceof TooManyExtraInputsOfTurnout.Match)) {
-          TooManyExtraInputsOfTurnout.Match other = (TooManyExtraInputsOfTurnout.Match) obj;
+      if ((obj instanceof TooManyInputsOfTurnout.Match)) {
+          TooManyInputsOfTurnout.Match other = (TooManyInputsOfTurnout.Match) obj;
           return Objects.equals(fT, other.fT);
       } else {
           // this should be infrequent
@@ -169,8 +176,8 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
     }
     
     @Override
-    public TooManyExtraInputsOfTurnout specification() {
-      return TooManyExtraInputsOfTurnout.instance();
+    public TooManyInputsOfTurnout specification() {
+      return TooManyInputsOfTurnout.instance();
     }
     
     /**
@@ -180,7 +187,7 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
      * @return the empty match.
      * 
      */
-    public static TooManyExtraInputsOfTurnout.Match newEmptyMatch() {
+    public static TooManyInputsOfTurnout.Match newEmptyMatch() {
       return new Mutable(null);
     }
     
@@ -192,7 +199,7 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
      * @return the new, mutable (partial) match object.
      * 
      */
-    public static TooManyExtraInputsOfTurnout.Match newMutableMatch(final Turnout pT) {
+    public static TooManyInputsOfTurnout.Match newMutableMatch(final Turnout pT) {
       return new Mutable(pT);
     }
     
@@ -204,11 +211,11 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
      * @return the (partial) match object.
      * 
      */
-    public static TooManyExtraInputsOfTurnout.Match newMatch(final Turnout pT) {
+    public static TooManyInputsOfTurnout.Match newMatch(final Turnout pT) {
       return new Immutable(pT);
     }
     
-    private static final class Mutable extends TooManyExtraInputsOfTurnout.Match {
+    private static final class Mutable extends TooManyInputsOfTurnout.Match {
       Mutable(final Turnout pT) {
         super(pT);
       }
@@ -219,7 +226,7 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
       }
     }
     
-    private static final class Immutable extends TooManyExtraInputsOfTurnout.Match {
+    private static final class Immutable extends TooManyInputsOfTurnout.Match {
       Immutable(final Turnout pT) {
         super(pT);
       }
@@ -232,7 +239,7 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
   }
   
   /**
-   * Generated pattern matcher API of the modes3.queries.tooManyExtraInputsOfTurnout pattern,
+   * Generated pattern matcher API of the modes3.queries.tooManyInputsOfTurnout pattern,
    * providing pattern-specific query methods.
    * 
    * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
@@ -242,19 +249,26 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
    * 
    * <p>Original source:
    * <code><pre>
-   * {@literal @}Constraint(message = "tooManyExtraInputsOfTurnout", severity = "error", key = { T })
-   * pattern tooManyExtraInputsOfTurnout(T : Turnout) {
-   *    find extraInputOfTurnout(T, I1);
-   *    find extraInputOfTurnout(T, I2);
+   * {@literal @}Constraint(message = "turnoutConnectedToBothOutputs", severity = "error", key = { T })
+   * pattern tooManyInputsOfTurnout(T : Turnout) {
+   *    find adjacent(I1, T);
+   *    find adjacent(I2, T);
+   *    find adjacent(I3, T);
+   *    find adjacent(I4, T);
    *    I1 != I2;
+   *    I1 != I3;
+   *    I1 != I4;
+   *    I2 != I3;
+   *    I2 != I4;
+   *    I3 != I4;
    * }
    * </pre></code>
    * 
    * @see Match
-   * @see TooManyExtraInputsOfTurnout
+   * @see TooManyInputsOfTurnout
    * 
    */
-  public static class Matcher extends BaseMatcher<TooManyExtraInputsOfTurnout.Match> {
+  public static class Matcher extends BaseMatcher<TooManyInputsOfTurnout.Match> {
     /**
      * Initializes the pattern matcher within an existing VIATRA Query engine.
      * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
@@ -263,7 +277,7 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
      * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
      * 
      */
-    public static TooManyExtraInputsOfTurnout.Matcher on(final ViatraQueryEngine engine) {
+    public static TooManyInputsOfTurnout.Matcher on(final ViatraQueryEngine engine) {
       // check if matcher already exists
       Matcher matcher = engine.getExistingMatcher(querySpecification());
       if (matcher == null) {
@@ -278,13 +292,13 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
      * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
      * 
      */
-    public static TooManyExtraInputsOfTurnout.Matcher create() {
+    public static TooManyInputsOfTurnout.Matcher create() {
       return new Matcher();
     }
     
     private static final int POSITION_T = 0;
     
-    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(TooManyExtraInputsOfTurnout.Matcher.class);
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(TooManyInputsOfTurnout.Matcher.class);
     
     /**
      * Initializes the pattern matcher within an existing VIATRA Query engine.
@@ -304,7 +318,7 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
      * @return matches represented as a Match object.
      * 
      */
-    public Collection<TooManyExtraInputsOfTurnout.Match> getAllMatches(final Turnout pT) {
+    public Collection<TooManyInputsOfTurnout.Match> getAllMatches(final Turnout pT) {
       return rawStreamAllMatches(new Object[]{pT}).collect(Collectors.toSet());
     }
     
@@ -318,7 +332,7 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
      * @return a stream of matches represented as a Match object.
      * 
      */
-    public Stream<TooManyExtraInputsOfTurnout.Match> streamAllMatches(final Turnout pT) {
+    public Stream<TooManyInputsOfTurnout.Match> streamAllMatches(final Turnout pT) {
       return rawStreamAllMatches(new Object[]{pT});
     }
     
@@ -329,7 +343,7 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
      * @return a match represented as a Match object, or null if no match is found.
      * 
      */
-    public Optional<TooManyExtraInputsOfTurnout.Match> getOneArbitraryMatch(final Turnout pT) {
+    public Optional<TooManyInputsOfTurnout.Match> getOneArbitraryMatch(final Turnout pT) {
       return rawGetOneArbitraryMatch(new Object[]{pT});
     }
     
@@ -362,7 +376,7 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
      * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
      * 
      */
-    public boolean forOneArbitraryMatch(final Turnout pT, final Consumer<? super TooManyExtraInputsOfTurnout.Match> processor) {
+    public boolean forOneArbitraryMatch(final Turnout pT, final Consumer<? super TooManyInputsOfTurnout.Match> processor) {
       return rawForOneArbitraryMatch(new Object[]{pT}, processor);
     }
     
@@ -374,8 +388,8 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
      * @return the (partial) match object.
      * 
      */
-    public TooManyExtraInputsOfTurnout.Match newMatch(final Turnout pT) {
-      return TooManyExtraInputsOfTurnout.Match.newMatch(pT);
+    public TooManyInputsOfTurnout.Match newMatch(final Turnout pT) {
+      return TooManyInputsOfTurnout.Match.newMatch(pT);
     }
     
     /**
@@ -406,9 +420,9 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
     }
     
     @Override
-    protected TooManyExtraInputsOfTurnout.Match tupleToMatch(final Tuple t) {
+    protected TooManyInputsOfTurnout.Match tupleToMatch(final Tuple t) {
       try {
-          return TooManyExtraInputsOfTurnout.Match.newMatch((Turnout) t.get(POSITION_T));
+          return TooManyInputsOfTurnout.Match.newMatch((Turnout) t.get(POSITION_T));
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in tuple not properly typed!",e);
           return null;
@@ -416,9 +430,9 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
     }
     
     @Override
-    protected TooManyExtraInputsOfTurnout.Match arrayToMatch(final Object[] match) {
+    protected TooManyInputsOfTurnout.Match arrayToMatch(final Object[] match) {
       try {
-          return TooManyExtraInputsOfTurnout.Match.newMatch((Turnout) match[POSITION_T]);
+          return TooManyInputsOfTurnout.Match.newMatch((Turnout) match[POSITION_T]);
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in array not properly typed!",e);
           return null;
@@ -426,9 +440,9 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
     }
     
     @Override
-    protected TooManyExtraInputsOfTurnout.Match arrayToMatchMutable(final Object[] match) {
+    protected TooManyInputsOfTurnout.Match arrayToMatchMutable(final Object[] match) {
       try {
-          return TooManyExtraInputsOfTurnout.Match.newMutableMatch((Turnout) match[POSITION_T]);
+          return TooManyInputsOfTurnout.Match.newMutableMatch((Turnout) match[POSITION_T]);
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in array not properly typed!",e);
           return null;
@@ -440,12 +454,12 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
      * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
      * 
      */
-    public static IQuerySpecification<TooManyExtraInputsOfTurnout.Matcher> querySpecification() {
-      return TooManyExtraInputsOfTurnout.instance();
+    public static IQuerySpecification<TooManyInputsOfTurnout.Matcher> querySpecification() {
+      return TooManyInputsOfTurnout.instance();
     }
   }
   
-  private TooManyExtraInputsOfTurnout() {
+  private TooManyInputsOfTurnout() {
     super(GeneratedPQuery.INSTANCE);
   }
   
@@ -454,7 +468,7 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
    * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
    * 
    */
-  public static TooManyExtraInputsOfTurnout instance() {
+  public static TooManyInputsOfTurnout instance() {
     try{
         return LazyHolder.INSTANCE;
     } catch (ExceptionInInitializerError err) {
@@ -463,35 +477,35 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
   }
   
   @Override
-  protected TooManyExtraInputsOfTurnout.Matcher instantiate(final ViatraQueryEngine engine) {
-    return TooManyExtraInputsOfTurnout.Matcher.on(engine);
+  protected TooManyInputsOfTurnout.Matcher instantiate(final ViatraQueryEngine engine) {
+    return TooManyInputsOfTurnout.Matcher.on(engine);
   }
   
   @Override
-  public TooManyExtraInputsOfTurnout.Matcher instantiate() {
-    return TooManyExtraInputsOfTurnout.Matcher.create();
+  public TooManyInputsOfTurnout.Matcher instantiate() {
+    return TooManyInputsOfTurnout.Matcher.create();
   }
   
   @Override
-  public TooManyExtraInputsOfTurnout.Match newEmptyMatch() {
-    return TooManyExtraInputsOfTurnout.Match.newEmptyMatch();
+  public TooManyInputsOfTurnout.Match newEmptyMatch() {
+    return TooManyInputsOfTurnout.Match.newEmptyMatch();
   }
   
   @Override
-  public TooManyExtraInputsOfTurnout.Match newMatch(final Object... parameters) {
-    return TooManyExtraInputsOfTurnout.Match.newMatch((modes3.Turnout) parameters[0]);
+  public TooManyInputsOfTurnout.Match newMatch(final Object... parameters) {
+    return TooManyInputsOfTurnout.Match.newMatch((modes3.Turnout) parameters[0]);
   }
   
   /**
-   * Inner class allowing the singleton instance of {@link TooManyExtraInputsOfTurnout} to be created 
+   * Inner class allowing the singleton instance of {@link TooManyInputsOfTurnout} to be created 
    *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link TooManyExtraInputsOfTurnout#instance()}.
+   *     but rather at the first call to {@link TooManyInputsOfTurnout#instance()}.
    * 
    * <p> This workaround is required e.g. to support recursion.
    * 
    */
   private static class LazyHolder {
-    private static final TooManyExtraInputsOfTurnout INSTANCE = new TooManyExtraInputsOfTurnout();
+    private static final TooManyInputsOfTurnout INSTANCE = new TooManyInputsOfTurnout();
     
     /**
      * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
@@ -509,7 +523,7 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
   }
   
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final TooManyExtraInputsOfTurnout.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    private static final TooManyInputsOfTurnout.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
     private final PParameter parameter_T = new PParameter("T", "modes3.Turnout", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")), PParameterDirection.INOUT);
     
@@ -521,7 +535,7 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
     
     @Override
     public String getFullyQualifiedName() {
-      return "modes3.queries.tooManyExtraInputsOfTurnout";
+      return "modes3.queries.tooManyInputsOfTurnout";
     }
     
     @Override
@@ -543,21 +557,37 @@ public final class TooManyExtraInputsOfTurnout extends BaseGeneratedEMFQuerySpec
           PVariable var_T = body.getOrCreateVariableByName("T");
           PVariable var_I1 = body.getOrCreateVariableByName("I1");
           PVariable var_I2 = body.getOrCreateVariableByName("I2");
+          PVariable var_I3 = body.getOrCreateVariableByName("I3");
+          PVariable var_I4 = body.getOrCreateVariableByName("I4");
           new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")));
           body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
              new ExportedParameter(body, var_T, parameter_T)
           ));
-          //    find extraInputOfTurnout(T, I1)
-          new PositivePatternCall(body, Tuples.flatTupleOf(var_T, var_I1), ExtraInputOfTurnout.instance().getInternalQueryRepresentation());
-          //    find extraInputOfTurnout(T, I2)
-          new PositivePatternCall(body, Tuples.flatTupleOf(var_T, var_I2), ExtraInputOfTurnout.instance().getInternalQueryRepresentation());
+          //    find adjacent(I1, T)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_I1, var_T), Adjacent.instance().getInternalQueryRepresentation());
+          //    find adjacent(I2, T)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_I2, var_T), Adjacent.instance().getInternalQueryRepresentation());
+          //    find adjacent(I3, T)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_I3, var_T), Adjacent.instance().getInternalQueryRepresentation());
+          //    find adjacent(I4, T)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_I4, var_T), Adjacent.instance().getInternalQueryRepresentation());
           //    I1 != I2
           new Inequality(body, var_I1, var_I2);
+          //    I1 != I3
+          new Inequality(body, var_I1, var_I3);
+          //    I1 != I4
+          new Inequality(body, var_I1, var_I4);
+          //    I2 != I3
+          new Inequality(body, var_I2, var_I3);
+          //    I2 != I4
+          new Inequality(body, var_I2, var_I4);
+          //    I3 != I4
+          new Inequality(body, var_I3, var_I4);
           bodies.add(body);
       }
       {
           PAnnotation annotation = new PAnnotation("Constraint");
-          annotation.addAttribute("message", "tooManyExtraInputsOfTurnout");
+          annotation.addAttribute("message", "turnoutConnectedToBothOutputs");
           annotation.addAttribute("severity", "error");
           annotation.addAttribute("key", Arrays.asList(new Object[] {
                               new ParameterReference("T")
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/Turnout.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/Turnout.java
deleted file mode 100644
index 34c7631c..00000000
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/Turnout.java
+++ /dev/null
@@ -1,543 +0,0 @@
-/**
- * Generated from platform:/resource/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
- */
-package modes3.queries;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import org.apache.log4j.Logger;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.query.runtime.api.IPatternMatch;
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
-
-/**
- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
- * 
- * <p>Original source:
- *         <code><pre>
- *         pattern turnout(T : Turnout) {
- *              Turnout(T);
- *         }
- * </pre></code>
- * 
- * @see Matcher
- * @see Match
- * 
- */
-@SuppressWarnings("all")
-public final class Turnout extends BaseGeneratedEMFQuerySpecification<Turnout.Matcher> {
-  /**
-   * Pattern-specific match representation of the modes3.queries.turnout pattern,
-   * to be used in conjunction with {@link Matcher}.
-   * 
-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
-   * Each instance is a (possibly partial) substitution of pattern parameters,
-   * usable to represent a match of the pattern in the result of a query,
-   * or to specify the bound (fixed) input parameters when issuing a query.
-   * 
-   * @see Matcher
-   * 
-   */
-  public static abstract class Match extends BasePatternMatch {
-    private modes3.Turnout fT;
-    
-    private static List<String> parameterNames = makeImmutableList("T");
-    
-    private Match(final modes3.Turnout pT) {
-      this.fT = pT;
-    }
-    
-    @Override
-    public Object get(final String parameterName) {
-      switch(parameterName) {
-          case "T": return this.fT;
-          default: return null;
-      }
-    }
-    
-    @Override
-    public Object get(final int index) {
-      switch(index) {
-          case 0: return this.fT;
-          default: return null;
-      }
-    }
-    
-    public modes3.Turnout getT() {
-      return this.fT;
-    }
-    
-    @Override
-    public boolean set(final String parameterName, final Object newValue) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      if ("T".equals(parameterName) ) {
-          this.fT = (modes3.Turnout) newValue;
-          return true;
-      }
-      return false;
-    }
-    
-    public void setT(final modes3.Turnout pT) {
-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
-      this.fT = pT;
-    }
-    
-    @Override
-    public String patternName() {
-      return "modes3.queries.turnout";
-    }
-    
-    @Override
-    public List<String> parameterNames() {
-      return Turnout.Match.parameterNames;
-    }
-    
-    @Override
-    public Object[] toArray() {
-      return new Object[]{fT};
-    }
-    
-    @Override
-    public Turnout.Match toImmutable() {
-      return isMutable() ? newMatch(fT) : this;
-    }
-    
-    @Override
-    public String prettyPrint() {
-      StringBuilder result = new StringBuilder();
-      result.append("\"T\"=" + prettyPrintValue(fT));
-      return result.toString();
-    }
-    
-    @Override
-    public int hashCode() {
-      return Objects.hash(fT);
-    }
-    
-    @Override
-    public boolean equals(final Object obj) {
-      if (this == obj)
-          return true;
-      if (obj == null) {
-          return false;
-      }
-      if ((obj instanceof Turnout.Match)) {
-          Turnout.Match other = (Turnout.Match) obj;
-          return Objects.equals(fT, other.fT);
-      } else {
-          // this should be infrequent
-          if (!(obj instanceof IPatternMatch)) {
-              return false;
-          }
-          IPatternMatch otherSig  = (IPatternMatch) obj;
-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
-      }
-    }
-    
-    @Override
-    public Turnout specification() {
-      return Turnout.instance();
-    }
-    
-    /**
-     * Returns an empty, mutable match.
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-     * 
-     * @return the empty match.
-     * 
-     */
-    public static Turnout.Match newEmptyMatch() {
-      return new Mutable(null);
-    }
-    
-    /**
-     * Returns a mutable (partial) match.
-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
-     * 
-     * @param pT the fixed value of pattern parameter T, or null if not bound.
-     * @return the new, mutable (partial) match object.
-     * 
-     */
-    public static Turnout.Match newMutableMatch(final modes3.Turnout pT) {
-      return new Mutable(pT);
-    }
-    
-    /**
-     * Returns a new (partial) match.
-     * This can be used e.g. to call the matcher with a partial match.
-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-     * @param pT the fixed value of pattern parameter T, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public static Turnout.Match newMatch(final modes3.Turnout pT) {
-      return new Immutable(pT);
-    }
-    
-    private static final class Mutable extends Turnout.Match {
-      Mutable(final modes3.Turnout pT) {
-        super(pT);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return true;
-      }
-    }
-    
-    private static final class Immutable extends Turnout.Match {
-      Immutable(final modes3.Turnout pT) {
-        super(pT);
-      }
-      
-      @Override
-      public boolean isMutable() {
-        return false;
-      }
-    }
-  }
-  
-  /**
-   * Generated pattern matcher API of the modes3.queries.turnout pattern,
-   * providing pattern-specific query methods.
-   * 
-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
-   * 
-   * <p>Matches of the pattern will be represented as {@link Match}.
-   * 
-   * <p>Original source:
-   * <code><pre>
-   * pattern turnout(T : Turnout) {
-   *    Turnout(T);
-   * }
-   * </pre></code>
-   * 
-   * @see Match
-   * @see Turnout
-   * 
-   */
-  public static class Matcher extends BaseMatcher<Turnout.Match> {
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    public static Turnout.Matcher on(final ViatraQueryEngine engine) {
-      // check if matcher already exists
-      Matcher matcher = engine.getExistingMatcher(querySpecification());
-      if (matcher == null) {
-          matcher = (Matcher)engine.getMatcher(querySpecification());
-      }
-      return matcher;
-    }
-    
-    /**
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * @return an initialized matcher
-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
-     * 
-     */
-    public static Turnout.Matcher create() {
-      return new Matcher();
-    }
-    
-    private static final int POSITION_T = 0;
-    
-    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(Turnout.Matcher.class);
-    
-    /**
-     * Initializes the pattern matcher within an existing VIATRA Query engine.
-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
-     * 
-     * @param engine the existing VIATRA Query engine in which this matcher will be created.
-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
-     * 
-     */
-    private Matcher() {
-      super(querySpecification());
-    }
-    
-    /**
-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pT the fixed value of pattern parameter T, or null if not bound.
-     * @return matches represented as a Match object.
-     * 
-     */
-    public Collection<Turnout.Match> getAllMatches(final modes3.Turnout pT) {
-      return rawStreamAllMatches(new Object[]{pT}).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
-     * </p>
-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
-     * @param pT the fixed value of pattern parameter T, or null if not bound.
-     * @return a stream of matches represented as a Match object.
-     * 
-     */
-    public Stream<Turnout.Match> streamAllMatches(final modes3.Turnout pT) {
-      return rawStreamAllMatches(new Object[]{pT});
-    }
-    
-    /**
-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-     * Neither determinism nor randomness of selection is guaranteed.
-     * @param pT the fixed value of pattern parameter T, or null if not bound.
-     * @return a match represented as a Match object, or null if no match is found.
-     * 
-     */
-    public Optional<Turnout.Match> getOneArbitraryMatch(final modes3.Turnout pT) {
-      return rawGetOneArbitraryMatch(new Object[]{pT});
-    }
-    
-    /**
-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
-     * under any possible substitution of the unspecified parameters (if any).
-     * @param pT the fixed value of pattern parameter T, or null if not bound.
-     * @return true if the input is a valid (partial) match of the pattern.
-     * 
-     */
-    public boolean hasMatch(final modes3.Turnout pT) {
-      return rawHasMatch(new Object[]{pT});
-    }
-    
-    /**
-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
-     * @param pT the fixed value of pattern parameter T, or null if not bound.
-     * @return the number of pattern matches found.
-     * 
-     */
-    public int countMatches(final modes3.Turnout pT) {
-      return rawCountMatches(new Object[]{pT});
-    }
-    
-    /**
-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
-     * Neither determinism nor randomness of selection is guaranteed.
-     * @param pT the fixed value of pattern parameter T, or null if not bound.
-     * @param processor the action that will process the selected match.
-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
-     * 
-     */
-    public boolean forOneArbitraryMatch(final modes3.Turnout pT, final Consumer<? super Turnout.Match> processor) {
-      return rawForOneArbitraryMatch(new Object[]{pT}, processor);
-    }
-    
-    /**
-     * Returns a new (partial) match.
-     * This can be used e.g. to call the matcher with a partial match.
-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
-     * @param pT the fixed value of pattern parameter T, or null if not bound.
-     * @return the (partial) match object.
-     * 
-     */
-    public Turnout.Match newMatch(final modes3.Turnout pT) {
-      return Turnout.Match.newMatch(pT);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for T.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    protected Stream<modes3.Turnout> rawStreamAllValuesOfT(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_T, parameters).map(modes3.Turnout.class::cast);
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for T.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Set<modes3.Turnout> getAllValuesOfT() {
-      return rawStreamAllValuesOfT(emptyArray()).collect(Collectors.toSet());
-    }
-    
-    /**
-     * Retrieve the set of values that occur in matches for T.
-     * @return the Set of all values or empty set if there are no matches
-     * 
-     */
-    public Stream<modes3.Turnout> streamAllValuesOfT() {
-      return rawStreamAllValuesOfT(emptyArray());
-    }
-    
-    @Override
-    protected Turnout.Match tupleToMatch(final Tuple t) {
-      try {
-          return Turnout.Match.newMatch((modes3.Turnout) t.get(POSITION_T));
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in tuple not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected Turnout.Match arrayToMatch(final Object[] match) {
-      try {
-          return Turnout.Match.newMatch((modes3.Turnout) match[POSITION_T]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    @Override
-    protected Turnout.Match arrayToMatchMutable(final Object[] match) {
-      try {
-          return Turnout.Match.newMutableMatch((modes3.Turnout) match[POSITION_T]);
-      } catch(ClassCastException e) {
-          LOGGER.error("Element(s) in array not properly typed!",e);
-          return null;
-      }
-    }
-    
-    /**
-     * @return the singleton instance of the query specification of this pattern
-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-     * 
-     */
-    public static IQuerySpecification<Turnout.Matcher> querySpecification() {
-      return Turnout.instance();
-    }
-  }
-  
-  private Turnout() {
-    super(GeneratedPQuery.INSTANCE);
-  }
-  
-  /**
-   * @return the singleton instance of the query specification
-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
-   * 
-   */
-  public static Turnout instance() {
-    try{
-        return LazyHolder.INSTANCE;
-    } catch (ExceptionInInitializerError err) {
-        throw processInitializerError(err);
-    }
-  }
-  
-  @Override
-  protected Turnout.Matcher instantiate(final ViatraQueryEngine engine) {
-    return Turnout.Matcher.on(engine);
-  }
-  
-  @Override
-  public Turnout.Matcher instantiate() {
-    return Turnout.Matcher.create();
-  }
-  
-  @Override
-  public Turnout.Match newEmptyMatch() {
-    return Turnout.Match.newEmptyMatch();
-  }
-  
-  @Override
-  public Turnout.Match newMatch(final Object... parameters) {
-    return Turnout.Match.newMatch((modes3.Turnout) parameters[0]);
-  }
-  
-  /**
-   * Inner class allowing the singleton instance of {@link Turnout} to be created 
-   *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link Turnout#instance()}.
-   * 
-   * <p> This workaround is required e.g. to support recursion.
-   * 
-   */
-  private static class LazyHolder {
-    private static final Turnout INSTANCE = new Turnout();
-    
-    /**
-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
-     * This initialization order is required to support indirect recursion.
-     * 
-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
-     * 
-     */
-    private static final Object STATIC_INITIALIZER = ensureInitialized();
-    
-    public static Object ensureInitialized() {
-      INSTANCE.ensureInitializedInternal();
-      return null;
-    }
-  }
-  
-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
-    private static final Turnout.GeneratedPQuery INSTANCE = new GeneratedPQuery();
-    
-    private final PParameter parameter_T = new PParameter("T", "modes3.Turnout", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")), PParameterDirection.INOUT);
-    
-    private final List<PParameter> parameters = Arrays.asList(parameter_T);
-    
-    private GeneratedPQuery() {
-      super(PVisibility.PUBLIC);
-    }
-    
-    @Override
-    public String getFullyQualifiedName() {
-      return "modes3.queries.turnout";
-    }
-    
-    @Override
-    public List<String> getParameterNames() {
-      return Arrays.asList("T");
-    }
-    
-    @Override
-    public List<PParameter> getParameters() {
-      return parameters;
-    }
-    
-    @Override
-    public Set<PBody> doGetContainedBodies() {
-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
-      Set<PBody> bodies = new LinkedHashSet<>();
-      {
-          PBody body = new PBody(this);
-          PVariable var_T = body.getOrCreateVariableByName("T");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")));
-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
-             new ExportedParameter(body, var_T, parameter_T)
-          ));
-          //    Turnout(T)
-          new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")));
-          bodies.add(body);
-      }
-      return bodies;
-    }
-  }
-}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.Modes3ModelGenerator.xtendbin b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.Modes3ModelGenerator.xtendbin
index 4f542a67..77f1ea6e 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.Modes3ModelGenerator.xtendbin
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.Modes3ModelGenerator.xtendbin
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.Modes3TypeScopeHint.xtendbin b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.Modes3TypeScopeHint.xtendbin
new file mode 100644
index 00000000..4fdbb71b
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.Modes3TypeScopeHint.xtendbin
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.Modes3UnitPropagationGenerator.xtendbin b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.Modes3UnitPropagationGenerator.xtendbin
index 28e763b9..e5e1b63e 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.Modes3UnitPropagationGenerator.xtendbin
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.Modes3UnitPropagationGenerator.xtendbin
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.gitignore b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.gitignore
index 53dcf60f..fb94df96 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.gitignore
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.gitignore
@@ -1,2 +1,3 @@
 /.Modes3ModelGenerator.java._trace
 /.Modes3UnitPropagationGenerator.java._trace
+/.Modes3TypeScopeHint.java._trace
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/Modes3ModelGenerator.java b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/Modes3ModelGenerator.java
index c7364257..f32a7172 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/Modes3ModelGenerator.java
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/Modes3ModelGenerator.java
@@ -12,7 +12,9 @@ import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor;
 import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.Ecore2logicannotationsFactory;
 import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.Ecore2logicannotationsPackage;
 import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.InverseRelationAssertion;
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel;
 import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicProblemBuilder;
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.SolutionScope;
 import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput;
 import hu.bme.mit.inf.dslreasoner.logic.model.builder.TypeScopes;
 import hu.bme.mit.inf.dslreasoner.logic.model.builder.VariableContext;
@@ -48,6 +50,7 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.par
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.RelationLink;
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretation2Gml;
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretationVisualisation;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.DebugConfiguration;
 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.StateCoderStrategy;
 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasoner;
 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasonerConfiguration;
@@ -57,12 +60,13 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.Consumer;
 import java.util.function.Predicate;
 import modes3.Modes3Factory;
 import modes3.Modes3ModelRoot;
 import modes3.Modes3Package;
 import modes3.queries.Modes3Queries;
+import modes3.run.Modes3TypeScopeHint;
+import modes3.run.Modes3UnitPropagationGenerator;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EAttribute;
@@ -175,29 +179,47 @@ public class Modes3ModelGenerator {
             it_1.minNewElements = this.modelSize;
             it_1.maxNewElements = this.modelSize;
             final Procedure1<Map<Type, Integer>> _function_4 = (Map<Type, Integer> it_2) -> {
-              it_2.put(this.ecore2Logic.TypeofEClass(metamodelLogic.getTrace(), Modes3Package.eINSTANCE.getTurnout()), Integer.valueOf(1));
             };
             ObjectExtensions.<Map<Type, Integer>>operator_doubleArrow(
               it_1.minNewElementsByType, _function_4);
             final Procedure1<Map<Type, Integer>> _function_5 = (Map<Type, Integer> it_2) -> {
               it_2.put(this.ecore2Logic.TypeofEClass(metamodelLogic.getTrace(), Modes3Package.eINSTANCE.getTrain()), Integer.valueOf(5));
+              it_2.put(this.ecore2Logic.TypeofEClass(metamodelLogic.getTrace(), Modes3Package.eINSTANCE.getTurnout()), Integer.valueOf(5));
             };
             ObjectExtensions.<Map<Type, Integer>>operator_doubleArrow(
               it_1.maxNewElementsByType, _function_5);
           };
           ObjectExtensions.<TypeScopes>operator_doubleArrow(
             it.typeScopes, _function_3);
-          it.solutionScope.numberOfRequiredSolutions = 1;
+          final Procedure1<SolutionScope> _function_4 = (SolutionScope it_1) -> {
+            it_1.numberOfRequiredSolutions = 1;
+          };
+          ObjectExtensions.<SolutionScope>operator_doubleArrow(
+            it.solutionScope, _function_4);
+          it.scopeWeight = 5;
           it.nameNewElements = false;
           it.typeInferenceMethod = TypeInferenceMethod.PreliminaryAnalysis;
-          it.stateCoderStrategy = StateCoderStrategy.Neighbourhood;
+          it.stateCoderStrategy = StateCoderStrategy.PairwiseNeighbourhood;
           ScopePropagatorStrategy.Polyhedral _polyhedral = new ScopePropagatorStrategy.Polyhedral(
             PolyhedralScopePropagatorConstraints.Relational, PolyhedralScopePropagatorSolver.Clp);
           it.scopePropagatorStrategy = _polyhedral;
-          it.debugConfiguration.partialInterpretatioVisualiser = null;
+          Ecore2Logic_Trace _trace = metamodelLogic.getTrace();
+          Modes3TypeScopeHint _modes3TypeScopeHint = new Modes3TypeScopeHint(this.ecore2Logic, _trace);
+          it.hints.add(_modes3TypeScopeHint);
+          Ecore2Logic_Trace _trace_1 = metamodelLogic.getTrace();
+          Modes3UnitPropagationGenerator _modes3UnitPropagationGenerator = new Modes3UnitPropagationGenerator(this.ecore2Logic, _trace_1);
+          it.unitPropagationPatternGenerators.add(_modes3UnitPropagationGenerator);
+          final Procedure1<DebugConfiguration> _function_5 = (DebugConfiguration it_1) -> {
+            GraphvizVisualiser _graphvizVisualiser = new GraphvizVisualiser();
+            it_1.partialInterpretatioVisualiser = _graphvizVisualiser;
+          };
+          ObjectExtensions.<DebugConfiguration>operator_doubleArrow(
+            it.debugConfiguration, _function_5);
+          it.documentationLevel = DocumentationLevel.NORMAL;
         };
         final ViatraReasonerConfiguration config = ObjectExtensions.<ViatraReasonerConfiguration>operator_doubleArrow(_viatraReasonerConfiguration, _function_2);
         final FileSystemWorkspace workspace = new FileSystemWorkspace("output/", "");
+        workspace.writeModel(logic.getOutput(), "problem.logicproblem");
         final LogicResult solution = this.solver.solve(logic.getOutput(), config, workspace);
         URI _xifexpression = null;
         if ((solution instanceof ModelResult)) {
@@ -226,27 +248,23 @@ public class Modes3ModelGenerator {
                 boolean _lessThan = (_size_1 < 160);
                 if (_lessThan) {
                   if ((representation instanceof PartialInterpretation)) {
-                    final Consumer<Type> _function_3 = (Type it) -> {
-                      InputOutput.<String>println(it.getName());
-                    };
-                    ((PartialInterpretation)representation).getProblem().getTypes().forEach(_function_3);
-                    final Function1<Type, Boolean> _function_4 = (Type it) -> {
+                    final Function1<Type, Boolean> _function_3 = (Type it) -> {
                       String _name_2 = it.getName();
                       return Boolean.valueOf(Objects.equal(_name_2, "Modes3ModelRoot class DefinedPart"));
                     };
-                    Type _findFirst = IterableExtensions.<Type>findFirst(((PartialInterpretation)representation).getProblem().getTypes(), _function_4);
+                    Type _findFirst = IterableExtensions.<Type>findFirst(((PartialInterpretation)representation).getProblem().getTypes(), _function_3);
                     final TypeDefinition rootType = ((TypeDefinition) _findFirst);
-                    final Function1<PartialComplexTypeInterpretation, Boolean> _function_5 = (PartialComplexTypeInterpretation it) -> {
+                    final Function1<PartialComplexTypeInterpretation, Boolean> _function_4 = (PartialComplexTypeInterpretation it) -> {
                       String _name_2 = it.getInterpretationOf().getName();
                       return Boolean.valueOf(Objects.equal(_name_2, "Modes3ModelRoot class"));
                     };
                     final PartialComplexTypeInterpretation rootIntepretation = IterableExtensions.<PartialComplexTypeInterpretation>findFirst(Iterables.<PartialComplexTypeInterpretation>filter(((PartialInterpretation)representation).getPartialtypeinterpratation(), 
-                      PartialComplexTypeInterpretation.class), _function_5);
+                      PartialComplexTypeInterpretation.class), _function_4);
                     rootIntepretation.getElements().removeAll(rootType.getElements());
                     ((PartialInterpretation)representation).getProblem().getElements().removeAll(rootType.getElements());
                     EList<PartialRelationInterpretation> _partialrelationinterpretation = ((PartialInterpretation)representation).getPartialrelationinterpretation();
                     for (final PartialRelationInterpretation relationInterpretation : _partialrelationinterpretation) {
-                      final Predicate<RelationLink> _function_6 = (RelationLink link) -> {
+                      final Predicate<RelationLink> _function_5 = (RelationLink link) -> {
                         boolean _xifexpression_1 = false;
                         if ((link instanceof BinaryElementRelationLink)) {
                           _xifexpression_1 = (rootType.getElements().contains(((BinaryElementRelationLink)link).getParam1()) || rootType.getElements().contains(((BinaryElementRelationLink)link).getParam2()));
@@ -255,7 +273,7 @@ public class Modes3ModelGenerator {
                         }
                         return _xifexpression_1;
                       };
-                      relationInterpretation.getRelationlinks().removeIf(_function_6);
+                      relationInterpretation.getRelationlinks().removeIf(_function_5);
                     }
                     rootType.getElements().clear();
                   }
@@ -349,13 +367,7 @@ public class Modes3ModelGenerator {
       Viatra2LogicAnnotationsPackage.eINSTANCE.getClass();
       Map<String, Object> _extensionToFactoryMap = Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap();
       XMIResourceFactoryImpl _xMIResourceFactoryImpl = new XMIResourceFactoryImpl();
-      _extensionToFactoryMap.put("ecore", _xMIResourceFactoryImpl);
-      Map<String, Object> _extensionToFactoryMap_1 = Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap();
-      XMIResourceFactoryImpl _xMIResourceFactoryImpl_1 = new XMIResourceFactoryImpl();
-      _extensionToFactoryMap_1.put("logicproblem", _xMIResourceFactoryImpl_1);
-      Map<String, Object> _extensionToFactoryMap_2 = Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap();
-      XMIResourceFactoryImpl _xMIResourceFactoryImpl_2 = new XMIResourceFactoryImpl();
-      _xblockexpression = _extensionToFactoryMap_2.put("partialinterpretation", _xMIResourceFactoryImpl_2);
+      _xblockexpression = _extensionToFactoryMap.put("*", _xMIResourceFactoryImpl);
     }
     return _xblockexpression;
   }
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/Modes3TypeScopeHint.java b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/Modes3TypeScopeHint.java
new file mode 100644
index 00000000..adb69760
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/Modes3TypeScopeHint.java
@@ -0,0 +1,133 @@
+package modes3.run;
+
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.Modality;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearBoundedExpression;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeConstraintHint;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeExpressionBuilderFactory;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.RelationConstraintUpdater;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternGenerator;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation;
+import java.util.Iterator;
+import java.util.Map;
+import modes3.Modes3Package;
+import modes3.queries.Adjacent;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery;
+import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.xbase.lib.Extension;
+
+@SuppressWarnings("all")
+public class Modes3TypeScopeHint implements LinearTypeConstraintHint {
+  private static final String TURNOUT_NEIGHBOR_COUNT = "turnoutNeighborCount";
+  
+  private final Type segmentType;
+  
+  private final Type turnoutType;
+  
+  public Modes3TypeScopeHint(@Extension final Ecore2Logic ecore2Logic, final Ecore2Logic_Trace ecore2LogicTrace) {
+    @Extension
+    final Modes3Package Modes3Package = modes3.Modes3Package.eINSTANCE;
+    this.segmentType = ecore2Logic.TypeofEClass(ecore2LogicTrace, Modes3Package.getSegment());
+    this.turnoutType = ecore2Logic.TypeofEClass(ecore2LogicTrace, Modes3Package.getTurnout());
+  }
+  
+  @Override
+  public CharSequence getAdditionalPatterns(@Extension final PatternGenerator patternGenerator, final Map<String, PQuery> fqnToPQuery) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("\t");
+    _builder.append("pattern ");
+    _builder.append(Modes3TypeScopeHint.TURNOUT_NEIGHBOR_COUNT, "\t");
+    _builder.append("_helper(problem: LogicProblem, interpretation: PartialInterpretation, source: DefinedElement, target: DefinedElement) {");
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t\t");
+    _builder.append("find interpretation(problem, interpretation);");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("find mustExist(problem, interpretation, source);");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("find mustExist(problem, interpretation, target);");
+    _builder.newLine();
+    _builder.append("\t\t");
+    CharSequence _referInstanceOf = patternGenerator.getTypeIndexer().referInstanceOf(this.turnoutType, Modality.MUST, "source");
+    _builder.append(_referInstanceOf, "\t\t");
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t\t");
+    CharSequence _referInstanceOf_1 = patternGenerator.getTypeIndexer().referInstanceOf(this.segmentType, Modality.MUST, "target");
+    _builder.append(_referInstanceOf_1, "\t\t");
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t\t");
+    CharSequence _referPattern = patternGenerator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Adjacent.instance().getFullyQualifiedName()), new String[] { "source", "target" }, Modality.MUST, true, false);
+    _builder.append(_referPattern, "\t\t");
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("pattern ");
+    _builder.append(Modes3TypeScopeHint.TURNOUT_NEIGHBOR_COUNT, "\t");
+    _builder.append("(problem: LogicProblem, interpretation: PartialInterpretation, element: DefinedElement, N) {");
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t\t");
+    _builder.append("find interpretation(problem, interpretation);");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("find mustExist(problem, interpretation, element);");
+    _builder.newLine();
+    _builder.append("\t\t");
+    CharSequence _referInstanceOf_2 = patternGenerator.getTypeIndexer().referInstanceOf(this.turnoutType, Modality.MUST, "element");
+    _builder.append(_referInstanceOf_2, "\t\t");
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t\t");
+    _builder.append("N == count find ");
+    _builder.append(Modes3TypeScopeHint.TURNOUT_NEIGHBOR_COUNT, "\t\t");
+    _builder.append("_helper(problem, interpretation, element, _);");
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t");
+    _builder.append("}");
+    _builder.newLine();
+    return _builder;
+  }
+  
+  @Override
+  public RelationConstraintUpdater createConstraintUpdater(final LinearTypeExpressionBuilderFactory builderFactory) {
+    final ViatraQueryMatcher<? extends IPatternMatch> turnoutNeighborCountMatcher = builderFactory.createMatcher(Modes3TypeScopeHint.TURNOUT_NEIGHBOR_COUNT);
+    final LinearBoundedExpression newNeighbors = builderFactory.createBuilder().add(1, this.segmentType).build();
+    final RelationConstraintUpdater _function = (PartialInterpretation partialInterpretation) -> {
+      final int requiredNeighbbors = Modes3TypeScopeHint.getRemainingCount(turnoutNeighborCountMatcher, partialInterpretation, 3);
+      newNeighbors.tightenLowerBound(Integer.valueOf(requiredNeighbbors));
+    };
+    return _function;
+  }
+  
+  private static <T extends IPatternMatch> int getRemainingCount(final ViatraQueryMatcher<T> matcher, final PartialInterpretation partialInterpretation, final int capacity) {
+    int _xblockexpression = (int) 0;
+    {
+      final T partialMatch = matcher.newEmptyMatch();
+      partialMatch.set(0, partialInterpretation.getProblem());
+      partialMatch.set(1, partialInterpretation);
+      final Iterator<T> iterator = matcher.streamAllMatches(partialMatch).iterator();
+      int max = 0;
+      while (iterator.hasNext()) {
+        {
+          final T match = iterator.next();
+          Object _get = match.get(3);
+          final int n = ((Integer) _get).intValue();
+          if ((n < capacity)) {
+            final int required = (capacity - n);
+            if ((max < required)) {
+              max = required;
+            }
+          }
+        }
+      }
+      _xblockexpression = max;
+    }
+    return _xblockexpression;
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/Modes3UnitPropagationGenerator.java b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/Modes3UnitPropagationGenerator.java
index 91adaaaa..5c5f82c5 100644
--- a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/Modes3UnitPropagationGenerator.java
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/Modes3UnitPropagationGenerator.java
@@ -10,9 +10,8 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.UnitPropaga
 import java.util.Collections;
 import java.util.Map;
 import modes3.Modes3Package;
-import modes3.queries.ExtraInputOfTurnout;
+import modes3.queries.Adjacent;
 import modes3.queries.Output;
-import modes3.queries.TurnoutOutput;
 import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery;
 import org.eclipse.xtend2.lib.StringConcatenationClient;
 import org.eclipse.xtext.xbase.lib.CollectionLiterals;
@@ -23,16 +22,20 @@ import org.eclipse.xtext.xbase.lib.Pair;
 public class Modes3UnitPropagationGenerator implements UnitPropagationPatternGenerator {
   private static final String MUST_NOT_CONNECTED_TO = "mustNotConnectedTo";
   
-  private static final String MUST_NOT_CONNECTED_TO_HELPER = "mustNotConnectedTo_helper";
-  
-  private static final String MUST_NOT_TURNOUT_OUTPUT = "mustNotTurnoutOutput";
-  
   private static final String MUST_NOT_STRAIGHT = "mustNotStraight";
   
   private static final String MUST_NOT_DIVERGENT = "mustNotDivergent";
   
+  private static final String MUST_CONNECTED_TO = "mustConnectedTo";
+  
+  private static final String MUST_STRAIGHT = "mustStraight";
+  
+  private static final String MUST_DIVERGENT = "mustDivergent";
+  
   private final Type segmentType;
   
+  private final Type simpleSegmentType;
+  
   private final Type turnoutType;
   
   private final Relation connectedToRelation;
@@ -45,6 +48,7 @@ public class Modes3UnitPropagationGenerator implements UnitPropagationPatternGen
     @Extension
     final Modes3Package Modes3Package = modes3.Modes3Package.eINSTANCE;
     this.segmentType = ecore2Logic.TypeofEClass(ecore2LogicTrace, Modes3Package.getSegment());
+    this.simpleSegmentType = ecore2Logic.TypeofEClass(ecore2LogicTrace, Modes3Package.getSimpleSegment());
     this.turnoutType = ecore2Logic.TypeofEClass(ecore2LogicTrace, Modes3Package.getTurnout());
     this.connectedToRelation = ecore2Logic.relationOfReference(ecore2LogicTrace, Modes3Package.getSegment_ConnectedTo());
     this.straightRelation = ecore2Logic.relationOfReference(ecore2LogicTrace, Modes3Package.getTurnout_Straight());
@@ -53,7 +57,10 @@ public class Modes3UnitPropagationGenerator implements UnitPropagationPatternGen
   
   @Override
   public Map<Relation, String> getMustPatterns() {
-    return CollectionLiterals.<Relation, String>emptyMap();
+    Pair<Relation, String> _mappedTo = Pair.<Relation, String>of(this.connectedToRelation, Modes3UnitPropagationGenerator.MUST_CONNECTED_TO);
+    Pair<Relation, String> _mappedTo_1 = Pair.<Relation, String>of(this.straightRelation, Modes3UnitPropagationGenerator.MUST_STRAIGHT);
+    Pair<Relation, String> _mappedTo_2 = Pair.<Relation, String>of(this.divergentRelation, Modes3UnitPropagationGenerator.MUST_DIVERGENT);
+    return Collections.<Relation, String>unmodifiableMap(CollectionLiterals.<Relation, String>newHashMap(_mappedTo, _mappedTo_1, _mappedTo_2));
   }
   
   @Override
@@ -89,496 +96,1078 @@ public class Modes3UnitPropagationGenerator implements UnitPropagationPatternGen
           _builder.newLine();
         }
       };
-      final StringConcatenationClient commonParameterConstraints = _client_1;
+      final StringConcatenationClient commonMustParameterConstraints = _client_1;
       StringConcatenationClient _client_2 = new StringConcatenationClient() {
         @Override
         protected void appendTo(StringConcatenationClient.TargetStringConcatenation _builder) {
+          _builder.append("find interpretation(problem, interpretation);");
+          _builder.newLine();
+          _builder.append("find mayExist(problem, interpretation, source);");
+          _builder.newLine();
+          _builder.append("find mayExist(problem, interpretation, target);");
+          _builder.newLine();
+        }
+      };
+      final StringConcatenationClient commonMayParameterConstraints = _client_2;
+      StringConcatenationClient _client_3 = new StringConcatenationClient() {
+        @Override
+        protected void appendTo(StringConcatenationClient.TargetStringConcatenation _builder) {
+          _builder.append("pattern mayInput(");
+          _builder.append(parameters);
+          _builder.append(") {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append(commonMayParameterConstraints, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
+          _builder.append(_referInstanceOf, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referPattern = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Adjacent.instance().getFullyQualifiedName()), new String[] { "target", "source" }, Modality.MAY, true, false);
+          _builder.append(_referPattern, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg ");
+          CharSequence _referRelation = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "target", "source", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg ");
+          CharSequence _referRelation_1 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "target", "source", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_1, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern multipleMayInput(problem: LogicProblem, interpretation: PartialInterpretation,");
+          _builder.newLine();
+          _builder.append("\t\t\t");
+          _builder.append("target: DefinedElement) {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find interpretation(problem, interpretation);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, target);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find mayInput(problem, interpretaton, source1, target);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find mayInput(problem, interpretaton, source2, target);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("neg find mustEquivalent(problem, interpretation, source1, source2);");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern multipleMayStraight(problem: LogicProblem, interpretation: PartialInterpretation,");
+          _builder.newLine();
+          _builder.append("\t\t\t");
+          _builder.append("source: DefinedElement) {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find interpretation(problem, interpretation);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, source);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_1 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MAY, "source");
+          _builder.append(_referInstanceOf_1, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referRelation_2 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "source", "target1", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_2, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referRelation_3 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "source", "target2", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_3, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg find mustEquivalent(problem, interpretation, target1, target2);");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern multipleMayDivergent(problem: LogicProblem, interpretation: PartialInterpretation,");
+          _builder.newLine();
+          _builder.append("\t\t\t");
+          _builder.append("source: DefinedElement) {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find interpretation(problem, interpretation);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, source);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_2 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MAY, "source");
+          _builder.append(_referInstanceOf_2, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referRelation_4 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "source", "target1", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_4, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referRelation_5 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "source", "target2", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_5, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg find mustEquivalent(problem, interpretation, target1, target2);");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
           _builder.append("pattern ");
-          _builder.append(Modes3UnitPropagationGenerator.MUST_NOT_CONNECTED_TO_HELPER);
+          _builder.append(Modes3UnitPropagationGenerator.MUST_CONNECTED_TO);
           _builder.append("(");
           _builder.append(parameters);
           _builder.append(") {");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          _builder.append("// connectedToReflexive unit propagation");
+          _builder.append(commonMustParameterConstraints, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_3 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
+          _builder.append(_referInstanceOf_3, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find mayInput(problem, interpretaton, source, target);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("neg find multipleMayInput(problem, interpretaton, target);");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append(commonParameterConstraints, "\t");
+          CharSequence _referRelation_6 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "source", "target", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_6, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "source");
-          _builder.append(_referInstanceOf, "\t");
+          _builder.append("neg ");
+          CharSequence _referRelation_7 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "source", "target", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_7, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_1 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "target");
-          _builder.append(_referInstanceOf_1, "\t");
+          _builder.append("neg ");
+          CharSequence _referRelation_8 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "source", "target", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_8, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          _builder.append("source == target;");
+          _builder.append("neg ");
+          CharSequence _referRelation_9 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "source", "target", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_9, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("}");
           _builder.newLine();
-          _builder.append("} or {");
           _builder.newLine();
+          _builder.append("pattern ");
+          _builder.append(Modes3UnitPropagationGenerator.MUST_STRAIGHT);
+          _builder.append("(");
+          _builder.append(parameters);
+          _builder.append(") {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append(commonMustParameterConstraints, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg ");
+          CharSequence _referRelation_10 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "source", "_", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_10, "\t");
+          _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          _builder.append("// tooManyInputsOfSegment unit propagation");
+          _builder.append("neg find multipleMayStraight(problem, interpretation, source);");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append(commonParameterConstraints, "\t");
+          CharSequence _referRelation_11 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "source", "target", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_11, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_2 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "source");
-          _builder.append(_referInstanceOf_2, "\t");
+          _builder.append("neg ");
+          CharSequence _referRelation_12 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "source", "target", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_12, "\t");
           _builder.newLineIfNotEmpty();
+          _builder.append("} or {");
+          _builder.newLine();
           _builder.append("\t");
-          CharSequence _referInstanceOf_3 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "target");
-          _builder.append(_referInstanceOf_3, "\t");
+          _builder.append(commonMustParameterConstraints, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_4 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "input1");
+          CharSequence _referInstanceOf_4 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
           _builder.append(_referInstanceOf_4, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_5 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "input2");
-          _builder.append(_referInstanceOf_5, "\t");
+          _builder.append("find mayInput(problem, interpretaton, source, target);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("neg find multipleMayInput(problem, interpretaton, target);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("neg ");
+          CharSequence _referRelation_13 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "source", "target", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_13, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referRelation_14 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "source", "target", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_14, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
           _builder.append("neg ");
-          CharSequence _referInstanceOf_6 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MAY, "source");
-          _builder.append(_referInstanceOf_6, "\t");
+          CharSequence _referRelation_15 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "source", "target", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_15, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referPattern = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Output.instance().getFullyQualifiedName()), new String[] { "input1", "source" }, Modality.MUST, true, false);
-          _builder.append(_referPattern, "\t");
+          _builder.append("neg ");
+          CharSequence _referRelation_16 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "source", "target", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_16, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern ");
+          _builder.append(Modes3UnitPropagationGenerator.MUST_DIVERGENT);
+          _builder.append("(");
+          _builder.append(parameters);
+          _builder.append(") {");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referPattern_1 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Output.instance().getFullyQualifiedName()), new String[] { "input2", "source" }, Modality.MUST, true, false);
-          _builder.append(_referPattern_1, "\t");
+          _builder.append(commonMustParameterConstraints, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg ");
+          CharSequence _referRelation_17 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "source", "_", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_17, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          _builder.append("input1 != input2;");
+          _builder.append("neg find multipleMayDivergent(problem, interpretation, source);");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append("input1 != target;");
+          CharSequence _referRelation_18 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "source", "target", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_18, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg ");
+          CharSequence _referRelation_19 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "source", "target", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_19, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("} or {");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append("input2 != target;");
+          _builder.append(commonMustParameterConstraints, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_5 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
+          _builder.append(_referInstanceOf_5, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find mayInput(problem, interpretaton, source, target);");
           _builder.newLine();
-          _builder.append("} or {");
+          _builder.append("\t");
+          _builder.append("neg find multipleMayInput(problem, interpretaton, target);");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append("// turnoutConnectedToBothOutputs unit propagation 1");
+          _builder.append("neg ");
+          CharSequence _referRelation_20 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "source", "target", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_20, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg ");
+          CharSequence _referRelation_21 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "source", "target", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_21, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referRelation_22 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "source", "target", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_22, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg ");
+          CharSequence _referRelation_23 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "source", "target", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_23, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("}");
           _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern turnoutOutput_must_to_true_by_straight(");
+          _builder.append(parameters);
+          _builder.append(", T : DefinedElement, S : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          _builder.append(commonParameterConstraints, "\t");
+          _builder.append(commonMayParameterConstraints, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_7 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MUST, "source");
-          _builder.append(_referInstanceOf_7, "\t");
+          CharSequence _referInstanceOf_6 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MAY, "source");
+          _builder.append(_referInstanceOf_6, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_8 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "target");
-          _builder.append(_referInstanceOf_8, "\t");
+          CharSequence _referInstanceOf_7 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
+          _builder.append(_referInstanceOf_7, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_9 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "divergent");
-          _builder.append(_referInstanceOf_9, "\t");
+          _builder.append("T == source;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("S == target;");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern turnoutOutput_must_to_true_by_divergent(");
+          _builder.append(parameters);
+          _builder.append(", T : DefinedElement, S : DefinedElement) {");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referRelation = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "source", "target", Modality.MUST, fqnToPQuery);
-          _builder.append(_referRelation, "\t");
+          _builder.append(commonMayParameterConstraints, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referRelation_1 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "source", "divergent", Modality.MUST, fqnToPQuery);
-          _builder.append(_referRelation_1, "\t");
+          CharSequence _referInstanceOf_8 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MAY, "source");
+          _builder.append(_referInstanceOf_8, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referRelation_2 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "source", "divergent", Modality.MUST, fqnToPQuery);
-          _builder.append(_referRelation_2, "\t");
+          CharSequence _referInstanceOf_9 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
+          _builder.append(_referInstanceOf_9, "\t");
           _builder.newLineIfNotEmpty();
-          _builder.append("} or {");
+          _builder.append("\t");
+          _builder.append("T == source;");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append("// turnoutConnectedToBothOutputs unit propagation 2");
+          _builder.append("S == target;");
           _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern output_must_to_true_by_connectedTo(");
+          _builder.append(parameters);
+          _builder.append(", S1 : DefinedElement, S2 : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          _builder.append(commonParameterConstraints, "\t");
+          _builder.append(commonMayParameterConstraints, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_10 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MUST, "source");
+          CharSequence _referInstanceOf_10 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "source");
           _builder.append(_referInstanceOf_10, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_11 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "target");
+          CharSequence _referInstanceOf_11 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
           _builder.append(_referInstanceOf_11, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_12 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "straight");
-          _builder.append(_referInstanceOf_12, "\t");
+          _builder.append("S1 == source;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("S2 == target;");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern output_must_to_true_by_straight(");
+          _builder.append(parameters);
+          _builder.append(", S1 : DefinedElement, S2 : DefinedElement) {");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referRelation_3 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "source", "straight", Modality.MUST, fqnToPQuery);
-          _builder.append(_referRelation_3, "\t");
+          _builder.append("find turnoutOutput_must_to_true_by_straight(problem, interpretation, source, target, S1, S2);");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern output_must_to_true_by_divergent(");
+          _builder.append(parameters);
+          _builder.append(", S1 : DefinedElement, S2 : DefinedElement) {");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referRelation_4 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "source", "target", Modality.MUST, fqnToPQuery);
-          _builder.append(_referRelation_4, "\t");
+          _builder.append("find turnoutOutput_must_to_true_by_divergent(problem, interpretation, source, target, S1, S2);");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern adjacent_must_to_true_by_connectedTo(");
+          _builder.append(parameters);
+          _builder.append(", S1 : DefinedElement, S2 : DefinedElement) {");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referRelation_5 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "source", "straight", Modality.MUST, fqnToPQuery);
-          _builder.append(_referRelation_5, "\t");
+          _builder.append("find output_must_to_true_by_connectedTo(problem, interpretation, source, target, S1, S2);");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern adjacent_must_to_true_by_straight(");
+          _builder.append(parameters);
+          _builder.append(", S1 : DefinedElement, S2 : DefinedElement) {");
           _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find output_must_to_true_by_straight(problem, interpretation, source, target, S1, S2);");
+          _builder.newLine();
           _builder.append("} or {");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append("// tooManyExtraInputsOfTurnout unit propagation");
+          _builder.append("find turnoutOutput_must_to_true_by_straight(problem, interpretation, source, target, S2, S1);");
           _builder.newLine();
-          _builder.append("\t");
-          _builder.append(commonParameterConstraints, "\t");
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern adjacent_must_to_true_by_divergent(");
+          _builder.append(parameters);
+          _builder.append(", S1 : DefinedElement, S2 : DefinedElement) {");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_13 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MUST, "source");
-          _builder.append(_referInstanceOf_13, "\t");
-          _builder.newLineIfNotEmpty();
+          _builder.append("find output_must_to_true_by_divergent(problem, interpretation, source, target, S1, S2);");
+          _builder.newLine();
+          _builder.append("} or {");
+          _builder.newLine();
           _builder.append("\t");
-          CharSequence _referInstanceOf_14 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "target");
-          _builder.append(_referInstanceOf_14, "\t");
+          _builder.append("find turnoutOutput_must_to_true_by_divergent(problem, interpretation, source, target, S2, S1);");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern connectedToReflexive_must_to_true_by_connectedTo(");
+          _builder.append(parameters);
+          _builder.append(", S : DefinedElement) {");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_15 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "extraInput");
-          _builder.append(_referInstanceOf_15, "\t");
+          _builder.append("find mustExist(problem, interpretation, source);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_12 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "source");
+          _builder.append(_referInstanceOf_12, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referPattern_2 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(TurnoutOutput.instance().getFullyQualifiedName()), new String[] { "source", "target" }, Modality.MAY, false, false);
-          _builder.append(_referPattern_2, "\t");
+          _builder.append("S == source;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("S == target;");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern outputReflexive_must_to_true_by_straight(");
+          _builder.append(parameters);
+          _builder.append(", T : DefinedElement) {");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referPattern_3 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(ExtraInputOfTurnout.instance().getFullyQualifiedName()), new String[] { "source", "extraInput" }, Modality.MUST, true, false);
-          _builder.append(_referPattern_3, "\t");
+          _builder.append("find turnoutOutput_must_to_true_by_straight(problem, interpretation, source, target, T, T);");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern outputReflexive_must_to_true_by_divergent(");
+          _builder.append(parameters);
+          _builder.append(", T : DefinedElement) {");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          _builder.append("target != extraInput;");
+          _builder.append("find turnoutOutput_must_to_true_by_divergent(problem, interpretation, source, target, T, T);");
           _builder.newLine();
           _builder.append("}");
           _builder.newLine();
           _builder.newLine();
-          _builder.append("pattern ");
-          _builder.append(Modes3UnitPropagationGenerator.MUST_NOT_CONNECTED_TO);
-          _builder.append("(");
+          _builder.append("pattern turnoutOutputsAreSame_must_to_true_by_straight(");
           _builder.append(parameters);
-          _builder.append(") {");
+          _builder.append(", T : DefinedElement) {");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          _builder.append("find ");
-          _builder.append(Modes3UnitPropagationGenerator.MUST_NOT_CONNECTED_TO_HELPER, "\t");
-          _builder.append("(problem, interpretation, source, target);");
+          _builder.append(commonMayParameterConstraints, "\t");
           _builder.newLineIfNotEmpty();
-          _builder.append("} or {");
+          _builder.append("\t");
+          CharSequence _referInstanceOf_13 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MAY, "source");
+          _builder.append(_referInstanceOf_13, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_14 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
+          _builder.append(_referInstanceOf_14, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("T == source;");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append("find ");
-          _builder.append(Modes3UnitPropagationGenerator.MUST_NOT_CONNECTED_TO_HELPER, "\t");
-          _builder.append("(problem, interpretation, target, source);");
+          _builder.append("S == target;");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referRelation_24 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "T", "S", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_24, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("}");
           _builder.newLine();
           _builder.newLine();
-          _builder.append("pattern ");
-          _builder.append(Modes3UnitPropagationGenerator.MUST_NOT_TURNOUT_OUTPUT);
-          _builder.append("(");
+          _builder.append("pattern turnoutOutputsAreSame_must_to_true_by_divergent(");
           _builder.append(parameters);
-          _builder.append(") {");
+          _builder.append(", T : DefinedElement) {");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          _builder.append("// outputReflexive unit propagation");
-          _builder.newLine();
+          _builder.append(commonMayParameterConstraints, "\t");
+          _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          _builder.append(commonParameterConstraints, "\t");
+          CharSequence _referInstanceOf_15 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MAY, "source");
+          _builder.append(_referInstanceOf_15, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_16 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MUST, "source");
+          CharSequence _referInstanceOf_16 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
           _builder.append(_referInstanceOf_16, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_17 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MUST, "target");
+          _builder.append("T == source;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("S == target;");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referRelation_25 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "T", "S", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_25, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern tooManyInputsOfSegment_must_to_true_by_connectedTo(");
+          _builder.append(parameters);
+          _builder.append(", S : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, S);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_17 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.simpleSegmentType, Modality.MUST, "S");
           _builder.append(_referInstanceOf_17, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          _builder.append("source == target;");
+          _builder.append("find output_must_to_true_by_connectedTo(problem, interpretation, source, target, I1, S);");
           _builder.newLine();
-          _builder.append("} or {");
+          _builder.append("\t");
+          CharSequence _referPattern_1 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Output.instance().getFullyQualifiedName()), new String[] { "I2", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_1, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referPattern_2 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Output.instance().getFullyQualifiedName()), new String[] { "I3", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_2, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("I1 != I2;");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append("// tooManyInputsOfSegment unit propagation");
+          _builder.append("I1 != I3;");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append(commonParameterConstraints, "\t");
+          _builder.append("I2 != I3;");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern tooManyInputsOfSegment_must_to_true_by_straight(");
+          _builder.append(parameters);
+          _builder.append(", S : DefinedElement) {");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_18 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MUST, "source");
+          _builder.append("find mustExist(problem, interpretation, S);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_18 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.simpleSegmentType, Modality.MUST, "S");
           _builder.append(_referInstanceOf_18, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_19 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "target");
-          _builder.append(_referInstanceOf_19, "\t");
-          _builder.newLineIfNotEmpty();
+          _builder.append("find output_must_to_true_by_straight(problem, interpretation, source, target, I1, S);");
+          _builder.newLine();
           _builder.append("\t");
-          CharSequence _referInstanceOf_20 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "input1");
-          _builder.append(_referInstanceOf_20, "\t");
+          CharSequence _referPattern_3 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Output.instance().getFullyQualifiedName()), new String[] { "I2", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_3, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_21 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "input2");
-          _builder.append(_referInstanceOf_21, "\t");
+          CharSequence _referPattern_4 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Output.instance().getFullyQualifiedName()), new String[] { "I3", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_4, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          _builder.append("neg ");
-          CharSequence _referInstanceOf_22 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MAY, "target");
-          _builder.append(_referInstanceOf_22, "\t");
+          _builder.append("I1 != I2;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I1 != I3;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I2 != I3;");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern tooManyInputsOfSegment_must_to_true_by_divergent(");
+          _builder.append(parameters);
+          _builder.append(", S : DefinedElement) {");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referPattern_4 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Output.instance().getFullyQualifiedName()), new String[] { "input1", "target" }, Modality.MUST, true, false);
-          _builder.append(_referPattern_4, "\t");
+          _builder.append("find mustExist(problem, interpretation, S);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_19 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.simpleSegmentType, Modality.MUST, "S");
+          _builder.append(_referInstanceOf_19, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referPattern_5 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Output.instance().getFullyQualifiedName()), new String[] { "input2", "target" }, Modality.MUST, true, false);
+          _builder.append("find output_must_to_true_by_divergent(problem, interpretation, source, target, I1, S);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referPattern_5 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Output.instance().getFullyQualifiedName()), new String[] { "I2", "S" }, Modality.MUST, true, false);
           _builder.append(_referPattern_5, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          _builder.append("input1 != input2;");
+          CharSequence _referPattern_6 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Output.instance().getFullyQualifiedName()), new String[] { "I3", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_6, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("I1 != I2;");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append("input1 != source;");
+          _builder.append("I1 != I3;");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append("input2 != source;");
+          _builder.append("I2 != I3;");
           _builder.newLine();
           _builder.append("}");
           _builder.newLine();
           _builder.newLine();
-          _builder.append("pattern ");
-          _builder.append(Modes3UnitPropagationGenerator.MUST_NOT_STRAIGHT);
-          _builder.append("(");
+          _builder.append("pattern turnoutConnectedToBothOutputs_must_to_true_by_connectedTo(");
           _builder.append(parameters);
-          _builder.append(") {");
+          _builder.append(", T : DefinedElement) {");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          _builder.append("find ");
-          _builder.append(Modes3UnitPropagationGenerator.MUST_NOT_TURNOUT_OUTPUT, "\t");
-          _builder.append("(problem, interpretation, source, target);");
+          _builder.append(commonMayParameterConstraints, "\t");
           _builder.newLineIfNotEmpty();
-          _builder.append("} or {");
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, Straight);");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append("// turnoutOutputsAreSame unit propagation");
+          _builder.append("find mustExist(problem, interpretation, Divergent);");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append(commonParameterConstraints, "\t");
+          CharSequence _referInstanceOf_20 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MAY, "source");
+          _builder.append(_referInstanceOf_20, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_21 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
+          _builder.append(_referInstanceOf_21, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_23 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MUST, "source");
+          CharSequence _referInstanceOf_22 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "Straight");
+          _builder.append(_referInstanceOf_22, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_23 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "Divergent");
           _builder.append(_referInstanceOf_23, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_24 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "target");
-          _builder.append(_referInstanceOf_24, "\t");
+          CharSequence _referRelation_26 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "T", "Straight", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_26, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referRelation_6 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "source", "target", Modality.MUST, fqnToPQuery);
-          _builder.append(_referRelation_6, "\t");
+          CharSequence _referRelation_27 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "T", "Divergent", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_27, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("T == source;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("Straight == target;");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referRelation_28 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "T", "Divergent", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_28, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("} or {");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append("// turnoutConnectedToBothOutputs unit propagation");
+          _builder.append(commonMayParameterConstraints, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, Straight);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, Divergent);");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append(commonParameterConstraints, "\t");
+          CharSequence _referInstanceOf_24 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MAY, "source");
+          _builder.append(_referInstanceOf_24, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_25 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MUST, "source");
+          CharSequence _referInstanceOf_25 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
           _builder.append(_referInstanceOf_25, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_26 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "target");
+          CharSequence _referInstanceOf_26 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "Straight");
           _builder.append(_referInstanceOf_26, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_27 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MUST, "divergent");
+          CharSequence _referInstanceOf_27 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "Divergent");
           _builder.append(_referInstanceOf_27, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referRelation_7 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "source", "target", Modality.MUST, fqnToPQuery);
-          _builder.append(_referRelation_7, "\t");
+          CharSequence _referRelation_29 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "T", "Straight", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_29, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referRelation_8 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "source", "divergent", Modality.MUST, fqnToPQuery);
-          _builder.append(_referRelation_8, "\t");
+          CharSequence _referRelation_30 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "T", "Divergent", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_30, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referRelation_9 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "source", "divergent", Modality.MUST, fqnToPQuery);
-          _builder.append(_referRelation_9, "\t");
+          CharSequence _referRelation_31 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "T", "Straight", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_31, "\t");
           _builder.newLineIfNotEmpty();
-          _builder.append("} or {");
+          _builder.append("\t");
+          _builder.append("T == source;");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append("// tooManyExtraInputsOfTurnout unit propagation");
+          _builder.append("Straight == target;");
+          _builder.newLine();
+          _builder.append("}");
           _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern turnoutConnectedToBothOutputs_must_to_true_by_straight(");
+          _builder.append(parameters);
+          _builder.append(", T : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          _builder.append(commonParameterConstraints, "\t");
+          _builder.append(commonMayParameterConstraints, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_28 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MUST, "source");
+          _builder.append("find mustExist(problem, interpretation, Straight);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, Divergent);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_28 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MAY, "source");
           _builder.append(_referInstanceOf_28, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_29 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "target");
+          CharSequence _referInstanceOf_29 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
           _builder.append(_referInstanceOf_29, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_30 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "extraInput");
+          CharSequence _referInstanceOf_30 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "Straight");
           _builder.append(_referInstanceOf_30, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_31 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "potentialExtraInput");
+          CharSequence _referInstanceOf_31 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "Divergent");
           _builder.append(_referInstanceOf_31, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referPattern_6 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(ExtraInputOfTurnout.instance().getFullyQualifiedName()), new String[] { "source", "extraInput" }, Modality.MUST, true, false);
-          _builder.append(_referPattern_6, "\t");
+          _builder.append("T == source;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("Straight == target;");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referRelation_32 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "T", "Divergent", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_32, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referRelation_10 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "source", "potentialExtraInput", Modality.MUST, fqnToPQuery);
-          _builder.append(_referRelation_10, "\t");
+          CharSequence _referRelation_33 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "T", "Straight", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_33, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          _builder.append("neg ");
-          CharSequence _referRelation_11 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "source", "potentialExtraInput", Modality.MAY, fqnToPQuery);
-          _builder.append(_referRelation_11, "\t");
+          CharSequence _referRelation_34 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "T", "Divergent", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_34, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern turnoutConnectedToBothOutputs_must_to_true_by_divergent(");
+          _builder.append(parameters);
+          _builder.append(", T : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append(commonMayParameterConstraints, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          _builder.append("extraInput != potentialExtraInput;");
+          _builder.append("find mustExist(problem, interpretation, Straight);");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append("extraInput != target;");
+          _builder.append("find mustExist(problem, interpretation, Divergent);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_32 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MAY, "source");
+          _builder.append(_referInstanceOf_32, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_33 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
+          _builder.append(_referInstanceOf_33, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_34 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "Straight");
+          _builder.append(_referInstanceOf_34, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_35 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "Divergent");
+          _builder.append(_referInstanceOf_35, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referRelation_35 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "T", "Straight", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_35, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("T == source;");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append("potentialExtraInput != target;");
+          _builder.append("Divergent == target;");
           _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referRelation_36 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "T", "Straight", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_36, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referRelation_37 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "T", "Divergent", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_37, "\t");
+          _builder.newLineIfNotEmpty();
           _builder.append("}");
           _builder.newLine();
           _builder.newLine();
-          _builder.append("pattern ");
-          _builder.append(Modes3UnitPropagationGenerator.MUST_NOT_DIVERGENT);
-          _builder.append("(");
+          _builder.append("pattern tooManyInputsOfTurnout_must_to_true_by_connectedTo(");
           _builder.append(parameters);
-          _builder.append(") {");
+          _builder.append(", T : DefinedElement) {");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          _builder.append("find ");
-          _builder.append(Modes3UnitPropagationGenerator.MUST_NOT_TURNOUT_OUTPUT, "\t");
-          _builder.append("(problem, interpretation, source, target);");
-          _builder.newLineIfNotEmpty();
-          _builder.append("} or {");
+          _builder.append("find mustExist(problem, interpretation, S);");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append("// turnoutOutputsAreSame unit propagation");
+          CharSequence _referInstanceOf_36 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MUST, "S");
+          _builder.append(_referInstanceOf_36, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find adjacent_must_to_true_by_connectedTo(problem, interpretation, source, target, I1, S);");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append(commonParameterConstraints, "\t");
+          CharSequence _referPattern_7 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Adjacent.instance().getFullyQualifiedName()), new String[] { "I2", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_7, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_32 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MUST, "source");
-          _builder.append(_referInstanceOf_32, "\t");
+          CharSequence _referPattern_8 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Adjacent.instance().getFullyQualifiedName()), new String[] { "I3", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_8, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_33 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "target");
-          _builder.append(_referInstanceOf_33, "\t");
+          CharSequence _referPattern_9 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Adjacent.instance().getFullyQualifiedName()), new String[] { "I4", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_9, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referRelation_12 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "source", "target", Modality.MUST, fqnToPQuery);
-          _builder.append(_referRelation_12, "\t");
-          _builder.newLineIfNotEmpty();
-          _builder.append("} or {");
+          _builder.append("I1 != I2;");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append("// turnoutConnectedToBothOutputs unit propagation");
+          _builder.append("I1 != I3;");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append(commonParameterConstraints, "\t");
-          _builder.newLineIfNotEmpty();
+          _builder.append("I1 != I4;");
+          _builder.newLine();
           _builder.append("\t");
-          CharSequence _referInstanceOf_34 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MUST, "source");
-          _builder.append(_referInstanceOf_34, "\t");
+          _builder.append("I2 != I3;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I2 != I4;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I3 != I4;");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern tooManyInputsOfTurnout_must_to_true_by_straight(");
+          _builder.append(parameters);
+          _builder.append(", T : DefinedElement) {");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_35 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "target");
-          _builder.append(_referInstanceOf_35, "\t");
+          _builder.append("find mustExist(problem, interpretation, S);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_37 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MUST, "S");
+          _builder.append(_referInstanceOf_37, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_36 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MUST, "straight");
-          _builder.append(_referInstanceOf_36, "\t");
+          _builder.append("find adjacent_must_to_true_by_straight(problem, interpretation, source, target, I1, S);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referPattern_10 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Adjacent.instance().getFullyQualifiedName()), new String[] { "I2", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_10, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referRelation_13 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "source", "target", Modality.MUST, fqnToPQuery);
-          _builder.append(_referRelation_13, "\t");
+          CharSequence _referPattern_11 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Adjacent.instance().getFullyQualifiedName()), new String[] { "I3", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_11, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referRelation_14 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "source", "straight", Modality.MUST, fqnToPQuery);
-          _builder.append(_referRelation_14, "\t");
+          CharSequence _referPattern_12 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Adjacent.instance().getFullyQualifiedName()), new String[] { "I4", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_12, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referRelation_15 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "source", "straight", Modality.MUST, fqnToPQuery);
-          _builder.append(_referRelation_15, "\t");
+          _builder.append("I1 != I2;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I1 != I3;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I1 != I4;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I2 != I3;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I2 != I4;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I3 != I4;");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern tooManyInputsOfTurnout_must_to_true_by_divergent(");
+          _builder.append(parameters);
+          _builder.append(", T : DefinedElement) {");
           _builder.newLineIfNotEmpty();
-          _builder.append("} or {");
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, S);");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append("// tooManyExtraInputsOfTurnout unit propagation");
+          CharSequence _referInstanceOf_38 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MUST, "S");
+          _builder.append(_referInstanceOf_38, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find adjacent_must_to_true_by_divergent(problem, interpretation, source, target, I1, S);");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append(commonParameterConstraints, "\t");
+          CharSequence _referPattern_13 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Adjacent.instance().getFullyQualifiedName()), new String[] { "I2", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_13, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_37 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MUST, "source");
-          _builder.append(_referInstanceOf_37, "\t");
+          CharSequence _referPattern_14 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Adjacent.instance().getFullyQualifiedName()), new String[] { "I3", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_14, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_38 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "target");
-          _builder.append(_referInstanceOf_38, "\t");
+          CharSequence _referPattern_15 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Adjacent.instance().getFullyQualifiedName()), new String[] { "I4", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_15, "\t");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_39 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "extraInput");
-          _builder.append(_referInstanceOf_39, "\t");
+          _builder.append("I1 != I2;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I1 != I3;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I1 != I4;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I2 != I3;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I2 != I4;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I3 != I4;");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern ");
+          _builder.append(Modes3UnitPropagationGenerator.MUST_NOT_CONNECTED_TO);
+          _builder.append("_helper(");
+          _builder.append(parameters);
+          _builder.append(") {");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referInstanceOf_40 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "potentialExtraInput");
-          _builder.append(_referInstanceOf_40, "\t");
+          _builder.append("find connectedToReflexive_must_to_true_by_connectedTo(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find tooManyInputsOfSegment_must_to_true_by_connectedTo(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find turnoutConnectedToBothOutputs_must_to_true_by_connectedTo(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find tooManyInputsOfTurnout_must_to_true_by_connectedTo(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern ");
+          _builder.append(Modes3UnitPropagationGenerator.MUST_NOT_CONNECTED_TO);
+          _builder.append("(");
+          _builder.append(parameters);
+          _builder.append(") {");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          CharSequence _referPattern_7 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(ExtraInputOfTurnout.instance().getFullyQualifiedName()), new String[] { "source", "extraInput" }, Modality.MUST, true, false);
-          _builder.append(_referPattern_7, "\t");
+          _builder.append("find ");
+          _builder.append(Modes3UnitPropagationGenerator.MUST_NOT_CONNECTED_TO, "\t");
+          _builder.append("_helper(problem, interpretation, source, target);");
           _builder.newLineIfNotEmpty();
+          _builder.append("} or {");
+          _builder.newLine();
           _builder.append("\t");
-          CharSequence _referRelation_16 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "source", "potentialExtraInput", Modality.MUST, fqnToPQuery);
-          _builder.append(_referRelation_16, "\t");
+          _builder.append("find ");
+          _builder.append(Modes3UnitPropagationGenerator.MUST_NOT_CONNECTED_TO, "\t");
+          _builder.append("_helper(problem, interpretation, target, source);");
+          _builder.newLineIfNotEmpty();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern ");
+          _builder.append(Modes3UnitPropagationGenerator.MUST_NOT_STRAIGHT);
+          _builder.append("(");
+          _builder.append(parameters);
+          _builder.append(") {");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          _builder.append("neg ");
-          CharSequence _referRelation_17 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "source", "potentialExtraInput", Modality.MAY, fqnToPQuery);
-          _builder.append(_referRelation_17, "\t");
+          _builder.append("find outputReflexive_must_to_true_by_straight(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find turnoutOutputsAreSame_must_to_true_by_straight(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find tooManyInputsOfSegment_must_to_true_by_straight(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find turnoutConnectedToBothOutputs_must_to_true_by_straight(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find tooManyInputsOfTurnout_must_to_true_by_straight(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern ");
+          _builder.append(Modes3UnitPropagationGenerator.MUST_NOT_DIVERGENT);
+          _builder.append("(");
+          _builder.append(parameters);
+          _builder.append(") {");
           _builder.newLineIfNotEmpty();
           _builder.append("\t");
-          _builder.append("extraInput != potentialExtraInput;");
+          _builder.append("find outputReflexive_must_to_true_by_divergent(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find turnoutOutputsAreSame_must_to_true_by_divergent(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("} or {");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append("extraInput != target;");
+          _builder.append("find tooManyInputsOfSegment_must_to_true_by_divergent(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find turnoutConnectedToBothOutputs_must_to_true_by_divergent(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("} or {");
           _builder.newLine();
           _builder.append("\t");
-          _builder.append("potentialExtraInput != target;");
+          _builder.append("find tooManyInputsOfTurnout_must_to_true_by_divergent(problem, interpretation, source, target, _);");
           _builder.newLine();
           _builder.append("}");
           _builder.newLine();
         }
       };
-      _xblockexpression = _client_2;
+      _xblockexpression = _client_3;
     }
     return _xblockexpression;
   }
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/plugin.xml b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/plugin.xml
index 331e2b61..d4ab204e 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/plugin.xml
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/plugin.xml
@@ -39,72 +39,4 @@
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.twoSynch"/>
     </group>
   </extension>
-  <extension id="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.Mutated" point="org.eclipse.viatra.query.runtime.queryspecification">
-    <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.Mutated" id="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.Mutated">
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.entryInRegion_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.entryInRegion_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.entryInRegion_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noEntryInRegion_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noEntryInRegion_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noEntryInRegion_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noEntryInRegion_M3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noEntryInRegion_M4"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noEntryInRegion_M5"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleEntryInRegion_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleEntryInRegion_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleEntryInRegion_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleEntryInRegion_M3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleEntryInRegion_M4"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleEntryInRegion_M5"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.transition_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.transition_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.transition_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.transition_M3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.transition_M4"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.incomingToEntry_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.incomingToEntry_1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.incomingToEntry_2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.incomingToEntry_3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.incomingToEntry_4"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.incomingToEntry_5"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noOutgoingTransitionFromEntry_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noOutgoingTransitionFromEntry_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noOutgoingTransitionFromEntry_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noOutgoingTransitionFromEntry_M3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noOutgoingTransitionFromEntry_M4"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noOutgoingTransitionFromEntry_M5"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleTransitionFromEntry_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleTransitionFromEntry_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleTransitionFromEntry_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleTransitionFromEntry_M3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleTransitionFromEntry_M4"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.outgoingFromExit_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.outgoingFromExit_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.outgoingFromExit_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.outgoingFromFinal_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.outgoingFromFinal_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.outgoingFromFinal_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noStateInRegion_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noStateInRegion_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noStateInRegion_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noStateInRegion_M3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.StateInRegion_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.StateInRegion_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.StateInRegion_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoOutgoing_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoOutgoing_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoOutgoing_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoOutgoing_M3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoOutgoing_M4"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoOutgoing_M5"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoOutgoing_M6"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoIncoming_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoIncoming_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoIncoming_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoIncoming_M3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoIncoming_M4"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoIncoming_M5"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoIncoming_M6"/>
-    </group>
-  </extension>
 </plugin>
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/ModelGenerationMethodProvider.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/ModelGenerationMethodProvider.xtend
index 431ae386..3bcd9116 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/ModelGenerationMethodProvider.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/ModelGenerationMethodProvider.xtend
@@ -49,6 +49,12 @@ class ModelGenerationStatistics {
         synchronized def addScopePropagationTime(long amount) {

                 scopePropagationTime += amount

         }

+        

+        public var long mustRelationPropagationTime = 0

+

+        synchronized def addMustRelationPropagationTime(long amount) {

+                mustRelationPropagationTime += amount

+        }

 

         public var long preliminaryTypeAnalisisTime = 0

 

@@ -133,9 +139,11 @@ class ModelGenerationMethodProvider {
 

                 val scopePropagator = createScopePropagator(scopePropagatorStrategy, emptySolution, hints, queries, statistics)

                 scopePropagator.propagateAllScopeConstraints

+                val unitRulePropagator = refinementRuleProvider.createUnitPrulePropagator(logicProblem, emptySolution,

+                        queries, scopePropagator, statistics)

                 val objectRefinementRules = refinementRuleProvider.createObjectRefinementRules(logicProblem, emptySolution,

-                        queries, scopePropagator, nameNewElements, statistics)

-                val relationRefinementRules = refinementRuleProvider.createRelationRefinementRules(queries, scopePropagator,

+                        queries, unitRulePropagator, nameNewElements, statistics)

+                val relationRefinementRules = refinementRuleProvider.createRelationRefinementRules(queries, unitRulePropagator,

                         statistics)

 

                 val unfinishedMultiplicities = goalConstraintProvider.getUnfinishedMultiplicityQueries(logicProblem, queries,

@@ -158,7 +166,7 @@ class ModelGenerationMethodProvider {
                 val currentUnitPropagationPreconditions = queries.getCurrentUnitPropagationPreconditionPatterns

 

                 val queriesToPrepare = ImmutableSet.builder.addAll(queries.refineObjectQueries.values).addAll(

-                        queries.refineTypeQueries.values).addAll(queries.refinerelationQueries.values).addAll(queries.

+                        queries.refineTypeQueries.values).addAll(queries.refineRelationQueries.values).addAll(queries.

                         multiplicityConstraintQueries.values.flatMap[allQueries]).addAll(queries.unfinishedWFQueries.values).addAll(

                         queries.invalidWFQueries.values).addAll(queries.mustUnitPropagationPreconditionPatterns.values).addAll(

                         queries.currentUnitPropagationPreconditionPatterns.values).add(queries.hasElementInContainmentQuery).build

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/LinearTypeConstraintHint.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/LinearTypeConstraintHint.xtend
index 8c21ca1d..31f98e36 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/LinearTypeConstraintHint.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/LinearTypeConstraintHint.xtend
@@ -3,8 +3,10 @@ package hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type
 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternGenerator
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
+import java.util.Map
 import org.eclipse.viatra.query.runtime.api.IPatternMatch
 import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery
 
 interface LinearTypeExpressionBuilderFactory {
         def ViatraQueryMatcher<? extends IPatternMatch> createMatcher(String queryName)
@@ -24,7 +26,7 @@ interface RelationConstraintUpdater {
 }
 
 interface LinearTypeConstraintHint {
-        def CharSequence getAdditionalPatterns(PatternGenerator patternGenerator)
+        def CharSequence getAdditionalPatterns(PatternGenerator patternGenerator, Map<String, PQuery> fqnToPQuery)
         
         def RelationConstraintUpdater createConstraintUpdater(LinearTypeExpressionBuilderFactory builderFactory)
 }
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ScopePropagator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ScopePropagator.xtend
index 93b83577..cacba3c6 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ScopePropagator.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/ScopePropagator.xtend
@@ -19,6 +19,8 @@ class ScopePropagator {
         val Map<PartialTypeInterpratation, Scope> type2Scope

         @Accessors(PROTECTED_GETTER) val Map<Scope, Set<Scope>> superScopes

         @Accessors(PROTECTED_GETTER) val Map<Scope, Set<Scope>> subScopes

+        

+        @Accessors(PUBLIC_GETTER) var scopePropagationNeeded = false

 

         new(PartialInterpretation p, ModelGenerationStatistics statistics) {

                 partialInterpretation = p

@@ -64,7 +66,8 @@ class ScopePropagator {
                 copyScopeBoundsToHeuristic()

         }

 

-        def propagateAllScopeConstraints() {

+        def void propagateAllScopeConstraints() {

+                scopePropagationNeeded = false

                 if (!valid) {

                         return

                 }

@@ -93,6 +96,7 @@ class ScopePropagator {
                 if (isPrimitive) {

                         return

                 }

+                scopePropagationNeeded = true

 //              println('''Adding to «(t as PartialComplexTypeInterpretation).interpretationOf.name»''')

                 val targetScope = type2Scope.get(t)

                 if (targetScope !== null) {

@@ -117,6 +121,12 @@ class ScopePropagator {
 //              this.partialInterpretation.scopes.forEach[println(''' «(it.targetTypeInterpretation as PartialComplexTypeInterpretation).interpretationOf.name»: «it.minNewElements»-«it.maxNewElements»''')]

 //              println('''All constraints are propagated upon increasing «(t as PartialComplexTypeInterpretation).interpretationOf.name»''')

         }

+        

+        def addedToRelation(Relation r) {

+                if (isPropagationNeededAfterAdditionToRelation(r)) {

+                        scopePropagationNeeded = true

+                }

+        }

 

         protected def setScopesInvalid() {

                 partialInterpretation.minNewElements = Integer.MAX_VALUE

@@ -127,7 +137,7 @@ class ScopePropagator {
                 }

         }

 

-        def isPropagationNeededAfterAdditionToRelation(Relation r) {

+        protected def isPropagationNeededAfterAdditionToRelation(Relation r) {

                 false

         }

         

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternGenerator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternGenerator.xtend
index a3efcf76..edf92343 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternGenerator.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternGenerator.xtend
@@ -369,13 +369,13 @@ class PatternGenerator {
                         //////////

                         // 4.3 Relation refinement

                         //////////

-                        «relationRefinementGenerator.generateRefineReference(problem)»

+                        «relationRefinementGenerator.generateRefineReference(problem, unitPropagationPatternGenerators)»

                         

                         //////////

                         // 5 Hints

                         //////////

                         «FOR hint : hints»

-                                «hint.getAdditionalPatterns(this)»

+                                «hint.getAdditionalPatterns(this, fqn2PQuery)»

                         «ENDFOR»

                         «FOR generator : unitPropagationPatternGenerators»

                                 «generator.getAdditionalPatterns(this, fqn2PQuery)»

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternProvider.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternProvider.xtend
index 21fd1989..2e786286 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternProvider.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternProvider.xtend
@@ -38,7 +38,8 @@ import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*
         public IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> hasElementInContainmentQuery

         public Map<ObjectCreationPrecondition, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> refineObjectQueries

         public Map<? extends Type, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> refineTypeQueries

-        public Map<Pair<RelationDeclaration, Relation>, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> refinerelationQueries

+        public Map<Pair<RelationDeclaration, Relation>, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> refineRelationQueries

+        public Map<Pair<RelationDeclaration, Relation>, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> mustRelationPropagationQueries

         public Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> mustUnitPropagationPreconditionPatterns

         public Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> currentUnitPropagationPreconditionPatterns

         public Map<RelationDefinition, ModalPatternQueries> modalRelationQueries

@@ -70,7 +71,6 @@ class UnifinishedMultiplicityQueries {
 }

 

 class PatternProvider {

-

         val TypeAnalysis typeAnalysis = new TypeAnalysis

 

         def generateQueries(LogicProblem problem, PartialInterpretation emptySolution, ModelGenerationStatistics statistics,

@@ -98,7 +98,8 @@ class PatternProvider {
                 val generatedQueries = parseUtil.parse(patternGeneratorResult.patternText)

                 val runtimeQueries = calclulateRuntimeQueries(patternGenerator, problem, emptySolution, typeAnalysisResult,

                         patternGeneratorResult.constraint2MustPreconditionName,

-                        patternGeneratorResult.constraint2CurrentPreconditionName, relationConstraints, generatedQueries)

+                        patternGeneratorResult.constraint2CurrentPreconditionName, relationConstraints,

+                        unitPropagationPatternGenerators, generatedQueries)

                 return runtimeQueries

         }

 

@@ -110,6 +111,7 @@ class PatternProvider {
                 HashMap<PConstraint, String> mustUnitPropagationTrace,

                 HashMap<PConstraint, String> currentUnitPropagationTrace,

                 RelationConstraints relationConstraints,

+                Collection<UnitPropagationPatternGenerator> unitPropagationPatternGenerators,

                 Map<String, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> queries

         ) {

                 val Map<Relation, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> invalidWFQueries = patternGenerator.

@@ -136,6 +138,8 @@ class PatternProvider {
                         ]

                 val Map<Pair<RelationDeclaration, Relation>, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> refineRelationQueries = patternGenerator.

                         relationRefinementGenerator.getRefineRelationQueries(problem).mapValues[it.lookup(queries)]

+                val Map<Pair<RelationDeclaration, Relation>, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> mustRelationPropagationQueries = patternGenerator.

+                        relationRefinementGenerator.getMustPropagationQueries(problem, unitPropagationPatternGenerators).mapValues[it.lookup(queries)]

                 val Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> mustUnitPropagationPreconditionPatterns = mustUnitPropagationTrace.

                         mapValues[it.lookup(queries)]

                 val Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> currentUnitPropagationPreconditionPatterns = currentUnitPropagationTrace.

@@ -158,6 +162,7 @@ class PatternProvider {
                         refineObjectsQueries,

                         refineTypeQueries,

                         refineRelationQueries,

+                        mustRelationPropagationQueries,

                         mustUnitPropagationPreconditionPatterns,

                         currentUnitPropagationPreconditionPatterns,

                         modalRelationQueries,

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationDeclarationIndexer.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationDeclarationIndexer.xtend
index 29d3eb61..23ba3cad 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationDeclarationIndexer.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationDeclarationIndexer.xtend
@@ -113,7 +113,7 @@ class RelationDeclarationIndexer {
                                         // 2. Circle in the containment hierarchy

                                         neg «base.containmentIndexer.referTransitiveMustContains("source","target")»

                                 «ENDIF»

-                                «IF mustNotRelations.empty»

+                                «IF !mustNotRelations.empty»

                                         // ![] unit propagation relations

                                         «FOR mustNotRelation : mustNotRelations»

                                                 neg find «mustNotRelation»(problem, interpretation, source, target);

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationRefinementGenerator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationRefinementGenerator.xtend
index 783cd36b..6f5f2402 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationRefinementGenerator.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/RelationRefinementGenerator.xtend
@@ -1,10 +1,17 @@
 package hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns

 

+import com.google.common.collect.ImmutableList

+import com.google.common.collect.ImmutableMap

+import com.google.common.collect.ImmutableSet

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Relation

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDeclaration

 import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem

 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.Modality

+import java.util.Collection

 import java.util.LinkedList

+import java.util.Map

+import java.util.Set

+import org.eclipse.xtend2.lib.StringConcatenationClient

 

 class RelationRefinementGenerator {

         PatternGenerator base;

@@ -13,53 +20,61 @@ class RelationRefinementGenerator {
                 this.base = base

         }

 

-        def CharSequence generateRefineReference(LogicProblem p) '''

-                «FOR relationRefinement : this.getRelationRefinements(p)»

-                        pattern «relationRefinementQueryName(relationRefinement.key,relationRefinement.value)»(

-                                problem:LogicProblem, interpretation:PartialInterpretation,

-                                relationIterpretation:PartialRelationInterpretation«IF relationRefinement.value !== null», oppositeInterpretation:PartialRelationInterpretation«ENDIF»,

-                                from: DefinedElement, to: DefinedElement)

-                        {

-                                find interpretation(problem,interpretation);

-                                PartialInterpretation.partialrelationinterpretation(interpretation,relationIterpretation);

-                                PartialRelationInterpretation.interpretationOf.name(relationIterpretation,"«relationRefinement.key.name»");

-                                «IF relationRefinement.value !== null»

-                                        PartialInterpretation.partialrelationinterpretation(interpretation,oppositeInterpretation);

-                                        PartialRelationInterpretation.interpretationOf.name(oppositeInterpretation,"«relationRefinement.value.name»");

+        def CharSequence generateRefineReference(LogicProblem p,

+                Collection<UnitPropagationPatternGenerator> unitPropagationPatternGenerators) {

+                val mustRelations = getMustRelations(unitPropagationPatternGenerators)

+

+                '''

+                        «FOR relationRefinement : this.getRelationRefinements(p)»

+                                pattern «relationRefinementQueryName(relationRefinement.key,relationRefinement.value)»(

+                                        problem:LogicProblem, interpretation:PartialInterpretation,

+                                        relationIterpretation:PartialRelationInterpretation«IF relationRefinement.value !== null», oppositeInterpretation:PartialRelationInterpretation«ENDIF»,

+                                        from: DefinedElement, to: DefinedElement)

+                                {

+                                        find interpretation(problem,interpretation);

+                                        PartialInterpretation.partialrelationinterpretation(interpretation,relationIterpretation);

+                                        PartialRelationInterpretation.interpretationOf.name(relationIterpretation,"«relationRefinement.key.name»");

+                                        «IF relationRefinement.value !== null»

+                                                PartialInterpretation.partialrelationinterpretation(interpretation,oppositeInterpretation);

+                                                PartialRelationInterpretation.interpretationOf.name(oppositeInterpretation,"«relationRefinement.value.name»");

+                                        «ENDIF»

+                                        find mustExist(problem, interpretation, from);

+                                        find mustExist(problem, interpretation, to);

+                                        «base.typeIndexer.referInstanceOfByReference(relationRefinement.key.parameters.get(0), Modality::MUST,"from")»

+                                        «base.typeIndexer.referInstanceOfByReference(relationRefinement.key.parameters.get(1), Modality::MUST,"to")»

+                                        «base.relationDeclarationIndexer.referRelation(relationRefinement.key,"from","to",Modality.MAY)»

+                                        neg «base.relationDeclarationIndexer.referRelation(relationRefinement.key,"from","to",Modality.MUST)»

+                                }

+                                

+                                «IF isMustPropagationQueryNeeded(relationRefinement.key, relationRefinement.value, mustRelations)»

+                                        pattern «mustPropagationQueryName(relationRefinement.key)»(

+                                                problem:LogicProblem, interpretation:PartialInterpretation,

+                                                relationIterpretation:PartialRelationInterpretation«IF relationRefinement.value !== null», oppositeInterpretation:PartialRelationInterpretation«ENDIF»,

+                                                from: DefinedElement, to: DefinedElement)

+                                        «FOR body : getMustPropagationBodies(relationRefinement.key, relationRefinement.value, mustRelations) SEPARATOR " or "»

+                                                {

+                                                        «referRefinementQuery(relationRefinement.key, relationRefinement.value, "relationIterpretation", "oppositeInterpretation", "from", "to")»

+                                                        «body»

+                                                }

+                                        «ENDFOR»

                                 «ENDIF»

-                                find mustExist(problem, interpretation, from);

-                                find mustExist(problem, interpretation, to);

-                                «base.typeIndexer.referInstanceOfByReference(relationRefinement.key.parameters.get(0), Modality::MUST,"from")»

-                                «base.typeIndexer.referInstanceOfByReference(relationRefinement.key.parameters.get(1), Modality::MUST,"to")»

-                                «base.relationDeclarationIndexer.referRelation(relationRefinement.key,"from","to",Modality.MAY)»

-                                neg «base.relationDeclarationIndexer.referRelation(relationRefinement.key,"from","to",Modality.MUST)»

-                        }

-                «ENDFOR»

-        '''

+                        «ENDFOR»

+                '''

+        }

 

         def String relationRefinementQueryName(RelationDeclaration relation, Relation inverseRelation) {

                 '''«IF inverseRelation !== null»refineRelation_«base.canonizeName(relation.name)»_and_«base.canonizeName(inverseRelation.name)»«ELSE»refineRelation_«base.canonizeName(relation.name)»«ENDIF»'''

         }

 

+        def String mustPropagationQueryName(RelationDeclaration relation) {

+                '''mustPropagation_«base.canonizeName(relation.name)»'''

+        }

+

         def referRefinementQuery(RelationDeclaration relation, Relation inverseRelation, String relInterpretationName,

                 String inverseInterpretationName, String sourceName,

                 String targetName) '''find «this.relationRefinementQueryName(relation,inverseRelation)»(problem, interpretation, «relInterpretationName», «IF inverseRelation !== null»«inverseInterpretationName», «ENDIF»«sourceName», «targetName»);'''

 

         def getRefineRelationQueries(LogicProblem p) {

-//              val containmentRelations = p.containmentHierarchies.map[containmentRelations].flatten.toSet

-//              p.relations.filter(RelationDeclaration).filter[!containmentRelations.contains(it)].toInvertedMap['''refineRelation_«base.canonizeName(it.name)»''']

-                /*

-                 * val res = new LinkedHashMap

-                 * for(relation: getRelationRefinements(p)) {

-                 *      if(inverseRelations.containsKey(relation)) {

-                 *              val name = '''refineRelation_«base.canonizeName(relation.name)»_and_«base.canonizeName(inverseRelations.get(relation).name)»'''

-                 *              res.put(relation -> inverseRelations.get(relation),name)

-                 *      } else {

-                 *              val name = '''refineRelation_«base.canonizeName(relation.name)»'''

-                 *              res.put(relation -> null,name)

-                 *      }

-                 * }

-                 return res*/

                 getRelationRefinements(p).toInvertedMap[relationRefinementQueryName(it.key, it.value)]

         }

 

@@ -83,4 +98,54 @@ class RelationRefinementGenerator {
                 }

                 return list

         }

+

+        def getMustPropagationQueries(LogicProblem p,

+                Collection<UnitPropagationPatternGenerator> unitPropagationPatternGenerators) {

+                val refinements = getRelationRefinements(p)

+                val mustRelations = getMustRelations(unitPropagationPatternGenerators)

+                refinements.filter[isMustPropagationQueryNeeded(key, value, mustRelations)].toInvertedMap [

+                        mustPropagationQueryName(key)

+                ]

+        }

+

+        private def getMustRelations(Collection<UnitPropagationPatternGenerator> unitPropagationPatternGenerators) {

+                ImmutableMap.copyOf(unitPropagationPatternGenerators.flatMap[mustPatterns.entrySet].groupBy[key].mapValues [

+                        ImmutableSet.copyOf(map[value])

+                ])

+        }

+

+        private def isMustPropagationQueryNeeded(Relation relation, Relation inverseRelation,

+                Map<Relation, ? extends Set<String>> mustRelations) {

+                val mustSet = mustRelations.get(relation)

+                if (mustSet !== null && !mustSet.empty) {

+                        return true

+                }

+                if (inverseRelation !== null) {

+                        val inverseMustSet = mustRelations.get(inverseRelation)

+                        if (inverseMustSet !== null && !inverseMustSet.empty) {

+                                return true

+                        }

+                }

+                false

+        }

+

+        private def getMustPropagationBodies(Relation relation, Relation inverseRelation,

+                Map<Relation, ? extends Set<String>> mustRelations) {

+                val builder = ImmutableList.<StringConcatenationClient>builder()

+                val mustSet = mustRelations.get(relation)

+                if (mustSet !== null) {

+                        for (refinementQuery : mustSet) {

+                                builder.add('''find «refinementQuery»(problem, interpretation, from, to);''')

+                        }

+                }

+                if (inverseRelation !== null && inverseRelation != relation) {

+                        val inverseMustSet = mustRelations.get(inverseRelation)

+                        if (inverseMustSet !== null) {

+                                for (refinementQuery : inverseMustSet) {

+                                        builder.add('''find «refinementQuery»(problem, interpretation, to, from);''')

+                                }

+                        }

+                }

+                builder.build

+        }

 }

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules/RefinementRuleProvider.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules/RefinementRuleProvider.xtend
index 699b095d..dca10baf 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules/RefinementRuleProvider.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/rules/RefinementRuleProvider.xtend
@@ -1,5 +1,6 @@
 package hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.rules

 

+import com.google.common.collect.ImmutableList

 import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.InverseRelationAssertion

 import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.LowerMultiplicityAssertion

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.BoolTypeReference

@@ -29,12 +30,14 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.par
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationFactory

 import java.lang.reflect.Field

 import java.util.HashMap

+import java.util.Iterator

 import java.util.LinkedHashMap

 import java.util.LinkedList

 import java.util.List

 import java.util.Map

 import org.eclipse.viatra.query.runtime.api.AdvancedViatraQueryEngine

 import org.eclipse.viatra.query.runtime.api.GenericPatternMatch

+import org.eclipse.viatra.query.runtime.api.IPatternMatch

 import org.eclipse.viatra.query.runtime.api.IQuerySpecification

 import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine

 import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher

@@ -43,6 +46,7 @@ import org.eclipse.viatra.query.runtime.rete.matcher.ReteBackendFactory
 import org.eclipse.viatra.transformation.runtime.emf.rules.batch.BatchTransformationRule

 import org.eclipse.viatra.transformation.runtime.emf.rules.batch.BatchTransformationRuleFactory

 import org.eclipse.xtend.lib.annotations.Data

+import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor

 import org.eclipse.xtext.xbase.lib.Functions.Function0

 

 class RefinementRuleProvider {

@@ -50,57 +54,55 @@ class RefinementRuleProvider {
         val extension PartialinterpretationFactory factory2 = PartialinterpretationFactory.eINSTANCE

         val extension LogiclanguageFactory factory3 = LogiclanguageFactory.eINSTANCE

 

-        var AdvancedViatraQueryEngine queryEngine

-        var Field delayMessageDelivery

-

         def canonizeName(String name) {

                 return name.replace(' ', '_')

         }

 

+        def createUnitPrulePropagator(LogicProblem p, PartialInterpretation i, GeneratedPatterns patterns,

+                ScopePropagator scopePropagator, ModelGenerationStatistics statistics) {

+                new UnitRulePropagator(p, i, this, scopePropagator, patterns.mustRelationPropagationQueries, statistics)

+        }

+

         def LinkedHashMap<ObjectCreationPrecondition, BatchTransformationRule<GenericPatternMatch, ViatraQueryMatcher<GenericPatternMatch>>> createObjectRefinementRules(

                 LogicProblem p,

                 PartialInterpretation i,

                 GeneratedPatterns patterns,

-                ScopePropagator scopePropagator,

+                UnitRulePropagator unitRulePropagator,

                 boolean nameNewElement,

                 ModelGenerationStatistics statistics

         ) {

                 val res = new LinkedHashMap

                 val recursiveObjectCreation = recursiveObjectCreation(p, i)

-                queryEngine = ViatraQueryEngine.on(new EMFScope(i)) as AdvancedViatraQueryEngine

-                delayMessageDelivery = queryEngine.class.getDeclaredField("delayMessageDelivery")

-                delayMessageDelivery.accessible = true

                 for (LHSEntry : patterns.refineObjectQueries.entrySet) {

                         val containmentRelation = LHSEntry.key.containmentRelation

                         val inverseRelation = LHSEntry.key.inverseContainment

                         val type = LHSEntry.key.newType

                         val lhs = LHSEntry.value as IQuerySpecification<ViatraQueryMatcher<GenericPatternMatch>>

                         val rule = createObjectCreationRule(p, containmentRelation, inverseRelation, type,

-                                recursiveObjectCreation.get(type), lhs, nameNewElement, scopePropagator, statistics)

+                                recursiveObjectCreation.get(type), lhs, nameNewElement, unitRulePropagator, statistics)

                         res.put(LHSEntry.key, rule)

                 }

                 return res

         }

 

         def private createObjectCreationRule(LogicProblem p, Relation containmentRelation, Relation inverseRelation,

-                Type type, List<ObjectCreationInterpretationData> recursiceObjectCreations,

+                Type type, List<ObjectCreationInterpretationData> recursiveObjectCreations,

                 IQuerySpecification<ViatraQueryMatcher<GenericPatternMatch>> lhs, boolean nameNewElement,

-                ScopePropagator scopePropagator, ModelGenerationStatistics statistics) {

+                UnitRulePropagator unitRulePropagator, ModelGenerationStatistics statistics) {

                 val name = '''addObject_«type.name.canonizeName»«IF containmentRelation!==null»_by_«containmentRelation.name.canonizeName»«ENDIF»'''

                 val ruleBuilder = factory.createRule(lhs).name(name)

                 if (containmentRelation !== null) {

                         if (inverseRelation !== null) {

                                 ruleBuilder.action [ match |

                                         statistics.incrementTransformationCount

-//                                      println(name)                                           

+//                                      println(name)

+                                        val startTime = System.nanoTime

                                         // val problem = match.get(0) as LogicProblem

                                         val interpretation = match.get(1) as PartialInterpretation

                                         val relationInterpretation = match.get(2) as PartialRelationInterpretation

                                         val inverseRelationInterpretation = match.get(3) as PartialRelationInterpretation

                                         val typeInterpretation = match.get(4) as PartialComplexTypeInterpretation

                                         val container = match.get(5) as DefinedElement

-

-                                        val startTime = System.nanoTime

                                         createObjectActionWithContainmentAndInverse(

                                                 nameNewElement,

                                                 interpretation,

@@ -109,29 +111,24 @@ class RefinementRuleProvider {
                                                 relationInterpretation,

                                                 inverseRelationInterpretation,

                                                 [createDefinedElement],

-                                                recursiceObjectCreations,

-                                                scopePropagator

+                                                recursiveObjectCreations,

+                                                unitRulePropagator

                                         )

                                         statistics.addExecutionTime(System.nanoTime - startTime)

 

-                                        flushQueryEngine(scopePropagator)

-

-                                        // Scope propagation

-                                        val propagatorStartTime = System.nanoTime

-                                        scopePropagator.propagateAllScopeConstraints()

-                                        statistics.addScopePropagationTime(System.nanoTime - propagatorStartTime)

+                                        unitRulePropagator.propagate

                                 ]

                         } else {

                                 ruleBuilder.action [ match |

                                         statistics.incrementTransformationCount

 //                                      println(name)

+                                        val startTime = System.nanoTime

                                         // val problem = match.get(0) as LogicProblem

                                         val interpretation = match.get(1) as PartialInterpretation

                                         val relationInterpretation = match.get(2) as PartialRelationInterpretation

                                         val typeInterpretation = match.get(3) as PartialComplexTypeInterpretation

                                         val container = match.get(4) as DefinedElement

 

-                                        val startTime = System.nanoTime

                                         createObjectActionWithContainment(

                                                 nameNewElement,

                                                 interpretation,

@@ -139,44 +136,34 @@ class RefinementRuleProvider {
                                                 container,

                                                 relationInterpretation,

                                                 [createDefinedElement],

-                                                recursiceObjectCreations,

-                                                scopePropagator

+                                                recursiveObjectCreations,

+                                                unitRulePropagator

                                         )

                                         statistics.addExecutionTime(System.nanoTime - startTime)

 

-                                        flushQueryEngine(scopePropagator)

-

-                                        // Scope propagation

-                                        val propagatorStartTime = System.nanoTime

-                                        scopePropagator.propagateAllScopeConstraints()

-                                        statistics.addScopePropagationTime(System.nanoTime - propagatorStartTime)

+                                        unitRulePropagator.propagate

                                 ]

                         }

                 } else {

                         ruleBuilder.action [ match |

                                 statistics.incrementTransformationCount

 //                              println(name)

+                                val startTime = System.nanoTime

                                 // val problem = match.get(0) as LogicProblem

                                 val interpretation = match.get(1) as PartialInterpretation

                                 val typeInterpretation = match.get(2) as PartialComplexTypeInterpretation

 

-                                val startTime = System.nanoTime

                                 createObjectAction(

                                         nameNewElement,

                                         interpretation,

                                         typeInterpretation,

                                         [createDefinedElement],

-                                        recursiceObjectCreations,

-                                        scopePropagator

+                                        recursiveObjectCreations,

+                                        unitRulePropagator

                                 )

                                 statistics.addExecutionTime(System.nanoTime - startTime)

 

-                                flushQueryEngine(scopePropagator)

-

-                                // Scope propagation

-                                val propagatorStartTime = System.nanoTime

-                                scopePropagator.propagateAllScopeConstraints()

-                                statistics.addScopePropagationTime(System.nanoTime - propagatorStartTime)

+                                unitRulePropagator.propagate

                         ]

                 }

                 return ruleBuilder.build

@@ -342,14 +329,14 @@ class RefinementRuleProvider {
                 [createStringElement]

         }

 

-        def createRelationRefinementRules(GeneratedPatterns patterns, ScopePropagator scopePropagator,

+        def createRelationRefinementRules(GeneratedPatterns patterns, UnitRulePropagator unitRulePropagator,

                 ModelGenerationStatistics statistics) {

                 val res = new LinkedHashMap

-                for (LHSEntry : patterns.refinerelationQueries.entrySet) {

+                for (LHSEntry : patterns.refineRelationQueries.entrySet) {

                         val declaration = LHSEntry.key.key

                         val inverseReference = LHSEntry.key.value

                         val lhs = LHSEntry.value as IQuerySpecification<ViatraQueryMatcher<GenericPatternMatch>>

-                        val rule = createRelationRefinementRule(declaration, inverseReference, lhs, scopePropagator, statistics)

+                        val rule = createRelationRefinementRule(declaration, inverseReference, lhs, unitRulePropagator, statistics)

                         res.put(LHSEntry.key, rule)

                 }

                 return res

@@ -357,57 +344,29 @@ class RefinementRuleProvider {
 

         def private BatchTransformationRule<GenericPatternMatch, ViatraQueryMatcher<GenericPatternMatch>> createRelationRefinementRule(

                 RelationDeclaration declaration, Relation inverseRelation,

-                IQuerySpecification<ViatraQueryMatcher<GenericPatternMatch>> lhs, ScopePropagator scopePropagator,

+                IQuerySpecification<ViatraQueryMatcher<GenericPatternMatch>> lhs, UnitRulePropagator unitRulePropagator,

                 ModelGenerationStatistics statistics) {

                 val name = '''addRelation_«declaration.name.canonizeName»«IF inverseRelation !== null»_and_«inverseRelation.name.canonizeName»«ENDIF»'''

                 val ruleBuilder = factory.createRule(lhs).name(name)

                 if (inverseRelation === null) {

                         ruleBuilder.action [ match |

                                 statistics.incrementTransformationCount

-

 //                              println(name)

-                                // val problem = match.get(0) as LogicProblem

-                                // val interpretation = match.get(1) as PartialInterpretation

-                                val relationInterpretation = match.get(2) as PartialRelationInterpretation

-                                val src = match.get(3) as DefinedElement

-                                val trg = match.get(4) as DefinedElement

-

                                 val startTime = System.nanoTime

-                                createRelationLinkAction(src, trg, relationInterpretation)

+                                createRelationLinkAction(match, unitRulePropagator)

                                 statistics.addExecutionTime(System.nanoTime - startTime)

 

-                                // Scope propagation

-                                if (scopePropagator.isPropagationNeededAfterAdditionToRelation(declaration)) {

-                                        flushQueryEngine(scopePropagator)

-

-                                        val propagatorStartTime = System.nanoTime

-                                        scopePropagator.propagateAllScopeConstraints()

-                                        statistics.addScopePropagationTime(System.nanoTime - propagatorStartTime)

-                                }

+                                unitRulePropagator.propagate

                         ]

                 } else {

                         ruleBuilder.action [ match |

                                 statistics.incrementTransformationCount

 //                              println(name)

-                                // val problem = match.get(0) as LogicProblem

-                                // val interpretation = match.get(1) as PartialInterpretation

-                                val relationInterpretation = match.get(2) as PartialRelationInterpretation

-                                val inverseInterpretation = match.get(3) as PartialRelationInterpretation

-                                val src = match.get(4) as DefinedElement

-                                val trg = match.get(5) as DefinedElement

-

                                 val startTime = System.nanoTime

-                                createRelationLinkWithInverse(src, trg, relationInterpretation, inverseInterpretation)

+                                createRelationLinkWithInverse(match, unitRulePropagator)

                                 statistics.addExecutionTime(System.nanoTime - startTime)

 

-                                // Scope propagation

-                                if (scopePropagator.isPropagationNeededAfterAdditionToRelation(declaration)) {

-                                        flushQueryEngine(scopePropagator)

-

-                                        val propagatorStartTime = System.nanoTime

-                                        scopePropagator.propagateAllScopeConstraints()

-                                        statistics.addScopePropagationTime(System.nanoTime - propagatorStartTime)

-                                }

+                                unitRulePropagator.propagate

                         ]

                 }

 

@@ -418,7 +377,7 @@ class RefinementRuleProvider {
         // Actions

         // ///////////////////////

         protected def void createObjectAction(boolean nameNewElement, ObjectCreationInterpretationData data,

-                DefinedElement container, ScopePropagator scopePropagator) {

+                DefinedElement container, UnitRulePropagator unitRulePropagator) {

                 if (data.containerInterpretation !== null) {

                         if (data.containerInverseInterpretation !== null) {

                                 createObjectActionWithContainmentAndInverse(

@@ -430,7 +389,7 @@ class RefinementRuleProvider {
                                         data.containerInverseInterpretation,

                                         data.constructor,

                                         data.recursiveConstructors,

-                                        scopePropagator

+                                        unitRulePropagator

                                 )

                         } else {

                                 createObjectActionWithContainment(

@@ -441,7 +400,7 @@ class RefinementRuleProvider {
                                         data.containerInterpretation,

                                         data.constructor,

                                         data.recursiveConstructors,

-                                        scopePropagator

+                                        unitRulePropagator

                                 )

                         }

                 } else {

@@ -451,7 +410,7 @@ class RefinementRuleProvider {
                                 data.typeInterpretation,

                                 data.constructor,

                                 data.recursiveConstructors,

-                                scopePropagator

+                                unitRulePropagator

                         )

                 }

 

@@ -466,7 +425,7 @@ class RefinementRuleProvider {
                 PartialRelationInterpretation inverseRelationInterpretation,

                 Function0<DefinedElement> constructor,

                 List<ObjectCreationInterpretationData> recursiceObjectCreations,

-                ScopePropagator scopePropagator

+                UnitRulePropagator unitRulePropagator

         ) {

                 val newElement = constructor.apply

                 if (nameNewElement) {

@@ -486,14 +445,16 @@ class RefinementRuleProvider {
                 inverseRelationInterpretation.relationlinks += newLink2

 

                 // Scope propagation

-                scopePropagator.decrementTypeScope(typeInterpretation)

+                unitRulePropagator.decrementTypeScope(typeInterpretation)

+                unitRulePropagator.addedToRelation(relationInterpretation.interpretationOf)

+                unitRulePropagator.addedToRelation(inverseRelationInterpretation.interpretationOf)

 

                 // Existence

                 interpretation.newElements += newElement

 

                 // Do recursive object creation

                 for (newConstructor : recursiceObjectCreations) {

-                        createObjectAction(nameNewElement, newConstructor, newElement, scopePropagator)

+                        createObjectAction(nameNewElement, newConstructor, newElement, unitRulePropagator)

                 }

 

                 return newElement

@@ -507,7 +468,7 @@ class RefinementRuleProvider {
                 PartialRelationInterpretation relationInterpretation,

                 Function0<DefinedElement> constructor,

                 List<ObjectCreationInterpretationData> recursiceObjectCreations,

-                ScopePropagator scopePropagator

+                UnitRulePropagator unitRulePropagator

         ) {

                 val newElement = constructor.apply

                 if (nameNewElement) {

@@ -522,16 +483,17 @@ class RefinementRuleProvider {
                 // ContainmentRelation

                 val newLink = factory2.createBinaryElementRelationLink => [it.param1 = container it.param2 = newElement]

                 relationInterpretation.relationlinks += newLink

+                unitRulePropagator.addedToRelation(relationInterpretation.interpretationOf)

 

                 // Scope propagation

-                scopePropagator.decrementTypeScope(typeInterpretation)

+                unitRulePropagator.decrementTypeScope(typeInterpretation)

 

                 // Existence

                 interpretation.newElements += newElement

 

                 // Do recursive object creation

                 for (newConstructor : recursiceObjectCreations) {

-                        createObjectAction(nameNewElement, newConstructor, newElement, scopePropagator)

+                        createObjectAction(nameNewElement, newConstructor, newElement, unitRulePropagator)

                 }

 

                 return newElement

@@ -539,7 +501,7 @@ class RefinementRuleProvider {
 

         protected def createObjectAction(boolean nameNewElement, PartialInterpretation interpretation,

                 PartialTypeInterpratation typeInterpretation, Function0<DefinedElement> constructor,

-                List<ObjectCreationInterpretationData> recursiceObjectCreations, ScopePropagator scopePropagator) {

+                List<ObjectCreationInterpretationData> recursiceObjectCreations, UnitRulePropagator unitRulePropagator) {

                 val newElement = constructor.apply

                 if (nameNewElement) {

                         newElement.name = '''new «interpretation.newElements.size»'''

@@ -552,38 +514,220 @@ class RefinementRuleProvider {
                 }

 

                 // Scope propagation

-                scopePropagator.decrementTypeScope(typeInterpretation)

+                unitRulePropagator.decrementTypeScope(typeInterpretation)

 

                 // Existence

                 interpretation.newElements += newElement

 

                 // Do recursive object creation

                 for (newConstructor : recursiceObjectCreations) {

-                        createObjectAction(nameNewElement, newConstructor, newElement, scopePropagator)

+                        createObjectAction(nameNewElement, newConstructor, newElement, unitRulePropagator)

                 }

 

                 return newElement

         }

 

-        protected def boolean createRelationLinkAction(DefinedElement src, DefinedElement trg,

-                PartialRelationInterpretation relationInterpretation) {

+        protected def createRelationLinkAction(IPatternMatch match, UnitRulePropagator unitRulePropagator) {

+                // val problem = match.get(0) as LogicProblem

+                // val interpretation = match.get(1) as PartialInterpretation

+                val relationInterpretation = match.get(2) as PartialRelationInterpretation

+                val src = match.get(3) as DefinedElement

+                val trg = match.get(4) as DefinedElement

+                createRelationLinkAction(src, trg, relationInterpretation, unitRulePropagator)

+        }

+

+        protected def void createRelationLinkAction(DefinedElement src, DefinedElement trg,

+                PartialRelationInterpretation relationInterpretation, UnitRulePropagator unitRulePropagator) {

                 val link = createBinaryElementRelationLink => [it.param1 = src it.param2 = trg]

                 relationInterpretation.relationlinks += link

+                unitRulePropagator.addedToRelation(relationInterpretation.interpretationOf)

         }

 

-        protected def boolean createRelationLinkWithInverse(DefinedElement src, DefinedElement trg,

-                PartialRelationInterpretation relationInterpretation, PartialRelationInterpretation inverseInterpretation) {

+        protected def void createRelationLinkWithInverse(IPatternMatch match, UnitRulePropagator unitRulePropagator) {

+                // val problem = match.get(0) as LogicProblem

+                // val interpretation = match.get(1) as PartialInterpretation

+                val relationInterpretation = match.get(2) as PartialRelationInterpretation

+                val inverseInterpretation = match.get(3) as PartialRelationInterpretation

+                val src = match.get(4) as DefinedElement

+                val trg = match.get(5) as DefinedElement

+                createRelationLinkWithInverse(src, trg, relationInterpretation, inverseInterpretation, unitRulePropagator)

+        }

+

+        protected def void createRelationLinkWithInverse(DefinedElement src, DefinedElement trg,

+                PartialRelationInterpretation relationInterpretation, PartialRelationInterpretation inverseInterpretation,

+                UnitRulePropagator unitRulePropagator) {

                 val link = createBinaryElementRelationLink => [it.param1 = src it.param2 = trg]

                 relationInterpretation.relationlinks += link

                 val inverseLink = createBinaryElementRelationLink => [it.param1 = trg it.param2 = src]

                 inverseInterpretation.relationlinks += inverseLink

+                unitRulePropagator.addedToRelation(relationInterpretation.interpretationOf)

+                unitRulePropagator.addedToRelation(inverseInterpretation.interpretationOf)

         }

 

-        protected def flushQueryEngine(ScopePropagator scopePropagator) {

-                if (scopePropagator.queryEngineFlushRequiredBeforePropagation && queryEngine.updatePropagationDelayed) {

-                        delayMessageDelivery.setBoolean(queryEngine, false)

-                        queryEngine.getQueryBackend(ReteBackendFactory.INSTANCE).flushUpdates

-                        delayMessageDelivery.setBoolean(queryEngine, true)

+        static class UnitRulePropagator {

+                val LogicProblem p

+                val PartialInterpretation i

+                val RefinementRuleProvider refinementRuleProvider

+                var AdvancedViatraQueryEngine queryEngine

+                var Field delayMessageDelivery

+                val ScopePropagator scopePropagator

+                val List<AbstractMustRelationPropagator<? extends IPatternMatch>> propagators

+                val ModelGenerationStatistics statistics

+

+                new(LogicProblem p, PartialInterpretation i, RefinementRuleProvider refinementRuleProvider,

+                        ScopePropagator scopePropagator,

+                        Map<Pair<RelationDeclaration, Relation>, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> mustRelationPropagationQueries,

+                        ModelGenerationStatistics statistics) {

+                        this.p = p

+                        this.i = i

+                        this.refinementRuleProvider = refinementRuleProvider

+                        queryEngine = ViatraQueryEngine.on(new EMFScope(i)) as AdvancedViatraQueryEngine

+                        delayMessageDelivery = queryEngine.class.getDeclaredField("delayMessageDelivery")

+                        delayMessageDelivery.accessible = true

+                        this.scopePropagator = scopePropagator

+                        propagators = ImmutableList.copyOf(mustRelationPropagationQueries.entrySet.map [ entry |

+                                val matcher = queryEngine.getMatcher(entry.value)

+                                getPropagator(entry.key.key, entry.key.value, matcher)

+                        ])

+                        this.statistics = statistics

+                }

+

+                def decrementTypeScope(PartialTypeInterpratation partialTypeInterpratation) {

+                        scopePropagator.decrementTypeScope(partialTypeInterpratation)

+                }

+

+                def addedToRelation(Relation r) {

+                        scopePropagator.addedToRelation(r)

+                }

+

+                def propagate() {

+                        var boolean changed

+                        do {

+                                val scopeChanged = propagateScope()

+                                val mustChanged = propagateMustRelations()

+                                changed = scopeChanged || mustChanged

+                        } while (changed)

+                }

+

+                protected def flushQueryEngine() {

+                        if (queryEngine.updatePropagationDelayed) {

+                                delayMessageDelivery.setBoolean(queryEngine, false)

+                                queryEngine.getQueryBackend(ReteBackendFactory.INSTANCE).flushUpdates

+                                delayMessageDelivery.setBoolean(queryEngine, true)

+                        }

+                }

+

+                protected def propagateScope() {

+                        if (scopePropagator.scopePropagationNeeded) {

+                                if (scopePropagator.queryEngineFlushRequiredBeforePropagation) {

+                                        flushQueryEngine()

+                                }

+                                val propagatorStartTime = System.nanoTime

+                                scopePropagator.propagateAllScopeConstraints()

+                                statistics.addScopePropagationTime(System.nanoTime - propagatorStartTime)

+                                true

+                        } else {

+                                false

+                        }

+                }

+

+                protected def propagateMustRelations() {

+                        if (propagators.empty) {

+                                return false

+                        }

+                        flushQueryEngine()

+                        val propagatorStartTime = System.nanoTime

+                        var changed = false

+                        for (propagator : propagators) {

+                                changed = propagator.propagate(p, i, refinementRuleProvider, this) || changed

+                        }

+                        statistics.addMustRelationPropagationTime(System.nanoTime - propagatorStartTime)

+                        changed

+                }

+

+                private static def <T extends IPatternMatch> getPropagator(Relation relation, Relation inverseRelation,

+                        ViatraQueryMatcher<T> matcher) {

+                        if (inverseRelation === null) {

+                                new MustRelationPropagator(matcher)

+                        } else if (relation == inverseRelation) {

+                                new MustRelationPropagatorWithSelfInverse(matcher)

+                        } else {

+                                new MustRelationPropagatorWithInverse(matcher)

+                        }

+                }

+

+                @FinalFieldsConstructor

+                private static abstract class AbstractMustRelationPropagator<T extends IPatternMatch> {

+                        val ViatraQueryMatcher<T> matcher

+

+                        def propagate(LogicProblem p, PartialInterpretation i, RefinementRuleProvider refinementRuleProvider,

+                                UnitRulePropagator unitRulePropagator) {

+                                val iterator = getIterator(p, i)

+                                if (!iterator.hasNext) {

+                                        return false

+                                }

+                                iterate(iterator, refinementRuleProvider, unitRulePropagator)

+                                true

+                        }

+

+                        def iterate(Iterator<T> iterator, RefinementRuleProvider refinementRuleProvider,

+                                UnitRulePropagator unitRulePropagator) {

+                                while (iterator.hasNext) {

+                                        doPropagate(iterator.next, refinementRuleProvider, unitRulePropagator)

+                                }

+                        }

+

+                        protected def getIterator(LogicProblem p, PartialInterpretation i) {

+                                val partialMatch = matcher.newEmptyMatch

+                                partialMatch.set(0, p)

+                                partialMatch.set(1, i)

+                                matcher.streamAllMatches(partialMatch).iterator

+                        }

+

+                        protected def void doPropagate(T match, RefinementRuleProvider refinementRuleProvider,

+                                UnitRulePropagator unitRulePropagator)

+                }

+

+                private static class MustRelationPropagator<T extends IPatternMatch> extends AbstractMustRelationPropagator<T> {

+                        new(ViatraQueryMatcher<T> matcher) {

+                                super(matcher)

+                        }

+

+                        override protected doPropagate(T match, RefinementRuleProvider refinementRuleProvider,

+                                UnitRulePropagator unitRulePropagator) {

+                                refinementRuleProvider.createRelationLinkAction(match, unitRulePropagator)

+                        }

+                }

+

+                private static class MustRelationPropagatorWithInverse<T extends IPatternMatch> extends AbstractMustRelationPropagator<T> {

+                        new(ViatraQueryMatcher<T> matcher) {

+                                super(matcher)

+                        }

+

+                        override protected doPropagate(T match, RefinementRuleProvider refinementRuleProvider,

+                                UnitRulePropagator unitRulePropagator) {

+                                refinementRuleProvider.createRelationLinkWithInverse(match, unitRulePropagator)

+                        }

+                }

+

+                private static class MustRelationPropagatorWithSelfInverse<T extends IPatternMatch> extends MustRelationPropagatorWithInverse<T> {

+                        new(ViatraQueryMatcher<T> matcher) {

+                                super(matcher)

+                        }

+

+                        override iterate(Iterator<T> iterator, RefinementRuleProvider refinementRuleProvider,

+                                UnitRulePropagator unitRulePropagator) {

+                                val pairs = newHashSet

+                                while (iterator.hasNext) {

+                                        val match = iterator.next

+                                        val src = match.get(4) as DefinedElement

+                                        val trg = match.get(5) as DefinedElement

+                                        if (!pairs.contains(trg -> src)) {

+                                                pairs.add(src -> trg)

+                                                doPropagate(match, refinementRuleProvider, unitRulePropagator)

+                                        }

+                                }

+                        }

                 }

         }

 }

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend
index 67d25208..8e05665c 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend
@@ -229,6 +229,10 @@ class ViatraReasoner extends LogicReasoner {
                                 it.value = (method.statistics.scopePropagationTime / 1000000) as int

                         ]

                         it.entries += createIntStatisticEntry => [

+                                it.name = "MustRelationPropagationTime"

+                                it.value = (method.statistics.mustRelationPropagationTime / 1000000) as int

+                        ]

+                        it.entries += createIntStatisticEntry => [

                                 it.name = "TypeAnalysisTime"

                                 it.value = (method.statistics.preliminaryTypeAnalisisTime / 1000000) as int

                         ]

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java
index a2de1abc..4800f71d 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/BestFirstStrategyForModelGeneration.java
@@ -307,7 +307,6 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
         

         public List<String> times = new LinkedList<String>();

         private void saveTimes() {

-                long statecoderTime = ((NeighbourhoodBasedPartialInterpretationStateCoder<?, ?>)this.context.getStateCoder()).getStatecoderRuntime()/1000000;

                 long forwardTime = context.getDesignSpaceManager().getForwardTime()/1000000;

                 long backtrackingTime = context.getDesignSpaceManager().getBacktrackingTime()/1000000;

                 long activationSelection = this.activationSelector.getRuntime()/1000000;

@@ -317,8 +316,7 @@ public class BestFirstStrategyForModelGeneration implements IStrategy {
                 long numericalSolverSolving = this.numericSolver.getSolverSolvingProblem()/1000000;

                 long numericalSolverInterpreting = this.numericSolver.getSolverSolution()/1000000;

                 this.times.add(

-                        "(TransformationExecutionTime"+method.getStatistics().transformationExecutionTime/1000000+ 

-                        "|StateCoderTime:"+statecoderTime+

+                        "(TransformationExecutionTime"+method.getStatistics().transformationExecutionTime/1000000+

                         "|ForwardTime:"+forwardTime+

                         "|Backtrackingtime:"+backtrackingTime+

                         "|GlobalConstraintEvaluationTime:"+(globalConstraintEvaluationTime/1000000)+

diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemHint.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemHint.xtend
index 8d6523b1..300f8b51 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemHint.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemHint.xtend
@@ -4,6 +4,8 @@ import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic
 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace
 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeExpressionBuilderFactory
 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternGenerator
+import java.util.Map
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery
 
 class FileSystemHint extends Ecore2LogicTraceBasedHint {
         static val REMAINING_CONTENTS_ROOT = "hint_root"
@@ -12,7 +14,7 @@ class FileSystemHint extends Ecore2LogicTraceBasedHint {
                 super(ecore2Logic, trace)
         }
 
-        override getAdditionalPatterns(PatternGenerator it) '''
+        override getAdditionalPatterns(PatternGenerator it, Map<String, PQuery> fqnToPQuery) '''
                 pattern «REMAINING_CONTENTS_ROOT»(problem:LogicProblem, interpretation:PartialInterpretation, remainingContents:java Integer) {
                         find interpretation(problem, interpretation);
                         remainingContents == sum find remainingContents_root_reference_Dir_helper(problem, interpretation, _, #_)
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphHint.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphHint.xtend
index 97ce4ee6..9a84f777 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphHint.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SGraphHint.xtend
@@ -4,13 +4,15 @@ import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic
 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace
 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeExpressionBuilderFactory
 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternGenerator
+import java.util.Map
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery
 
 class SGraphHint extends Ecore2LogicTraceBasedHint {
         new(Ecore2Logic ecore2Logic, Ecore2Logic_Trace trace) {
                 super(ecore2Logic, trace)
         }
 
-        override getAdditionalPatterns(extension PatternGenerator patternGenerator) {
+        override getAdditionalPatterns(extension PatternGenerator patternGenerator, Map<String, PQuery> fqnToPQuery) {
                 ""
         }
 
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SatelliteHint.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SatelliteHint.xtend
index ef5b779e..28954d60 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SatelliteHint.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SatelliteHint.xtend
@@ -5,6 +5,8 @@ import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace
 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.Modality
 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeExpressionBuilderFactory
 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternGenerator
+import java.util.Map
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery
 
 class SatelliteHint extends Ecore2LogicTraceBasedHint {
         static val INTERFEROMETY_PAYLOAD = "hint_interferometryPayload"
@@ -14,7 +16,7 @@ class SatelliteHint extends Ecore2LogicTraceBasedHint {
                 super(ecore2Logic, trace)
         }
 
-        override getAdditionalPatterns(PatternGenerator it) '''
+        override getAdditionalPatterns(PatternGenerator it, Map<String, PQuery> fqnToPQuery) '''
                 pattern «INTERFEROMETY_PAYLOAD»(problem:LogicProblem, interpretation:PartialInterpretation, object:DefinedElement) {
                         find interpretation(problem, interpretation);
                         find mustExist(problem, interpretation, object);
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
index b65826ad..5e2d0920 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend
@@ -1,9 +1,8 @@
 package hu.bme.mit.inf.dslreasoner.run

 

 import functionalarchitecture.FunctionalarchitecturePackage

+import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Model

 import hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns

-import hu.bme.mit.inf.dslreasoner.domains.transima.fam.Model

-import hu.bme.mit.inf.dslreasoner.domains.transima.fam.Type

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration

 import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor

@@ -15,7 +14,6 @@ import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore
 import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic

 import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2LogicConfiguration

 import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor

-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ScopePropagatorStrategy

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretation2Gml

@@ -121,8 +119,6 @@ class SimpleRun {
                 val patterns = i.specifications.toList

                 val wfPatterns = patterns.filter[it.allAnnotations.exists[it.name== "Constraint"]].toSet

                 val derivedFeatures = new LinkedHashMap

-                derivedFeatures.put(Type.instance,metamodel.attributes.filter[it.name == "type"].head)

-                derivedFeatures.put(Model.instance,metamodel.references.filter[it.name == "model"].head)

                 val res = new ViatraQuerySetDescriptor(

                         patterns,

                         wfPatterns,