1 files changed, 68 insertions, 47 deletions
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternProvider.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternProvider.xtend
index e87f52af..90f79810 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternProvider.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/patterns/PatternProvider.xtend
@@ -10,6 +10,8 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.ModelGenerationStati
 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.TypeAnalysis
 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.TypeAnalysisResult
 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.TypeInferenceMethod
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.RelationConstraints
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.RelationMultiplicityConstraint
 import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.util.ParseUtil
 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
 import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace
@@ -23,78 +25,96 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery
 import org.eclipse.xtend.lib.annotations.Data
 import static extension hu.bme.mit.inf.dslreasoner.util.CollectionsUtil.*
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ScopePropagatorStrategy
-@Data class GeneratedPatterns {
+@Data
-        public Map<Relation,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> invalidWFQueries
+class GeneratedPatterns {
-        public Map<Relation,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> unfinishedWFQueries
+        public Map<Relation, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> invalidWFQueries
-        public Map<Relation,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> unfinishedMulticiplicityQueries
+        public Map<Relation, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> unfinishedWFQueries
-        public Map<ObjectCreationPrecondition,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> refineObjectQueries
+        public Map<RelationMultiplicityConstraint, UnifinishedMultiplicityQueries> multiplicityConstraintQueries
-        public Map<? extends Type,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> refineTypeQueries
+        public Map<Relation, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> unfinishedMulticiplicityQueries
-        public Map<Pair<RelationDeclaration, Relation>,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> refinerelationQueries
+        public Map<ObjectCreationPrecondition, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> refineObjectQueries
+        public Map<? extends Type, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> refineTypeQueries
+        public Map<Pair<RelationDeclaration, Relation>, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> refinerelationQueries
        public Map<RelationDefinition, ModalPatternQueries> modalRelationQueries
        public Collection<IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> allQueries
 }
-@Data class ModalPatternQueries {
+@Data
+class ModalPatternQueries {
        val IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> mayQuery
        val IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> mustQuery
        val IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> currentQuery
 }
+@Data
+class UnifinishedMultiplicityQueries {
+        val IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> unfinishedMultiplicityQuery
+        val IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> unrepairableMultiplicityQuery
+        val IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> remainingInverseMultiplicityQuery
+        val IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> remainingContentsQuery
+}
 class PatternProvider {
-        
        val TypeAnalysis typeAnalysis = new TypeAnalysis
-        
-        public def generateQueries(
+        def generateQueries(LogicProblem problem, PartialInterpretation emptySolution, ModelGenerationStatistics statistics,
-                LogicProblem problem,
+                Set<PQuery> existingQueries, ReasonerWorkspace workspace, TypeInferenceMethod typeInferenceMethod,
-                PartialInterpretation emptySolution,
+                ScopePropagatorStrategy scopePropagatorStrategy, RelationConstraints relationConstraints, boolean writeToFile) {
-                ModelGenerationStatistics statistics,
-                Set<PQuery> existingQueries,
-                ReasonerWorkspace workspace,
-                TypeInferenceMethod typeInferenceMethod,
-                boolean writeToFile)
-        {
                val fqn2Query = existingQueries.toMap[it.fullyQualifiedName]
-                val PatternGenerator patternGenerator = new PatternGenerator(typeInferenceMethod)
+                val PatternGenerator patternGenerator = new PatternGenerator(typeInferenceMethod, scopePropagatorStrategy)
-                val typeAnalysisResult = if(patternGenerator.requiresTypeAnalysis) {
+                val typeAnalysisResult = if (patternGenerator.requiresTypeAnalysis) {
-                        val startTime = System.nanoTime
+                                val startTime = System.nanoTime
-                        val result = typeAnalysis.performTypeAnalysis(problem,emptySolution)
+                                val result = typeAnalysis.performTypeAnalysis(problem, emptySolution)
-                        val typeAnalysisTime = System.nanoTime - startTime
+                                val typeAnalysisTime = System.nanoTime - startTime
-                        statistics.PreliminaryTypeAnalisisTime = typeAnalysisTime
+                                statistics.PreliminaryTypeAnalisisTime = typeAnalysisTime
-                        result
+                                result
-                } else {
+                        } else {
-                        null
+                                null
-                }
+                        }
-                val baseIndexerFile = patternGenerator.transformBaseProperties(problem,emptySolution,fqn2Query,typeAnalysisResult)
+                val baseIndexerFile = patternGenerator.transformBaseProperties(problem, emptySolution, fqn2Query,
-                if(writeToFile) {
+                        typeAnalysisResult, relationConstraints)
-                        workspace.writeText('''generated3valued.vql_deactivated''',baseIndexerFile)
+                if (writeToFile) {
+                        workspace.writeText('''generated3valued.vql_deactivated''', baseIndexerFile)
                }
                val ParseUtil parseUtil = new ParseUtil
                val generatedQueries = parseUtil.parse(baseIndexerFile)
-                val runtimeQueries = calclulateRuntimeQueries(patternGenerator,problem,emptySolution,typeAnalysisResult,generatedQueries);
+                val runtimeQueries = calclulateRuntimeQueries(patternGenerator, problem, emptySolution, typeAnalysisResult,
+                        relationConstraints, generatedQueries)
                return runtimeQueries
        }
-        
        private def GeneratedPatterns calclulateRuntimeQueries(
                PatternGenerator patternGenerator,
                LogicProblem problem,
                PartialInterpretation emptySolution,
                TypeAnalysisResult typeAnalysisResult,
+                RelationConstraints relationConstraints,
                Map<String, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> queries
        ) {
-                val Map<Relation,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>
+                val invalidWFQueries = patternGenerator.invalidIndexer.getInvalidateByWfQueryNames(problem).mapValues [
-                        invalidWFQueries = patternGenerator.invalidIndexer.getInvalidateByWfQueryNames(problem).mapValues[it.lookup(queries)]
+                        it.lookup(queries)
-                val Map<Relation,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>
+                ]
-                        unfinishedWFQueries = patternGenerator.unfinishedIndexer.getUnfinishedWFQueryNames(problem).mapValues[it.lookup(queries)]
+                val unfinishedWFQueries = patternGenerator.unfinishedIndexer.getUnfinishedWFQueryNames(problem).mapValues [
-                val Map<Relation,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>
+                        it.lookup(queries)
-                        unfinishedMultiplicityQueries = patternGenerator.unfinishedIndexer.getUnfinishedMultiplicityQueries(problem).mapValues[it.lookup(queries)]
+                ]
-                val Map<ObjectCreationPrecondition,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>
+                val multiplicityConstraintQueries = patternGenerator.unfinishedIndexer.getUnfinishedMultiplicityQueries(
-                        refineObjectsQueries = patternGenerator.typeRefinementGenerator.getRefineObjectQueryNames(problem,emptySolution,typeAnalysisResult).mapValues[it.lookup(queries)]
+                        relationConstraints.multiplicityConstraints).mapValues [
-                val Map<? extends Type,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>
+                        new UnifinishedMultiplicityQueries(unfinishedMultiplicityQueryName?.lookup(queries),
-                        refineTypeQueries = patternGenerator.typeRefinementGenerator.getRefineTypeQueryNames(problem,emptySolution,typeAnalysisResult).mapValues[it.lookup(queries)]
+                                unrepairableMultiplicityQueryName?.lookup(queries),
-                val Map<Pair<RelationDeclaration, Relation>,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>
+                                remainingInverseMultiplicityQueryName?.lookup(queries), remainingContentsQueryName?.lookup(queries))
-                        refineRelationQueries = patternGenerator.relationRefinementGenerator.getRefineRelationQueries(problem).mapValues[it.lookup(queries)]
+                ]
-                val Map<RelationDefinition, ModalPatternQueries> modalRelationQueries = problem.relations.filter(RelationDefinition).toMap([it], [ relationDefinition |
+                val unfinishedMultiplicityQueries = multiplicityConstraintQueries.entrySet.filter [
+                        value.unfinishedMultiplicityQuery !== null
+                ].toMap([key.relation], [value.unfinishedMultiplicityQuery])
+                val refineObjectsQueries = patternGenerator.typeRefinementGenerator.
+                        getRefineObjectQueryNames(problem, emptySolution, typeAnalysisResult).mapValues[it.lookup(queries)]
+                val refineTypeQueries = patternGenerator.typeRefinementGenerator.getRefineTypeQueryNames(problem, emptySolution,
+                        typeAnalysisResult).mapValues[it.lookup(queries)]
+                val refineRelationQueries = patternGenerator.relationRefinementGenerator.getRefineRelationQueries(problem).
+                        mapValues[it.lookup(queries)]
+                val modalRelationQueries = problem.relations.filter(RelationDefinition).toMap([it], [ relationDefinition |
                        val indexer = patternGenerator.relationDefinitionIndexer
                        new ModalPatternQueries(
                                indexer.relationDefinitionName(relationDefinition, Modality.MAY).lookup(queries),
@@ -105,6 +125,7 @@ class PatternProvider {
                return new GeneratedPatterns(
                        invalidWFQueries,
                        unfinishedWFQueries,
+                        multiplicityConstraintQueries,
                        unfinishedMultiplicityQueries,
                        refineObjectsQueries,
                        refineTypeQueries,