Regenerated school queries

Author: ujhelyiz

school/school.incquery/plugin.xml

@@ -35,36 +35,36 @@
 
 public final class GroupOfFileSchoolqueries extends BaseGeneratedPatternGroup {
   public GroupOfFileSchoolqueries() throws IncQueryException {
-    matcherFactories.add(SchoolsNamesMatcher.factory());
+    matcherFactories.add(MoreFriendsThanMatcher.factory());
+    matcherFactories.add(TeachersOfSchoolMatcher.factory());
+    matcherFactories.add(ClassesOfSchoolMatcher.factory());
+    matcherFactories.add(CourseWithPrimeWeightMatcher.factory());
+    matcherFactories.add(TeachersOfSchoolNamesMatcher.factory());
+    matcherFactories.add(TheOnesWithTheBiggestCircleMatcher.factory());
     matcherFactories.add(TheOnesWithTheBiggestCircleNameMatcher.factory());
-    matcherFactories.add(TeachersMatcher.factory());
+    matcherFactories.add(FinalPatternMatcher.factory());
     matcherFactories.add(InTheCircleOfFriendsNamesMatcher.factory());
-    matcherFactories.add(TeachersOfSchoolNamesMatcher.factory());
-    matcherFactories.add(ClassesOfSchoolMatcher.factory());
+    matcherFactories.add(SchoolsNamesMatcher.factory());
     matcherFactories.add(SomeCourseMatcher.factory());
     matcherFactories.add(ClassesOfTeacherNamesMatcher.factory());
-    matcherFactories.add(FinalPattern2Matcher.factory());
-    matcherFactories.add(StudentOfSchoolMatcher.factory());
-    matcherFactories.add(StudentOfSchoolNamesMatcher.factory());
-    matcherFactories.add(CourseWithNameLongerThanWeightMatcher.factory());
+    matcherFactories.add(SchoolsMatcher.factory());
     matcherFactories.add(CourseWithNameLongerThanWeightIntMatcher.factory());
-    matcherFactories.add(InTheCircleOfFriendsMatcher.factory());
+    matcherFactories.add(ClassesOfTeacherMatcher.factory());
+    matcherFactories.add(FinalPattern2Matcher.factory());
     matcherFactories.add(TeachesTheMostCoursesMatcher.factory());
+    matcherFactories.add(StudentOfSchoolNamesMatcher.factory());
+    matcherFactories.add(CourseWithWeightThirtyMatcher.factory());
     matcherFactories.add(TeacherWithoutClassNamesMatcher.factory());
-    matcherFactories.add(MoreFriendsThanMatcher.factory());
-    matcherFactories.add(TeachesMoreClassesMatcher.factory());
-    matcherFactories.add(SchoolsMatcher.factory());
-    matcherFactories.add(TeacherWithoutClassMatcher.factory());
     matcherFactories.add(CoursesOfTeacherNamesMatcher.factory());
-    matcherFactories.add(TeachersOfSchoolMatcher.factory());
     matcherFactories.add(CoursesOfTeacherMatcher.factory());
-    matcherFactories.add(FinalPatternMatcher.factory());
-    matcherFactories.add(TheOnesWithTheBiggestCircleMatcher.factory());
-    matcherFactories.add(CourseWithWeightThirtyMatcher.factory());
-    matcherFactories.add(FriendlyToMatcher.factory());
-    matcherFactories.add(ClassesOfTeacherMatcher.factory());
-    matcherFactories.add(CourseWithPrimeWeightMatcher.factory());
+    matcherFactories.add(StudentOfSchoolMatcher.factory());
     matcherFactories.add(TeachersNamesMatcher.factory());
+    matcherFactories.add(CourseWithNameLongerThanWeightMatcher.factory());
+    matcherFactories.add(TeachersMatcher.factory());
+    matcherFactories.add(TeacherWithoutClassMatcher.factory());
+    matcherFactories.add(TeachesMoreClassesMatcher.factory());
+    matcherFactories.add(InTheCircleOfFriendsMatcher.factory());
+    matcherFactories.add(FriendlyToMatcher.factory());
 
   }
 }

school/school.incquery/queries/globalEiqModel.xmi

@@ -7,8 +7,8 @@
 
 public final class GroupOfFileSchoolvalidationrules extends BaseGeneratedPatternGroup {
   public GroupOfFileSchoolvalidationrules() throws IncQueryException {
-    matcherFactories.add(CourseWithTeacherMatcher.factory());
     matcherFactories.add(CourseWithoutTeacherMatcher.factory());
+    matcherFactories.add(CourseWithTeacherMatcher.factory());
 
   }
 }

school/school.incquery/src-gen/school/.GroupOfFileSchoolvalidationrules.java._trace

@@ -11,7 +11,7 @@ public class CourseWithNameLongerThanWeightIntEvaluator1_1 implements IMatchChec
   /**
    * The raw java code generated from the xbase xexpression by xtext.
    */
-  private Boolean evaluateXExpressionGenerated(final String CName, final Integer W) {
+  private Boolean evaluateXExpressionGenerated(final Integer W, final String CName) {
     String _CName = CName;
     int _length = _CName.length();
     Integer _W = W;
@@ -24,10 +24,10 @@ private Boolean evaluateXExpressionGenerated(final String CName, final Integer W
    */
   @Override
   public Boolean evaluateXExpression(final Tuple tuple, final Map<String,Integer> tupleNameMap) {
-    int CNamePosition = tupleNameMap.get("CName");
-    java.lang.String CName = (java.lang.String) tuple.get(CNamePosition);
     int WPosition = tupleNameMap.get("W");
     java.lang.Integer W = (java.lang.Integer) tuple.get(WPosition);
-    return evaluateXExpressionGenerated(CName, W);
+    int CNamePosition = tupleNameMap.get("CName");
+    java.lang.String CName = (java.lang.String) tuple.get(CNamePosition);
+    return evaluateXExpressionGenerated(W, CName);
   }
 }