2 files changed, 31 insertions, 29 deletions

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/plugin.xml b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/plugin.xml
index 413002e2..bad09614 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/plugin.xml
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/plugin.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?><?eclipse version="3.0"?><!--
---><plugin>

-  <extension point="org.eclipse.emf.ecore.generated_package">

-    <!-- @generated logiclanguage -->

-    <package class="hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage" genModel="model/logiclanguage.genmodel" uri="http://www.bme.hu/mit/inf/dslreasoner/logic/model/language"/>

-  </extension>

-  <extension point="org.eclipse.emf.ecore.generated_package">

-    <!-- @generated logiclanguage -->

-    <package class="hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage" genModel="model/logiclanguage.genmodel" uri="http://www.bme.hu/mit/inf/dslreasoner/logic/model/problem"/>

-  </extension>

-  <extension point="org.eclipse.emf.ecore.generated_package">

-    <!-- @generated logiclanguage -->

-    <package class="hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicresultPackage" genModel="model/logiclanguage.genmodel" uri="http://www.bme.hu/mit/inf/dslreasoner/logic/model/result"/>

-  </extension>

-  <extension id="hu.bme.mit.inf.dslreasoner.logic.model.patterns.TypeUtil" point="org.eclipse.viatra.query.runtime.queryspecification">

-    <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:hu.bme.mit.inf.dslreasoner.logic.model.patterns.TypeUtil" id="hu.bme.mit.inf.dslreasoner.logic.model.patterns.TypeUtil">

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.logic.model.patterns.supertypeStar"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.logic.model.patterns.typeDirectElements"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.logic.model.patterns.possibleDynamicType"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.logic.model.patterns.mustTypeElement"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.logic.model.patterns.typeSystemIsInconsistent"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.logic.model.patterns.elementNotDefinedInSupertype"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.logic.model.patterns.elementWithNoPossibleDynamicType"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.logic.model.patterns.cyclicTypeHierarchy"/>

-    </group>

-  </extension>

-</plugin>

+--><plugin>
+  <extension point="org.eclipse.emf.ecore.generated_package">
+    <!-- @generated logiclanguage -->
+    <package class="hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage" genModel="model/logiclanguage.genmodel" uri="http://www.bme.hu/mit/inf/dslreasoner/logic/model/language"/>
+  </extension>
+  <extension point="org.eclipse.emf.ecore.generated_package">
+    <!-- @generated logiclanguage -->
+    <package class="hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage" genModel="model/logiclanguage.genmodel" uri="http://www.bme.hu/mit/inf/dslreasoner/logic/model/problem"/>
+  </extension>
+  <extension point="org.eclipse.emf.ecore.generated_package">
+    <!-- @generated logiclanguage -->
+    <package class="hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicresultPackage" genModel="model/logiclanguage.genmodel" uri="http://www.bme.hu/mit/inf/dslreasoner/logic/model/result"/>
+  </extension>
+  <extension id="hu.bme.mit.inf.dslreasoner.logic.model.patterns.TypeUtil" point="org.eclipse.viatra.query.runtime.queryspecification">
+    <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:hu.bme.mit.inf.dslreasoner.logic.model.patterns.TypeUtil" id="hu.bme.mit.inf.dslreasoner.logic.model.patterns.TypeUtil">
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.logic.model.patterns.supertypeStar"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.logic.model.patterns.typeDirectElements"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.logic.model.patterns.possibleDynamicType"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.logic.model.patterns.mustTypeElement"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.logic.model.patterns.typeSystemIsInconsistent"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.logic.model.patterns.elementNotDefinedInSupertype"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.logic.model.patterns.elementWithNoPossibleDynamicType"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.logic.model.patterns.cyclicTypeHierarchy"/>
+    </group>
+  </extension>
+</plugin>
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicSolver.xtend b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicSolver.xtend
index f1d410d8..e62a3cb7 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicSolver.xtend
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/LogicSolver.xtend
@@ -34,7 +34,7 @@ public class LogicReasonerException extends Exception {
         }

 }

 

-abstract class LogicSolverConfiguration {

+abstract class SolverConfiguration {

         public static val Unlimited = -1;

         public static val String UndefinedPath = null

 

@@ -42,7 +42,7 @@ abstract class LogicSolverConfiguration {
         public String solverPath = UndefinedPath

         /** Max runtime limit in seconds. */

         public int runtimeLimit = Unlimited

-        /** Max runtime limit in seconds. */

+        /** Max memory limit in megabytes. */

         public int memoryLimit = Unlimited

         /** Documentation level of the solver. */

         public DocumentationLevel documentationLevel = DocumentationLevel::NONE

@@ -52,7 +52,9 @@ abstract class LogicSolverConfiguration {
          *     or via a listener registered by {@link progressMonitor.addCancelListener}</li>

          */

         public SolverProgressMonitor progressMonitor = new NullSolverProgressMonitor

+}

 

+abstract class LogicSolverConfiguration extends SolverConfiguration {

         public var TypeScopes typeScopes = new TypeScopes;

         public var SolutionScope solutionScope = new SolutionScope

 }

@@ -157,7 +159,7 @@ public class TypeScopes {
  */

 public class SolutionScope {

         public static val All = Integer.MAX_VALUE;

-        public var numberOfRequiredSolution = 1

+        public var numberOfRequiredSolutions = 1

 }

 /** Progress monitor class for a solver to

  * <li>(optionally) report progress via {@link worked}</li>