4 files changed, 68 insertions, 46 deletions

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 70eab455..1e7d444f 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore
@@ -50,12 +50,3 @@
 /Opposite.java
 /OppositeDifferentClass.java
 /PatternContent.java
-/.Dir.java._trace
-/.RootIsNotDir.java._trace
-/Dir.java
-/RootIsNotDir.java
-/.Unsat_loopInInheritance.java._trace
-/.Subpackage.java._trace
-/.Unsat_subpackage.java._trace
-/.Unsat_subpackageOrSelf.java._trace
-/.Unsat_topLevelPackageWithLoop.java._trace
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Live.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Live.java
index 178ec37d..3f2448aa 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
@@ -706,7 +706,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", "FSObject")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "Dir")));
           new Equality(body, var__virtual_0_, var_l);
           bodies.add(body);
       }
@@ -725,7 +725,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", "FSObject")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "Dir")));
           new Equality(body, var__virtual_0_, var_root);
           //    find patternContent+(root,l)
           new BinaryTransitiveClosure(body, Tuples.flatTupleOf(var_root, var_l), PatternContent.instance().getInternalQueryRepresentation());
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 bd02fa5b..7c48b978 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,7 +3,6 @@
  */
 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;
@@ -44,7 +43,7 @@ import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
  * 
  * <p>Original source:
  *         <code><pre>
- *         pattern patternContent(o1: Dir, o2: FSObject) {
+ *         pattern patternContent(o1: FSObject, o2: FSObject) {
  *              Dir.contents(o1,o2);
  *         }
  * </pre></code>
@@ -68,13 +67,13 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
    * 
    */
   public static abstract class Match extends BasePatternMatch {
-    private Dir fO1;
+    private FSObject fO1;
     
     private FSObject fO2;
     
     private static List<String> parameterNames = makeImmutableList("o1", "o2");
     
-    private Match(final Dir pO1, final FSObject pO2) {
+    private Match(final FSObject pO1, final FSObject pO2) {
       this.fO1 = pO1;
       this.fO2 = pO2;
     }
@@ -97,7 +96,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
       }
     }
     
-    public Dir getO1() {
+    public FSObject getO1() {
       return this.fO1;
     }
     
@@ -109,7 +108,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 = (Dir) newValue;
+          this.fO1 = (FSObject) newValue;
           return true;
       }
       if ("o2".equals(parameterName) ) {
@@ -119,7 +118,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
       return false;
     }
     
-    public void setO1(final Dir pO1) {
+    public void setO1(final FSObject pO1) {
       if (!isMutable()) throw new java.lang.UnsupportedOperationException();
       this.fO1 = pO1;
     }
@@ -207,7 +206,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the new, mutable (partial) match object.
      * 
      */
-    public static PatternContent.Match newMutableMatch(final Dir pO1, final FSObject pO2) {
+    public static PatternContent.Match newMutableMatch(final FSObject pO1, final FSObject pO2) {
       return new Mutable(pO1, pO2);
     }
     
@@ -220,12 +219,12 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the (partial) match object.
      * 
      */
-    public static PatternContent.Match newMatch(final Dir pO1, final FSObject pO2) {
+    public static PatternContent.Match newMatch(final FSObject pO1, final FSObject pO2) {
       return new Immutable(pO1, pO2);
     }
     
     private static final class Mutable extends PatternContent.Match {
-      Mutable(final Dir pO1, final FSObject pO2) {
+      Mutable(final FSObject pO1, final FSObject pO2) {
         super(pO1, pO2);
       }
       
@@ -236,7 +235,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
     }
     
     private static final class Immutable extends PatternContent.Match {
-      Immutable(final Dir pO1, final FSObject pO2) {
+      Immutable(final FSObject pO1, final FSObject pO2) {
         super(pO1, pO2);
       }
       
@@ -258,7 +257,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
    * 
    * <p>Original source:
    * <code><pre>
-   * pattern patternContent(o1: Dir, o2: FSObject) {
+   * pattern patternContent(o1: FSObject, o2: FSObject) {
    *    Dir.contents(o1,o2);
    * }
    * </pre></code>
@@ -320,7 +319,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return matches represented as a Match object.
      * 
      */
-    public Collection<PatternContent.Match> getAllMatches(final Dir pO1, final FSObject pO2) {
+    public Collection<PatternContent.Match> getAllMatches(final FSObject pO1, final FSObject pO2) {
       return rawStreamAllMatches(new Object[]{pO1, pO2}).collect(Collectors.toSet());
     }
     
@@ -335,7 +334,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return a stream of matches represented as a Match object.
      * 
      */
-    public Stream<PatternContent.Match> streamAllMatches(final Dir pO1, final FSObject pO2) {
+    public Stream<PatternContent.Match> streamAllMatches(final FSObject pO1, final FSObject pO2) {
       return rawStreamAllMatches(new Object[]{pO1, pO2});
     }
     
@@ -347,7 +346,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 Dir pO1, final FSObject pO2) {
+    public Optional<PatternContent.Match> getOneArbitraryMatch(final FSObject pO1, final FSObject pO2) {
       return rawGetOneArbitraryMatch(new Object[]{pO1, pO2});
     }
     
@@ -359,7 +358,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 Dir pO1, final FSObject pO2) {
+    public boolean hasMatch(final FSObject pO1, final FSObject pO2) {
       return rawHasMatch(new Object[]{pO1, pO2});
     }
     
@@ -370,7 +369,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the number of pattern matches found.
      * 
      */
-    public int countMatches(final Dir pO1, final FSObject pO2) {
+    public int countMatches(final FSObject pO1, final FSObject pO2) {
       return rawCountMatches(new Object[]{pO1, pO2});
     }
     
@@ -383,7 +382,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 Dir pO1, final FSObject pO2, final Consumer<? super PatternContent.Match> processor) {
+    public boolean forOneArbitraryMatch(final FSObject pO1, final FSObject pO2, final Consumer<? super PatternContent.Match> processor) {
       return rawForOneArbitraryMatch(new Object[]{pO1, pO2}, processor);
     }
     
@@ -396,7 +395,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the (partial) match object.
      * 
      */
-    public PatternContent.Match newMatch(final Dir pO1, final FSObject pO2) {
+    public PatternContent.Match newMatch(final FSObject pO1, final FSObject pO2) {
       return PatternContent.Match.newMatch(pO1, pO2);
     }
     
@@ -405,8 +404,8 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    protected Stream<Dir> rawStreamAllValuesOfo1(final Object[] parameters) {
-      return rawStreamAllValues(POSITION_O1, parameters).map(Dir.class::cast);
+    protected Stream<FSObject> rawStreamAllValuesOfo1(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_O1, parameters).map(FSObject.class::cast);
     }
     
     /**
@@ -414,7 +413,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    public Set<Dir> getAllValuesOfo1() {
+    public Set<FSObject> getAllValuesOfo1() {
       return rawStreamAllValuesOfo1(emptyArray()).collect(Collectors.toSet());
     }
     
@@ -423,7 +422,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    public Stream<Dir> streamAllValuesOfo1() {
+    public Stream<FSObject> streamAllValuesOfo1() {
       return rawStreamAllValuesOfo1(emptyArray());
     }
     
@@ -437,7 +436,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the Stream of all values or empty set if there are no matches
      * 
      */
-    public Stream<Dir> streamAllValuesOfo1(final PatternContent.Match partialMatch) {
+    public Stream<FSObject> streamAllValuesOfo1(final PatternContent.Match partialMatch) {
       return rawStreamAllValuesOfo1(partialMatch.toArray());
     }
     
@@ -451,7 +450,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the Stream of all values or empty set if there are no matches
      * 
      */
-    public Stream<Dir> streamAllValuesOfo1(final FSObject pO2) {
+    public Stream<FSObject> streamAllValuesOfo1(final FSObject pO2) {
       return rawStreamAllValuesOfo1(new Object[]{null, pO2});
     }
     
@@ -460,7 +459,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    public Set<Dir> getAllValuesOfo1(final PatternContent.Match partialMatch) {
+    public Set<FSObject> getAllValuesOfo1(final PatternContent.Match partialMatch) {
       return rawStreamAllValuesOfo1(partialMatch.toArray()).collect(Collectors.toSet());
     }
     
@@ -469,7 +468,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
      * @return the Set of all values or empty set if there are no matches
      * 
      */
-    public Set<Dir> getAllValuesOfo1(final FSObject pO2) {
+    public Set<FSObject> getAllValuesOfo1(final FSObject pO2) {
       return rawStreamAllValuesOfo1(new Object[]{null, pO2}).collect(Collectors.toSet());
     }
     
@@ -524,7 +523,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 Dir pO1) {
+    public Stream<FSObject> streamAllValuesOfo2(final FSObject pO1) {
       return rawStreamAllValuesOfo2(new Object[]{pO1, null});
     }
     
@@ -542,14 +541,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 Dir pO1) {
+    public Set<FSObject> getAllValuesOfo2(final FSObject pO1) {
       return rawStreamAllValuesOfo2(new Object[]{pO1, null}).collect(Collectors.toSet());
     }
     
     @Override
     protected PatternContent.Match tupleToMatch(final Tuple t) {
       try {
-          return PatternContent.Match.newMatch((Dir) t.get(POSITION_O1), (FSObject) t.get(POSITION_O2));
+          return PatternContent.Match.newMatch((FSObject) t.get(POSITION_O1), (FSObject) t.get(POSITION_O2));
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in tuple not properly typed!",e);
           return null;
@@ -559,7 +558,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
     @Override
     protected PatternContent.Match arrayToMatch(final Object[] match) {
       try {
-          return PatternContent.Match.newMatch((Dir) match[POSITION_O1], (FSObject) match[POSITION_O2]);
+          return PatternContent.Match.newMatch((FSObject) match[POSITION_O1], (FSObject) match[POSITION_O2]);
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in array not properly typed!",e);
           return null;
@@ -569,7 +568,7 @@ public final class PatternContent extends BaseGeneratedEMFQuerySpecification<Pat
     @Override
     protected PatternContent.Match arrayToMatchMutable(final Object[] match) {
       try {
-          return PatternContent.Match.newMutableMatch((Dir) match[POSITION_O1], (FSObject) match[POSITION_O2]);
+          return PatternContent.Match.newMutableMatch((FSObject) match[POSITION_O1], (FSObject) match[POSITION_O2]);
       } catch(ClassCastException e) {
           LOGGER.error("Element(s) in array not properly typed!",e);
           return null;
@@ -620,7 +619,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.Dir) 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.FSObject) parameters[0], (hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject) parameters[1]);
   }
   
   /**
@@ -652,7 +651,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.Dir", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("FS", "Dir")), PParameterDirection.INOUT);
+    private final PParameter parameter_o1 = new PParameter("o1", "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("FS", "FSObject")), PParameterDirection.INOUT);
     
     private final PParameter parameter_o2 = new PParameter("o2", "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FSObject", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("FS", "FSObject")), PParameterDirection.INOUT);
     
@@ -685,7 +684,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", "Dir")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_o1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FSObject")));
           new TypeConstraint(body, Tuples.flatTupleOf(var_o2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FSObject")));
           body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
              new ExportedParameter(body, var_o1, parameter_o1),
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/util/.gitignore b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/util/.gitignore
new file mode 100644
index 00000000..4b17cd82
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/util/.gitignore
@@ -0,0 +1,32 @@
+/.ContentInNotLiveProcessor.java._trace
+/.ContentInNotLiveQuerySpecification.java._trace
+/.DirectSupertypeProcessor.java._trace
+/.DirectSupertypeQuerySpecification.java._trace
+/.LiveProcessor.java._trace
+/.LiveQuerySpecification.java._trace
+/.LoopInInheritenceProcessor.java._trace
+/.LoopInInheritenceQuerySpecification.java._trace
+/.NonSymmetricOppositeProcessor.java._trace
+/.NonSymmetricOppositeQuerySpecification.java._trace
+/.OppositeDifferentClassProcessor.java._trace
+/.OppositeDifferentClassQuerySpecification.java._trace
+/.OppositeProcessor.java._trace
+/.OppositeQuerySpecification.java._trace
+/.PatternContentProcessor.java._trace
+/.PatternContentQuerySpecification.java._trace
+/ContentInNotLiveProcessor.java
+/ContentInNotLiveQuerySpecification.java
+/DirectSupertypeProcessor.java
+/DirectSupertypeQuerySpecification.java
+/LiveProcessor.java
+/LiveQuerySpecification.java
+/LoopInInheritenceProcessor.java
+/LoopInInheritenceQuerySpecification.java
+/NonSymmetricOppositeProcessor.java
+/NonSymmetricOppositeQuerySpecification.java
+/OppositeDifferentClassProcessor.java
+/OppositeDifferentClassQuerySpecification.java
+/OppositeProcessor.java
+/OppositeQuerySpecification.java
+/PatternContentProcessor.java
+/PatternContentQuerySpecification.java