(lipstick)

5 files changed, 9 insertions, 5 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend
index c9d38c7d..790ef76b 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend
@@ -132,9 +132,8 @@ class GenerationTaskExecutor {
                         // 5. create a solver and a configuration

                         // 5.1 initialize

                         val solver = solverLoader.loadSolver(task.solver,configurationMap)

-                        val solverConfig = solverLoader.loadSolverConfig(task.solver,configurationMap,console)

-                        

                         

+                        val solverConfig = solverLoader.loadSolverConfig(task.solver,configurationMap,console)

                         // 5.2 set values that defined directly 

                         solverConfig.solutionScope = new SolutionScope => [

                                 it.numberOfRequiredSolution = if(task.numberSpecified) {

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend
index a9573fbf..3f0ba03f 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/SolverLoader.xtend
@@ -14,6 +14,7 @@ import java.util.Optional
 import org.eclipse.xtext.xbase.lib.Functions.Function1

 import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvizVisualiser

 import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.DiversityDescriptor

+import hu.bme.mit.inf.dlsreasoner.alloy.reasoner.builder.SolverConfiguration

 

 class SolverLoader {

         def loadSolver(Solver solver, Map<String, String> config) {

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.java b/Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.java
index 3ed13964..567551f1 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.java
+++ b/Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.java
@@ -79,7 +79,7 @@ public class QueryAndMetamodelValidator {
           }

         }

       };

-      return Iterables.<ENamedElement>filter(Iterables.<ENamedElement>concat(ListExtensions.<EReference, Iterable<ENamedElement>>map(references, _function_1)), ENamedElement.class);

+      return Iterables.<ENamedElement>filter((Iterables.<ENamedElement>concat(ListExtensions.<EReference, Iterable<ENamedElement>>map(references, _function_1))), ENamedElement.class);

     };

     return Iterables.<ENamedElement>concat(ListExtensions.<EObject, Iterable<ENamedElement>>map(elements, _function));

   }

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/PartialInterpretationInitialiser.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/PartialInterpretationInitialiser.xtend
index f7a1ce4f..d37acb6d 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/PartialInterpretationInitialiser.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/PartialInterpretationInitialiser.xtend
@@ -42,6 +42,7 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntLiteral
 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RealLiteral

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.StringLiteral

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialTypeInterpratation

+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDefinition

 

 @Data class Problem2PartialInterpretationTrace {

         Map<TypeDeclaration, PartialComplexTypeInterpretation> type2Interpretation

@@ -233,7 +234,11 @@ class PartialInterpretationInitialiser {
         

         def private Map<RelationDeclaration, PartialRelationInterpretation> initRelations(PartialInterpretation interpretation, PrimitiveValueTrace trace) {

                 val Map<RelationDeclaration, PartialRelationInterpretation> relation2Interpretation = new HashMap

-                for(relation : interpretation.problem.relations.filter(RelationDeclaration)) {

+                val definedRelationDeclarations = interpretation.problem.relations.filter(RelationDefinition).map[defines]

+                val undefinedRelationDeclarations = interpretation.problem.relations.filter(RelationDeclaration).filter[

+                        declared | !definedRelationDeclarations.exists[defined | defined === declared]

+                ]

+                for(relation : undefinedRelationDeclarations) {

                         val partialInterpretation = relation.initialisePartialRelationInterpretation

                         interpretation.partialrelationinterpretation += partialInterpretation

                         relation2Interpretation.put(relation,partialInterpretation)

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend
index 6639e5f3..bdc48b8d 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasoner.xtend
@@ -59,7 +59,6 @@ class ViatraReasoner extends LogicReasoner{
                 val transformationStartTime = System.nanoTime

                 

                 

-                

                 val emptySolution = initialiser.initialisePartialInterpretation(problem,viatraConfig.typeScopes).output

                 if((viatraConfig.documentationLevel == DocumentationLevel::FULL || viatraConfig.documentationLevel == DocumentationLevel::NORMAL) && workspace !== null) {

                         workspace.writeModel(emptySolution,"init.partialmodel")