From 2f99ce37e5380c8e53fb3515cc2bc5d48bd3d7fd Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kris7topher@gmail.com>
Date: Fri, 11 Jan 2019 15:41:57 +0100
Subject: Build with Eclipse 2018.12, generated files change

---
 .../dslreasoner/domains/alloyexamples/.gitignore   |   8 +
 .../domains/alloyexamples/ContentInNotLive.java    | 741 +++++++++++++++++++++
 .../domains/alloyexamples/DirectSupertype.java     | 692 +++++++++++++++++++
 .../dslreasoner/domains/alloyexamples/Live.java    | 730 ++++++++++++++++++++
 .../domains/alloyexamples/LoopInInheritence.java   | 548 +++++++++++++++
 .../alloyexamples/NonSymmetricOpposite.java        | 707 ++++++++++++++++++++
 .../domains/alloyexamples/Opposite.java            | 693 +++++++++++++++++++
 .../alloyexamples/OppositeDifferentClass.java      | 577 ++++++++++++++++
 .../domains/alloyexamples/PatternContent.java      | 693 +++++++++++++++++++
 9 files changed, 5389 insertions(+)
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/ContentInNotLive.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/DirectSupertype.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Live.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/LoopInInheritence.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/NonSymmetricOpposite.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Opposite.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/OppositeDifferentClass.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/PatternContent.java

(limited to 'Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf')

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore
index 9d608403..52338993 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore
@@ -34,3 +34,11 @@
 /OppositeMatcher.java
 /PatternContentMatch.java
 /PatternContentMatcher.java
+/.ContentInNotLive.java._trace
+/.DirectSupertype.java._trace
+/.Live.java._trace
+/.LoopInInheritence.java._trace
+/.NonSymmetricOpposite.java._trace
+/.Opposite.java._trace
+/.OppositeDifferentClass.java._trace
+/.PatternContent.java._trace
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/ContentInNotLive.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/ContentInNotLive.java
new file mode 100644
index 00000000..ffdc1a69
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/ContentInNotLive.java
@@ -0,0 +1,741 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/FileSystem.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.alloyexamples;
+
+import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir;
+import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject;
+import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Live;
+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.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.NegativePatternCall;
+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>
+ *         {@literal @}Constraint(key={child}, severity="error", message="error")
+ *         pattern contentInNotLive(parent : Dir, child: FSObject) {
+ *         	Dir.contents(parent,child);
+ *         	neg find live(_,parent);
+ *         } or {
+ *         	Dir.contents(parent,child);
+ *         	neg find live(_,child);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class ContentInNotLive extends BaseGeneratedEMFQuerySpecification<ContentInNotLive.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.contentInNotLive 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 Dir fParent;
+    
+    private FSObject fChild;
+    
+    private static List<String> parameterNames = makeImmutableList("parent", "child");
+    
+    private Match(final Dir pParent, final FSObject pChild) {
+      this.fParent = pParent;
+      this.fChild = pChild;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      if ("parent".equals(parameterName)) return this.fParent;
+      if ("child".equals(parameterName)) return this.fChild;
+      return null;
+    }
+    
+    public Dir getParent() {
+      return this.fParent;
+    }
+    
+    public FSObject getChild() {
+      return this.fChild;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("parent".equals(parameterName) ) {
+          this.fParent = (Dir) newValue;
+          return true;
+      }
+      if ("child".equals(parameterName) ) {
+          this.fChild = (FSObject) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setParent(final Dir pParent) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fParent = pParent;
+    }
+    
+    public void setChild(final FSObject pChild) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fChild = pChild;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.contentInNotLive";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return ContentInNotLive.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fParent, fChild};
+    }
+    
+    @Override
+    public ContentInNotLive.Match toImmutable() {
+      return isMutable() ? newMatch(fParent, fChild) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"parent\"=" + prettyPrintValue(fParent) + ", ");
+      result.append("\"child\"=" + prettyPrintValue(fChild));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fParent, fChild);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof ContentInNotLive.Match)) {
+          ContentInNotLive.Match other = (ContentInNotLive.Match) obj;
+          return Objects.equals(fParent, other.fParent) && Objects.equals(fChild, other.fChild);
+      } 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 ContentInNotLive specification() {
+      return ContentInNotLive.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 ContentInNotLive.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 pParent the fixed value of pattern parameter parent, or null if not bound.
+     * @param pChild the fixed value of pattern parameter child, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static ContentInNotLive.Match newMutableMatch(final Dir pParent, final FSObject pChild) {
+      return new Mutable(pParent, pChild);
+    }
+    
+    /**
+     * 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 pParent the fixed value of pattern parameter parent, or null if not bound.
+     * @param pChild the fixed value of pattern parameter child, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static ContentInNotLive.Match newMatch(final Dir pParent, final FSObject pChild) {
+      return new Immutable(pParent, pChild);
+    }
+    
+    private static final class Mutable extends ContentInNotLive.Match {
+      Mutable(final Dir pParent, final FSObject pChild) {
+        super(pParent, pChild);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends ContentInNotLive.Match {
+      Immutable(final Dir pParent, final FSObject pChild) {
+        super(pParent, pChild);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.contentInNotLive 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>
+   * {@literal @}Constraint(key={child}, severity="error", message="error")
+   * pattern contentInNotLive(parent : Dir, child: FSObject) {
+   * 	Dir.contents(parent,child);
+   * 	neg find live(_,parent);
+   * } or {
+   * 	Dir.contents(parent,child);
+   * 	neg find live(_,child);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see ContentInNotLive
+   * 
+   */
+  public static class Matcher extends BaseMatcher<ContentInNotLive.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 ContentInNotLive.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 ContentInNotLive.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_PARENT = 0;
+    
+    private static final int POSITION_CHILD = 1;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(ContentInNotLive.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 pParent the fixed value of pattern parameter parent, or null if not bound.
+     * @param pChild the fixed value of pattern parameter child, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<ContentInNotLive.Match> getAllMatches(final Dir pParent, final FSObject pChild) {
+      return rawStreamAllMatches(new Object[]{pParent, pChild}).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 pParent the fixed value of pattern parameter parent, or null if not bound.
+     * @param pChild the fixed value of pattern parameter child, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<ContentInNotLive.Match> streamAllMatches(final Dir pParent, final FSObject pChild) {
+      return rawStreamAllMatches(new Object[]{pParent, pChild});
+    }
+    
+    /**
+     * 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 pParent the fixed value of pattern parameter parent, or null if not bound.
+     * @param pChild the fixed value of pattern parameter child, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<ContentInNotLive.Match> getOneArbitraryMatch(final Dir pParent, final FSObject pChild) {
+      return rawGetOneArbitraryMatch(new Object[]{pParent, pChild});
+    }
+    
+    /**
+     * 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 pParent the fixed value of pattern parameter parent, or null if not bound.
+     * @param pChild the fixed value of pattern parameter child, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Dir pParent, final FSObject pChild) {
+      return rawHasMatch(new Object[]{pParent, pChild});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pParent the fixed value of pattern parameter parent, or null if not bound.
+     * @param pChild the fixed value of pattern parameter child, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Dir pParent, final FSObject pChild) {
+      return rawCountMatches(new Object[]{pParent, pChild});
+    }
+    
+    /**
+     * 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 pParent the fixed value of pattern parameter parent, or null if not bound.
+     * @param pChild the fixed value of pattern parameter child, 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 Dir pParent, final FSObject pChild, final Consumer<? super ContentInNotLive.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pParent, pChild}, 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 pParent the fixed value of pattern parameter parent, or null if not bound.
+     * @param pChild the fixed value of pattern parameter child, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public ContentInNotLive.Match newMatch(final Dir pParent, final FSObject pChild) {
+      return ContentInNotLive.Match.newMatch(pParent, pChild);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for parent.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Dir> rawStreamAllValuesOfparent(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_PARENT, parameters).map(Dir.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for parent.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Dir> getAllValuesOfparent() {
+      return rawStreamAllValuesOfparent(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for parent.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Dir> streamAllValuesOfparent() {
+      return rawStreamAllValuesOfparent(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for parent.
+     * </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<Dir> streamAllValuesOfparent(final ContentInNotLive.Match partialMatch) {
+      return rawStreamAllValuesOfparent(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for parent.
+     * </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<Dir> streamAllValuesOfparent(final FSObject pChild) {
+      return rawStreamAllValuesOfparent(new Object[]{null, pChild});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for parent.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Dir> getAllValuesOfparent(final ContentInNotLive.Match partialMatch) {
+      return rawStreamAllValuesOfparent(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for parent.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Dir> getAllValuesOfparent(final FSObject pChild) {
+      return rawStreamAllValuesOfparent(new Object[]{null, pChild}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for child.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<FSObject> rawStreamAllValuesOfchild(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_CHILD, parameters).map(FSObject.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for child.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<FSObject> getAllValuesOfchild() {
+      return rawStreamAllValuesOfchild(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for child.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<FSObject> streamAllValuesOfchild() {
+      return rawStreamAllValuesOfchild(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for child.
+     * </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<FSObject> streamAllValuesOfchild(final ContentInNotLive.Match partialMatch) {
+      return rawStreamAllValuesOfchild(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for child.
+     * </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<FSObject> streamAllValuesOfchild(final Dir pParent) {
+      return rawStreamAllValuesOfchild(new Object[]{pParent, null});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for child.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<FSObject> getAllValuesOfchild(final ContentInNotLive.Match partialMatch) {
+      return rawStreamAllValuesOfchild(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for child.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<FSObject> getAllValuesOfchild(final Dir pParent) {
+      return rawStreamAllValuesOfchild(new Object[]{pParent, null}).collect(Collectors.toSet());
+    }
+    
+    @Override
+    protected ContentInNotLive.Match tupleToMatch(final Tuple t) {
+      try {
+          return ContentInNotLive.Match.newMatch((Dir) t.get(POSITION_PARENT), (FSObject) t.get(POSITION_CHILD));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected ContentInNotLive.Match arrayToMatch(final Object[] match) {
+      try {
+          return ContentInNotLive.Match.newMatch((Dir) match[POSITION_PARENT], (FSObject) match[POSITION_CHILD]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected ContentInNotLive.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return ContentInNotLive.Match.newMutableMatch((Dir) match[POSITION_PARENT], (FSObject) match[POSITION_CHILD]);
+      } 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<ContentInNotLive.Matcher> querySpecification() {
+      return ContentInNotLive.instance();
+    }
+  }
+  
+  private ContentInNotLive() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static ContentInNotLive instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected ContentInNotLive.Matcher instantiate(final ViatraQueryEngine engine) {
+    return ContentInNotLive.Matcher.on(engine);
+  }
+  
+  @Override
+  public ContentInNotLive.Matcher instantiate() {
+    return ContentInNotLive.Matcher.create();
+  }
+  
+  @Override
+  public ContentInNotLive.Match newEmptyMatch() {
+    return ContentInNotLive.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public ContentInNotLive.Match newMatch(final Object... parameters) {
+    return ContentInNotLive.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir) parameters[0], (hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject) parameters[1]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.ContentInNotLive (visibility: PUBLIC, simpleName: ContentInNotLive, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.ContentInNotLive, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.ContentInNotLive (visibility: PUBLIC, simpleName: ContentInNotLive, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.ContentInNotLive, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final ContentInNotLive INSTANCE = new ContentInNotLive();
+    
+    /**
+     * 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 ContentInNotLive.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_parent = new PParameter("parent", "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("FS", "Dir")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_child = new PParameter("child", "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("FS", "FSObject")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_parent, parameter_child);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.contentInNotLive";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("parent","child");
+    }
+    
+    @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_parent = body.getOrCreateVariableByName("parent");
+          PVariable var_child = body.getOrCreateVariableByName("child");
+          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_parent), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "Dir")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_child), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FSObject")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_parent, parameter_parent),
+             new ExportedParameter(body, var_child, parameter_child)
+          ));
+          // 	Dir.contents(parent,child)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_parent), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "Dir")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_parent, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("FS", "Dir", "contents")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FSObject")));
+          new Equality(body, var__virtual_0_, var_child);
+          // 	neg find live(_,parent)
+          new NegativePatternCall(body, Tuples.flatTupleOf(var___0_, var_parent), Live.instance().getInternalQueryRepresentation());
+          bodies.add(body);
+      }
+      {
+          PBody body = new PBody(this);
+          PVariable var_parent = body.getOrCreateVariableByName("parent");
+          PVariable var_child = body.getOrCreateVariableByName("child");
+          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_parent), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "Dir")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_child), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FSObject")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_parent, parameter_parent),
+             new ExportedParameter(body, var_child, parameter_child)
+          ));
+          // 	Dir.contents(parent,child)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_parent), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "Dir")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_parent, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("FS", "Dir", "contents")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FSObject")));
+          new Equality(body, var__virtual_0_, var_child);
+          // 	neg find live(_,child)
+          new NegativePatternCall(body, Tuples.flatTupleOf(var___0_, var_child), Live.instance().getInternalQueryRepresentation());
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("child")
+                              }));
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("message", "error");
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/DirectSupertype.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/DirectSupertype.java
new file mode 100644
index 00000000..03020a7c
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/DirectSupertype.java
@@ -0,0 +1,692 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Ecore.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.alloyexamples;
+
+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.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.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 directSupertype(a: EClass, b:EClass) {
+ *         	EClass.eSuperTypes(a,b);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class DirectSupertype extends BaseGeneratedEMFQuerySpecification<DirectSupertype.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.directSupertype 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 EClass fA;
+    
+    private EClass fB;
+    
+    private static List<String> parameterNames = makeImmutableList("a", "b");
+    
+    private Match(final EClass pA, final EClass pB) {
+      this.fA = pA;
+      this.fB = pB;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      if ("a".equals(parameterName)) return this.fA;
+      if ("b".equals(parameterName)) return this.fB;
+      return null;
+    }
+    
+    public EClass getA() {
+      return this.fA;
+    }
+    
+    public EClass getB() {
+      return this.fB;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("a".equals(parameterName) ) {
+          this.fA = (EClass) newValue;
+          return true;
+      }
+      if ("b".equals(parameterName) ) {
+          this.fB = (EClass) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setA(final EClass pA) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fA = pA;
+    }
+    
+    public void setB(final EClass pB) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fB = pB;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.directSupertype";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return DirectSupertype.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fA, fB};
+    }
+    
+    @Override
+    public DirectSupertype.Match toImmutable() {
+      return isMutable() ? newMatch(fA, fB) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"a\"=" + prettyPrintValue(fA) + ", ");
+      result.append("\"b\"=" + prettyPrintValue(fB));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fA, fB);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof DirectSupertype.Match)) {
+          DirectSupertype.Match other = (DirectSupertype.Match) obj;
+          return Objects.equals(fA, other.fA) && Objects.equals(fB, other.fB);
+      } 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 DirectSupertype specification() {
+      return DirectSupertype.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 DirectSupertype.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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static DirectSupertype.Match newMutableMatch(final EClass pA, final EClass pB) {
+      return new Mutable(pA, pB);
+    }
+    
+    /**
+     * 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static DirectSupertype.Match newMatch(final EClass pA, final EClass pB) {
+      return new Immutable(pA, pB);
+    }
+    
+    private static final class Mutable extends DirectSupertype.Match {
+      Mutable(final EClass pA, final EClass pB) {
+        super(pA, pB);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends DirectSupertype.Match {
+      Immutable(final EClass pA, final EClass pB) {
+        super(pA, pB);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.directSupertype 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 directSupertype(a: EClass, b:EClass) {
+   * 	EClass.eSuperTypes(a,b);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see DirectSupertype
+   * 
+   */
+  public static class Matcher extends BaseMatcher<DirectSupertype.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 DirectSupertype.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 DirectSupertype.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_A = 0;
+    
+    private static final int POSITION_B = 1;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(DirectSupertype.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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<DirectSupertype.Match> getAllMatches(final EClass pA, final EClass pB) {
+      return rawStreamAllMatches(new Object[]{pA, pB}).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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<DirectSupertype.Match> streamAllMatches(final EClass pA, final EClass pB) {
+      return rawStreamAllMatches(new Object[]{pA, pB});
+    }
+    
+    /**
+     * 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<DirectSupertype.Match> getOneArbitraryMatch(final EClass pA, final EClass pB) {
+      return rawGetOneArbitraryMatch(new Object[]{pA, pB});
+    }
+    
+    /**
+     * 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final EClass pA, final EClass pB) {
+      return rawHasMatch(new Object[]{pA, pB});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final EClass pA, final EClass pB) {
+      return rawCountMatches(new Object[]{pA, pB});
+    }
+    
+    /**
+     * 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, 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 EClass pA, final EClass pB, final Consumer<? super DirectSupertype.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pA, pB}, 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public DirectSupertype.Match newMatch(final EClass pA, final EClass pB) {
+      return DirectSupertype.Match.newMatch(pA, pB);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<EClass> rawStreamAllValuesOfa(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_A, parameters).map(EClass.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EClass> getAllValuesOfa() {
+      return rawStreamAllValuesOfa(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<EClass> streamAllValuesOfa() {
+      return rawStreamAllValuesOfa(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * </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<EClass> streamAllValuesOfa(final DirectSupertype.Match partialMatch) {
+      return rawStreamAllValuesOfa(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * </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<EClass> streamAllValuesOfa(final EClass pB) {
+      return rawStreamAllValuesOfa(new Object[]{null, pB});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EClass> getAllValuesOfa(final DirectSupertype.Match partialMatch) {
+      return rawStreamAllValuesOfa(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EClass> getAllValuesOfa(final EClass pB) {
+      return rawStreamAllValuesOfa(new Object[]{null, pB}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<EClass> rawStreamAllValuesOfb(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_B, parameters).map(EClass.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EClass> getAllValuesOfb() {
+      return rawStreamAllValuesOfb(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<EClass> streamAllValuesOfb() {
+      return rawStreamAllValuesOfb(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * </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<EClass> streamAllValuesOfb(final DirectSupertype.Match partialMatch) {
+      return rawStreamAllValuesOfb(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * </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<EClass> streamAllValuesOfb(final EClass pA) {
+      return rawStreamAllValuesOfb(new Object[]{pA, null});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EClass> getAllValuesOfb(final DirectSupertype.Match partialMatch) {
+      return rawStreamAllValuesOfb(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EClass> getAllValuesOfb(final EClass pA) {
+      return rawStreamAllValuesOfb(new Object[]{pA, null}).collect(Collectors.toSet());
+    }
+    
+    @Override
+    protected DirectSupertype.Match tupleToMatch(final Tuple t) {
+      try {
+          return DirectSupertype.Match.newMatch((EClass) t.get(POSITION_A), (EClass) t.get(POSITION_B));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected DirectSupertype.Match arrayToMatch(final Object[] match) {
+      try {
+          return DirectSupertype.Match.newMatch((EClass) match[POSITION_A], (EClass) match[POSITION_B]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected DirectSupertype.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return DirectSupertype.Match.newMutableMatch((EClass) match[POSITION_A], (EClass) match[POSITION_B]);
+      } 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<DirectSupertype.Matcher> querySpecification() {
+      return DirectSupertype.instance();
+    }
+  }
+  
+  private DirectSupertype() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static DirectSupertype instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected DirectSupertype.Matcher instantiate(final ViatraQueryEngine engine) {
+    return DirectSupertype.Matcher.on(engine);
+  }
+  
+  @Override
+  public DirectSupertype.Matcher instantiate() {
+    return DirectSupertype.Matcher.create();
+  }
+  
+  @Override
+  public DirectSupertype.Match newEmptyMatch() {
+    return DirectSupertype.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public DirectSupertype.Match newMatch(final Object... parameters) {
+    return DirectSupertype.Match.newMatch((org.eclipse.emf.ecore.EClass) parameters[0], (org.eclipse.emf.ecore.EClass) parameters[1]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.DirectSupertype (visibility: PUBLIC, simpleName: DirectSupertype, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.DirectSupertype, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.DirectSupertype (visibility: PUBLIC, simpleName: DirectSupertype, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.DirectSupertype, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final DirectSupertype INSTANCE = new DirectSupertype();
+    
+    /**
+     * 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 DirectSupertype.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_a = new PParameter("a", "org.eclipse.emf.ecore.EClass", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.eclipse.org/emf/2002/Ecore", "EClass")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_b = new PParameter("b", "org.eclipse.emf.ecore.EClass", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.eclipse.org/emf/2002/Ecore", "EClass")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_a, parameter_b);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.directSupertype";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("a","b");
+    }
+    
+    @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_a = body.getOrCreateVariableByName("a");
+          PVariable var_b = body.getOrCreateVariableByName("b");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_a), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EClass")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_b), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EClass")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_a, parameter_a),
+             new ExportedParameter(body, var_b, parameter_b)
+          ));
+          // 	EClass.eSuperTypes(a,b)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_a), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EClass")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_a, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/emf/2002/Ecore", "EClass", "eSuperTypes")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EClass")));
+          new Equality(body, var__virtual_0_, var_b);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Live.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Live.java
new file mode 100644
index 00000000..ae0f0c58
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Live.java
@@ -0,0 +1,730 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/FileSystem.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.alloyexamples;
+
+import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject;
+import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FileSystem;
+import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.PatternContent;
+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.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.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.BinaryTransitiveClosure;
+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>
+ *         {@literal @}QueryBasedFeature
+ *         pattern live(this: FileSystem, l: FSObject) {
+ *         	FileSystem.root(this,l);
+ *         } or {
+ *         	FileSystem.root(this,root);
+ *         	find patternContent+(root,l);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class Live extends BaseGeneratedEMFQuerySpecification<Live.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.live 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 FileSystem fThis;
+    
+    private FSObject fL;
+    
+    private static List<String> parameterNames = makeImmutableList("this", "l");
+    
+    private Match(final FileSystem pThis, final FSObject pL) {
+      this.fThis = pThis;
+      this.fL = pL;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      if ("this".equals(parameterName)) return this.fThis;
+      if ("l".equals(parameterName)) return this.fL;
+      return null;
+    }
+    
+    public FileSystem getThis() {
+      return this.fThis;
+    }
+    
+    public FSObject getL() {
+      return this.fL;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("this".equals(parameterName) ) {
+          this.fThis = (FileSystem) newValue;
+          return true;
+      }
+      if ("l".equals(parameterName) ) {
+          this.fL = (FSObject) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setThis(final FileSystem pThis) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fThis = pThis;
+    }
+    
+    public void setL(final FSObject pL) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fL = pL;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.live";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return Live.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fThis, fL};
+    }
+    
+    @Override
+    public Live.Match toImmutable() {
+      return isMutable() ? newMatch(fThis, fL) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"this\"=" + prettyPrintValue(fThis) + ", ");
+      result.append("\"l\"=" + prettyPrintValue(fL));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fThis, fL);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof Live.Match)) {
+          Live.Match other = (Live.Match) obj;
+          return Objects.equals(fThis, other.fThis) && Objects.equals(fL, other.fL);
+      } 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 Live specification() {
+      return Live.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 Live.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 pThis the fixed value of pattern parameter this, or null if not bound.
+     * @param pL the fixed value of pattern parameter l, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static Live.Match newMutableMatch(final FileSystem pThis, final FSObject pL) {
+      return new Mutable(pThis, pL);
+    }
+    
+    /**
+     * 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 pThis the fixed value of pattern parameter this, or null if not bound.
+     * @param pL the fixed value of pattern parameter l, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static Live.Match newMatch(final FileSystem pThis, final FSObject pL) {
+      return new Immutable(pThis, pL);
+    }
+    
+    private static final class Mutable extends Live.Match {
+      Mutable(final FileSystem pThis, final FSObject pL) {
+        super(pThis, pL);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends Live.Match {
+      Immutable(final FileSystem pThis, final FSObject pL) {
+        super(pThis, pL);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.live 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>
+   * {@literal @}QueryBasedFeature
+   * pattern live(this: FileSystem, l: FSObject) {
+   * 	FileSystem.root(this,l);
+   * } or {
+   * 	FileSystem.root(this,root);
+   * 	find patternContent+(root,l);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see Live
+   * 
+   */
+  public static class Matcher extends BaseMatcher<Live.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 Live.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 Live.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_THIS = 0;
+    
+    private static final int POSITION_L = 1;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(Live.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 pThis the fixed value of pattern parameter this, or null if not bound.
+     * @param pL the fixed value of pattern parameter l, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<Live.Match> getAllMatches(final FileSystem pThis, final FSObject pL) {
+      return rawStreamAllMatches(new Object[]{pThis, pL}).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 pThis the fixed value of pattern parameter this, or null if not bound.
+     * @param pL the fixed value of pattern parameter l, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<Live.Match> streamAllMatches(final FileSystem pThis, final FSObject pL) {
+      return rawStreamAllMatches(new Object[]{pThis, pL});
+    }
+    
+    /**
+     * 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 pThis the fixed value of pattern parameter this, or null if not bound.
+     * @param pL the fixed value of pattern parameter l, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<Live.Match> getOneArbitraryMatch(final FileSystem pThis, final FSObject pL) {
+      return rawGetOneArbitraryMatch(new Object[]{pThis, pL});
+    }
+    
+    /**
+     * 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 pThis the fixed value of pattern parameter this, or null if not bound.
+     * @param pL the fixed value of pattern parameter l, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final FileSystem pThis, final FSObject pL) {
+      return rawHasMatch(new Object[]{pThis, pL});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pThis the fixed value of pattern parameter this, or null if not bound.
+     * @param pL the fixed value of pattern parameter l, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final FileSystem pThis, final FSObject pL) {
+      return rawCountMatches(new Object[]{pThis, pL});
+    }
+    
+    /**
+     * 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 pThis the fixed value of pattern parameter this, or null if not bound.
+     * @param pL the fixed value of pattern parameter l, 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 FileSystem pThis, final FSObject pL, final Consumer<? super Live.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pThis, pL}, 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 pThis the fixed value of pattern parameter this, or null if not bound.
+     * @param pL the fixed value of pattern parameter l, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public Live.Match newMatch(final FileSystem pThis, final FSObject pL) {
+      return Live.Match.newMatch(pThis, pL);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for this.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<FileSystem> rawStreamAllValuesOfthis(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_THIS, parameters).map(FileSystem.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for this.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<FileSystem> getAllValuesOfthis() {
+      return rawStreamAllValuesOfthis(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for this.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<FileSystem> streamAllValuesOfthis() {
+      return rawStreamAllValuesOfthis(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for this.
+     * </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<FileSystem> streamAllValuesOfthis(final Live.Match partialMatch) {
+      return rawStreamAllValuesOfthis(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for this.
+     * </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<FileSystem> streamAllValuesOfthis(final FSObject pL) {
+      return rawStreamAllValuesOfthis(new Object[]{null, pL});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for this.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<FileSystem> getAllValuesOfthis(final Live.Match partialMatch) {
+      return rawStreamAllValuesOfthis(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for this.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<FileSystem> getAllValuesOfthis(final FSObject pL) {
+      return rawStreamAllValuesOfthis(new Object[]{null, pL}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for l.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<FSObject> rawStreamAllValuesOfl(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_L, parameters).map(FSObject.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for l.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<FSObject> getAllValuesOfl() {
+      return rawStreamAllValuesOfl(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for l.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<FSObject> streamAllValuesOfl() {
+      return rawStreamAllValuesOfl(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for l.
+     * </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<FSObject> streamAllValuesOfl(final Live.Match partialMatch) {
+      return rawStreamAllValuesOfl(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for l.
+     * </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<FSObject> streamAllValuesOfl(final FileSystem pThis) {
+      return rawStreamAllValuesOfl(new Object[]{pThis, null});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for l.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<FSObject> getAllValuesOfl(final Live.Match partialMatch) {
+      return rawStreamAllValuesOfl(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for l.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<FSObject> getAllValuesOfl(final FileSystem pThis) {
+      return rawStreamAllValuesOfl(new Object[]{pThis, null}).collect(Collectors.toSet());
+    }
+    
+    @Override
+    protected Live.Match tupleToMatch(final Tuple t) {
+      try {
+          return Live.Match.newMatch((FileSystem) t.get(POSITION_THIS), (FSObject) t.get(POSITION_L));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Live.Match arrayToMatch(final Object[] match) {
+      try {
+          return Live.Match.newMatch((FileSystem) match[POSITION_THIS], (FSObject) match[POSITION_L]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Live.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return Live.Match.newMutableMatch((FileSystem) match[POSITION_THIS], (FSObject) match[POSITION_L]);
+      } 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<Live.Matcher> querySpecification() {
+      return Live.instance();
+    }
+  }
+  
+  private Live() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static Live instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected Live.Matcher instantiate(final ViatraQueryEngine engine) {
+    return Live.Matcher.on(engine);
+  }
+  
+  @Override
+  public Live.Matcher instantiate() {
+    return Live.Matcher.create();
+  }
+  
+  @Override
+  public Live.Match newEmptyMatch() {
+    return Live.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public Live.Match newMatch(final Object... parameters) {
+    return Live.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FileSystem) parameters[0], (hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject) parameters[1]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Live (visibility: PUBLIC, simpleName: Live, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Live, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Live (visibility: PUBLIC, simpleName: Live, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Live, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final Live INSTANCE = new Live();
+    
+    /**
+     * 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 Live.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_this = new PParameter("this", "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FileSystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("FS", "FileSystem")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_l = new PParameter("l", "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("FS", "FSObject")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_this, parameter_l);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.live";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("this","l");
+    }
+    
+    @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_this = body.getOrCreateVariableByName("this");
+          PVariable var_l = body.getOrCreateVariableByName("l");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_this), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FileSystem")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_l), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FSObject")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_this, parameter_this),
+             new ExportedParameter(body, var_l, parameter_l)
+          ));
+          // 	FileSystem.root(this,l)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_this), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FileSystem")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_this, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("FS", "FileSystem", "root")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "Dir")));
+          new Equality(body, var__virtual_0_, var_l);
+          bodies.add(body);
+      }
+      {
+          PBody body = new PBody(this);
+          PVariable var_this = body.getOrCreateVariableByName("this");
+          PVariable var_l = body.getOrCreateVariableByName("l");
+          PVariable var_root = body.getOrCreateVariableByName("root");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_this), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FileSystem")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_l), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FSObject")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_this, parameter_this),
+             new ExportedParameter(body, var_l, parameter_l)
+          ));
+          // 	FileSystem.root(this,root)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_this), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FileSystem")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_this, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("FS", "FileSystem", "root")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "Dir")));
+          new Equality(body, var__virtual_0_, var_root);
+          // 	find patternContent+(root,l)
+          new BinaryTransitiveClosure(body, Tuples.flatTupleOf(var_root, var_l), PatternContent.instance().getInternalQueryRepresentation());
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("QueryBasedFeature");
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/LoopInInheritence.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/LoopInInheritence.java
new file mode 100644
index 00000000..51bd83a9
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/LoopInInheritence.java
@@ -0,0 +1,548 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Ecore.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.alloyexamples;
+
+import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.DirectSupertype;
+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.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.basicenumerables.BinaryTransitiveClosure;
+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>
+ *         {@literal @}Constraint(key={a}, severity="error", message="error")
+ *         pattern loopInInheritence(a: EClass) {
+ *         	find directSupertype+(a,a);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class LoopInInheritence extends BaseGeneratedEMFQuerySpecification<LoopInInheritence.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.loopInInheritence 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 EClass fA;
+    
+    private static List<String> parameterNames = makeImmutableList("a");
+    
+    private Match(final EClass pA) {
+      this.fA = pA;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      if ("a".equals(parameterName)) return this.fA;
+      return null;
+    }
+    
+    public EClass getA() {
+      return this.fA;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("a".equals(parameterName) ) {
+          this.fA = (EClass) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setA(final EClass pA) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fA = pA;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.loopInInheritence";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return LoopInInheritence.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fA};
+    }
+    
+    @Override
+    public LoopInInheritence.Match toImmutable() {
+      return isMutable() ? newMatch(fA) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"a\"=" + prettyPrintValue(fA));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fA);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof LoopInInheritence.Match)) {
+          LoopInInheritence.Match other = (LoopInInheritence.Match) obj;
+          return Objects.equals(fA, other.fA);
+      } 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 LoopInInheritence specification() {
+      return LoopInInheritence.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 LoopInInheritence.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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static LoopInInheritence.Match newMutableMatch(final EClass pA) {
+      return new Mutable(pA);
+    }
+    
+    /**
+     * 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static LoopInInheritence.Match newMatch(final EClass pA) {
+      return new Immutable(pA);
+    }
+    
+    private static final class Mutable extends LoopInInheritence.Match {
+      Mutable(final EClass pA) {
+        super(pA);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends LoopInInheritence.Match {
+      Immutable(final EClass pA) {
+        super(pA);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.loopInInheritence 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>
+   * {@literal @}Constraint(key={a}, severity="error", message="error")
+   * pattern loopInInheritence(a: EClass) {
+   * 	find directSupertype+(a,a);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see LoopInInheritence
+   * 
+   */
+  public static class Matcher extends BaseMatcher<LoopInInheritence.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 LoopInInheritence.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 LoopInInheritence.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_A = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(LoopInInheritence.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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<LoopInInheritence.Match> getAllMatches(final EClass pA) {
+      return rawStreamAllMatches(new Object[]{pA}).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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<LoopInInheritence.Match> streamAllMatches(final EClass pA) {
+      return rawStreamAllMatches(new Object[]{pA});
+    }
+    
+    /**
+     * 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<LoopInInheritence.Match> getOneArbitraryMatch(final EClass pA) {
+      return rawGetOneArbitraryMatch(new Object[]{pA});
+    }
+    
+    /**
+     * 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final EClass pA) {
+      return rawHasMatch(new Object[]{pA});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pA the fixed value of pattern parameter a, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final EClass pA) {
+      return rawCountMatches(new Object[]{pA});
+    }
+    
+    /**
+     * 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 pA the fixed value of pattern parameter a, 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 EClass pA, final Consumer<? super LoopInInheritence.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pA}, 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public LoopInInheritence.Match newMatch(final EClass pA) {
+      return LoopInInheritence.Match.newMatch(pA);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<EClass> rawStreamAllValuesOfa(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_A, parameters).map(EClass.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EClass> getAllValuesOfa() {
+      return rawStreamAllValuesOfa(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<EClass> streamAllValuesOfa() {
+      return rawStreamAllValuesOfa(emptyArray());
+    }
+    
+    @Override
+    protected LoopInInheritence.Match tupleToMatch(final Tuple t) {
+      try {
+          return LoopInInheritence.Match.newMatch((EClass) t.get(POSITION_A));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected LoopInInheritence.Match arrayToMatch(final Object[] match) {
+      try {
+          return LoopInInheritence.Match.newMatch((EClass) match[POSITION_A]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected LoopInInheritence.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return LoopInInheritence.Match.newMutableMatch((EClass) match[POSITION_A]);
+      } 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<LoopInInheritence.Matcher> querySpecification() {
+      return LoopInInheritence.instance();
+    }
+  }
+  
+  private LoopInInheritence() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static LoopInInheritence instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected LoopInInheritence.Matcher instantiate(final ViatraQueryEngine engine) {
+    return LoopInInheritence.Matcher.on(engine);
+  }
+  
+  @Override
+  public LoopInInheritence.Matcher instantiate() {
+    return LoopInInheritence.Matcher.create();
+  }
+  
+  @Override
+  public LoopInInheritence.Match newEmptyMatch() {
+    return LoopInInheritence.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public LoopInInheritence.Match newMatch(final Object... parameters) {
+    return LoopInInheritence.Match.newMatch((org.eclipse.emf.ecore.EClass) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.LoopInInheritence (visibility: PUBLIC, simpleName: LoopInInheritence, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.LoopInInheritence, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.LoopInInheritence (visibility: PUBLIC, simpleName: LoopInInheritence, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.LoopInInheritence, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final LoopInInheritence INSTANCE = new LoopInInheritence();
+    
+    /**
+     * 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 LoopInInheritence.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_a = new PParameter("a", "org.eclipse.emf.ecore.EClass", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.eclipse.org/emf/2002/Ecore", "EClass")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_a);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.loopInInheritence";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("a");
+    }
+    
+    @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_a = body.getOrCreateVariableByName("a");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_a), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EClass")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_a, parameter_a)
+          ));
+          // 	find directSupertype+(a,a)
+          new BinaryTransitiveClosure(body, Tuples.flatTupleOf(var_a, var_a), DirectSupertype.instance().getInternalQueryRepresentation());
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("a")
+                              }));
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("message", "error");
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/NonSymmetricOpposite.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/NonSymmetricOpposite.java
new file mode 100644
index 00000000..bd2833a7
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/NonSymmetricOpposite.java
@@ -0,0 +1,707 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Ecore.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.alloyexamples;
+
+import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Opposite;
+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.emf.ecore.EReference;
+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.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.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;
+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>
+ *         {@literal @}Constraint(key={a}, severity="error", message="error")
+ *         pattern nonSymmetricOpposite(a:EReference, b:EReference) {
+ *         	find opposite(a,b);
+ *         	neg find opposite(b,a);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class NonSymmetricOpposite extends BaseGeneratedEMFQuerySpecification<NonSymmetricOpposite.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.nonSymmetricOpposite 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 EReference fA;
+    
+    private EReference fB;
+    
+    private static List<String> parameterNames = makeImmutableList("a", "b");
+    
+    private Match(final EReference pA, final EReference pB) {
+      this.fA = pA;
+      this.fB = pB;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      if ("a".equals(parameterName)) return this.fA;
+      if ("b".equals(parameterName)) return this.fB;
+      return null;
+    }
+    
+    public EReference getA() {
+      return this.fA;
+    }
+    
+    public EReference getB() {
+      return this.fB;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("a".equals(parameterName) ) {
+          this.fA = (EReference) newValue;
+          return true;
+      }
+      if ("b".equals(parameterName) ) {
+          this.fB = (EReference) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setA(final EReference pA) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fA = pA;
+    }
+    
+    public void setB(final EReference pB) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fB = pB;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.nonSymmetricOpposite";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return NonSymmetricOpposite.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fA, fB};
+    }
+    
+    @Override
+    public NonSymmetricOpposite.Match toImmutable() {
+      return isMutable() ? newMatch(fA, fB) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"a\"=" + prettyPrintValue(fA) + ", ");
+      result.append("\"b\"=" + prettyPrintValue(fB));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fA, fB);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof NonSymmetricOpposite.Match)) {
+          NonSymmetricOpposite.Match other = (NonSymmetricOpposite.Match) obj;
+          return Objects.equals(fA, other.fA) && Objects.equals(fB, other.fB);
+      } 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 NonSymmetricOpposite specification() {
+      return NonSymmetricOpposite.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 NonSymmetricOpposite.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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static NonSymmetricOpposite.Match newMutableMatch(final EReference pA, final EReference pB) {
+      return new Mutable(pA, pB);
+    }
+    
+    /**
+     * 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static NonSymmetricOpposite.Match newMatch(final EReference pA, final EReference pB) {
+      return new Immutable(pA, pB);
+    }
+    
+    private static final class Mutable extends NonSymmetricOpposite.Match {
+      Mutable(final EReference pA, final EReference pB) {
+        super(pA, pB);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends NonSymmetricOpposite.Match {
+      Immutable(final EReference pA, final EReference pB) {
+        super(pA, pB);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.nonSymmetricOpposite 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>
+   * {@literal @}Constraint(key={a}, severity="error", message="error")
+   * pattern nonSymmetricOpposite(a:EReference, b:EReference) {
+   * 	find opposite(a,b);
+   * 	neg find opposite(b,a);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see NonSymmetricOpposite
+   * 
+   */
+  public static class Matcher extends BaseMatcher<NonSymmetricOpposite.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 NonSymmetricOpposite.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 NonSymmetricOpposite.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_A = 0;
+    
+    private static final int POSITION_B = 1;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(NonSymmetricOpposite.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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<NonSymmetricOpposite.Match> getAllMatches(final EReference pA, final EReference pB) {
+      return rawStreamAllMatches(new Object[]{pA, pB}).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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<NonSymmetricOpposite.Match> streamAllMatches(final EReference pA, final EReference pB) {
+      return rawStreamAllMatches(new Object[]{pA, pB});
+    }
+    
+    /**
+     * 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<NonSymmetricOpposite.Match> getOneArbitraryMatch(final EReference pA, final EReference pB) {
+      return rawGetOneArbitraryMatch(new Object[]{pA, pB});
+    }
+    
+    /**
+     * 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final EReference pA, final EReference pB) {
+      return rawHasMatch(new Object[]{pA, pB});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final EReference pA, final EReference pB) {
+      return rawCountMatches(new Object[]{pA, pB});
+    }
+    
+    /**
+     * 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, 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 EReference pA, final EReference pB, final Consumer<? super NonSymmetricOpposite.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pA, pB}, 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public NonSymmetricOpposite.Match newMatch(final EReference pA, final EReference pB) {
+      return NonSymmetricOpposite.Match.newMatch(pA, pB);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<EReference> rawStreamAllValuesOfa(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_A, parameters).map(EReference.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EReference> getAllValuesOfa() {
+      return rawStreamAllValuesOfa(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<EReference> streamAllValuesOfa() {
+      return rawStreamAllValuesOfa(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * </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<EReference> streamAllValuesOfa(final NonSymmetricOpposite.Match partialMatch) {
+      return rawStreamAllValuesOfa(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * </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<EReference> streamAllValuesOfa(final EReference pB) {
+      return rawStreamAllValuesOfa(new Object[]{null, pB});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EReference> getAllValuesOfa(final NonSymmetricOpposite.Match partialMatch) {
+      return rawStreamAllValuesOfa(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EReference> getAllValuesOfa(final EReference pB) {
+      return rawStreamAllValuesOfa(new Object[]{null, pB}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<EReference> rawStreamAllValuesOfb(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_B, parameters).map(EReference.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EReference> getAllValuesOfb() {
+      return rawStreamAllValuesOfb(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<EReference> streamAllValuesOfb() {
+      return rawStreamAllValuesOfb(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * </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<EReference> streamAllValuesOfb(final NonSymmetricOpposite.Match partialMatch) {
+      return rawStreamAllValuesOfb(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * </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<EReference> streamAllValuesOfb(final EReference pA) {
+      return rawStreamAllValuesOfb(new Object[]{pA, null});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EReference> getAllValuesOfb(final NonSymmetricOpposite.Match partialMatch) {
+      return rawStreamAllValuesOfb(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EReference> getAllValuesOfb(final EReference pA) {
+      return rawStreamAllValuesOfb(new Object[]{pA, null}).collect(Collectors.toSet());
+    }
+    
+    @Override
+    protected NonSymmetricOpposite.Match tupleToMatch(final Tuple t) {
+      try {
+          return NonSymmetricOpposite.Match.newMatch((EReference) t.get(POSITION_A), (EReference) t.get(POSITION_B));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected NonSymmetricOpposite.Match arrayToMatch(final Object[] match) {
+      try {
+          return NonSymmetricOpposite.Match.newMatch((EReference) match[POSITION_A], (EReference) match[POSITION_B]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected NonSymmetricOpposite.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return NonSymmetricOpposite.Match.newMutableMatch((EReference) match[POSITION_A], (EReference) match[POSITION_B]);
+      } 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<NonSymmetricOpposite.Matcher> querySpecification() {
+      return NonSymmetricOpposite.instance();
+    }
+  }
+  
+  private NonSymmetricOpposite() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static NonSymmetricOpposite instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected NonSymmetricOpposite.Matcher instantiate(final ViatraQueryEngine engine) {
+    return NonSymmetricOpposite.Matcher.on(engine);
+  }
+  
+  @Override
+  public NonSymmetricOpposite.Matcher instantiate() {
+    return NonSymmetricOpposite.Matcher.create();
+  }
+  
+  @Override
+  public NonSymmetricOpposite.Match newEmptyMatch() {
+    return NonSymmetricOpposite.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public NonSymmetricOpposite.Match newMatch(final Object... parameters) {
+    return NonSymmetricOpposite.Match.newMatch((org.eclipse.emf.ecore.EReference) parameters[0], (org.eclipse.emf.ecore.EReference) parameters[1]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.NonSymmetricOpposite (visibility: PUBLIC, simpleName: NonSymmetricOpposite, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.NonSymmetricOpposite, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.NonSymmetricOpposite (visibility: PUBLIC, simpleName: NonSymmetricOpposite, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.NonSymmetricOpposite, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final NonSymmetricOpposite INSTANCE = new NonSymmetricOpposite();
+    
+    /**
+     * 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 NonSymmetricOpposite.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_a = new PParameter("a", "org.eclipse.emf.ecore.EReference", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.eclipse.org/emf/2002/Ecore", "EReference")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_b = new PParameter("b", "org.eclipse.emf.ecore.EReference", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.eclipse.org/emf/2002/Ecore", "EReference")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_a, parameter_b);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.nonSymmetricOpposite";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("a","b");
+    }
+    
+    @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_a = body.getOrCreateVariableByName("a");
+          PVariable var_b = body.getOrCreateVariableByName("b");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_a), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EReference")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_b), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EReference")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_a, parameter_a),
+             new ExportedParameter(body, var_b, parameter_b)
+          ));
+          // 	find opposite(a,b)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_a, var_b), Opposite.instance().getInternalQueryRepresentation());
+          // 	neg find opposite(b,a)
+          new NegativePatternCall(body, Tuples.flatTupleOf(var_b, var_a), Opposite.instance().getInternalQueryRepresentation());
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("a")
+                              }));
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("message", "error");
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Opposite.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Opposite.java
new file mode 100644
index 00000000..c4832370
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Opposite.java
@@ -0,0 +1,693 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Ecore.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.alloyexamples;
+
+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.emf.ecore.EReference;
+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.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 opposite(a:EReference, b: EReference) {
+ *         	EReference.eOpposite(a,b);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class Opposite extends BaseGeneratedEMFQuerySpecification<Opposite.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.opposite 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 EReference fA;
+    
+    private EReference fB;
+    
+    private static List<String> parameterNames = makeImmutableList("a", "b");
+    
+    private Match(final EReference pA, final EReference pB) {
+      this.fA = pA;
+      this.fB = pB;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      if ("a".equals(parameterName)) return this.fA;
+      if ("b".equals(parameterName)) return this.fB;
+      return null;
+    }
+    
+    public EReference getA() {
+      return this.fA;
+    }
+    
+    public EReference getB() {
+      return this.fB;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("a".equals(parameterName) ) {
+          this.fA = (EReference) newValue;
+          return true;
+      }
+      if ("b".equals(parameterName) ) {
+          this.fB = (EReference) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setA(final EReference pA) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fA = pA;
+    }
+    
+    public void setB(final EReference pB) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fB = pB;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.opposite";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return Opposite.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fA, fB};
+    }
+    
+    @Override
+    public Opposite.Match toImmutable() {
+      return isMutable() ? newMatch(fA, fB) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"a\"=" + prettyPrintValue(fA) + ", ");
+      result.append("\"b\"=" + prettyPrintValue(fB));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fA, fB);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof Opposite.Match)) {
+          Opposite.Match other = (Opposite.Match) obj;
+          return Objects.equals(fA, other.fA) && Objects.equals(fB, other.fB);
+      } 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 Opposite specification() {
+      return Opposite.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 Opposite.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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static Opposite.Match newMutableMatch(final EReference pA, final EReference pB) {
+      return new Mutable(pA, pB);
+    }
+    
+    /**
+     * 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static Opposite.Match newMatch(final EReference pA, final EReference pB) {
+      return new Immutable(pA, pB);
+    }
+    
+    private static final class Mutable extends Opposite.Match {
+      Mutable(final EReference pA, final EReference pB) {
+        super(pA, pB);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends Opposite.Match {
+      Immutable(final EReference pA, final EReference pB) {
+        super(pA, pB);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.opposite 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 opposite(a:EReference, b: EReference) {
+   * 	EReference.eOpposite(a,b);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see Opposite
+   * 
+   */
+  public static class Matcher extends BaseMatcher<Opposite.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 Opposite.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 Opposite.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_A = 0;
+    
+    private static final int POSITION_B = 1;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(Opposite.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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<Opposite.Match> getAllMatches(final EReference pA, final EReference pB) {
+      return rawStreamAllMatches(new Object[]{pA, pB}).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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<Opposite.Match> streamAllMatches(final EReference pA, final EReference pB) {
+      return rawStreamAllMatches(new Object[]{pA, pB});
+    }
+    
+    /**
+     * 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<Opposite.Match> getOneArbitraryMatch(final EReference pA, final EReference pB) {
+      return rawGetOneArbitraryMatch(new Object[]{pA, pB});
+    }
+    
+    /**
+     * 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final EReference pA, final EReference pB) {
+      return rawHasMatch(new Object[]{pA, pB});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final EReference pA, final EReference pB) {
+      return rawCountMatches(new Object[]{pA, pB});
+    }
+    
+    /**
+     * 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, 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 EReference pA, final EReference pB, final Consumer<? super Opposite.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pA, pB}, 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public Opposite.Match newMatch(final EReference pA, final EReference pB) {
+      return Opposite.Match.newMatch(pA, pB);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<EReference> rawStreamAllValuesOfa(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_A, parameters).map(EReference.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EReference> getAllValuesOfa() {
+      return rawStreamAllValuesOfa(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<EReference> streamAllValuesOfa() {
+      return rawStreamAllValuesOfa(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * </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<EReference> streamAllValuesOfa(final Opposite.Match partialMatch) {
+      return rawStreamAllValuesOfa(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * </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<EReference> streamAllValuesOfa(final EReference pB) {
+      return rawStreamAllValuesOfa(new Object[]{null, pB});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EReference> getAllValuesOfa(final Opposite.Match partialMatch) {
+      return rawStreamAllValuesOfa(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EReference> getAllValuesOfa(final EReference pB) {
+      return rawStreamAllValuesOfa(new Object[]{null, pB}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<EReference> rawStreamAllValuesOfb(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_B, parameters).map(EReference.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EReference> getAllValuesOfb() {
+      return rawStreamAllValuesOfb(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<EReference> streamAllValuesOfb() {
+      return rawStreamAllValuesOfb(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * </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<EReference> streamAllValuesOfb(final Opposite.Match partialMatch) {
+      return rawStreamAllValuesOfb(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * </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<EReference> streamAllValuesOfb(final EReference pA) {
+      return rawStreamAllValuesOfb(new Object[]{pA, null});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EReference> getAllValuesOfb(final Opposite.Match partialMatch) {
+      return rawStreamAllValuesOfb(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EReference> getAllValuesOfb(final EReference pA) {
+      return rawStreamAllValuesOfb(new Object[]{pA, null}).collect(Collectors.toSet());
+    }
+    
+    @Override
+    protected Opposite.Match tupleToMatch(final Tuple t) {
+      try {
+          return Opposite.Match.newMatch((EReference) t.get(POSITION_A), (EReference) t.get(POSITION_B));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Opposite.Match arrayToMatch(final Object[] match) {
+      try {
+          return Opposite.Match.newMatch((EReference) match[POSITION_A], (EReference) match[POSITION_B]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Opposite.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return Opposite.Match.newMutableMatch((EReference) match[POSITION_A], (EReference) match[POSITION_B]);
+      } 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<Opposite.Matcher> querySpecification() {
+      return Opposite.instance();
+    }
+  }
+  
+  private Opposite() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static Opposite instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected Opposite.Matcher instantiate(final ViatraQueryEngine engine) {
+    return Opposite.Matcher.on(engine);
+  }
+  
+  @Override
+  public Opposite.Matcher instantiate() {
+    return Opposite.Matcher.create();
+  }
+  
+  @Override
+  public Opposite.Match newEmptyMatch() {
+    return Opposite.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public Opposite.Match newMatch(final Object... parameters) {
+    return Opposite.Match.newMatch((org.eclipse.emf.ecore.EReference) parameters[0], (org.eclipse.emf.ecore.EReference) parameters[1]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Opposite (visibility: PUBLIC, simpleName: Opposite, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Opposite, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Opposite (visibility: PUBLIC, simpleName: Opposite, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Opposite, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final Opposite INSTANCE = new Opposite();
+    
+    /**
+     * 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 Opposite.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_a = new PParameter("a", "org.eclipse.emf.ecore.EReference", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.eclipse.org/emf/2002/Ecore", "EReference")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_b = new PParameter("b", "org.eclipse.emf.ecore.EReference", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.eclipse.org/emf/2002/Ecore", "EReference")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_a, parameter_b);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.opposite";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("a","b");
+    }
+    
+    @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_a = body.getOrCreateVariableByName("a");
+          PVariable var_b = body.getOrCreateVariableByName("b");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_a), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EReference")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_b), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EReference")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_a, parameter_a),
+             new ExportedParameter(body, var_b, parameter_b)
+          ));
+          // 	EReference.eOpposite(a,b)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_a), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EReference")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_a, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/emf/2002/Ecore", "EReference", "eOpposite")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EReference")));
+          new Equality(body, var__virtual_0_, var_b);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/OppositeDifferentClass.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/OppositeDifferentClass.java
new file mode 100644
index 00000000..887f8584
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/OppositeDifferentClass.java
@@ -0,0 +1,577 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Ecore.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.alloyexamples;
+
+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.emf.ecore.EReference;
+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.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.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>
+ *         {@literal @}Constraint(key={a}, severity="error", message="error")
+ *         pattern oppositeDifferentClass(a:EReference) {
+ *         	EReference.eOpposite(a,b);
+ *         	EReference.eContainingClass(a,aContaining);
+ *         	EReference.eType(b,bTarget);
+ *         	aContaining != bTarget;
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class OppositeDifferentClass extends BaseGeneratedEMFQuerySpecification<OppositeDifferentClass.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.oppositeDifferentClass 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 EReference fA;
+    
+    private static List<String> parameterNames = makeImmutableList("a");
+    
+    private Match(final EReference pA) {
+      this.fA = pA;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      if ("a".equals(parameterName)) return this.fA;
+      return null;
+    }
+    
+    public EReference getA() {
+      return this.fA;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("a".equals(parameterName) ) {
+          this.fA = (EReference) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setA(final EReference pA) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fA = pA;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.oppositeDifferentClass";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return OppositeDifferentClass.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fA};
+    }
+    
+    @Override
+    public OppositeDifferentClass.Match toImmutable() {
+      return isMutable() ? newMatch(fA) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"a\"=" + prettyPrintValue(fA));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fA);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof OppositeDifferentClass.Match)) {
+          OppositeDifferentClass.Match other = (OppositeDifferentClass.Match) obj;
+          return Objects.equals(fA, other.fA);
+      } 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 OppositeDifferentClass specification() {
+      return OppositeDifferentClass.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 OppositeDifferentClass.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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static OppositeDifferentClass.Match newMutableMatch(final EReference pA) {
+      return new Mutable(pA);
+    }
+    
+    /**
+     * 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static OppositeDifferentClass.Match newMatch(final EReference pA) {
+      return new Immutable(pA);
+    }
+    
+    private static final class Mutable extends OppositeDifferentClass.Match {
+      Mutable(final EReference pA) {
+        super(pA);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends OppositeDifferentClass.Match {
+      Immutable(final EReference pA) {
+        super(pA);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.oppositeDifferentClass 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>
+   * {@literal @}Constraint(key={a}, severity="error", message="error")
+   * pattern oppositeDifferentClass(a:EReference) {
+   * 	EReference.eOpposite(a,b);
+   * 	EReference.eContainingClass(a,aContaining);
+   * 	EReference.eType(b,bTarget);
+   * 	aContaining != bTarget;
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see OppositeDifferentClass
+   * 
+   */
+  public static class Matcher extends BaseMatcher<OppositeDifferentClass.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 OppositeDifferentClass.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 OppositeDifferentClass.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_A = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(OppositeDifferentClass.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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<OppositeDifferentClass.Match> getAllMatches(final EReference pA) {
+      return rawStreamAllMatches(new Object[]{pA}).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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<OppositeDifferentClass.Match> streamAllMatches(final EReference pA) {
+      return rawStreamAllMatches(new Object[]{pA});
+    }
+    
+    /**
+     * 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<OppositeDifferentClass.Match> getOneArbitraryMatch(final EReference pA) {
+      return rawGetOneArbitraryMatch(new Object[]{pA});
+    }
+    
+    /**
+     * 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final EReference pA) {
+      return rawHasMatch(new Object[]{pA});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pA the fixed value of pattern parameter a, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final EReference pA) {
+      return rawCountMatches(new Object[]{pA});
+    }
+    
+    /**
+     * 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 pA the fixed value of pattern parameter a, 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 EReference pA, final Consumer<? super OppositeDifferentClass.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pA}, 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public OppositeDifferentClass.Match newMatch(final EReference pA) {
+      return OppositeDifferentClass.Match.newMatch(pA);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<EReference> rawStreamAllValuesOfa(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_A, parameters).map(EReference.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EReference> getAllValuesOfa() {
+      return rawStreamAllValuesOfa(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<EReference> streamAllValuesOfa() {
+      return rawStreamAllValuesOfa(emptyArray());
+    }
+    
+    @Override
+    protected OppositeDifferentClass.Match tupleToMatch(final Tuple t) {
+      try {
+          return OppositeDifferentClass.Match.newMatch((EReference) t.get(POSITION_A));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected OppositeDifferentClass.Match arrayToMatch(final Object[] match) {
+      try {
+          return OppositeDifferentClass.Match.newMatch((EReference) match[POSITION_A]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected OppositeDifferentClass.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return OppositeDifferentClass.Match.newMutableMatch((EReference) match[POSITION_A]);
+      } 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<OppositeDifferentClass.Matcher> querySpecification() {
+      return OppositeDifferentClass.instance();
+    }
+  }
+  
+  private OppositeDifferentClass() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static OppositeDifferentClass instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected OppositeDifferentClass.Matcher instantiate(final ViatraQueryEngine engine) {
+    return OppositeDifferentClass.Matcher.on(engine);
+  }
+  
+  @Override
+  public OppositeDifferentClass.Matcher instantiate() {
+    return OppositeDifferentClass.Matcher.create();
+  }
+  
+  @Override
+  public OppositeDifferentClass.Match newEmptyMatch() {
+    return OppositeDifferentClass.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public OppositeDifferentClass.Match newMatch(final Object... parameters) {
+    return OppositeDifferentClass.Match.newMatch((org.eclipse.emf.ecore.EReference) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.OppositeDifferentClass (visibility: PUBLIC, simpleName: OppositeDifferentClass, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.OppositeDifferentClass, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.OppositeDifferentClass (visibility: PUBLIC, simpleName: OppositeDifferentClass, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.OppositeDifferentClass, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final OppositeDifferentClass INSTANCE = new OppositeDifferentClass();
+    
+    /**
+     * 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 OppositeDifferentClass.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_a = new PParameter("a", "org.eclipse.emf.ecore.EReference", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.eclipse.org/emf/2002/Ecore", "EReference")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_a);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.oppositeDifferentClass";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("a");
+    }
+    
+    @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_a = body.getOrCreateVariableByName("a");
+          PVariable var_b = body.getOrCreateVariableByName("b");
+          PVariable var_aContaining = body.getOrCreateVariableByName("aContaining");
+          PVariable var_bTarget = body.getOrCreateVariableByName("bTarget");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_a), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EReference")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_a, parameter_a)
+          ));
+          // 	EReference.eOpposite(a,b)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_a), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EReference")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_a, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/emf/2002/Ecore", "EReference", "eOpposite")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EReference")));
+          new Equality(body, var__virtual_0_, var_b);
+          // 	EReference.eContainingClass(a,aContaining)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_a), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EReference")));
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_a, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/emf/2002/Ecore", "EStructuralFeature", "eContainingClass")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EClass")));
+          new Equality(body, var__virtual_1_, var_aContaining);
+          // 	EReference.eType(b,bTarget)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_b), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EReference")));
+          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_b, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/emf/2002/Ecore", "ETypedElement", "eType")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EClassifier")));
+          new Equality(body, var__virtual_2_, var_bTarget);
+          // 	aContaining != bTarget
+          new Inequality(body, var_aContaining, var_bTarget);
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("a")
+                              }));
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("message", "error");
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/PatternContent.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/PatternContent.java
new file mode 100644
index 00000000..690d3e27
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/PatternContent.java
@@ -0,0 +1,693 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/FileSystem.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.alloyexamples;
+
+import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject;
+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.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.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 patternContent(o1: FSObject, o2: FSObject) {
+ *         	Dir.contents(o1,o2);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class PatternContent extends BaseGeneratedEMFQuerySpecification<PatternContent.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.patternContent 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 FSObject fO1;
+    
+    private FSObject fO2;
+    
+    private static List<String> parameterNames = makeImmutableList("o1", "o2");
+    
+    private Match(final FSObject pO1, final FSObject pO2) {
+      this.fO1 = pO1;
+      this.fO2 = pO2;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      if ("o1".equals(parameterName)) return this.fO1;
+      if ("o2".equals(parameterName)) return this.fO2;
+      return null;
+    }
+    
+    public FSObject getO1() {
+      return this.fO1;
+    }
+    
+    public FSObject getO2() {
+      return this.fO2;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("o1".equals(parameterName) ) {
+          this.fO1 = (FSObject) newValue;
+          return true;
+      }
+      if ("o2".equals(parameterName) ) {
+          this.fO2 = (FSObject) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setO1(final FSObject pO1) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fO1 = pO1;
+    }
+    
+    public void setO2(final FSObject pO2) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fO2 = pO2;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.patternContent";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return PatternContent.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fO1, fO2};
+    }
+    
+    @Override
+    public PatternContent.Match toImmutable() {
+      return isMutable() ? newMatch(fO1, fO2) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"o1\"=" + prettyPrintValue(fO1) + ", ");
+      result.append("\"o2\"=" + prettyPrintValue(fO2));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fO1, fO2);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof PatternContent.Match)) {
+          PatternContent.Match other = (PatternContent.Match) obj;
+          return Objects.equals(fO1, other.fO1) && Objects.equals(fO2, other.fO2);
+      } 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 PatternContent specification() {
+      return PatternContent.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 PatternContent.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 pO1 the fixed value of pattern parameter o1, or null if not bound.
+     * @param pO2 the fixed value of pattern parameter o2, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static PatternContent.Match newMutableMatch(final FSObject pO1, final FSObject pO2) {
+      return new Mutable(pO1, pO2);
+    }
+    
+    /**
+     * 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 pO1 the fixed value of pattern parameter o1, or null if not bound.
+     * @param pO2 the fixed value of pattern parameter o2, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static PatternContent.Match newMatch(final FSObject pO1, final FSObject pO2) {
+      return new Immutable(pO1, pO2);
+    }
+    
+    private static final class Mutable extends PatternContent.Match {
+      Mutable(final FSObject pO1, final FSObject pO2) {
+        super(pO1, pO2);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends PatternContent.Match {
+      Immutable(final FSObject pO1, final FSObject pO2) {
+        super(pO1, pO2);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.patternContent 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 patternContent(o1: FSObject, o2: FSObject) {
+   * 	Dir.contents(o1,o2);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see PatternContent
+   * 
+   */
+  public static class Matcher extends BaseMatcher<PatternContent.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 PatternContent.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 PatternContent.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_O1 = 0;
+    
+    private static final int POSITION_O2 = 1;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(PatternContent.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 pO1 the fixed value of pattern parameter o1, or null if not bound.
+     * @param pO2 the fixed value of pattern parameter o2, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<PatternContent.Match> getAllMatches(final FSObject pO1, final FSObject pO2) {
+      return rawStreamAllMatches(new Object[]{pO1, pO2}).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 pO1 the fixed value of pattern parameter o1, or null if not bound.
+     * @param pO2 the fixed value of pattern parameter o2, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<PatternContent.Match> streamAllMatches(final FSObject pO1, final FSObject pO2) {
+      return rawStreamAllMatches(new Object[]{pO1, pO2});
+    }
+    
+    /**
+     * 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 pO1 the fixed value of pattern parameter o1, or null if not bound.
+     * @param pO2 the fixed value of pattern parameter o2, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<PatternContent.Match> getOneArbitraryMatch(final FSObject pO1, final FSObject pO2) {
+      return rawGetOneArbitraryMatch(new Object[]{pO1, pO2});
+    }
+    
+    /**
+     * 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 pO1 the fixed value of pattern parameter o1, or null if not bound.
+     * @param pO2 the fixed value of pattern parameter o2, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final FSObject pO1, final FSObject pO2) {
+      return rawHasMatch(new Object[]{pO1, pO2});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pO1 the fixed value of pattern parameter o1, or null if not bound.
+     * @param pO2 the fixed value of pattern parameter o2, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final FSObject pO1, final FSObject pO2) {
+      return rawCountMatches(new Object[]{pO1, pO2});
+    }
+    
+    /**
+     * 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 pO1 the fixed value of pattern parameter o1, or null if not bound.
+     * @param pO2 the fixed value of pattern parameter o2, 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 FSObject pO1, final FSObject pO2, final Consumer<? super PatternContent.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pO1, pO2}, 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 pO1 the fixed value of pattern parameter o1, or null if not bound.
+     * @param pO2 the fixed value of pattern parameter o2, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public PatternContent.Match newMatch(final FSObject pO1, final FSObject pO2) {
+      return PatternContent.Match.newMatch(pO1, pO2);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for o1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<FSObject> rawStreamAllValuesOfo1(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_O1, parameters).map(FSObject.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for o1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<FSObject> getAllValuesOfo1() {
+      return rawStreamAllValuesOfo1(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for o1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<FSObject> streamAllValuesOfo1() {
+      return rawStreamAllValuesOfo1(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for o1.
+     * </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<FSObject> streamAllValuesOfo1(final PatternContent.Match partialMatch) {
+      return rawStreamAllValuesOfo1(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for o1.
+     * </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<FSObject> streamAllValuesOfo1(final FSObject pO2) {
+      return rawStreamAllValuesOfo1(new Object[]{null, pO2});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for o1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<FSObject> getAllValuesOfo1(final PatternContent.Match partialMatch) {
+      return rawStreamAllValuesOfo1(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for o1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<FSObject> getAllValuesOfo1(final FSObject pO2) {
+      return rawStreamAllValuesOfo1(new Object[]{null, pO2}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for o2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<FSObject> rawStreamAllValuesOfo2(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_O2, parameters).map(FSObject.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for o2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<FSObject> getAllValuesOfo2() {
+      return rawStreamAllValuesOfo2(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for o2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<FSObject> streamAllValuesOfo2() {
+      return rawStreamAllValuesOfo2(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for o2.
+     * </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<FSObject> streamAllValuesOfo2(final PatternContent.Match partialMatch) {
+      return rawStreamAllValuesOfo2(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for o2.
+     * </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<FSObject> streamAllValuesOfo2(final FSObject pO1) {
+      return rawStreamAllValuesOfo2(new Object[]{pO1, null});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for o2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<FSObject> getAllValuesOfo2(final PatternContent.Match partialMatch) {
+      return rawStreamAllValuesOfo2(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for o2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<FSObject> getAllValuesOfo2(final FSObject pO1) {
+      return rawStreamAllValuesOfo2(new Object[]{pO1, null}).collect(Collectors.toSet());
+    }
+    
+    @Override
+    protected PatternContent.Match tupleToMatch(final Tuple t) {
+      try {
+          return PatternContent.Match.newMatch((FSObject) t.get(POSITION_O1), (FSObject) t.get(POSITION_O2));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected PatternContent.Match arrayToMatch(final Object[] match) {
+      try {
+          return PatternContent.Match.newMatch((FSObject) match[POSITION_O1], (FSObject) match[POSITION_O2]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected PatternContent.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return PatternContent.Match.newMutableMatch((FSObject) match[POSITION_O1], (FSObject) match[POSITION_O2]);
+      } 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<PatternContent.Matcher> querySpecification() {
+      return PatternContent.instance();
+    }
+  }
+  
+  private PatternContent() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static PatternContent instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected PatternContent.Matcher instantiate(final ViatraQueryEngine engine) {
+    return PatternContent.Matcher.on(engine);
+  }
+  
+  @Override
+  public PatternContent.Matcher instantiate() {
+    return PatternContent.Matcher.create();
+  }
+  
+  @Override
+  public PatternContent.Match newEmptyMatch() {
+    return PatternContent.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public PatternContent.Match newMatch(final Object... parameters) {
+    return PatternContent.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject) parameters[0], (hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject) parameters[1]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.PatternContent (visibility: PUBLIC, simpleName: PatternContent, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.PatternContent, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.PatternContent (visibility: PUBLIC, simpleName: PatternContent, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.PatternContent, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final PatternContent INSTANCE = new PatternContent();
+    
+    /**
+     * 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 PatternContent.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_o1 = new PParameter("o1", "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("FS", "FSObject")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_o2 = new PParameter("o2", "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("FS", "FSObject")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_o1, parameter_o2);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.patternContent";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("o1","o2");
+    }
+    
+    @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_o1 = body.getOrCreateVariableByName("o1");
+          PVariable var_o2 = body.getOrCreateVariableByName("o2");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_o1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FSObject")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_o2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FSObject")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_o1, parameter_o1),
+             new ExportedParameter(body, var_o2, parameter_o2)
+          ));
+          // 	Dir.contents(o1,o2)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_o1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "Dir")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_o1, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("FS", "Dir", "contents")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FSObject")));
+          new Equality(body, var__virtual_0_, var_o2);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
-- 
cgit v1.2.3-54-g00ecf


From 30617bc0afc7eb9ce0e7f703e8b4296749d2c3aa Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kris7topher@gmail.com>
Date: Thu, 1 Aug 2019 18:38:43 +0200
Subject: Ensure that experiment runner code compiles

---
 .../.classpath                                     | 23 +++---
 .../META-INF/MANIFEST.MF                           |  3 +-
 .../build.properties                               |  3 +-
 .../dslreasoner/domains/alloyexamples/.gitignore   |  8 +++
 .../domains/alloyexamples/util/.gitignore          | 32 ---------
 .../META-INF/MANIFEST.MF                           |  4 +-
 Tests/hu.bme.mit.inf.dslreasoner.run/.classpath    | 21 +++---
 .../META-INF/MANIFEST.MF                           |  5 +-
 .../dslreasoner/run/DiverseMeasurementRunner.xtend | 13 ++--
 .../mit/inf/dslreasoner/run/MetamodelLoader.xtend  | 30 ++++----
 .../mit/inf/dslreasoner/run/RunMeasurements.xtend  | 17 ++---
 .../inf/dslreasoner/run/RunModelExtension.xtend    | 18 ++---
 .../hu/bme/mit/inf/dslreasoner/run/SimpleRun.xtend | 84 ++++++++++------------
 .../run/VisualiseAllModelInDirectory.xtend         | 12 ++--
 14 files changed, 113 insertions(+), 160 deletions(-)
 delete mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/util/.gitignore

(limited to 'Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf')

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/.classpath b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/.classpath
index 3b808ec0..7f459bda 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/.classpath
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/.classpath
@@ -1,10 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="xtend-gen"/>
-	<classpathentry kind="src" path="patterns"/>
-	<classpathentry kind="src" path="src-gen/"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="patterns"/>
+	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/META-INF/MANIFEST.MF b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/META-INF/MANIFEST.MF
index 5fb85170..1adef165 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/META-INF/MANIFEST.MF
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/META-INF/MANIFEST.MF
@@ -9,8 +9,7 @@ Bundle-Localization: plugin
 Export-Package: hu.bme.mit.inf.dslreasoner.domains.alloyexamples,
  hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem,
  hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.impl,
- hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.util,
- hu.bme.mit.inf.dslreasoner.domains.alloyexamples.util
+ hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.util
 Require-Bundle: org.eclipse.viatra.addon.querybasedfeatures.runtime,
  org.eclipse.viatra.query.runtime,
  org.eclipse.core.runtime,
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/build.properties b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/build.properties
index a9ab8b56..418a7a43 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/build.properties
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/build.properties
@@ -5,5 +5,6 @@ bin.includes = .,\
                plugin.properties
 jars.compile.order = .
 source.. = src/,\
-           src-gen/
+           src-gen/,\
+           patterns/
 output.. = bin/
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore
index 52338993..1e7d444f 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore
@@ -42,3 +42,11 @@
 /.Opposite.java._trace
 /.OppositeDifferentClass.java._trace
 /.PatternContent.java._trace
+/ContentInNotLive.java
+/DirectSupertype.java
+/Live.java
+/LoopInInheritence.java
+/NonSymmetricOpposite.java
+/Opposite.java
+/OppositeDifferentClass.java
+/PatternContent.java
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/util/.gitignore b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/util/.gitignore
deleted file mode 100644
index 4b17cd82..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/util/.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-/.ContentInNotLiveProcessor.java._trace
-/.ContentInNotLiveQuerySpecification.java._trace
-/.DirectSupertypeProcessor.java._trace
-/.DirectSupertypeQuerySpecification.java._trace
-/.LiveProcessor.java._trace
-/.LiveQuerySpecification.java._trace
-/.LoopInInheritenceProcessor.java._trace
-/.LoopInInheritenceQuerySpecification.java._trace
-/.NonSymmetricOppositeProcessor.java._trace
-/.NonSymmetricOppositeQuerySpecification.java._trace
-/.OppositeDifferentClassProcessor.java._trace
-/.OppositeDifferentClassQuerySpecification.java._trace
-/.OppositeProcessor.java._trace
-/.OppositeQuerySpecification.java._trace
-/.PatternContentProcessor.java._trace
-/.PatternContentQuerySpecification.java._trace
-/ContentInNotLiveProcessor.java
-/ContentInNotLiveQuerySpecification.java
-/DirectSupertypeProcessor.java
-/DirectSupertypeQuerySpecification.java
-/LiveProcessor.java
-/LiveQuerySpecification.java
-/LoopInInheritenceProcessor.java
-/LoopInInheritenceQuerySpecification.java
-/NonSymmetricOppositeProcessor.java
-/NonSymmetricOppositeQuerySpecification.java
-/OppositeDifferentClassProcessor.java
-/OppositeDifferentClassQuerySpecification.java
-/OppositeProcessor.java
-/OppositeQuerySpecification.java
-/PatternContentProcessor.java
-/PatternContentQuerySpecification.java
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/META-INF/MANIFEST.MF b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/META-INF/MANIFEST.MF
index 73ebb2c7..81ee8677 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/META-INF/MANIFEST.MF
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/META-INF/MANIFEST.MF
@@ -10,9 +10,7 @@ Export-Package: hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm,
  hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.impl,
  hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.util,
  hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu,
- hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated,
- hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.util,
- hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.util
+ hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated
 Require-Bundle: org.eclipse.viatra.query.runtime,
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/.classpath b/Tests/hu.bme.mit.inf.dslreasoner.run/.classpath
index 29ba3981..e7847821 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/.classpath
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/.classpath
@@ -1,9 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="xtend-gen"/>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="xtend-gen"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/META-INF/MANIFEST.MF b/Tests/hu.bme.mit.inf.dslreasoner.run/META-INF/MANIFEST.MF
index e2918491..548d3608 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/META-INF/MANIFEST.MF
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/META-INF/MANIFEST.MF
@@ -17,15 +17,12 @@ Require-Bundle: hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlan
  org.eclipse.viatra.query.tooling.core;bundle-version="1.5.0",
  org.eclipse.viatra.query.runtime.base.itc;bundle-version="1.5.0",
  hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner;bundle-version="1.0.0",
- org.eclipse.viatra.query.patternlanguage;bundle-version="1.5.0",
- org.eclipse.viatra.query.patternlanguage.emf;bundle-version="1.5.0",
  hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatraquery;bundle-version="1.0.0",
  org.junit;bundle-version="4.12.0",
- hu.bme.mit.inf.dslreasoner.domains.transima.fam;bundle-version="1.0.0",
+ ModelGenExampleFAM_plugin;bundle-version="1.0.0",
  hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph;bundle-version="1.0.0",
  org.eclipse.viatra.dse;bundle-version="0.15.0",
  hu.bme.mit.inf.dlsreasoner.alloy.reasoner;bundle-version="1.0.0",
- hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic;bundle-version="1.0.0",
  org.eclipse.viatra.query.runtime.localsearch;bundle-version="1.5.0",
  hu.bme.mit.inf.dslreasoner.logic2ecore;bundle-version="1.0.0",
  hu.bme.mit.inf.dslreasoner.visualisation;bundle-version="1.0.0",
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/DiverseMeasurementRunner.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/DiverseMeasurementRunner.xtend
index daa932fd..e15dbf3f 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/DiverseMeasurementRunner.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/DiverseMeasurementRunner.xtend
@@ -24,7 +24,7 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.DiversityDescriptor
 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
-import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvizVisualisation
+import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvizVisualiser
 import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace
 import java.util.LinkedList
 import java.util.List
@@ -32,9 +32,6 @@ import org.eclipse.emf.ecore.EObject
 import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl
 import org.eclipse.xtend.lib.annotations.Data
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification
-import java.util.Set
-import java.util.Comparator
 
 enum Metamodel {
 	FAM, YakinduWOSynch, Yakindu
@@ -187,8 +184,7 @@ class ScenarioRunner {
 				it.runtimeLimit = 300
 				it.typeScopes.maxNewElements = scenario.size
 				it.typeScopes.minNewElements = scenario.size
-				it.solutionScope.numberOfRequiredSolution = scenario.number
-				it.existingQueries = vq.patterns.map[it.internalQueryRepresentation]
+				it.solutionScope.numberOfRequiredSolutions = scenario.number
 				it.nameNewElements = false
 				it.typeInferenceMethod = TypeInferenceMethod.PreliminaryAnalysis
 				it.searchSpaceConstraints.additionalGlobalConstraints += loader.additionalConstraints
@@ -223,9 +219,8 @@ class ScenarioRunner {
 				it.runtimeLimit = 300
 				it.typeScopes.maxNewElements = scenario.size
 				it.typeScopes.minNewElements = scenario.size
-				it.solutionScope.numberOfRequiredSolution = scenario.number
+				it.solutionScope.numberOfRequiredSolutions = scenario.number
 				it.typeScopes.maxNewIntegers = 0
-				it.writeToFile=true
 				it.randomise = run-1
 			]
 		}
@@ -259,7 +254,7 @@ class ScenarioRunner {
 //				ecore2GML.transform(root)
 //				workspace.writeText('''solutionVisualisation«representationNumber».gml''',gml)
 //				
-				val visualiser = new GraphvizVisualisation
+				val visualiser = new GraphvizVisualiser
 				val visualisation = visualiser.visualiseConcretization(representation)
 				visualisation.writeToFile(workspace,'''solutionVisualisation«representationNumber»''')
 				
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend
index 43d145d3..34f3c267 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend
@@ -1,9 +1,10 @@
 package hu.bme.mit.inf.dslreasoner.run
 
-import hu.bme.mit.inf.dslreasomer.domains.transima.fam.FunctionalArchitecture.FunctionalArchitecturePackage
+import functionalarchitecture.FunctionalarchitecturePackage
+import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Ecore
 import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.FileSystem
 import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FilesystemPackage
-import hu.bme.mit.inf.dslreasoner.domains.transima.fam.patterns.Pattern
+import hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns
 import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.YakindummPackage
 import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor
 import hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.Patterns
@@ -12,6 +13,7 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationMetho
 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ModelGenerationMethodBasedGlobalConstraint
 import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace
 import java.util.Collection
+import java.util.HashMap
 import java.util.LinkedHashMap
 import java.util.List
 import java.util.Set
@@ -21,14 +23,14 @@ import org.eclipse.emf.ecore.EEnum
 import org.eclipse.emf.ecore.EEnumLiteral
 import org.eclipse.emf.ecore.EObject
 import org.eclipse.emf.ecore.EReference
-import org.eclipse.xtext.xbase.lib.Functions.Function1
-import java.util.HashMap
 import org.eclipse.emf.ecore.EcorePackage
-import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Ecore
+import org.eclipse.xtext.xbase.lib.Functions.Function1
+import hu.bme.mit.inf.dslreasoner.domains.transima.fam.Type
+import hu.bme.mit.inf.dslreasoner.domains.transima.fam.Model
 
 abstract class MetamodelLoader {
 	protected val ReasonerWorkspace workspace
-	public new(ReasonerWorkspace workspace) {
+	new(ReasonerWorkspace workspace) {
 		this.workspace = workspace
 	} 
 	def EcoreMetamodelDescriptor loadMetamodel()
@@ -53,7 +55,7 @@ class FAMLoader extends MetamodelLoader{
 	}
 	
 	override loadMetamodel() {
-		val package = FunctionalArchitecturePackage.eINSTANCE
+		val package = FunctionalarchitecturePackage.eINSTANCE
 		val List<EClass> classes = package.EClassifiers.filter(EClass).toList
 		val List<EEnum> enums = package.EClassifiers.filter(EEnum).toList
 		val List<EEnumLiteral> literals = enums.map[ELiterals].flatten.toList
@@ -70,12 +72,12 @@ class FAMLoader extends MetamodelLoader{
 	}
 	
 	override loadQueries(EcoreMetamodelDescriptor metamodel) {
-		val i = Pattern.instance
+		val i = FamPatterns.instance
 		val patterns = i.specifications.toList
 		val wfPatterns = patterns.filter[it.allAnnotations.exists[it.name== "Constraint"]].toSet
 		val derivedFeatures = new LinkedHashMap
-		derivedFeatures.put(i.type,metamodel.attributes.filter[it.name == "type"].head)
-		derivedFeatures.put(i.model,metamodel.references.filter[it.name == "model"].head)
+		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,
@@ -92,8 +94,8 @@ class FAMLoader extends MetamodelLoader{
 
 class YakinduLoader extends MetamodelLoader{
 	
-	private var useSynchronization = true;
-	private var useComplexStates = false; 
+	var useSynchronization = true;
+	var useComplexStates = false; 
 	public static val patternsWithSynchronization = #[
 		"synchHasNoOutgoing", "synchHasNoIncoming", "SynchronizedIncomingInSameRegion", "notSynchronizingStates",
 		"hasMultipleOutgoingTrainsition", "hasMultipleIncomingTrainsition", "SynchronizedRegionsAreNotSiblings",
@@ -104,10 +106,10 @@ class YakinduLoader extends MetamodelLoader{
 		YakindummPackage.eINSTANCE.eClass
 	}
 	
-	public def setUseSynchronization(boolean useSynchronization) {
+	def setUseSynchronization(boolean useSynchronization) {
 		this.useSynchronization = useSynchronization
 	}
-	public def setUseComplexStates(boolean useComplexStates) {
+	def setUseComplexStates(boolean useComplexStates) {
 		this.useComplexStates = useComplexStates
 	}
 	
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunMeasurements.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunMeasurements.xtend
index 8d96958d..ae810a9b 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunMeasurements.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunMeasurements.xtend
@@ -25,10 +25,12 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.TypeInferenceMethod
 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.partialinterpretation.PartialinterpretationPackage
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretation2Gml
 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.DiversityDescriptor
 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
+import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvizVisualiser
 import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace
 import java.io.BufferedReader
 import java.io.InputStreamReader
@@ -37,9 +39,6 @@ import org.eclipse.emf.ecore.EObject
 import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl
 import org.junit.Test
-import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvizVisualisation
-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretationSizePrinter
-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretation2Gml
 
 enum UseSolver{Viatra, Smt, ViatraWithSmt, Alloy}
 enum Domain{FAM, Yakindu, FileSystem,Ecore}
@@ -129,7 +128,7 @@ class RunMeasurements {
 			val smtConfig = new SmtSolverConfiguration() => [
 				it.typeScopes.maxNewElements = size
 				it.typeScopes.minNewElements = size
-				it.solutionScope.numberOfRequiredSolution = number
+				it.solutionScope.numberOfRequiredSolutions = number
 				it.solverPath = '''"D:/Programs/Z3/4.3/z3.exe"'''
 			]
 			val solution = this.smtSolver.solve(
@@ -142,9 +141,8 @@ class RunMeasurements {
 			val alloyConfig = new AlloySolverConfiguration => [
 				it.typeScopes.maxNewElements = size
 				it.typeScopes.minNewElements = size
-				it.solutionScope.numberOfRequiredSolution = number
+				it.solutionScope.numberOfRequiredSolutions = number
 				it.typeScopes.maxNewIntegers = 0
-				it.writeToFile = true
 			]
 			val solution = this.alloyReasoner.solve(
 				problem,
@@ -157,13 +155,12 @@ class RunMeasurements {
 				it.runtimeLimit = 400
 				it.typeScopes.maxNewElements = size
 				it.typeScopes.minNewElements = size
-				it.solutionScope.numberOfRequiredSolution = number
-				it.existingQueries = vq.patterns.map[it.internalQueryRepresentation]
+				it.solutionScope.numberOfRequiredSolutions = number
 				it.nameNewElements = false
 				it.typeInferenceMethod = TypeInferenceMethod.PreliminaryAnalysis
 				it.searchSpaceConstraints.additionalGlobalConstraints += loader.additionalConstraints
 				it.stateCoderStrategy = StateCoderStrategy::Neighbourhood
-				it.debugCongiguration.partalInterpretationVisualisationFrequency = 100
+				it.debugConfiguration.partalInterpretationVisualisationFrequency = 100
 				//it.debugCongiguration.partialInterpretatioVisualiser =
 					//new GraphvizVisualisation
 					//new PartialInterpretationSizePrinter
@@ -267,7 +264,7 @@ class RunMeasurements {
 					val gml = partialInterpretation2GML.transform(representation)
 					r.workspace.writeText('''solution«representationNumber».gml''',gml)
 					if(representation.newElements.size <160) {
-						val visualiser = new GraphvizVisualisation
+						val visualiser = new GraphvizVisualiser
 						val visualisation = visualiser.visualiseConcretization(representation)
 						visualisation.writeToFile(r.workspace,'''solution«representationNumber»''')
 					}
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunModelExtension.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunModelExtension.xtend
index d8f75b89..1b8fe3e9 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunModelExtension.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/RunModelExtension.xtend
@@ -30,7 +30,7 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.DiversityDescriptor
 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
-import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvizVisualisation
+import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvizVisualiser
 import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace
 import java.io.BufferedReader
 import java.io.InputStreamReader
@@ -44,7 +44,6 @@ import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl
 import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine
 import org.eclipse.viatra.query.runtime.emf.EMFScope
-import java.lang.invoke.VolatileCallSite
 
 enum PartialModelSource { Homeworks, Random }
 enum ValidationTechique {Alloy, Viatra}
@@ -116,7 +115,7 @@ class RunModelExtensionMeasurements {
 			val smtConfig = new SmtSolverConfiguration() => [
 				it.typeScopes.maxNewElements = size
 				it.typeScopes.minNewElements = size
-				it.solutionScope.numberOfRequiredSolution = 1
+				it.solutionScope.numberOfRequiredSolutions = 1
 				it.solverPath = '''"D:/Programs/Z3/4.3/z3.exe"'''
 			]
 			val solution = this.smtSolver.solve(
@@ -129,9 +128,8 @@ class RunModelExtensionMeasurements {
 			val alloyConfig = new AlloySolverConfiguration => [
 				it.typeScopes.maxNewElements = size
 				it.typeScopes.minNewElements = size
-				it.solutionScope.numberOfRequiredSolution = 1
+				it.solutionScope.numberOfRequiredSolutions = 1
 				it.typeScopes.maxNewIntegers = 0
-				it.writeToFile = true
 			]
 			val solution = this.alloyReasoner.solve(
 				problem,
@@ -144,16 +142,12 @@ class RunModelExtensionMeasurements {
 				it.runtimeLimit = 400
 				it.typeScopes.maxNewElements = size
 				it.typeScopes.minNewElements = size
-				it.solutionScope.numberOfRequiredSolution = 1
-				it.existingQueries = vq.patterns.map[it.internalQueryRepresentation]
+				it.solutionScope.numberOfRequiredSolutions = 1
 				it.nameNewElements = false
 				it.typeInferenceMethod = TypeInferenceMethod.PreliminaryAnalysis
 				it.searchSpaceConstraints.additionalGlobalConstraints += loader.additionalConstraints
 				it.stateCoderStrategy = StateCoderStrategy::Neighbourhood
-				it.debugCongiguration.partalInterpretationVisualisationFrequency = 100
-				//it.debugCongiguration.partialInterpretatioVisualiser =
-					//new GraphvizVisualisation
-					//new PartialInterpretationSizePrinter
+				it.debugConfiguration.partalInterpretationVisualisationFrequency = 100
 			]
 			viatraConfig.diversityRequirement = diversityRequirement
 			if (solver == UseSolver.Viatra) {
@@ -314,7 +308,7 @@ class RunModelExtensionMeasurements {
 							val gml = partialInterpretation2GML.transform(representation)
 							r.workspace.writeText('''solution«representationNumber».gml''',gml)
 							if(representation.newElements.size <160) {
-								val visualiser = new GraphvizVisualisation
+								val visualiser = new GraphvizVisualiser
 								val visualisation = visualiser.visualiseConcretization(representation)
 								visualisation.writeToFile(r.workspace,'''solution«representationNumber»''')
 							}
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 863a91c8..91c46dd6 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,41 +1,39 @@
 package hu.bme.mit.inf.dslreasoner.run
 
+import functionalarchitecture.FunctionalarchitecturePackage
+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
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner
+import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult
+import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult
+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.partialinterpretation2logic.InstanceModel2Logic
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretation2Gml
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasoner
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasonerConfiguration
+import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvizVisualiser
 import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace
-import hu.bme.mit.inf.dslreasomer.domains.transima.fam.FunctionalArchitecture.FunctionalArchitecturePackage
+import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace
+import java.util.LinkedHashMap
+import java.util.LinkedList
 import java.util.List
+import org.eclipse.emf.ecore.EAttribute
 import org.eclipse.emf.ecore.EClass
-import org.eclipse.emf.ecore.EEnumLiteral
-import org.eclipse.emf.ecore.EReference
 import org.eclipse.emf.ecore.EEnum
-import org.eclipse.emf.ecore.EAttribute
-import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor
-import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace
+import org.eclipse.emf.ecore.EEnumLiteral
 import org.eclipse.emf.ecore.EObject
-import java.util.LinkedHashMap
-import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor
-import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic
-import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic
-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic
-import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration
-import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2LogicConfiguration
-import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasonerConfiguration
-import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.TypeInferenceMethod
-import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.StateCoderStrategy
-import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasoner
-import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult
-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
-import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult
+import org.eclipse.emf.ecore.EReference
 import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl
-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretation2Gml
-import hu.bme.mit.inf.dlsreasoner.alloy.reasoner.AlloySolverConfiguration
-import hu.bme.mit.inf.dlsreasoner.alloy.reasoner.AlloySolver
-import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore
-import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner
-import java.util.LinkedList
-import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvizVisualisation
-import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicStructureBuilder
-import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicProblemBuilder
 
 class SimpleRun {
 	
@@ -59,7 +57,7 @@ class SimpleRun {
 		
 		val modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel,new Ecore2LogicConfiguration())
 		val modelExtensionProblem = instanceModel2Logic.transform(modelGenerationProblem,partialModel)
-		val validModelExtensionProblem = viatra2Logic.transformQueries(queries,modelGenerationProblem,new Viatra2LogicConfiguration)
+		val validModelExtensionProblem = viatra2Logic.transformQueries(queries,modelExtensionProblem,new Viatra2LogicConfiguration)
 		
 		val logicProblem = validModelExtensionProblem.output
 		
@@ -71,11 +69,10 @@ class SimpleRun {
 		val viatraConfig = new ViatraReasonerConfiguration => [
 			it.typeScopes.maxNewElements = 40
 			it.typeScopes.minNewElements = 40
-			it.solutionScope.numberOfRequiredSolution = 1
-			it.existingQueries = queries.patterns.map[it.internalQueryRepresentation]
-			it.debugCongiguration.logging = false
-			it.debugCongiguration.partalInterpretationVisualisationFrequency = 1
-			it.debugCongiguration.partialInterpretatioVisualiser = new GraphvizVisualisation
+			it.solutionScope.numberOfRequiredSolutions = 1
+			it.documentationLevel = DocumentationLevel.NONE
+			it.debugConfiguration.partalInterpretationVisualisationFrequency = 1
+			it.debugConfiguration.partialInterpretatioVisualiser = new GraphvizVisualiser
 		]
 		solution = reasoner.solve(logicProblem,viatraConfig,workspace)
 		/*/
@@ -95,11 +92,6 @@ class SimpleRun {
 		val interpretations = reasoner.getInterpretations(solution as ModelResult)
 		val models = new LinkedList
 		for(interpretation : interpretations) {
-			val extension b = new LogicStructureBuilder
-			val extension a = new LogicProblemBuilder
-			
-			
-			
 			val instanceModel = logic2Ecore.transformInterpretation(interpretation,modelGenerationProblem.trace)
 			models+=instanceModel
 		}
@@ -108,7 +100,7 @@ class SimpleRun {
 	}
 	
 	def private static loadMetamodel() {
-		val pckg = FunctionalArchitecturePackage.eINSTANCE
+		val pckg = FunctionalarchitecturePackage.eINSTANCE
 		val List<EClass> classes = pckg.EClassifiers.filter(EClass).toList
 		val List<EEnum> enums = pckg.EClassifiers.filter(EEnum).toList
 		val List<EEnumLiteral> literals = enums.map[ELiterals].flatten.toList
@@ -118,12 +110,12 @@ class SimpleRun {
 	}
 	
 	def private static loadQueries(EcoreMetamodelDescriptor metamodel) {
-		val i = hu.bme.mit.inf.dslreasoner.domains.transima.fam.patterns.Pattern.instance
+		val i = FamPatterns.instance
 		val patterns = i.specifications.toList
 		val wfPatterns = patterns.filter[it.allAnnotations.exists[it.name== "Constraint"]].toSet
 		val derivedFeatures = new LinkedHashMap
-		derivedFeatures.put(i.type,metamodel.attributes.filter[it.name == "type"].head)
-		derivedFeatures.put(i.model,metamodel.references.filter[it.name == "model"].head)
+		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,
@@ -160,8 +152,4 @@ class SimpleRun {
 			println("Solution saved and visualised")
 		} 
 	}
-	
-	def static visualizeSolution() {
-		
-	}
 }
\ No newline at end of file
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/VisualiseAllModelInDirectory.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/VisualiseAllModelInDirectory.xtend
index 6b74d161..3a100ace 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/VisualiseAllModelInDirectory.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/VisualiseAllModelInDirectory.xtend
@@ -1,16 +1,16 @@
 package hu.bme.mit.inf.dslreasoner.run
 
+import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.Ecore2logicannotationsPackage
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage
 import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage
+import hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.Viatra2LogicAnnotationsPackage
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretation2Gml
+import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvizVisualiser
 import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace
 import java.io.File
-import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage
-import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.Ecore2logicannotationsPackage
-import hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.Viatra2LogicAnnotationsPackage
 import org.eclipse.emf.ecore.resource.Resource
-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretation2Gml
-import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvizVisualisation
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl
 
 class VisualiseAllModelInDirectory {
@@ -62,7 +62,7 @@ class VisualiseAllModelInDirectory {
 		}
 
 		if(!hasPng && model.newElements.size <160) {
-			val visualiser = new GraphvizVisualisation
+			val visualiser = new GraphvizVisualiser
 			val visualisation = visualiser.visualiseConcretization(model)
 			visualisation.writeToFile(workspace,fileNameWithoutExtension)
 			println('''«fileNameWithoutExtension».png''')
-- 
cgit v1.2.3-54-g00ecf


From 110268c8e8937df8d67075caebd6d31460d0f81a Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kris7topher@gmail.com>
Date: Thu, 15 Aug 2019 15:36:05 +0200
Subject: Measurements WIP

---
 .../META-INF/MANIFEST.MF                           |   5 +-
 .../model/FileSytem.ecore                          |   2 +-
 .../model/FileSytem.genmodel                       |   8 +-
 .../domains/alloyexamples/FileSystem.vql           |  12 +-
 .../plugin.xml                                     |   2 +
 .../dslreasoner/domains/alloyexamples/.gitignore   |   2 +
 .../inf/dslreasoner/domains/alloyexamples/Dir.java | 533 ++++++++++++++++++++
 .../dslreasoner/domains/alloyexamples/Live.java    |   4 +-
 .../domains/alloyexamples/PatternContent.java      |  69 +--
 .../domains/alloyexamples/RootIsNotDir.java        | 560 +++++++++++++++++++++
 .../alloyexamples/Filesystem/FileSystem.java       |   6 +-
 .../alloyexamples/Filesystem/impl/DirImpl.java     |   1 +
 .../Filesystem/impl/FSObjectImpl.java              |   2 +
 .../Filesystem/impl/FileSystemImpl.java            |  18 +-
 .../Filesystem/impl/FilesystemFactoryImpl.java     |   5 +
 .../Filesystem/impl/FilesystemPackageImpl.java     |  36 +-
 .../alloyexamples/Filesystem/impl/ModelImpl.java   |   3 +
 ..._ViatraSolver_polyhedral_typeHierarchy_Clp.json |   7 +-
 .../mit/inf/dslreasoner/run/FileSystemHint.xtend   |  32 ++
 .../run/FileSystemInconsistencyDetector.xtend      |   6 +-
 .../mit/inf/dslreasoner/run/MetamodelLoader.xtend  |  15 +-
 .../mit/inf/dslreasoner/run/SatelliteHint.xtend    |  37 --
 .../dslreasoner/run/script/MeasurementScript.xtend |   2 +-
 .../run/script/MeasurementScriptRunner.xtend       |   2 +-
 24 files changed, 1254 insertions(+), 115 deletions(-)
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Dir.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/RootIsNotDir.java
 create mode 100644 Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemHint.xtend

(limited to 'Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf')

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/META-INF/MANIFEST.MF b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/META-INF/MANIFEST.MF
index 1adef165..d5f7db65 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/META-INF/MANIFEST.MF
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/META-INF/MANIFEST.MF
@@ -19,6 +19,7 @@ Require-Bundle: org.eclipse.viatra.addon.querybasedfeatures.runtime,
  org.eclipse.xtext.xbase.lib,
  org.eclipse.xtend.lib,
  org.eclipse.xtend.lib.macro
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
 Import-Package: org.apache.log4j
+Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.domains.alloyexamples
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/model/FileSytem.ecore b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/model/FileSytem.ecore
index 87ba7135..32874953 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/model/FileSytem.ecore
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/model/FileSytem.ecore
@@ -5,7 +5,7 @@
     <details key="settingDelegates" value="org.eclipse.viatra.query.querybasedfeature"/>
   </eAnnotations>
   <eClassifiers xsi:type="ecore:EClass" name="FileSystem">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="root" lowerBound="1" eType="#//Dir"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="root" lowerBound="1" eType="#//FSObject"
         containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="live" upperBound="-1" eType="#//FSObject"
         changeable="false" volatile="true" transient="true" derived="true">
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/model/FileSytem.genmodel b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/model/FileSytem.genmodel
index 355ac109..daa44727 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/model/FileSytem.genmodel
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/model/FileSytem.genmodel
@@ -11,13 +11,13 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FileSytem.ecore#//FileSystem/root"/>
       <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference FileSytem.ecore#//FileSystem/live"/>
     </genClasses>
-    <genClasses image="false" ecoreClass="FileSytem.ecore#//FSObject"/>
+    <genClasses image="false" ecoreClass="FileSytem.ecore#//FSObject">
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference FileSytem.ecore#//FSObject/parent"/>
+    </genClasses>
     <genClasses ecoreClass="FileSytem.ecore#//Dir">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FileSytem.ecore#//Dir/contents"/>
     </genClasses>
-    <genClasses ecoreClass="FileSytem.ecore#//File">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference FileSytem.ecore#//File/parent"/>
-    </genClasses>
+    <genClasses ecoreClass="FileSytem.ecore#//File"/>
     <genClasses ecoreClass="FileSytem.ecore#//Model">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FileSytem.ecore#//Model/filesystems"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FileSytem.ecore#//Model/otherFSObjects"/>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/FileSystem.vql b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/FileSystem.vql
index 719a9d96..c785c2fc 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/FileSystem.vql
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/FileSystem.vql
@@ -2,7 +2,7 @@ package hu.bme.mit.inf.dslreasoner.domains.alloyexamples
 
 import epackage "FS"
 
-pattern patternContent(o1: FSObject, o2: FSObject) {
+pattern patternContent(o1: Dir, o2: FSObject) {
 	Dir.contents(o1,o2);
 }
 
@@ -22,3 +22,13 @@ pattern contentInNotLive(parent : Dir, child: FSObject) {
 	Dir.contents(parent,child);
 	neg find live(_,child);
 }
+
+pattern dir(d: Dir) {
+	Dir(d);
+}
+
+@Constraint(key={fs}, severity="error", message="error")
+pattern rootIsNotDir(fs: FileSystem) {
+	FileSystem.root(fs, root);
+	neg find dir(root);
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/plugin.xml b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/plugin.xml
index d7fd112a..6eae8535 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/plugin.xml
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/plugin.xml
@@ -21,6 +21,8 @@
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.patternContent"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.live"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.contentInNotLive"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.dir"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.rootIsNotDir"/>
     </group>
   </extension>
 </plugin>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore
index 1e7d444f..fa9b1325 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore
@@ -50,3 +50,5 @@
 /Opposite.java
 /OppositeDifferentClass.java
 /PatternContent.java
+/.Dir.java._trace
+/.RootIsNotDir.java._trace
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Dir.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Dir.java
new file mode 100644
index 00000000..ad04c098
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Dir.java
@@ -0,0 +1,533 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/FileSystem.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.alloyexamples;
+
+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 dir(d: Dir) {
+ *         	Dir(d);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class Dir extends BaseGeneratedEMFQuerySpecification<Dir.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.dir 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 hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir fD;
+    
+    private static List<String> parameterNames = makeImmutableList("d");
+    
+    private Match(final hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD) {
+      this.fD = pD;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      if ("d".equals(parameterName)) return this.fD;
+      return null;
+    }
+    
+    public hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir getD() {
+      return this.fD;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("d".equals(parameterName) ) {
+          this.fD = (hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setD(final hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fD = pD;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.dir";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return Dir.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fD};
+    }
+    
+    @Override
+    public Dir.Match toImmutable() {
+      return isMutable() ? newMatch(fD) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"d\"=" + prettyPrintValue(fD));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fD);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof Dir.Match)) {
+          Dir.Match other = (Dir.Match) obj;
+          return Objects.equals(fD, other.fD);
+      } 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 Dir specification() {
+      return Dir.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 Dir.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 pD the fixed value of pattern parameter d, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static Dir.Match newMutableMatch(final hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD) {
+      return new Mutable(pD);
+    }
+    
+    /**
+     * 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 pD the fixed value of pattern parameter d, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static Dir.Match newMatch(final hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD) {
+      return new Immutable(pD);
+    }
+    
+    private static final class Mutable extends Dir.Match {
+      Mutable(final hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD) {
+        super(pD);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends Dir.Match {
+      Immutable(final hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD) {
+        super(pD);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.dir 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 dir(d: Dir) {
+   * 	Dir(d);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see Dir
+   * 
+   */
+  public static class Matcher extends BaseMatcher<Dir.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 Dir.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 Dir.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_D = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(Dir.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 pD the fixed value of pattern parameter d, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<Dir.Match> getAllMatches(final hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD) {
+      return rawStreamAllMatches(new Object[]{pD}).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 pD the fixed value of pattern parameter d, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<Dir.Match> streamAllMatches(final hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD) {
+      return rawStreamAllMatches(new Object[]{pD});
+    }
+    
+    /**
+     * 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 pD the fixed value of pattern parameter d, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<Dir.Match> getOneArbitraryMatch(final hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD) {
+      return rawGetOneArbitraryMatch(new Object[]{pD});
+    }
+    
+    /**
+     * 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 pD the fixed value of pattern parameter d, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD) {
+      return rawHasMatch(new Object[]{pD});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pD the fixed value of pattern parameter d, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD) {
+      return rawCountMatches(new Object[]{pD});
+    }
+    
+    /**
+     * 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 pD the fixed value of pattern parameter d, 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 hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD, final Consumer<? super Dir.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pD}, 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 pD the fixed value of pattern parameter d, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public Dir.Match newMatch(final hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD) {
+      return Dir.Match.newMatch(pD);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for d.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir> rawStreamAllValuesOfd(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_D, parameters).map(hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for d.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir> getAllValuesOfd() {
+      return rawStreamAllValuesOfd(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for d.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir> streamAllValuesOfd() {
+      return rawStreamAllValuesOfd(emptyArray());
+    }
+    
+    @Override
+    protected Dir.Match tupleToMatch(final Tuple t) {
+      try {
+          return Dir.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir) t.get(POSITION_D));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Dir.Match arrayToMatch(final Object[] match) {
+      try {
+          return Dir.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir) match[POSITION_D]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Dir.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return Dir.Match.newMutableMatch((hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir) match[POSITION_D]);
+      } 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<Dir.Matcher> querySpecification() {
+      return Dir.instance();
+    }
+  }
+  
+  private Dir() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static Dir instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected Dir.Matcher instantiate(final ViatraQueryEngine engine) {
+    return Dir.Matcher.on(engine);
+  }
+  
+  @Override
+  public Dir.Matcher instantiate() {
+    return Dir.Matcher.create();
+  }
+  
+  @Override
+  public Dir.Match newEmptyMatch() {
+    return Dir.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public Dir.Match newMatch(final Object... parameters) {
+    return Dir.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Dir (visibility: PUBLIC, simpleName: Dir, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Dir, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Dir (visibility: PUBLIC, simpleName: Dir, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Dir, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final Dir INSTANCE = new Dir();
+    
+    /**
+     * 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 Dir.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_d = new PParameter("d", "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("FS", "Dir")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_d);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.dir";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("d");
+    }
+    
+    @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_d = body.getOrCreateVariableByName("d");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_d), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "Dir")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_d, parameter_d)
+          ));
+          // 	Dir(d)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_d), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "Dir")));
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Live.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Live.java
index ae0f0c58..14a4c5c0 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Live.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Live.java
@@ -695,7 +695,7 @@ public final class Live extends BaseGeneratedEMFQuerySpecification<Live.Matcher>
           new TypeConstraint(body, Tuples.flatTupleOf(var_this), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FileSystem")));
           PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
           new TypeConstraint(body, Tuples.flatTupleOf(var_this, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("FS", "FileSystem", "root")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "Dir")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FSObject")));
           new Equality(body, var__virtual_0_, var_l);
           bodies.add(body);
       }
@@ -714,7 +714,7 @@ public final class Live extends BaseGeneratedEMFQuerySpecification<Live.Matcher>
           new TypeConstraint(body, Tuples.flatTupleOf(var_this), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FileSystem")));
           PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
           new TypeConstraint(body, Tuples.flatTupleOf(var_this, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("FS", "FileSystem", "root")));
-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "Dir")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FSObject")));
           new Equality(body, var__virtual_0_, var_root);
           // 	find patternContent+(root,l)
           new BinaryTransitiveClosure(body, Tuples.flatTupleOf(var_root, var_l), PatternContent.instance().getInternalQueryRepresentation());
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/PatternContent.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/PatternContent.java
index 690d3e27..5410b693 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/PatternContent.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/PatternContent.java
@@ -3,6 +3,7 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.alloyexamples;
 
+import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir;
 import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject;
 import java.util.Arrays;
 import java.util.Collection;
@@ -43,7 +44,7 @@ import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
  * 
  * <p>Original source:
  *         <code><pre>
- *         pattern patternContent(o1: FSObject, o2: FSObject) {
+ *         pattern patternContent(o1: Dir, o2: FSObject) {
  *         	Dir.contents(o1,o2);
  *         }
  * </pre></code>
@@ -67,13 +68,13 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
    * 
    */
   public static abstract class Match extends BasePatternMatch {
-    private FSObject fO1;
+    private Dir fO1;
     
     private FSObject fO2;
     
     private static List<String> parameterNames = makeImmutableList("o1", "o2");
     
-    private Match(final FSObject pO1, final FSObject pO2) {
+    private Match(final Dir pO1, final FSObject pO2) {
       this.fO1 = pO1;
       this.fO2 = pO2;
     }
@@ -85,7 +86,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
       return null;
     }
     
-    public FSObject getO1() {
+    public Dir getO1() {
       return this.fO1;
     }
     
@@ -97,7 +98,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
     public boolean set(final String parameterName, final Object newValue) {
       if (!isMutable()) throw new java.lang.UnsupportedOperationException();
       if ("o1".equals(parameterName) ) {
-          this.fO1 = (FSObject) newValue;
+          this.fO1 = (Dir) newValue;
           return true;
       }
       if ("o2".equals(parameterName) ) {
@@ -107,7 +108,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
       return false;
     }
     
-    public void setO1(final FSObject pO1) {
+    public void setO1(final Dir pO1) {
       if (!isMutable()) throw new java.lang.UnsupportedOperationException();
       this.fO1 = pO1;
     }
@@ -195,7 +196,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the new, mutable (partial) match object.
      * 
      */
-    public static PatternContent.Match newMutableMatch(final FSObject pO1, final FSObject pO2) {
+    public static PatternContent.Match newMutableMatch(final Dir pO1, final FSObject pO2) {
       return new Mutable(pO1, pO2);
     }
     
@@ -208,12 +209,12 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the (partial) match object.
      * 
      */
-    public static PatternContent.Match newMatch(final FSObject pO1, final FSObject pO2) {
+    public static PatternContent.Match newMatch(final Dir pO1, final FSObject pO2) {
       return new Immutable(pO1, pO2);
     }
     
     private static final class Mutable extends PatternContent.Match {
-      Mutable(final FSObject pO1, final FSObject pO2) {
+      Mutable(final Dir pO1, final FSObject pO2) {
         super(pO1, pO2);
       }
       
@@ -224,7 +225,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
     }
     
     private static final class Immutable extends PatternContent.Match {
-      Immutable(final FSObject pO1, final FSObject pO2) {
+      Immutable(final Dir pO1, final FSObject pO2) {
         super(pO1, pO2);
       }
       
@@ -246,7 +247,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
    * 
    * <p>Original source:
    * <code><pre>
-   * pattern patternContent(o1: FSObject, o2: FSObject) {
+   * pattern patternContent(o1: Dir, o2: FSObject) {
    * 	Dir.contents(o1,o2);
    * }
    * </pre></code>
@@ -308,7 +309,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return matches represented as a Match object.
      * 
      */
-    public Collection<PatternContent.Match> getAllMatches(final FSObject pO1, final FSObject pO2) {
+    public Collection<PatternContent.Match> getAllMatches(final Dir pO1, final FSObject pO2) {
       return rawStreamAllMatches(new Object[]{pO1, pO2}).collect(Collectors.toSet());
     }
     
@@ -323,7 +324,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return a stream of matches represented as a Match object.
      * 
      */
-    public Stream<PatternContent.Match> streamAllMatches(final FSObject pO1, final FSObject pO2) {
+    public Stream<PatternContent.Match> streamAllMatches(final Dir pO1, final FSObject pO2) {
       return rawStreamAllMatches(new Object[]{pO1, pO2});
     }
     
@@ -335,7 +336,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return a match represented as a Match object, or null if no match is found.
      * 
      */
-    public Optional<PatternContent.Match> getOneArbitraryMatch(final FSObject pO1, final FSObject pO2) {
+    public Optional<PatternContent.Match> getOneArbitraryMatch(final Dir pO1, final FSObject pO2) {
       return rawGetOneArbitraryMatch(new Object[]{pO1, pO2});
     }
     
@@ -347,7 +348,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return true if the input is a valid (partial) match of the pattern.
      * 
      */
-    public boolean hasMatch(final FSObject pO1, final FSObject pO2) {
+    public boolean hasMatch(final Dir pO1, final FSObject pO2) {
       return rawHasMatch(new Object[]{pO1, pO2});
     }
     
@@ -358,7 +359,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the number of pattern matches found.
      * 
      */
-    public int countMatches(final FSObject pO1, final FSObject pO2) {
+    public int countMatches(final Dir pO1, final FSObject pO2) {
       return rawCountMatches(new Object[]{pO1, pO2});
     }
     
@@ -371,7 +372,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @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 FSObject pO1, final FSObject pO2, final Consumer<? super PatternContent.Match> processor) {
+    public boolean forOneArbitraryMatch(final Dir pO1, final FSObject pO2, final Consumer<? super PatternContent.Match> processor) {
       return rawForOneArbitraryMatch(new Object[]{pO1, pO2}, processor);
     }
     
@@ -384,7 +385,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the (partial) match object.
      * 
      */
-    public PatternContent.Match newMatch(final FSObject pO1, final FSObject pO2) {
+    public PatternContent.Match newMatch(final Dir pO1, final FSObject pO2) {
       return PatternContent.Match.newMatch(pO1, pO2);
     }
     
@@ -393,8 +394,8 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    protected Stream<FSObject> rawStreamAllValuesOfo1(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_O1, parameters).map(FSObject.class::cast);
+    protected Stream<Dir> rawStreamAllValuesOfo1(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_O1, parameters).map(Dir.class::cast);
     }
     
     /**
@@ -402,7 +403,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    public Set<FSObject> getAllValuesOfo1() {
+    public Set<Dir> getAllValuesOfo1() {
       return rawStreamAllValuesOfo1(emptyArray()).collect(Collectors.toSet());
     }
     
@@ -411,7 +412,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    public Stream<FSObject> streamAllValuesOfo1() {
+    public Stream<Dir> streamAllValuesOfo1() {
       return rawStreamAllValuesOfo1(emptyArray());
     }
     
@@ -425,7 +426,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the Stream of all values or empty set if there are no matches
      * 
      */
-    public Stream<FSObject> streamAllValuesOfo1(final PatternContent.Match partialMatch) {
+    public Stream<Dir> streamAllValuesOfo1(final PatternContent.Match partialMatch) {
       return rawStreamAllValuesOfo1(partialMatch.toArray());
     }
     
@@ -439,7 +440,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the Stream of all values or empty set if there are no matches
      * 
      */
-    public Stream<FSObject> streamAllValuesOfo1(final FSObject pO2) {
+    public Stream<Dir> streamAllValuesOfo1(final FSObject pO2) {
       return rawStreamAllValuesOfo1(new Object[]{null, pO2});
     }
     
@@ -448,7 +449,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    public Set<FSObject> getAllValuesOfo1(final PatternContent.Match partialMatch) {
+    public Set<Dir> getAllValuesOfo1(final PatternContent.Match partialMatch) {
       return rawStreamAllValuesOfo1(partialMatch.toArray()).collect(Collectors.toSet());
     }
     
@@ -457,7 +458,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    public Set<FSObject> getAllValuesOfo1(final FSObject pO2) {
+    public Set<Dir> getAllValuesOfo1(final FSObject pO2) {
       return rawStreamAllValuesOfo1(new Object[]{null, pO2}).collect(Collectors.toSet());
     }
     
@@ -512,7 +513,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the Stream of all values or empty set if there are no matches
      * 
      */
-    public Stream<FSObject> streamAllValuesOfo2(final FSObject pO1) {
+    public Stream<FSObject> streamAllValuesOfo2(final Dir pO1) {
       return rawStreamAllValuesOfo2(new Object[]{pO1, null});
     }
     
@@ -530,14 +531,14 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    public Set<FSObject> getAllValuesOfo2(final FSObject pO1) {
+    public Set<FSObject> getAllValuesOfo2(final Dir pO1) {
       return rawStreamAllValuesOfo2(new Object[]{pO1, null}).collect(Collectors.toSet());
     }
     
     @Override
     protected PatternContent.Match tupleToMatch(final Tuple t) {
       try {
-          return PatternContent.Match.newMatch((FSObject) t.get(POSITION_O1), (FSObject) t.get(POSITION_O2));
+          return PatternContent.Match.newMatch((Dir) t.get(POSITION_O1), (FSObject) t.get(POSITION_O2));
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in tuple not properly typed!",e);
           return null;
@@ -547,7 +548,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
     @Override
     protected PatternContent.Match arrayToMatch(final Object[] match) {
       try {
-          return PatternContent.Match.newMatch((FSObject) match[POSITION_O1], (FSObject) match[POSITION_O2]);
+          return PatternContent.Match.newMatch((Dir) match[POSITION_O1], (FSObject) match[POSITION_O2]);
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in array not properly typed!",e);
           return null;
@@ -557,7 +558,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
     @Override
     protected PatternContent.Match arrayToMatchMutable(final Object[] match) {
       try {
-          return PatternContent.Match.newMutableMatch((FSObject) match[POSITION_O1], (FSObject) match[POSITION_O2]);
+          return PatternContent.Match.newMutableMatch((Dir) match[POSITION_O1], (FSObject) match[POSITION_O2]);
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in array not properly typed!",e);
           return null;
@@ -608,7 +609,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
   
   @Override
   public PatternContent.Match newMatch(final Object... parameters) {
-    return PatternContent.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject) parameters[0], (hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject) parameters[1]);
+    return PatternContent.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir) parameters[0], (hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject) parameters[1]);
   }
   
   /**
@@ -640,7 +641,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
   private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
     private static final PatternContent.GeneratedPQuery INSTANCE = new GeneratedPQuery();
     
-    private final PParameter parameter_o1 = new PParameter("o1", "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("FS", "FSObject")), PParameterDirection.INOUT);
+    private final PParameter parameter_o1 = new PParameter("o1", "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("FS", "Dir")), PParameterDirection.INOUT);
     
     private final PParameter parameter_o2 = new PParameter("o2", "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("FS", "FSObject")), PParameterDirection.INOUT);
     
@@ -673,7 +674,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
           PBody body = new PBody(this);
           PVariable var_o1 = body.getOrCreateVariableByName("o1");
           PVariable var_o2 = body.getOrCreateVariableByName("o2");
-          new TypeConstraint(body, Tuples.flatTupleOf(var_o1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FSObject")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_o1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "Dir")));
           new TypeConstraint(body, Tuples.flatTupleOf(var_o2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FSObject")));
           body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
              new ExportedParameter(body, var_o1, parameter_o1),
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/RootIsNotDir.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/RootIsNotDir.java
new file mode 100644
index 00000000..22c31158
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/RootIsNotDir.java
@@ -0,0 +1,560 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/FileSystem.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.alloyexamples;
+
+import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Dir;
+import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FileSystem;
+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.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.NegativePatternCall;
+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>
+ *         {@literal @}Constraint(key={fs}, severity="error", message="error")
+ *         pattern rootIsNotDir(fs: FileSystem) {
+ *         	FileSystem.root(fs, root);
+ *         	neg find dir(root);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class RootIsNotDir extends BaseGeneratedEMFQuerySpecification<RootIsNotDir.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.rootIsNotDir 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 FileSystem fFs;
+    
+    private static List<String> parameterNames = makeImmutableList("fs");
+    
+    private Match(final FileSystem pFs) {
+      this.fFs = pFs;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      if ("fs".equals(parameterName)) return this.fFs;
+      return null;
+    }
+    
+    public FileSystem getFs() {
+      return this.fFs;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("fs".equals(parameterName) ) {
+          this.fFs = (FileSystem) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setFs(final FileSystem pFs) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fFs = pFs;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.rootIsNotDir";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return RootIsNotDir.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fFs};
+    }
+    
+    @Override
+    public RootIsNotDir.Match toImmutable() {
+      return isMutable() ? newMatch(fFs) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"fs\"=" + prettyPrintValue(fFs));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fFs);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof RootIsNotDir.Match)) {
+          RootIsNotDir.Match other = (RootIsNotDir.Match) obj;
+          return Objects.equals(fFs, other.fFs);
+      } 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 RootIsNotDir specification() {
+      return RootIsNotDir.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 RootIsNotDir.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 pFs the fixed value of pattern parameter fs, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static RootIsNotDir.Match newMutableMatch(final FileSystem pFs) {
+      return new Mutable(pFs);
+    }
+    
+    /**
+     * 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 pFs the fixed value of pattern parameter fs, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static RootIsNotDir.Match newMatch(final FileSystem pFs) {
+      return new Immutable(pFs);
+    }
+    
+    private static final class Mutable extends RootIsNotDir.Match {
+      Mutable(final FileSystem pFs) {
+        super(pFs);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends RootIsNotDir.Match {
+      Immutable(final FileSystem pFs) {
+        super(pFs);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.rootIsNotDir 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>
+   * {@literal @}Constraint(key={fs}, severity="error", message="error")
+   * pattern rootIsNotDir(fs: FileSystem) {
+   * 	FileSystem.root(fs, root);
+   * 	neg find dir(root);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see RootIsNotDir
+   * 
+   */
+  public static class Matcher extends BaseMatcher<RootIsNotDir.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 RootIsNotDir.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 RootIsNotDir.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_FS = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(RootIsNotDir.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 pFs the fixed value of pattern parameter fs, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<RootIsNotDir.Match> getAllMatches(final FileSystem pFs) {
+      return rawStreamAllMatches(new Object[]{pFs}).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 pFs the fixed value of pattern parameter fs, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<RootIsNotDir.Match> streamAllMatches(final FileSystem pFs) {
+      return rawStreamAllMatches(new Object[]{pFs});
+    }
+    
+    /**
+     * 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 pFs the fixed value of pattern parameter fs, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<RootIsNotDir.Match> getOneArbitraryMatch(final FileSystem pFs) {
+      return rawGetOneArbitraryMatch(new Object[]{pFs});
+    }
+    
+    /**
+     * 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 pFs the fixed value of pattern parameter fs, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final FileSystem pFs) {
+      return rawHasMatch(new Object[]{pFs});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pFs the fixed value of pattern parameter fs, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final FileSystem pFs) {
+      return rawCountMatches(new Object[]{pFs});
+    }
+    
+    /**
+     * 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 pFs the fixed value of pattern parameter fs, 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 FileSystem pFs, final Consumer<? super RootIsNotDir.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pFs}, 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 pFs the fixed value of pattern parameter fs, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public RootIsNotDir.Match newMatch(final FileSystem pFs) {
+      return RootIsNotDir.Match.newMatch(pFs);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for fs.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<FileSystem> rawStreamAllValuesOffs(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_FS, parameters).map(FileSystem.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for fs.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<FileSystem> getAllValuesOffs() {
+      return rawStreamAllValuesOffs(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for fs.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<FileSystem> streamAllValuesOffs() {
+      return rawStreamAllValuesOffs(emptyArray());
+    }
+    
+    @Override
+    protected RootIsNotDir.Match tupleToMatch(final Tuple t) {
+      try {
+          return RootIsNotDir.Match.newMatch((FileSystem) t.get(POSITION_FS));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected RootIsNotDir.Match arrayToMatch(final Object[] match) {
+      try {
+          return RootIsNotDir.Match.newMatch((FileSystem) match[POSITION_FS]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected RootIsNotDir.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return RootIsNotDir.Match.newMutableMatch((FileSystem) match[POSITION_FS]);
+      } 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<RootIsNotDir.Matcher> querySpecification() {
+      return RootIsNotDir.instance();
+    }
+  }
+  
+  private RootIsNotDir() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static RootIsNotDir instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected RootIsNotDir.Matcher instantiate(final ViatraQueryEngine engine) {
+    return RootIsNotDir.Matcher.on(engine);
+  }
+  
+  @Override
+  public RootIsNotDir.Matcher instantiate() {
+    return RootIsNotDir.Matcher.create();
+  }
+  
+  @Override
+  public RootIsNotDir.Match newEmptyMatch() {
+    return RootIsNotDir.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public RootIsNotDir.Match newMatch(final Object... parameters) {
+    return RootIsNotDir.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FileSystem) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.RootIsNotDir (visibility: PUBLIC, simpleName: RootIsNotDir, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.RootIsNotDir, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.RootIsNotDir (visibility: PUBLIC, simpleName: RootIsNotDir, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.RootIsNotDir, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final RootIsNotDir INSTANCE = new RootIsNotDir();
+    
+    /**
+     * 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 RootIsNotDir.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_fs = new PParameter("fs", "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FileSystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("FS", "FileSystem")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_fs);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.rootIsNotDir";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("fs");
+    }
+    
+    @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_fs = body.getOrCreateVariableByName("fs");
+          PVariable var_root = body.getOrCreateVariableByName("root");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_fs), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FileSystem")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_fs, parameter_fs)
+          ));
+          // 	FileSystem.root(fs, root)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_fs), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FileSystem")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_fs, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("FS", "FileSystem", "root")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FSObject")));
+          new Equality(body, var__virtual_0_, var_root);
+          // 	neg find dir(root)
+          new NegativePatternCall(body, Tuples.flatTupleOf(var_root), Dir.instance().getInternalQueryRepresentation());
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("fs")
+                              }));
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("message", "error");
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/FileSystem.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/FileSystem.java
index 1896e31e..f0066955 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/FileSystem.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/FileSystem.java
@@ -33,12 +33,12 @@ public interface FileSystem extends EObject {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Root</em>' containment reference.
-	 * @see #setRoot(Dir)
+	 * @see #setRoot(FSObject)
 	 * @see hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FilesystemPackage#getFileSystem_Root()
 	 * @model containment="true" required="true"
 	 * @generated
 	 */
-	Dir getRoot();
+	FSObject getRoot();
 
 	/**
 	 * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FileSystem#getRoot <em>Root</em>}' containment reference.
@@ -48,7 +48,7 @@ public interface FileSystem extends EObject {
 	 * @see #getRoot()
 	 * @generated
 	 */
-	void setRoot(Dir value);
+	void setRoot(FSObject value);
 
 	/**
 	 * Returns the value of the '<em><b>Live</b></em>' reference list.
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/DirImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/DirImpl.java
index 62df04af..c2d417d2 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/DirImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/DirImpl.java
@@ -66,6 +66,7 @@ public class DirImpl extends FSObjectImpl implements Dir {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<FSObject> getContents() {
 		if (contents == null) {
 			contents = new EObjectContainmentWithInverseEList<FSObject>(FSObject.class, this, FilesystemPackage.DIR__CONTENTS, FilesystemPackage.FS_OBJECT__PARENT);
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FSObjectImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FSObjectImpl.java
index c8e73b4e..d87935d6 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FSObjectImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FSObjectImpl.java
@@ -53,6 +53,7 @@ public abstract class FSObjectImpl extends MinimalEObjectImpl.Container implemen
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Dir getParent() {
 		if (eContainerFeatureID() != FilesystemPackage.FS_OBJECT__PARENT) return null;
 		return (Dir)eInternalContainer();
@@ -73,6 +74,7 @@ public abstract class FSObjectImpl extends MinimalEObjectImpl.Container implemen
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setParent(Dir newParent) {
 		if (newParent != eInternalContainer() || (eContainerFeatureID() != FilesystemPackage.FS_OBJECT__PARENT && newParent != null)) {
 			if (EcoreUtil.isAncestor(this, newParent))
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FileSystemImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FileSystemImpl.java
index adf30f3a..e6859cab 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FileSystemImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FileSystemImpl.java
@@ -2,7 +2,6 @@
  */
 package hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.impl;
 
-import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir;
 import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject;
 import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FileSystem;
 import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FilesystemPackage;
@@ -42,7 +41,7 @@ public class FileSystemImpl extends MinimalEObjectImpl.Container implements File
 	 * @generated
 	 * @ordered
 	 */
-	protected Dir root;
+	protected FSObject root;
 
 	/**
 	 * The cached setting delegate for the '{@link #getLive() <em>Live</em>}' reference list.
@@ -78,7 +77,8 @@ public class FileSystemImpl extends MinimalEObjectImpl.Container implements File
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Dir getRoot() {
+	@Override
+	public FSObject getRoot() {
 		return root;
 	}
 
@@ -87,8 +87,8 @@ public class FileSystemImpl extends MinimalEObjectImpl.Container implements File
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public NotificationChain basicSetRoot(Dir newRoot, NotificationChain msgs) {
-		Dir oldRoot = root;
+	public NotificationChain basicSetRoot(FSObject newRoot, NotificationChain msgs) {
+		FSObject oldRoot = root;
 		root = newRoot;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FilesystemPackage.FILE_SYSTEM__ROOT, oldRoot, newRoot);
@@ -102,7 +102,8 @@ public class FileSystemImpl extends MinimalEObjectImpl.Container implements File
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setRoot(Dir newRoot) {
+	@Override
+	public void setRoot(FSObject newRoot) {
 		if (newRoot != root) {
 			NotificationChain msgs = null;
 			if (root != null)
@@ -122,6 +123,7 @@ public class FileSystemImpl extends MinimalEObjectImpl.Container implements File
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
+	@Override
 	public EList<FSObject> getLive() {
 		return (EList<FSObject>)LIVE__ESETTING_DELEGATE.dynamicGet(this, null, 0, true, false);
 	}
@@ -165,7 +167,7 @@ public class FileSystemImpl extends MinimalEObjectImpl.Container implements File
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
 			case FilesystemPackage.FILE_SYSTEM__ROOT:
-				setRoot((Dir)newValue);
+				setRoot((FSObject)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -180,7 +182,7 @@ public class FileSystemImpl extends MinimalEObjectImpl.Container implements File
 	public void eUnset(int featureID) {
 		switch (featureID) {
 			case FilesystemPackage.FILE_SYSTEM__ROOT:
-				setRoot((Dir)null);
+				setRoot((FSObject)null);
 				return;
 		}
 		super.eUnset(featureID);
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FilesystemFactoryImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FilesystemFactoryImpl.java
index e40b0bd1..b4b09e15 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FilesystemFactoryImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FilesystemFactoryImpl.java
@@ -70,6 +70,7 @@ public class FilesystemFactoryImpl extends EFactoryImpl implements FilesystemFac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public FileSystem createFileSystem() {
 		FileSystemImpl fileSystem = new FileSystemImpl();
 		return fileSystem;
@@ -80,6 +81,7 @@ public class FilesystemFactoryImpl extends EFactoryImpl implements FilesystemFac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Dir createDir() {
 		DirImpl dir = new DirImpl();
 		return dir;
@@ -90,6 +92,7 @@ public class FilesystemFactoryImpl extends EFactoryImpl implements FilesystemFac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public File createFile() {
 		FileImpl file = new FileImpl();
 		return file;
@@ -100,6 +103,7 @@ public class FilesystemFactoryImpl extends EFactoryImpl implements FilesystemFac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public Model createModel() {
 		ModelImpl model = new ModelImpl();
 		return model;
@@ -110,6 +114,7 @@ public class FilesystemFactoryImpl extends EFactoryImpl implements FilesystemFac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public FilesystemPackage getFilesystemPackage() {
 		return (FilesystemPackage)getEPackage();
 	}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FilesystemPackageImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FilesystemPackageImpl.java
index 87390fee..4c0ca4c5 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FilesystemPackageImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/FilesystemPackageImpl.java
@@ -86,7 +86,7 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
 
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
+	 *
 	 * <p>This method is used to initialize {@link FilesystemPackage#eINSTANCE} when that field is accessed.
 	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
 	 * <!-- begin-user-doc -->
@@ -100,7 +100,8 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
 		if (isInited) return (FilesystemPackage)EPackage.Registry.INSTANCE.getEPackage(FilesystemPackage.eNS_URI);
 
 		// Obtain or create and register package
-		FilesystemPackageImpl theFilesystemPackage = (FilesystemPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FilesystemPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FilesystemPackageImpl());
+		Object registeredFilesystemPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+		FilesystemPackageImpl theFilesystemPackage = registeredFilesystemPackage instanceof FilesystemPackageImpl ? (FilesystemPackageImpl)registeredFilesystemPackage : new FilesystemPackageImpl();
 
 		isInited = true;
 
@@ -113,7 +114,6 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
 		// Mark meta-data to indicate it can't be changed
 		theFilesystemPackage.freeze();
 
-  
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(FilesystemPackage.eNS_URI, theFilesystemPackage);
 		return theFilesystemPackage;
@@ -124,6 +124,7 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getFileSystem() {
 		return fileSystemEClass;
 	}
@@ -133,6 +134,7 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getFileSystem_Root() {
 		return (EReference)fileSystemEClass.getEStructuralFeatures().get(0);
 	}
@@ -142,6 +144,7 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getFileSystem_Live() {
 		return (EReference)fileSystemEClass.getEStructuralFeatures().get(1);
 	}
@@ -151,6 +154,7 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getFSObject() {
 		return fsObjectEClass;
 	}
@@ -160,6 +164,7 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getFSObject_Parent() {
 		return (EReference)fsObjectEClass.getEStructuralFeatures().get(0);
 	}
@@ -169,6 +174,7 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getDir() {
 		return dirEClass;
 	}
@@ -178,6 +184,7 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getDir_Contents() {
 		return (EReference)dirEClass.getEStructuralFeatures().get(0);
 	}
@@ -187,6 +194,7 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getFile() {
 		return fileEClass;
 	}
@@ -196,6 +204,7 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EClass getModel() {
 		return modelEClass;
 	}
@@ -205,6 +214,7 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getModel_Filesystems() {
 		return (EReference)modelEClass.getEStructuralFeatures().get(0);
 	}
@@ -214,6 +224,7 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EReference getModel_OtherFSObjects() {
 		return (EReference)modelEClass.getEStructuralFeatures().get(1);
 	}
@@ -223,6 +234,7 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public FilesystemFactory getFilesystemFactory() {
 		return (FilesystemFactory)getEFactoryInstance();
 	}
@@ -296,7 +308,7 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
 
 		// Initialize classes, features, and operations; add parameters
 		initEClass(fileSystemEClass, FileSystem.class, "FileSystem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getFileSystem_Root(), this.getDir(), null, "root", null, 1, 1, FileSystem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getFileSystem_Root(), this.getFSObject(), null, "root", null, 1, 1, FileSystem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getFileSystem_Live(), this.getFSObject(), null, "live", null, 0, -1, FileSystem.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 
 		initEClass(fsObjectEClass, FSObject.class, "FSObject", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -328,12 +340,12 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
 	 * @generated
 	 */
 	protected void createEcoreAnnotations() {
-		String source = "http://www.eclipse.org/emf/2002/Ecore";	
+		String source = "http://www.eclipse.org/emf/2002/Ecore";
 		addAnnotation
-		  (this, 
-		   source, 
+		  (this,
+		   source,
 		   new String[] {
-			 "settingDelegates", "org.eclipse.viatra.query.querybasedfeature"
+			   "settingDelegates", "org.eclipse.viatra.query.querybasedfeature"
 		   });
 	}
 
@@ -344,12 +356,12 @@ public class FilesystemPackageImpl extends EPackageImpl implements FilesystemPac
 	 * @generated
 	 */
 	protected void createOrgAnnotations() {
-		String source = "org.eclipse.viatra.query.querybasedfeature";	
+		String source = "org.eclipse.viatra.query.querybasedfeature";
 		addAnnotation
-		  (getFileSystem_Live(), 
-		   source, 
+		  (getFileSystem_Live(),
+		   source,
 		   new String[] {
-			 "patternFQN", "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.live"
+			   "patternFQN", "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.live"
 		   });
 	}
 
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/ModelImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/ModelImpl.java
index 4c236e8e..093b9972 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/ModelImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Filesystem/impl/ModelImpl.java
@@ -82,6 +82,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public FileSystem getFilesystems() {
 		return filesystems;
 	}
@@ -106,6 +107,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setFilesystems(FileSystem newFilesystems) {
 		if (newFilesystems != filesystems) {
 			NotificationChain msgs = null;
@@ -125,6 +127,7 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public EList<FSObject> getOtherFSObjects() {
 		if (otherFSObjects == null) {
 			otherFSObjects = new EObjectContainmentEList<FSObject>(FSObject.class, this, FilesystemPackage.MODEL__OTHER_FS_OBJECTS);
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/configs/fs_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json b/Tests/hu.bme.mit.inf.dslreasoner.run/configs/fs_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json
index d7955ddd..a7e29a22 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/configs/fs_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/configs/fs_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json
@@ -6,10 +6,11 @@
 	"warmupIterations": 1,
 	"iterations": 1,
 	"domain": "fs",
-	"scope": "useful",
+	"scope": "none",
 	"sizes": [50, 100, 150, 200, 250, 300, 350, 400, 450, 500],
 	"solver": "ViatraSolver",
 	"scopePropagator": "polyhedral",
-	"propagatedConstraints": "relations",
-	"polyhedronSolver": "Clp"
+	"propagatedConstraints": "hints",
+	"polyhedronSolver": "Clp",
+	"scopeHeuristic": "polyhedral"
 }
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
new file mode 100644
index 00000000..8d6523b1
--- /dev/null
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemHint.xtend
@@ -0,0 +1,32 @@
+package hu.bme.mit.inf.dslreasoner.run
+
+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
+
+class FileSystemHint extends Ecore2LogicTraceBasedHint {
+	static val REMAINING_CONTENTS_ROOT = "hint_root"
+
+	new(Ecore2Logic ecore2Logic, Ecore2Logic_Trace trace) {
+		super(ecore2Logic, trace)
+	}
+
+	override getAdditionalPatterns(PatternGenerator it) '''
+		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, _, #_)
+		}
+	'''
+
+	override createConstraintUpdater(LinearTypeExpressionBuilderFactory it) {
+		val dirCount = createBuilder.add(1, "Dir".type).build
+
+		val remainingContentsRootMatcher = createMatcher(REMAINING_CONTENTS_ROOT)
+
+		return [ p |
+			dirCount.tightenLowerBound(remainingContentsRootMatcher.getCount(p))
+		]
+	}
+
+}
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemInconsistencyDetector.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemInconsistencyDetector.xtend
index e79a6261..f4f36951 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemInconsistencyDetector.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/FileSystemInconsistencyDetector.xtend
@@ -35,11 +35,11 @@ class FileSystemInconsistencyDetector extends ModelGenerationMethodBasedGlobalCo
 	
 	override checkGlobalConstraint(ThreadContext context) {
 		var requiredNewObjects = 
-				filesystem.countMatches*2 +
-				root.countMatches
+				root.countMatches*2 +
+				filesystem.countMatches
 		val availableNewObjects = partialInterpretation.maxNewElements
 		val res = availableNewObjects >= requiredNewObjects
-		//println('''[«availableNewObjects» >= «requiredNewObjects»] = «res»''')
+		println('''[«availableNewObjects» >= «requiredNewObjects»] = «res»''')
 		return res
 	}
 	
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend
index 54724226..4b0791d4 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend
@@ -195,8 +195,9 @@ class YakinduLoader extends MetamodelLoader {
 		this.workspace.readModel(EObject, "Yakindu.xmi").eResource.allContents.toList
 	}
 
-	override additionalConstraints() { // #[]
-		#[[method|new SGraphInconsistencyDetector(method)]]
+	override additionalConstraints() {
+		//#[[method|new SGraphInconsistencyDetector(method)]]
+		emptyList
 	}
 
 	override getTypeQuantiles() {
@@ -260,9 +261,17 @@ class FileSystemLoader extends MetamodelLoader {
 	}
 
 	override additionalConstraints() {
-		#[[method|new FileSystemInconsistencyDetector(method)]]
+		//#[[method|new FileSystemInconsistencyDetector(method)]]
+		emptyList
 	}
 
+	override getTypeQuantiles() {
+		#{
+			"Filesystem" -> new TypeQuantiles(0, 0.05),
+			"Dir" -> new TypeQuantiles(0.15, 0.3),
+			"File" -> new TypeQuantiles(0.25, 0.85)
+		}
+	}
 }
 
 class EcoreLoader extends MetamodelLoader {
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 e95c0c64..ef5b779e 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
@@ -9,8 +9,6 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternGene
 class SatelliteHint extends Ecore2LogicTraceBasedHint {
 	static val INTERFEROMETY_PAYLOAD = "hint_interferometryPayload"
 	static val REMAINING_CONTENTS_KA_COMM_SUBSYSTEM = "hint_kaCommSubsystem"
-	static val HINT_SPACECRAFT_UHF_POSSIBLE_LINK = "hint_spacecraftWithUhfPossibleLink"
-	static val HINT_SPACECRAFT_UHF_ONLY_NO_LINK = "hint_spacecraftUhfOnlyNoLink"
 
 	new(Ecore2Logic ecore2Logic, Ecore2Logic_Trace trace) {
 		super(ecore2Logic, trace)
@@ -32,54 +30,19 @@ class SatelliteHint extends Ecore2LogicTraceBasedHint {
 			find interpretation(problem, interpretation);
 			remainingContents == sum find «REMAINING_CONTENTS_KA_COMM_SUBSYSTEM»_helper(problem, interpretation, _, #_);
 		}
-		
-		private pattern hint_spacecraftNotUhfOnly(problem:LogicProblem, interpretation:PartialInterpretation, spacecraft:DefinedElement) {
-			find interpretation(problem, interpretation);
-			find mustExist(problem, interpretation, spacecraft);
-			«typeIndexer.referInstanceOf("Spacecraft".type, Modality.MUST, "spacecraft")»
-			«relationDeclarationIndexer.referRelation("CommunicatingElement".relation("commSubsystem"), "spacecraft", "comm", Modality.MAY)»
-			neg «typeIndexer.referInstanceOf("UHFCommSubsystem".type, Modality.MUST, "comm")»
-		}
-		
-		private pattern hint_spacecraftWithUhf(problem:LogicProblem, interpretation:PartialInterpretation, spacecraft:DefinedElement) {
-			find interpretation(problem, interpretation);
-			find mustExist(problem, interpretation, spacecraft);
-			«typeIndexer.referInstanceOf("Spacecraft".type, Modality.MUST, "spacecraft")»
-			«relationDeclarationIndexer.referRelation("CommunicatingElement".relation("commSubsystem"), "spacecraft", "comm", Modality.MUST)»
-			«typeIndexer.referInstanceOf("UHFCommSubsystem".type, Modality.MUST, "comm")»
-		}
-		
-		pattern «HINT_SPACECRAFT_UHF_POSSIBLE_LINK»(problem:LogicProblem, interpretation:PartialInterpretation) {
-			find hint_spacecraftWithUhf(problem, interpretation, spacecraft);
-			find hint_spacecraftNotUhfOnly(problem, interpretation, spacecraft);
-		}
-		
-		pattern «HINT_SPACECRAFT_UHF_ONLY_NO_LINK»(problem:LogicProblem, interpretation:PartialInterpretation) {
-			find interpretation(problem, interpretation);
-			find mustExist(problem, interpretation, spacecraft);
-			«typeIndexer.referInstanceOf("Spacecraft".type, Modality.MUST, "spacecraft")»
-			neg find hint_spacecraftNotUhfOnly(problem, interpretation, spacecraft);
-			find currentInRelation_pattern_hu_bme_mit_inf_dslreasoner_domains_satellite_queries_noLinkToGroundStation(problem, interpretation, spacecraft);
-		}
 	'''
 
 	override createConstraintUpdater(LinearTypeExpressionBuilderFactory it) {
 		val interferometryPayloadCount = createBuilder.add(1, "InterferometryPayload".type).build
 		val kaCommSubsystemWithoutSmallSatCount = createBuilder.add(1, "KaCommSubsystem".type).add(-2, "SmallSat".type).
 			build
-		val uhfCommSubsystemCount = createBuilder.add(1, "UHFCommSubsystem".type).build
 
 		val interferometryPayloadMatcher = createMatcher(INTERFEROMETY_PAYLOAD)
 		val kaCommSubsystemRemainingContentsMatcher = createMatcher(REMAINING_CONTENTS_KA_COMM_SUBSYSTEM)
-		val uhfPossibleLinkMatcher = createMatcher(HINT_SPACECRAFT_UHF_POSSIBLE_LINK)
-		val uhfNoLinkMatcher = createMatcher(HINT_SPACECRAFT_UHF_ONLY_NO_LINK)
 
 		return [ p |
 			interferometryPayloadCount.tightenLowerBound(2 - interferometryPayloadMatcher.countMatches(p))
 			kaCommSubsystemWithoutSmallSatCount.tightenUpperBound(kaCommSubsystemRemainingContentsMatcher.getCount(p))
-			if (uhfPossibleLinkMatcher.countMatches(p) == 0 && uhfNoLinkMatcher.countMatches(p) >= 1) {
-				uhfCommSubsystemCount.tightenLowerBound(1)
-			}
 		]
 	}
 
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/script/MeasurementScript.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/script/MeasurementScript.xtend
index 5abff962..56a65091 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/script/MeasurementScript.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/script/MeasurementScript.xtend
@@ -22,7 +22,7 @@ class MeasurementScript {
 	ScopeHeuristic scopeHeuristic
 
 	def toCsvHeader() {
-		'''«domain»,«scope»,«solver»,«scopePropagator ?: "NULL"»,«propagatedConstraints ?: "NULL"»,«polyhedronSolver ?: "NULL"»'''
+		'''«domain»,«scope»,«solver»,«scopePropagator ?: "NULL"»,«propagatedConstraints ?: "NULL"»,«polyhedronSolver ?: "NULL"»,«scopeHeuristic ?: "NULL"»'''
 	}
 }
 
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/script/MeasurementScriptRunner.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/script/MeasurementScriptRunner.xtend
index 48e750cb..bfbbf329 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/script/MeasurementScriptRunner.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/script/MeasurementScriptRunner.xtend
@@ -68,7 +68,7 @@ class MeasurementScriptRunner {
 		this.script = script
 		inputWorkspace = new FileSystemWorkspace(script.inputPath + "/", "")
 		outputWorkspace = new FileSystemWorkspace(script.outputPath +
-			"/", '''«script.domain»_«script.solver»_«script.scope»_«script.scopePropagator ?: "na"»_«script.propagatedConstraints ?: "na"»_«script.polyhedronSolver ?: "na"»_''')
+			"/", '''«script.domain»_«script.solver»_«script.scope»_«script.scopePropagator ?: "na"»_«script.propagatedConstraints ?: "na"»_«script.polyhedronSolver ?: "na"»_«script.scopeHeuristic ?: "na"»_''')
 		metamodelLoader = switch (script.domain) {
 			case fs: new FileSystemLoader(inputWorkspace)
 			case ecore: new EcoreLoader(inputWorkspace)
-- 
cgit v1.2.3-54-g00ecf


From 9ccfc1a2853f3da61758a50c0c545235dcebbfab Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kris7topher@gmail.com>
Date: Tue, 29 Oct 2019 16:43:49 +0100
Subject: Remove empty src directories from build path

---
 .../dslreasoner/domains/alloyexamples/.gitignore    |  2 ++
 .../domains/alloyexamples/ContentInNotLive.java     | 21 ++++++++++++++++-----
 .../inf/dslreasoner/domains/alloyexamples/Dir.java  | 18 ++++++++++++++----
 .../domains/alloyexamples/DirectSupertype.java      | 21 ++++++++++++++++-----
 .../inf/dslreasoner/domains/alloyexamples/Live.java | 21 ++++++++++++++++-----
 .../domains/alloyexamples/LoopInInheritence.java    | 18 ++++++++++++++----
 .../domains/alloyexamples/NonSymmetricOpposite.java | 21 ++++++++++++++++-----
 .../dslreasoner/domains/alloyexamples/Opposite.java | 21 ++++++++++++++++-----
 .../alloyexamples/OppositeDifferentClass.java       | 18 ++++++++++++++----
 .../domains/alloyexamples/PatternContent.java       | 21 ++++++++++++++++-----
 .../domains/alloyexamples/RootIsNotDir.java         | 18 ++++++++++++++----
 Tests/Ecore-Plugin/.classpath                       | 17 ++++++++++-------
 Tests/Ecore-Plugin/.gitignore                       |  1 +
 .../.settings/org.eclipse.jdt.core.prefs            |  8 ++++++++
 Tests/Ecore-Plugin/build.properties                 |  2 --
 15 files changed, 173 insertions(+), 55 deletions(-)
 create mode 100644 Tests/Ecore-Plugin/.gitignore

(limited to 'Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf')

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore
index fa9b1325..0f8c77a1 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore
@@ -52,3 +52,5 @@
 /PatternContent.java
 /.Dir.java._trace
 /.RootIsNotDir.java._trace
+/Dir.java
+/RootIsNotDir.java
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/ContentInNotLive.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/ContentInNotLive.java
index ffdc1a69..ef0aaaf3 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/ContentInNotLive.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/ContentInNotLive.java
@@ -90,9 +90,20 @@ public final class ContentInNotLive extends BaseGeneratedEMFQuerySpecification<C
     
     @Override
     public Object get(final String parameterName) {
-      if ("parent".equals(parameterName)) return this.fParent;
-      if ("child".equals(parameterName)) return this.fChild;
-      return null;
+      switch(parameterName) {
+          case "parent": return this.fParent;
+          case "child": return this.fChild;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fParent;
+          case 1: return this.fChild;
+          default: return null;
+      }
     }
     
     public Dir getParent() {
@@ -627,9 +638,9 @@ public final class ContentInNotLive extends BaseGeneratedEMFQuerySpecification<C
   }
   
   /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.ContentInNotLive (visibility: PUBLIC, simpleName: ContentInNotLive, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.ContentInNotLive, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   * Inner class allowing the singleton instance of {@link ContentInNotLive} to be created 
    *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.ContentInNotLive (visibility: PUBLIC, simpleName: ContentInNotLive, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.ContentInNotLive, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   *     but rather at the first call to {@link ContentInNotLive#instance()}.
    * 
    * <p> This workaround is required e.g. to support recursion.
    * 
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Dir.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Dir.java
index ad04c098..83195aea 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Dir.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Dir.java
@@ -74,8 +74,18 @@ public final class Dir extends BaseGeneratedEMFQuerySpecification<Dir.Matcher> {
     
     @Override
     public Object get(final String parameterName) {
-      if ("d".equals(parameterName)) return this.fD;
-      return null;
+      switch(parameterName) {
+          case "d": return this.fD;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fD;
+          default: return null;
+      }
     }
     
     public hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir getD() {
@@ -461,9 +471,9 @@ public final class Dir extends BaseGeneratedEMFQuerySpecification<Dir.Matcher> {
   }
   
   /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Dir (visibility: PUBLIC, simpleName: Dir, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Dir, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   * Inner class allowing the singleton instance of {@link Dir} to be created 
    *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Dir (visibility: PUBLIC, simpleName: Dir, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Dir, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   *     but rather at the first call to {@link Dir#instance()}.
    * 
    * <p> This workaround is required e.g. to support recursion.
    * 
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/DirectSupertype.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/DirectSupertype.java
index 03020a7c..72c31e34 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/DirectSupertype.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/DirectSupertype.java
@@ -79,9 +79,20 @@ public final class DirectSupertype extends BaseGeneratedEMFQuerySpecification<Di
     
     @Override
     public Object get(final String parameterName) {
-      if ("a".equals(parameterName)) return this.fA;
-      if ("b".equals(parameterName)) return this.fB;
-      return null;
+      switch(parameterName) {
+          case "a": return this.fA;
+          case "b": return this.fB;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fA;
+          case 1: return this.fB;
+          default: return null;
+      }
     }
     
     public EClass getA() {
@@ -611,9 +622,9 @@ public final class DirectSupertype extends BaseGeneratedEMFQuerySpecification<Di
   }
   
   /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.DirectSupertype (visibility: PUBLIC, simpleName: DirectSupertype, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.DirectSupertype, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   * Inner class allowing the singleton instance of {@link DirectSupertype} to be created 
    *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.DirectSupertype (visibility: PUBLIC, simpleName: DirectSupertype, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.DirectSupertype, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   *     but rather at the first call to {@link DirectSupertype#instance()}.
    * 
    * <p> This workaround is required e.g. to support recursion.
    * 
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Live.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Live.java
index 14a4c5c0..178ec37d 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Live.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Live.java
@@ -88,9 +88,20 @@ public final class Live extends BaseGeneratedEMFQuerySpecification<Live.Matcher>
     
     @Override
     public Object get(final String parameterName) {
-      if ("this".equals(parameterName)) return this.fThis;
-      if ("l".equals(parameterName)) return this.fL;
-      return null;
+      switch(parameterName) {
+          case "this": return this.fThis;
+          case "l": return this.fL;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fThis;
+          case 1: return this.fL;
+          default: return null;
+      }
     }
     
     public FileSystem getThis() {
@@ -624,9 +635,9 @@ public final class Live extends BaseGeneratedEMFQuerySpecification<Live.Matcher>
   }
   
   /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Live (visibility: PUBLIC, simpleName: Live, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Live, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   * Inner class allowing the singleton instance of {@link Live} to be created 
    *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Live (visibility: PUBLIC, simpleName: Live, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Live, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   *     but rather at the first call to {@link Live#instance()}.
    * 
    * <p> This workaround is required e.g. to support recursion.
    * 
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/LoopInInheritence.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/LoopInInheritence.java
index 51bd83a9..f81b989c 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/LoopInInheritence.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/LoopInInheritence.java
@@ -79,8 +79,18 @@ public final class LoopInInheritence extends BaseGeneratedEMFQuerySpecification<
     
     @Override
     public Object get(final String parameterName) {
-      if ("a".equals(parameterName)) return this.fA;
-      return null;
+      switch(parameterName) {
+          case "a": return this.fA;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fA;
+          default: return null;
+      }
     }
     
     public EClass getA() {
@@ -467,9 +477,9 @@ public final class LoopInInheritence extends BaseGeneratedEMFQuerySpecification<
   }
   
   /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.LoopInInheritence (visibility: PUBLIC, simpleName: LoopInInheritence, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.LoopInInheritence, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   * Inner class allowing the singleton instance of {@link LoopInInheritence} to be created 
    *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.LoopInInheritence (visibility: PUBLIC, simpleName: LoopInInheritence, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.LoopInInheritence, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   *     but rather at the first call to {@link LoopInInheritence#instance()}.
    * 
    * <p> This workaround is required e.g. to support recursion.
    * 
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/NonSymmetricOpposite.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/NonSymmetricOpposite.java
index bd2833a7..53725305 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/NonSymmetricOpposite.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/NonSymmetricOpposite.java
@@ -85,9 +85,20 @@ public final class NonSymmetricOpposite extends BaseGeneratedEMFQuerySpecificati
     
     @Override
     public Object get(final String parameterName) {
-      if ("a".equals(parameterName)) return this.fA;
-      if ("b".equals(parameterName)) return this.fB;
-      return null;
+      switch(parameterName) {
+          case "a": return this.fA;
+          case "b": return this.fB;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fA;
+          case 1: return this.fB;
+          default: return null;
+      }
     }
     
     public EReference getA() {
@@ -619,9 +630,9 @@ public final class NonSymmetricOpposite extends BaseGeneratedEMFQuerySpecificati
   }
   
   /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.NonSymmetricOpposite (visibility: PUBLIC, simpleName: NonSymmetricOpposite, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.NonSymmetricOpposite, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   * Inner class allowing the singleton instance of {@link NonSymmetricOpposite} to be created 
    *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.NonSymmetricOpposite (visibility: PUBLIC, simpleName: NonSymmetricOpposite, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.NonSymmetricOpposite, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   *     but rather at the first call to {@link NonSymmetricOpposite#instance()}.
    * 
    * <p> This workaround is required e.g. to support recursion.
    * 
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Opposite.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Opposite.java
index c4832370..7689d070 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Opposite.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Opposite.java
@@ -80,9 +80,20 @@ public final class Opposite extends BaseGeneratedEMFQuerySpecification<Opposite.
     
     @Override
     public Object get(final String parameterName) {
-      if ("a".equals(parameterName)) return this.fA;
-      if ("b".equals(parameterName)) return this.fB;
-      return null;
+      switch(parameterName) {
+          case "a": return this.fA;
+          case "b": return this.fB;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fA;
+          case 1: return this.fB;
+          default: return null;
+      }
     }
     
     public EReference getA() {
@@ -612,9 +623,9 @@ public final class Opposite extends BaseGeneratedEMFQuerySpecification<Opposite.
   }
   
   /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Opposite (visibility: PUBLIC, simpleName: Opposite, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Opposite, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   * Inner class allowing the singleton instance of {@link Opposite} to be created 
    *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Opposite (visibility: PUBLIC, simpleName: Opposite, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Opposite, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   *     but rather at the first call to {@link Opposite#instance()}.
    * 
    * <p> This workaround is required e.g. to support recursion.
    * 
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/OppositeDifferentClass.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/OppositeDifferentClass.java
index 887f8584..aca12eca 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/OppositeDifferentClass.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/OppositeDifferentClass.java
@@ -84,8 +84,18 @@ public final class OppositeDifferentClass extends BaseGeneratedEMFQuerySpecifica
     
     @Override
     public Object get(final String parameterName) {
-      if ("a".equals(parameterName)) return this.fA;
-      return null;
+      switch(parameterName) {
+          case "a": return this.fA;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fA;
+          default: return null;
+      }
     }
     
     public EReference getA() {
@@ -475,9 +485,9 @@ public final class OppositeDifferentClass extends BaseGeneratedEMFQuerySpecifica
   }
   
   /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.OppositeDifferentClass (visibility: PUBLIC, simpleName: OppositeDifferentClass, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.OppositeDifferentClass, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   * Inner class allowing the singleton instance of {@link OppositeDifferentClass} to be created 
    *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.OppositeDifferentClass (visibility: PUBLIC, simpleName: OppositeDifferentClass, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.OppositeDifferentClass, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   *     but rather at the first call to {@link OppositeDifferentClass#instance()}.
    * 
    * <p> This workaround is required e.g. to support recursion.
    * 
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/PatternContent.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/PatternContent.java
index 5410b693..bd02fa5b 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/PatternContent.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/PatternContent.java
@@ -81,9 +81,20 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
     
     @Override
     public Object get(final String parameterName) {
-      if ("o1".equals(parameterName)) return this.fO1;
-      if ("o2".equals(parameterName)) return this.fO2;
-      return null;
+      switch(parameterName) {
+          case "o1": return this.fO1;
+          case "o2": return this.fO2;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fO1;
+          case 1: return this.fO2;
+          default: return null;
+      }
     }
     
     public Dir getO1() {
@@ -613,9 +624,9 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
   }
   
   /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.PatternContent (visibility: PUBLIC, simpleName: PatternContent, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.PatternContent, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   * Inner class allowing the singleton instance of {@link PatternContent} to be created 
    *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.PatternContent (visibility: PUBLIC, simpleName: PatternContent, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.PatternContent, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   *     but rather at the first call to {@link PatternContent#instance()}.
    * 
    * <p> This workaround is required e.g. to support recursion.
    * 
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/RootIsNotDir.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/RootIsNotDir.java
index 22c31158..e2d9c175 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/RootIsNotDir.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/RootIsNotDir.java
@@ -83,8 +83,18 @@ public final class RootIsNotDir extends BaseGeneratedEMFQuerySpecification<RootI
     
     @Override
     public Object get(final String parameterName) {
-      if ("fs".equals(parameterName)) return this.fFs;
-      return null;
+      switch(parameterName) {
+          case "fs": return this.fFs;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fFs;
+          default: return null;
+      }
     }
     
     public FileSystem getFs() {
@@ -472,9 +482,9 @@ public final class RootIsNotDir extends BaseGeneratedEMFQuerySpecification<RootI
   }
   
   /**
-   * Inner class allowing the singleton instance of {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.RootIsNotDir (visibility: PUBLIC, simpleName: RootIsNotDir, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.RootIsNotDir, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 
+   * Inner class allowing the singleton instance of {@link RootIsNotDir} to be created 
    *     <b>not</b> at the class load time of the outer class, 
-   *     but rather at the first call to {@link JvmGenericType: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.RootIsNotDir (visibility: PUBLIC, simpleName: RootIsNotDir, identifier: hu.bme.mit.inf.dslreasoner.domains.alloyexamples.RootIsNotDir, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: hu.bme.mit.inf.dslreasoner.domains.alloyexamples) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.
+   *     but rather at the first call to {@link RootIsNotDir#instance()}.
    * 
    * <p> This workaround is required e.g. to support recursion.
    * 
diff --git a/Tests/Ecore-Plugin/.classpath b/Tests/Ecore-Plugin/.classpath
index b862a296..19ec8693 100644
--- a/Tests/Ecore-Plugin/.classpath
+++ b/Tests/Ecore-Plugin/.classpath
@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/Tests/Ecore-Plugin/.gitignore b/Tests/Ecore-Plugin/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/Tests/Ecore-Plugin/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/Tests/Ecore-Plugin/.settings/org.eclipse.jdt.core.prefs b/Tests/Ecore-Plugin/.settings/org.eclipse.jdt.core.prefs
index 295926d9..c59d0c6a 100644
--- a/Tests/Ecore-Plugin/.settings/org.eclipse.jdt.core.prefs
+++ b/Tests/Ecore-Plugin/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/Tests/Ecore-Plugin/build.properties b/Tests/Ecore-Plugin/build.properties
index 41eb6ade..577870e2 100644
--- a/Tests/Ecore-Plugin/build.properties
+++ b/Tests/Ecore-Plugin/build.properties
@@ -1,4 +1,2 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
                .
-- 
cgit v1.2.3-54-g00ecf


From 6a3ff9bb588bf47242a56b91e35479dbba38eb19 Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <marussy@mit.bme.hu>
Date: Thu, 7 May 2020 17:26:07 +0200
Subject: Scope unsat benchmarks

---
 .../.ApplicationConfigurationIdeModule.xtendbin    | Bin 1701 -> 1701 bytes
 .../ide/.ApplicationConfigurationIdeSetup.xtendbin | Bin 2570 -> 2526 bytes
 .../Examples/ModelGenExampleFAM_plugin/.project    |   6 +
 .../Examples/ModelGenExampleFAM_plugin/plugin.xml  |  18 +-
 .../dslreasoner/domains/alloyexamples/Ecore.vql    |  10 +
 .../plugin.xml                                     |   2 +
 .../dslreasoner/domains/alloyexamples/.gitignore   |   5 +
 .../alloyexamples/Unsat_loopInInheritance.java     | 566 +++++++++++++++++
 .../domains/alloyexamples/Unsat_subpackage.java    | 704 +++++++++++++++++++++
 .../domains/alloyexamples/internal/.gitignore      |   4 +
 .../plugin.xml                                     |  12 +-
 .../domains/satellite/queries/SatelliteQueries.vql |  13 +
 .../plugin.xml                                     |   1 +
 .../partialsnapshot_mavo/yakindu/patterns.vql      |  11 +
 .../.classpath                                     |  26 +-
 .../META-INF/MANIFEST.MF                           |   7 +-
 .../NeighbourhoodBasedStateCoderFactory.xtend      |   9 +-
 .../reasoner/ViatraReasonerConfiguration.xtend     |   2 +-
 ..._ViatraSolver_polyhedral_typeHierarchy_Clp.json |  16 -
 .../configs/Yakindu.json                           |  13 +
 ..._ViatraSolver_polyhedral_typeHierarchy_Clp.json |  17 -
 .../configs/ecore.json                             |  17 +
 ..._ViatraSolver_polyhedral_typeHierarchy_Clp.json |  16 -
 ..._ViatraSolver_polyhedral_typeHierarchy_Clp.json |  16 -
 .../configs/satellite.json                         |  17 +
 ..._ViatraSolver_polyhedral_typeHierarchy_Clp.json |  17 -
 .../mit/inf/dslreasoner/run/MetamodelLoader.xtend  |  63 +-
 .../dslreasoner/run/script/MeasurementScript.xtend |  13 +-
 .../run/script/MeasurementScriptRunner.xtend       |  46 +-
 29 files changed, 1511 insertions(+), 136 deletions(-)
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Unsat_loopInInheritance.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Unsat_subpackage.java
 create mode 100644 Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/internal/.gitignore
 delete mode 100644 Tests/hu.bme.mit.inf.dslreasoner.run/configs/FAM_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json
 create mode 100644 Tests/hu.bme.mit.inf.dslreasoner.run/configs/Yakindu.json
 delete mode 100644 Tests/hu.bme.mit.inf.dslreasoner.run/configs/Yakindu_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json
 create mode 100644 Tests/hu.bme.mit.inf.dslreasoner.run/configs/ecore.json
 delete mode 100644 Tests/hu.bme.mit.inf.dslreasoner.run/configs/ecore_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json
 delete mode 100644 Tests/hu.bme.mit.inf.dslreasoner.run/configs/fs_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json
 create mode 100644 Tests/hu.bme.mit.inf.dslreasoner.run/configs/satellite.json
 delete mode 100644 Tests/hu.bme.mit.inf.dslreasoner.run/configs/satellite_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json

(limited to 'Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf')

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 83195553..c8086733 100644
Binary files a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin and b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin differ
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 f5085470..1a907776 100644
Binary files a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin and b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin differ
diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/.project b/Domains/Examples/ModelGenExampleFAM_plugin/.project
index 6e1b3a06..570f8a60 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/.project
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.viatra.query.tooling.ui.projectbuilder</name>
 			<arguments>
@@ -30,5 +35,6 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.viatra.query.projectnature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 	</natures>
 </projectDescription>
diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml b/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml
index c117a28e..8d99d401 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml
@@ -5,23 +5,13 @@
   <extension id="extension.derived.hu.bme.mit.inf.dslreasoner.domains.transima.fam.type" point="org.eclipse.viatra.query.runtime.base.wellbehaving.derived.features">
     <wellbehaving-derived-feature classifier-name="Function" feature-name="type" package-nsUri="http://www.inf.mit.bme.hu/viatrasolver/example/fam"/>
   </extension>
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <!-- @generated FamMetamodel -->
-      <package
-            uri="http://www.inf.mit.bme.hu/viatrasolver/example/fam"
-            class="functionalarchitecture.FunctionalarchitecturePackage"
-            genModel="model/FamMetamodel.genmodel"/>
-   </extension>
+  <extension point="org.eclipse.emf.ecore.generated_package">
+    <!-- @generated FamMetamodel -->
+    <package class="functionalarchitecture.FunctionalarchitecturePackage" genModel="model/FamMetamodel.genmodel" uri="http://www.inf.mit.bme.hu/viatrasolver/example/fam"/>
+  </extension>
   <extension id="hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns" point="org.eclipse.viatra.query.runtime.queryspecification">
     <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns" id="hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns">
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.terminatorAndInformation"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.type"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.rootElements"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.parent"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.model"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.hasRoot"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.hasInt"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.hasLeaf"/>
     </group>
   </extension>
 </plugin>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Ecore.vql b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Ecore.vql
index 78525a35..16c24d05 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Ecore.vql
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Ecore.vql
@@ -11,6 +11,16 @@ pattern loopInInheritence(a: EClass) {
 	find directSupertype+(a,a);
 }
 
+pattern unsat_subpackage(a: EPackage, b: EPackage) {
+	EPackage.eSubpackages(a, b);
+}
+
+@Constraint(key={p}, severity="error", message="error")
+pattern unsat_loopInInheritance(p: EPackage) {
+	neg find unsat_subpackage(_, p);
+	neg find loopInInheritence(_);
+}
+
 pattern opposite(a:EReference, b: EReference) {
 	EReference.eOpposite(a,b);
 }
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/plugin.xml b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/plugin.xml
index 6eae8535..eddd482c 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/plugin.xml
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/plugin.xml
@@ -11,6 +11,8 @@
     <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Ecore" id="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Ecore">
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.directSupertype"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.loopInInheritence"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.unsat_subpackage"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.unsat_loopInInheritance"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.opposite"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.oppositeDifferentClass"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.alloyexamples.nonSymmetricOpposite"/>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore
index 0f8c77a1..70eab455 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore
@@ -54,3 +54,8 @@
 /.RootIsNotDir.java._trace
 /Dir.java
 /RootIsNotDir.java
+/.Unsat_loopInInheritance.java._trace
+/.Subpackage.java._trace
+/.Unsat_subpackage.java._trace
+/.Unsat_subpackageOrSelf.java._trace
+/.Unsat_topLevelPackageWithLoop.java._trace
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Unsat_loopInInheritance.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Unsat_loopInInheritance.java
new file mode 100644
index 00000000..83bd0f66
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Unsat_loopInInheritance.java
@@ -0,0 +1,566 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Ecore.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.alloyexamples;
+
+import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.LoopInInheritence;
+import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Unsat_subpackage;
+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.emf.ecore.EPackage;
+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.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.NegativePatternCall;
+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>
+ *         {@literal @}Constraint(key={p}, severity="error", message="error")
+ *         pattern unsat_loopInInheritance(p: EPackage) {
+ *         	neg find unsat_subpackage(_, p);
+ *         	neg find loopInInheritence(_);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class Unsat_loopInInheritance extends BaseGeneratedEMFQuerySpecification<Unsat_loopInInheritance.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.unsat_loopInInheritance 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 EPackage fP;
+    
+    private static List<String> parameterNames = makeImmutableList("p");
+    
+    private Match(final EPackage pP) {
+      this.fP = pP;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "p": return this.fP;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fP;
+          default: return null;
+      }
+    }
+    
+    public EPackage getP() {
+      return this.fP;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("p".equals(parameterName) ) {
+          this.fP = (EPackage) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setP(final EPackage pP) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fP = pP;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.unsat_loopInInheritance";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return Unsat_loopInInheritance.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fP};
+    }
+    
+    @Override
+    public Unsat_loopInInheritance.Match toImmutable() {
+      return isMutable() ? newMatch(fP) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"p\"=" + prettyPrintValue(fP));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fP);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof Unsat_loopInInheritance.Match)) {
+          Unsat_loopInInheritance.Match other = (Unsat_loopInInheritance.Match) obj;
+          return Objects.equals(fP, other.fP);
+      } 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 Unsat_loopInInheritance specification() {
+      return Unsat_loopInInheritance.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 Unsat_loopInInheritance.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 pP the fixed value of pattern parameter p, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static Unsat_loopInInheritance.Match newMutableMatch(final EPackage pP) {
+      return new Mutable(pP);
+    }
+    
+    /**
+     * 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 pP the fixed value of pattern parameter p, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static Unsat_loopInInheritance.Match newMatch(final EPackage pP) {
+      return new Immutable(pP);
+    }
+    
+    private static final class Mutable extends Unsat_loopInInheritance.Match {
+      Mutable(final EPackage pP) {
+        super(pP);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends Unsat_loopInInheritance.Match {
+      Immutable(final EPackage pP) {
+        super(pP);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.unsat_loopInInheritance 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>
+   * {@literal @}Constraint(key={p}, severity="error", message="error")
+   * pattern unsat_loopInInheritance(p: EPackage) {
+   * 	neg find unsat_subpackage(_, p);
+   * 	neg find loopInInheritence(_);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see Unsat_loopInInheritance
+   * 
+   */
+  public static class Matcher extends BaseMatcher<Unsat_loopInInheritance.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 Unsat_loopInInheritance.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 Unsat_loopInInheritance.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_P = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(Unsat_loopInInheritance.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 pP the fixed value of pattern parameter p, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<Unsat_loopInInheritance.Match> getAllMatches(final EPackage pP) {
+      return rawStreamAllMatches(new Object[]{pP}).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 pP the fixed value of pattern parameter p, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<Unsat_loopInInheritance.Match> streamAllMatches(final EPackage pP) {
+      return rawStreamAllMatches(new Object[]{pP});
+    }
+    
+    /**
+     * 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 pP the fixed value of pattern parameter p, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<Unsat_loopInInheritance.Match> getOneArbitraryMatch(final EPackage pP) {
+      return rawGetOneArbitraryMatch(new Object[]{pP});
+    }
+    
+    /**
+     * 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 pP the fixed value of pattern parameter p, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final EPackage pP) {
+      return rawHasMatch(new Object[]{pP});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pP the fixed value of pattern parameter p, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final EPackage pP) {
+      return rawCountMatches(new Object[]{pP});
+    }
+    
+    /**
+     * 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 pP the fixed value of pattern parameter p, 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 EPackage pP, final Consumer<? super Unsat_loopInInheritance.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pP}, 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 pP the fixed value of pattern parameter p, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public Unsat_loopInInheritance.Match newMatch(final EPackage pP) {
+      return Unsat_loopInInheritance.Match.newMatch(pP);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for p.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<EPackage> rawStreamAllValuesOfp(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_P, parameters).map(EPackage.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for p.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EPackage> getAllValuesOfp() {
+      return rawStreamAllValuesOfp(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for p.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<EPackage> streamAllValuesOfp() {
+      return rawStreamAllValuesOfp(emptyArray());
+    }
+    
+    @Override
+    protected Unsat_loopInInheritance.Match tupleToMatch(final Tuple t) {
+      try {
+          return Unsat_loopInInheritance.Match.newMatch((EPackage) t.get(POSITION_P));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Unsat_loopInInheritance.Match arrayToMatch(final Object[] match) {
+      try {
+          return Unsat_loopInInheritance.Match.newMatch((EPackage) match[POSITION_P]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Unsat_loopInInheritance.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return Unsat_loopInInheritance.Match.newMutableMatch((EPackage) match[POSITION_P]);
+      } 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<Unsat_loopInInheritance.Matcher> querySpecification() {
+      return Unsat_loopInInheritance.instance();
+    }
+  }
+  
+  private Unsat_loopInInheritance() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static Unsat_loopInInheritance instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected Unsat_loopInInheritance.Matcher instantiate(final ViatraQueryEngine engine) {
+    return Unsat_loopInInheritance.Matcher.on(engine);
+  }
+  
+  @Override
+  public Unsat_loopInInheritance.Matcher instantiate() {
+    return Unsat_loopInInheritance.Matcher.create();
+  }
+  
+  @Override
+  public Unsat_loopInInheritance.Match newEmptyMatch() {
+    return Unsat_loopInInheritance.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public Unsat_loopInInheritance.Match newMatch(final Object... parameters) {
+    return Unsat_loopInInheritance.Match.newMatch((org.eclipse.emf.ecore.EPackage) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link Unsat_loopInInheritance} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link Unsat_loopInInheritance#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final Unsat_loopInInheritance INSTANCE = new Unsat_loopInInheritance();
+    
+    /**
+     * 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 Unsat_loopInInheritance.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_p = new PParameter("p", "org.eclipse.emf.ecore.EPackage", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.eclipse.org/emf/2002/Ecore", "EPackage")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_p);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.unsat_loopInInheritance";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("p");
+    }
+    
+    @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_p = body.getOrCreateVariableByName("p");
+          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
+          PVariable var___1_ = body.getOrCreateVariableByName("_<1>");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_p), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EPackage")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_p, parameter_p)
+          ));
+          // 	neg find unsat_subpackage(_, p)
+          new NegativePatternCall(body, Tuples.flatTupleOf(var___0_, var_p), Unsat_subpackage.instance().getInternalQueryRepresentation());
+          // 	neg find loopInInheritence(_)
+          new NegativePatternCall(body, Tuples.flatTupleOf(var___1_), LoopInInheritence.instance().getInternalQueryRepresentation());
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("p")
+                              }));
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("message", "error");
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Unsat_subpackage.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Unsat_subpackage.java
new file mode 100644
index 00000000..a9c8aed8
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Unsat_subpackage.java
@@ -0,0 +1,704 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Ecore.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.alloyexamples;
+
+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.emf.ecore.EPackage;
+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.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 unsat_subpackage(a: EPackage, b: EPackage) {
+ *         	EPackage.eSubpackages(a, b);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class Unsat_subpackage extends BaseGeneratedEMFQuerySpecification<Unsat_subpackage.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.unsat_subpackage 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 EPackage fA;
+    
+    private EPackage fB;
+    
+    private static List<String> parameterNames = makeImmutableList("a", "b");
+    
+    private Match(final EPackage pA, final EPackage pB) {
+      this.fA = pA;
+      this.fB = pB;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "a": return this.fA;
+          case "b": return this.fB;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fA;
+          case 1: return this.fB;
+          default: return null;
+      }
+    }
+    
+    public EPackage getA() {
+      return this.fA;
+    }
+    
+    public EPackage getB() {
+      return this.fB;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("a".equals(parameterName) ) {
+          this.fA = (EPackage) newValue;
+          return true;
+      }
+      if ("b".equals(parameterName) ) {
+          this.fB = (EPackage) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setA(final EPackage pA) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fA = pA;
+    }
+    
+    public void setB(final EPackage pB) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fB = pB;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.unsat_subpackage";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return Unsat_subpackage.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fA, fB};
+    }
+    
+    @Override
+    public Unsat_subpackage.Match toImmutable() {
+      return isMutable() ? newMatch(fA, fB) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"a\"=" + prettyPrintValue(fA) + ", ");
+      result.append("\"b\"=" + prettyPrintValue(fB));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fA, fB);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof Unsat_subpackage.Match)) {
+          Unsat_subpackage.Match other = (Unsat_subpackage.Match) obj;
+          return Objects.equals(fA, other.fA) && Objects.equals(fB, other.fB);
+      } 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 Unsat_subpackage specification() {
+      return Unsat_subpackage.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 Unsat_subpackage.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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static Unsat_subpackage.Match newMutableMatch(final EPackage pA, final EPackage pB) {
+      return new Mutable(pA, pB);
+    }
+    
+    /**
+     * 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static Unsat_subpackage.Match newMatch(final EPackage pA, final EPackage pB) {
+      return new Immutable(pA, pB);
+    }
+    
+    private static final class Mutable extends Unsat_subpackage.Match {
+      Mutable(final EPackage pA, final EPackage pB) {
+        super(pA, pB);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends Unsat_subpackage.Match {
+      Immutable(final EPackage pA, final EPackage pB) {
+        super(pA, pB);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.unsat_subpackage 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 unsat_subpackage(a: EPackage, b: EPackage) {
+   * 	EPackage.eSubpackages(a, b);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see Unsat_subpackage
+   * 
+   */
+  public static class Matcher extends BaseMatcher<Unsat_subpackage.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 Unsat_subpackage.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 Unsat_subpackage.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_A = 0;
+    
+    private static final int POSITION_B = 1;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(Unsat_subpackage.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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<Unsat_subpackage.Match> getAllMatches(final EPackage pA, final EPackage pB) {
+      return rawStreamAllMatches(new Object[]{pA, pB}).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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<Unsat_subpackage.Match> streamAllMatches(final EPackage pA, final EPackage pB) {
+      return rawStreamAllMatches(new Object[]{pA, pB});
+    }
+    
+    /**
+     * 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<Unsat_subpackage.Match> getOneArbitraryMatch(final EPackage pA, final EPackage pB) {
+      return rawGetOneArbitraryMatch(new Object[]{pA, pB});
+    }
+    
+    /**
+     * 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final EPackage pA, final EPackage pB) {
+      return rawHasMatch(new Object[]{pA, pB});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final EPackage pA, final EPackage pB) {
+      return rawCountMatches(new Object[]{pA, pB});
+    }
+    
+    /**
+     * 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, 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 EPackage pA, final EPackage pB, final Consumer<? super Unsat_subpackage.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pA, pB}, 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 pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public Unsat_subpackage.Match newMatch(final EPackage pA, final EPackage pB) {
+      return Unsat_subpackage.Match.newMatch(pA, pB);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<EPackage> rawStreamAllValuesOfa(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_A, parameters).map(EPackage.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EPackage> getAllValuesOfa() {
+      return rawStreamAllValuesOfa(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<EPackage> streamAllValuesOfa() {
+      return rawStreamAllValuesOfa(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * </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<EPackage> streamAllValuesOfa(final Unsat_subpackage.Match partialMatch) {
+      return rawStreamAllValuesOfa(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * </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<EPackage> streamAllValuesOfa(final EPackage pB) {
+      return rawStreamAllValuesOfa(new Object[]{null, pB});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EPackage> getAllValuesOfa(final Unsat_subpackage.Match partialMatch) {
+      return rawStreamAllValuesOfa(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EPackage> getAllValuesOfa(final EPackage pB) {
+      return rawStreamAllValuesOfa(new Object[]{null, pB}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<EPackage> rawStreamAllValuesOfb(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_B, parameters).map(EPackage.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EPackage> getAllValuesOfb() {
+      return rawStreamAllValuesOfb(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<EPackage> streamAllValuesOfb() {
+      return rawStreamAllValuesOfb(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * </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<EPackage> streamAllValuesOfb(final Unsat_subpackage.Match partialMatch) {
+      return rawStreamAllValuesOfb(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * </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<EPackage> streamAllValuesOfb(final EPackage pA) {
+      return rawStreamAllValuesOfb(new Object[]{pA, null});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EPackage> getAllValuesOfb(final Unsat_subpackage.Match partialMatch) {
+      return rawStreamAllValuesOfb(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EPackage> getAllValuesOfb(final EPackage pA) {
+      return rawStreamAllValuesOfb(new Object[]{pA, null}).collect(Collectors.toSet());
+    }
+    
+    @Override
+    protected Unsat_subpackage.Match tupleToMatch(final Tuple t) {
+      try {
+          return Unsat_subpackage.Match.newMatch((EPackage) t.get(POSITION_A), (EPackage) t.get(POSITION_B));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Unsat_subpackage.Match arrayToMatch(final Object[] match) {
+      try {
+          return Unsat_subpackage.Match.newMatch((EPackage) match[POSITION_A], (EPackage) match[POSITION_B]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Unsat_subpackage.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return Unsat_subpackage.Match.newMutableMatch((EPackage) match[POSITION_A], (EPackage) match[POSITION_B]);
+      } 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<Unsat_subpackage.Matcher> querySpecification() {
+      return Unsat_subpackage.instance();
+    }
+  }
+  
+  private Unsat_subpackage() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static Unsat_subpackage instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected Unsat_subpackage.Matcher instantiate(final ViatraQueryEngine engine) {
+    return Unsat_subpackage.Matcher.on(engine);
+  }
+  
+  @Override
+  public Unsat_subpackage.Matcher instantiate() {
+    return Unsat_subpackage.Matcher.create();
+  }
+  
+  @Override
+  public Unsat_subpackage.Match newEmptyMatch() {
+    return Unsat_subpackage.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public Unsat_subpackage.Match newMatch(final Object... parameters) {
+    return Unsat_subpackage.Match.newMatch((org.eclipse.emf.ecore.EPackage) parameters[0], (org.eclipse.emf.ecore.EPackage) parameters[1]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link Unsat_subpackage} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link Unsat_subpackage#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final Unsat_subpackage INSTANCE = new Unsat_subpackage();
+    
+    /**
+     * 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 Unsat_subpackage.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_a = new PParameter("a", "org.eclipse.emf.ecore.EPackage", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.eclipse.org/emf/2002/Ecore", "EPackage")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_b = new PParameter("b", "org.eclipse.emf.ecore.EPackage", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.eclipse.org/emf/2002/Ecore", "EPackage")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_a, parameter_b);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.unsat_subpackage";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("a","b");
+    }
+    
+    @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_a = body.getOrCreateVariableByName("a");
+          PVariable var_b = body.getOrCreateVariableByName("b");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_a), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EPackage")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_b), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EPackage")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_a, parameter_a),
+             new ExportedParameter(body, var_b, parameter_b)
+          ));
+          // 	EPackage.eSubpackages(a, b)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_a), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EPackage")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_a, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/emf/2002/Ecore", "EPackage", "eSubpackages")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EPackage")));
+          new Equality(body, var__virtual_0_, var_b);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/internal/.gitignore b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/internal/.gitignore
new file mode 100644
index 00000000..995169ff
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/internal/.gitignore
@@ -0,0 +1,4 @@
+/.EcoreAll.java._trace
+/.SubpackageOrSelf.java._trace
+/.Subpackage.java._trace
+/.TopLevelPackageWithLoop.java._trace
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/plugin.xml b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/plugin.xml
index b0b77996..fe1af62e 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/plugin.xml
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/plugin.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?><?eclipse version="3.0"?><!--
 --><plugin>
-  <extension point="org.eclipse.emf.ecore.generated_package">
-    <!-- @generated satellite -->
-    <package class="satellite.SatellitePackage" genModel="model/satellite.genmodel" uri="http://www.example.org/satellite"/>
-  </extension>
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated satellite -->
+      <package
+            uri="http://www.example.org/satellite"
+            class="satellite.SatellitePackage"
+            genModel="model/satellite.genmodel"/>
+   </extension>
   <extension id="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SatelliteQueries" point="org.eclipse.viatra.query.runtime.queryspecification">
     <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SatelliteQueries" id="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SatelliteQueries">
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkDoesNotStartAtContainingElement"/>
@@ -11,6 +14,7 @@
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.roundStationNetworkUHF"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.notEnoughInterferometryPayloads"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.noLinkToGroundStation"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.unsat_linkToGroundStation"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.noPotentialLinkToGroundStation"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLoop"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.incompatibleSourceAndTargetBand"/>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
index 1f83a3b0..ba12bbda 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
@@ -59,6 +59,19 @@ pattern noLinkToGroundStation(Spacecraft : Spacecraft) {
 	neg find indirectCommunicationLink(Spacecraft, GroundStation);
 }
 
+//@Constraint(severity = "error", key = {Spacecraft}, message = "UNSAT")
+//pattern unsat_linkToGroundStation(Spacecraft : Spacecraft) {
+//	ConstellationMission.groundStationNetwork(Mission, GroundStation);
+//	ConstellationMission.spacecraft(Mission, Spacecraft);
+//	find indirectCommunicationLink(Spacecraft, GroundStation);
+//}
+
+@Constraint(severity = "error", key = {Mission}, message = "UNSAT")
+pattern unsat_linkToGroundStation(Mission : InterferometryMission) {
+	InterferometryMission(Mission);
+	neg find noLinkToGroundStation(_);
+}
+
 @Constraint(severity = "error", key = {Spacecraft},
 	message = "Spacecraft has no potential communication path to the ground station.")
 pattern noPotentialLinkToGroundStation(Spacecraft : Spacecraft) {
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 7bf4a20b..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
@@ -8,6 +8,7 @@
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.entryInRegion"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.noEntryInRegion"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.multipleEntryInRegion"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.unsat_multipleEntryInRegion"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.transition"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.transitionFrom"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.transitionTo"/>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/queries/hu/bme/mit/inf/dslreasoner/partialsnapshot_mavo/yakindu/patterns.vql b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/queries/hu/bme/mit/inf/dslreasoner/partialsnapshot_mavo/yakindu/patterns.vql
index 98a10cde..49fb5b2f 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/queries/hu/bme/mit/inf/dslreasoner/partialsnapshot_mavo/yakindu/patterns.vql
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/queries/hu/bme/mit/inf/dslreasoner/partialsnapshot_mavo/yakindu/patterns.vql
@@ -22,6 +22,12 @@ pattern multipleEntryInRegion(r : Region) {
 	e1 != e2;
 }
 
+@Constraint(severity="error", message="error", key = {sct})
+pattern unsat_multipleEntryInRegion(sct : Statechart) {
+	Statechart(sct);
+	neg find multipleEntryInRegion(_);
+}
+
 pattern transition(t : Transition, src : Vertex, trg : Vertex) {
 	Transition.source(t, src);
 	Transition.target(t, trg);
@@ -197,6 +203,11 @@ pattern SynchronizedRegionDoesNotHaveMultipleRegions(s : Synchronization, v : Ve
 	neg find hasMultipleRegions(c);
 }
 
+//@Constraint(severity="error", message="error", key = {sct})
+//pattern unsat_SynchronizedRegionDoesNotHaveMultipleRegions(sct : Statechart) {
+//	Statechart(sct);
+//	neg find SynchronizedRegionDoesNotHaveMultipleRegions(_, _);
+//}
 
 pattern hasMultipleRegions(composite: CompositeElement) {
 	CompositeElement.regions(composite,region1);
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/.classpath b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/.classpath
index de68b5f7..25b7f16f 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/.classpath
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/.classpath
@@ -1,11 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="xtend-gen"/>
-	<classpathentry kind="src" path="queries"/>
-	<classpathentry kind="src" path="vql-gen"/>
-	<classpathentry exported="true" kind="lib" path="lib/alloy4.2_2015-02-22.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="xtend-gen"/>
+	<classpathentry kind="src" path="queries"/>
+	<classpathentry kind="src" path="vql-gen"/>
+	<classpathentry exported="true" kind="lib" path="lib/alloy4.2_2015-02-22.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="hu.bme.mit.inf.dlsreasoner.alloy.reasoner/lib"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/META-INF/MANIFEST.MF b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/META-INF/MANIFEST.MF
index b944302b..75581def 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/META-INF/MANIFEST.MF
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/META-INF/MANIFEST.MF
@@ -20,7 +20,8 @@ Require-Bundle: com.google.guava,
  org.eclipse.viatra.query.runtime.base.itc;bundle-version="1.3.0",
  hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",
  org.eclipse.viatra.query.runtime;bundle-version="2.0.0"
-Import-Package: org.apache.log4j;version="1.2.15"
-Automatic-Module-Name: hu.bme.mit.inf.dlsreasoner.alloy.reasoner
-Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+Bundle-NativeCode: libminisat.so;osname=Linux;processor=x86_64
+Automatic-Module-Name: hu.bme.mit.inf.dlsreasoner.alloy.reasoner
+Import-Package: org.apache.log4j;version="1.2.15"
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/NeighbourhoodBasedStateCoderFactory.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/NeighbourhoodBasedStateCoderFactory.xtend
index 5e442ca7..f19ac30f 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/NeighbourhoodBasedStateCoderFactory.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/statecoder/NeighbourhoodBasedStateCoderFactory.xtend
@@ -59,15 +59,14 @@ class NeighbourhoodBasedPartialInterpretationStateCoder<ModelRep, NodeRep> exten
 	override doCreateActivationCode(IPatternMatch match) {
 		val size = match.specification.parameters.size
 		val res = new ArrayList(size)
-		var int index = 0
 		var int equivalenceHash = 0
 		val prime = 31
 
-		while (index < size) {
-			res.add(getCode(match.get(index)))
-			index++
+		for (var int index = 0; index < size; index++) {
+			val matchArgument = match.get(index)
+			res.add(getCode(matchArgument))
 			for (var i = 0; i < index; i++) {
-				val number = if (match.get(index) === match.get(i)) {
+				val number = if (matchArgument === match.get(i)) {
 						1
 					} else {
 						0
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend
index 6f38d261..c0a71c85 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend
@@ -55,7 +55,7 @@ class ViatraReasonerConfiguration extends LogicSolverConfiguration {
 	 */
 	public var SearchSpaceConstraint searchSpaceConstraints = new SearchSpaceConstraint
 
-	public var ScopePropagatorStrategy scopePropagatorStrategy = new ScopePropagatorStrategy.Polyhedral(
+	public var ScopePropagatorStrategy scopePropagatorStrategy = ScopePropagatorStrategy.Polyhedral(
 		PolyhedralScopePropagatorConstraints.Relational, PolyhedralScopePropagatorSolver.Clp)
 	
 	public var List<LinearTypeConstraintHint> hints = newArrayList
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/configs/FAM_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json b/Tests/hu.bme.mit.inf.dslreasoner.run/configs/FAM_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json
deleted file mode 100644
index 1e2d4dd4..00000000
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/configs/FAM_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"inputPath": "initialModels",
-	"outputPath": "outputModels",
-	"timeout": 1200,
-	"saveModels": true,
-	"warmupIterations": 0,
-	"iterations": 5,
-	"domain": "FAM",
-	"scope": "none",
-	"sizes": [500],
-	"solver": "ViatraSolver",
-	"scopePropagator": "polyhedral",
-	"propagatedConstraints": "hints",
-	"polyhedronSolver": "Clp",
-	"scopeHeuristics": "polyhedral"
-}
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/configs/Yakindu.json b/Tests/hu.bme.mit.inf.dslreasoner.run/configs/Yakindu.json
new file mode 100644
index 00000000..b602f2fe
--- /dev/null
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/configs/Yakindu.json
@@ -0,0 +1,13 @@
+{
+	"inputPath": "initialModels",
+	"outputPath": "outputModels",
+	"timeout": 300,
+	"saveModels": true,
+	"saveTemporaryFiles": false,
+	"warmupIterations": 0,
+	"iterations": 30,
+	"domain": "Yakindu",
+	"scope": "unsat",
+	"sizes": [20],
+	"solver": "AlloySolver"
+}
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/configs/Yakindu_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json b/Tests/hu.bme.mit.inf.dslreasoner.run/configs/Yakindu_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json
deleted file mode 100644
index b4d51684..00000000
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/configs/Yakindu_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"inputPath": "initialModels",
-	"outputPath": "outputModels",
-	"timeout": 1200,
-	"saveModels": false,
-	"saveTemporaryFiles": true,
-	"warmupIterations": 0,
-	"iterations": 5,
-	"domain": "Yakindu",
-	"scope": "none",
-	"sizes": [100],
-	"solver": "ViatraSolver",
-	"scopePropagator": "polyhedral",
-	"propagatedConstraints": "hints",
-	"polyhedronSolver": "Clp",
-	"scopeHeuristic": "polyhedral"
-}
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/configs/ecore.json b/Tests/hu.bme.mit.inf.dslreasoner.run/configs/ecore.json
new file mode 100644
index 00000000..36fb0ea2
--- /dev/null
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/configs/ecore.json
@@ -0,0 +1,17 @@
+{
+	"inputPath": "initialModels",
+	"outputPath": "outputModels",
+	"timeout": 300,
+	"saveModels": true,
+	"saveTemporaryFiles": false,
+	"warmupIterations": 0,
+	"iterations": 1,
+	"domain": "ecoreUnsat",
+	"scope": "none",
+	"sizes": [5, 10, 20, 30, 40, 50],
+	"solver": "ViatraSolver",
+	"scopePropagator": "polyhedral",
+	"propagatedConstraints": "hints",
+	"polyhedronSolver": "Clp",
+	"scopeHeuristic": "polyhedral"
+}
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/configs/ecore_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json b/Tests/hu.bme.mit.inf.dslreasoner.run/configs/ecore_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json
deleted file mode 100644
index 72e97957..00000000
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/configs/ecore_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"inputPath": "initialModels",
-	"outputPath": "outputModels",
-	"timeout": 1200,
-	"saveModels": true,
-	"warmupIterations": 0,
-	"iterations": 5,
-	"domain": "ecore",
-	"scope": "quantiles",
-	"sizes": [50],
-	"solver": "ViatraSolver",
-	"scopePropagator": "polyhedral",
-	"propagatedConstraints": "hints",
-	"polyhedronSolver": "Clp",
-	"scopeHeuristic": "polyhedral"
-}
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/configs/fs_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json b/Tests/hu.bme.mit.inf.dslreasoner.run/configs/fs_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json
deleted file mode 100644
index a7e29a22..00000000
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/configs/fs_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"inputPath": "initialModels",
-	"outputPath": "outputModels",
-	"timeout": 1200,
-	"saveModels": true,
-	"warmupIterations": 1,
-	"iterations": 1,
-	"domain": "fs",
-	"scope": "none",
-	"sizes": [50, 100, 150, 200, 250, 300, 350, 400, 450, 500],
-	"solver": "ViatraSolver",
-	"scopePropagator": "polyhedral",
-	"propagatedConstraints": "hints",
-	"polyhedronSolver": "Clp",
-	"scopeHeuristic": "polyhedral"
-}
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/configs/satellite.json b/Tests/hu.bme.mit.inf.dslreasoner.run/configs/satellite.json
new file mode 100644
index 00000000..16abb5d0
--- /dev/null
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/configs/satellite.json
@@ -0,0 +1,17 @@
+{
+	"inputPath": "initialModels",
+	"outputPath": "outputModels",
+	"timeout": 300,
+	"saveModels": true,
+	"saveTemporaryFiles": false,
+	"warmupIterations": 0,
+	"iterations": 30,
+	"domain": "satelliteUnsat",
+	"scope": "none",
+	"sizes": [10],
+	"solver": "ViatraSolver",
+	"scopePropagator": "polyhedral",
+	"propagatedConstraints": "hints",
+	"polyhedronSolver": "Clp",
+	"scopeHeuristic": "polyhedral"
+}
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/configs/satellite_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json b/Tests/hu.bme.mit.inf.dslreasoner.run/configs/satellite_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json
deleted file mode 100644
index d5469948..00000000
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/configs/satellite_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"inputPath": "initialModels",
-	"outputPath": "outputModels",
-	"timeout": 120,
-	"saveModels": true,
-	"saveTemporaryFiles": true,
-	"warmupIterations": 0,
-	"iterations": 1,
-	"domain": "Yakindu",
-	"scope": "quantiles",
-	"sizes": [10, 20, 30, 40, 50, 60, 70, 80, 90, 100],
-	"solver": "ViatraSolver",
-	"scopePropagator": "polyhedral",
-	"propagatedConstraints": "hints",
-	"polyhedronSolver": "Clp",
-	"scopeHeuristic": "polyhedral"
-}
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend
index 1be03eed..bf9ca274 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend
@@ -40,6 +40,8 @@ class TypeQuantiles {
 }
 
 abstract class MetamodelLoader {
+	public static val UNSAT_PREFIX = "unsat_"
+	
 	protected val ReasonerWorkspace workspace
 
 	new(ReasonerWorkspace workspace) {
@@ -61,6 +63,10 @@ abstract class MetamodelLoader {
 	def Map<String, TypeQuantiles> getTypeQuantiles() {
 		emptyMap
 	}
+	
+	def Map<String, TypeQuantiles> getUnsatTypeQuantiles() {
+		throw new UnsupportedOperationException("This domain has no type quantiles for unsatisfiable problems")
+	}
 
 	def List<LinearTypeConstraintHint> getHints(Ecore2Logic ecore2Logic, Ecore2Logic_Trace trace) {
 		emptyList
@@ -136,9 +142,15 @@ class YakinduLoader extends MetamodelLoader {
 	public static val patternsWithComplexStates = #["outgoingFromExit", "outgoingFromFinal", "choiceHasNoOutgoing",
 		"choiceHasNoIncoming"]
 
+	val boolean satisfiable	
+
 	new(ReasonerWorkspace workspace) {
+		this(workspace, true)
+	}
+
+	new(ReasonerWorkspace workspace, boolean satisfiable) {
 		super(workspace)
-		YakindummPackage.eINSTANCE.eClass
+		this.satisfiable = satisfiable
 	}
 
 	def setUseSynchronization(boolean useSynchronization) {
@@ -173,6 +185,8 @@ class YakinduLoader extends MetamodelLoader {
 			useSynchInThisLoad || !patternsWithSynchronization.exists[spec.fullyQualifiedName.endsWith(it)]
 		].filter [ spec |
 			useComplexStates || !patternsWithComplexStates.exists[spec.fullyQualifiedName.endsWith(it)]
+		].filter [
+			!satisfiable || !it.simpleName.startsWith(UNSAT_PREFIX)
 		].toList
 		val wfPatterns = patterns.filter[it.allAnnotations.exists[it.name == "Constraint"]].toSet
 		val derivedFeatures = new LinkedHashMap
@@ -213,6 +227,19 @@ class YakinduLoader extends MetamodelLoader {
 			"Transition" -> new TypeQuantiles(0.581632653061224, 0.645161290322581)
 		}
 	}
+	
+	override getUnsatTypeQuantiles() {
+		#{
+			"Choice" -> new TypeQuantiles(0.118279569892473, 0.154020979020979),
+			"Entry" -> new TypeQuantiles(0.2, 0.4),
+			"Exit" -> new TypeQuantiles(0, 0),
+			"FinalState" -> new TypeQuantiles(0, 0),
+			"Region" -> new TypeQuantiles(0.0294117647058824, 0.0633258678611422),
+			"State" -> new TypeQuantiles(0.132023636740618, 0.175925925925926),
+//			"Statechart" -> new TypeQuantiles(0.00961538461538462, 0.010752688172043),
+			"Transition" -> new TypeQuantiles(0.581632653061224, 0.645161290322581)
+		}
+	}
 
 	override getHints(Ecore2Logic ecore2Logic, Ecore2Logic_Trace trace) {
 		#[new SGraphHint(ecore2Logic, trace)]
@@ -276,9 +303,15 @@ class FileSystemLoader extends MetamodelLoader {
 }
 
 class EcoreLoader extends MetamodelLoader {
+	val boolean satisfiable	
 
 	new(ReasonerWorkspace workspace) {
+		this(workspace, true)
+	}
+
+	new(ReasonerWorkspace workspace, boolean satisfiable) {
 		super(workspace)
+		this.satisfiable = satisfiable
 	}
 
 	override loadMetamodel() {
@@ -307,7 +340,12 @@ class EcoreLoader extends MetamodelLoader {
 	override loadQueries(EcoreMetamodelDescriptor metamodel) {
 		val patternGroup = Ecore.instance
 		val patterns = patternGroup.specifications.toList
-		val wfPatterns = patterns.filter[it.allAnnotations.exists[it.name == "Constraint"]].toSet
+		val allWfPatterns = patterns.filter[it.allAnnotations.exists[it.name == "Constraint"]].toSet
+		val wfPatterns = if (satisfiable) {
+			allWfPatterns.filter[!it.simpleName.startsWith(UNSAT_PREFIX)].toSet
+		} else {
+			allWfPatterns
+		}
 		val derivedFeatures = new HashMap
 		return new ViatraQuerySetDescriptor(
 			patterns,
@@ -346,9 +384,15 @@ class EcoreLoader extends MetamodelLoader {
 }
 
 class SatelliteLoader extends MetamodelLoader {
+	val boolean satisfiable	
 
 	new(ReasonerWorkspace workspace) {
+		this(workspace, true)
+	}
+
+	new(ReasonerWorkspace workspace, boolean satisfiable) {
 		super(workspace)
+		this.satisfiable = satisfiable
 	}
 
 	override loadMetamodel() {
@@ -371,7 +415,9 @@ class SatelliteLoader extends MetamodelLoader {
 
 	override loadQueries(EcoreMetamodelDescriptor metamodel) {
 		val i = SatelliteQueriesAll.instance
-		val patterns = i.specifications.toList
+		val patterns = i.specifications.filter [
+			!satisfiable || !it.simpleName.startsWith(UNSAT_PREFIX)
+		].toList
 		val wfPatterns = patterns.filter[it.allAnnotations.exists[it.name == "Constraint"]].toSet
 		val derivedFeatures = new LinkedHashMap
 		val res = new ViatraQuerySetDescriptor(
@@ -404,4 +450,15 @@ class SatelliteLoader extends MetamodelLoader {
 		}
 	}
 
+	override getUnsatTypeQuantiles() {
+		#{
+			"CubeSat3U" -> new TypeQuantiles(0.1, 0.25),
+			"CubeSat6U" -> new TypeQuantiles(0.1, 0.25),
+			"SmallSat" -> new TypeQuantiles(0.1, 0.25),
+			"UHFCommSubsystem" -> new TypeQuantiles(0.08, 0.1),
+			"XCommSubsystem" -> new TypeQuantiles(0, 0.1),
+			"KaCommSubsystem" -> new TypeQuantiles(0, 0.05),
+			"InterferometryPayload" -> new TypeQuantiles(0.15, 0.25)
+		}
+	}
 }
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/script/MeasurementScript.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/script/MeasurementScript.xtend
index 56a65091..f842afb5 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/script/MeasurementScript.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/script/MeasurementScript.xtend
@@ -29,19 +29,26 @@ class MeasurementScript {
 enum Domain {
 	fs,
 	ecore,
+	ecoreUnsat,
 	Yakindu,
+	YakinduUnsat,
 	FAM,
-	satellite
+	satellite,
+	satelliteUnsat
 }
 
 enum Scope {
 	none,
-	quantiles
+	quantiles,
+	upperOnly,
+	unsat,
+	exactly
 }
 
 enum Solver {
 	ViatraSolver,
-	AlloySolver
+	AlloySolver,
+	AlloyMiniSat
 }
 
 enum ScopePropagator {
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/script/MeasurementScriptRunner.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/script/MeasurementScriptRunner.xtend
index 1127f01a..973c3d13 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/script/MeasurementScriptRunner.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/script/MeasurementScriptRunner.xtend
@@ -54,6 +54,7 @@ import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguageStandalone
 import org.eclipse.viatra.query.runtime.api.ViatraQueryEngineOptions
 import org.eclipse.viatra.query.runtime.rete.matcher.ReteBackendFactory
 import org.eclipse.xtend.lib.annotations.Data
+import hu.bme.mit.inf.dlsreasoner.alloy.reasoner.AlloyBackendSolver
 
 class MeasurementScriptRunner {
 	static val MODEL_SIZE_GAP = 0
@@ -75,9 +76,12 @@ class MeasurementScriptRunner {
 		metamodelLoader = switch (script.domain) {
 			case fs: new FileSystemLoader(inputWorkspace)
 			case ecore: new EcoreLoader(inputWorkspace)
+			case ecoreUnsat: new EcoreLoader(inputWorkspace, false)
 			case Yakindu: new YakinduLoader(inputWorkspace) => [useSynchronization = false; useComplexStates = true]
+			case YakinduUnsat: new YakinduLoader(inputWorkspace, false) => [useSynchronization = false; useComplexStates = true]
 			case FAM: new FAMLoader(inputWorkspace)
 			case satellite: new SatelliteLoader(inputWorkspace)
+			case satelliteUnsat: new SatelliteLoader(inputWorkspace, false)
 			default: throw new IllegalArgumentException("Unsupported domain: " + script.domain)
 		}
 	}
@@ -191,15 +195,17 @@ class MeasurementScriptRunner {
 		config
 	}
 
-	private def createAlloyConfig() {
+	private def createAlloyConfig(AlloyBackendSolver backendSolver) {
 		val config = new AlloySolverConfiguration
+		config.solver = backendSolver
 		config
 	}
 
 	private def createConfig(int modelSize) {
 		val config = switch (solver : script.solver) {
 			case ViatraSolver: createViatraConfig()
-			case AlloySolver: createAlloyConfig()
+			case AlloySolver: createAlloyConfig(AlloyBackendSolver.SAT4J)
+			case AlloyMiniSat: createAlloyConfig(AlloyBackendSolver.MiniSatJNI)
 			default: throw new IllegalArgumentException("Unknown solver: " + solver)
 		}
 		config.solutionScope.numberOfRequiredSolutions = 1
@@ -243,7 +249,8 @@ class MeasurementScriptRunner {
 
 		val solver = switch (solver : script.solver) {
 			case ViatraSolver: new ViatraReasoner
-			case AlloySolver: new AlloySolver
+			case AlloySolver,
+			case AlloyMiniSat: new AlloySolver
 			default: throw new IllegalArgumentException("Unknown solver: " + solver)
 		}
 		val result = solver.solve(problem, config, outputWorkspace)
@@ -284,14 +291,31 @@ class MeasurementScriptRunner {
 		} else {
 			val numberOfKnownElements = knownElements.values.flatten.toSet.size
 			val newElementCount = modelSize - numberOfKnownElements
-			config.typeScopes.minNewElements = newElementCount
-			config.typeScopes.maxNewElements = newElementCount + MODEL_SIZE_GAP
+			switch (script.scope) {
+				case upperOnly:
+					config.typeScopes.maxNewElements = newElementCount + MODEL_SIZE_GAP
+				case exactly: {
+					config.typeScopes.minNewElements = newElementCount
+					config.typeScopes.maxNewElements = newElementCount
+				}
+				default: {
+					config.typeScopes.minNewElements = newElementCount
+					config.typeScopes.maxNewElements = newElementCount + MODEL_SIZE_GAP
+				}
+			}
 		}
-		switch (script.scope) {
-			case none:
+		switch (scope : script.scope) {
+			case none,
+			case exactly:
 				return
-			case quantiles: {
-				val quantiles = metamodelLoader.typeQuantiles
+			case quantiles,
+			case unsat,
+			case upperOnly: {
+				val quantiles = if (scope == Scope.unsat) {
+					metamodelLoader.unsatTypeQuantiles
+				} else {
+					metamodelLoader.typeQuantiles
+				}
 				for (eClassInScope : eClassMapper.allClassesInScope(trace)) {
 					val quantile = quantiles.get(eClassInScope.name)
 					if (quantile !== null) {
@@ -301,7 +325,9 @@ class MeasurementScriptRunner {
 						val lowCount = Math.floor(modelSize * quantile.low) as int
 						val highCount = Math.ceil((modelSize + MODEL_SIZE_GAP) * quantile.high) as int
 //						println('''«type.name» «lowCount» «highCount»''')
-						config.typeScopes.minNewElementsByType.put(type, Math.max(lowCount - currentCount, 0))
+						if (script.scope != Scope.upperOnly) {
+							config.typeScopes.minNewElementsByType.put(type, Math.max(lowCount - currentCount, 0))
+						}
 						config.typeScopes.maxNewElementsByType.put(type, highCount - currentCount)
 					}
 				}
-- 
cgit v1.2.3-54-g00ecf