Measurements WIP

24 files changed, 1254 insertions, 115 deletions

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)