1 files changed, 36 insertions, 11 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 18e3018a..f3de4ccc 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
@@ -27,11 +27,13 @@ import java.util.HashMap
 @Data class GeneratedPatterns {
        public Map<Relation,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> invalidWFQueries
        public Map<Relation,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> unfinishedWFQueries
-        public Map<Relation,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> unfinishedMulticiplicityQueries
+        public Map<Relation,  Pair<IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>,Integer>> unfinishedContainmentMulticiplicityQueries
+        public Map<Relation,  Pair<IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>,Integer>> unfinishedNonContainmentMulticiplicityQueries
        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<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>  unitPropagationPreconditionPatterns
+        public Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>  mustUnitPropagationPreconditionPatterns
+        public Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>  currentUnitPropagationPreconditionPatterns
        public Collection<IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> allQueries
 }
@@ -60,14 +62,15 @@ class PatternProvider {
                        null
                }
                val patternGeneratorResult = patternGenerator.transformBaseProperties(problem,emptySolution,fqn2Query,typeAnalysisResult)
-                val baseIndexerFile = patternGeneratorResult.key
+                val baseIndexerFile = patternGeneratorResult.patternText
-                val unitPropagationTrace = patternGeneratorResult.value
+                val mustUnitPropagationTrace = patternGeneratorResult.constraint2MustPreconditionName
+                val currentUnitPropagationTrace = patternGeneratorResult.constraint2CurrentPreconditionName
                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,unitPropagationTrace,generatedQueries);
+                val runtimeQueries = calclulateRuntimeQueries(patternGenerator,problem,emptySolution,typeAnalysisResult,mustUnitPropagationTrace,currentUnitPropagationTrace,generatedQueries);
                return runtimeQueries
        }
        
@@ -76,15 +79,33 @@ class PatternProvider {
                LogicProblem problem,
                PartialInterpretation emptySolution,
                TypeAnalysisResult typeAnalysisResult,
-                HashMap<PConstraint, String> unitPropagationTrace,
+                HashMap<PConstraint, String> mustUnitPropagationTrace,
+                HashMap<PConstraint, String> currentUnitPropagationTrace,
                Map<String, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> queries
        ) {
                val Map<Relation,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>
                        invalidWFQueries = patternGenerator.invalidIndexer.getInvalidateByWfQueryNames(problem).mapValues[it.lookup(queries)]
                val Map<Relation,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>
                        unfinishedWFQueries = patternGenerator.unfinishedIndexer.getUnfinishedWFQueryNames(problem).mapValues[it.lookup(queries)]
-                val Map<Relation,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>
+                        
-                        unfinishedMultiplicityQueries = patternGenerator.unfinishedIndexer.getUnfinishedMultiplicityQueries(problem).mapValues[it.lookup(queries)]
+                val unfinishedMultiplicities = patternGenerator.unfinishedIndexer.getUnfinishedMultiplicityQueries(problem)
+                val unfinishedContainmentMultiplicities = new HashMap
+                val unfinishedNonContainmentMultiplicities = new HashMap
+                for(entry : unfinishedMultiplicities.entrySet) {
+                        val relation = entry.key
+                        val name = entry.value.key
+                        val amount = entry.value.value
+                        val query = name.lookup(queries)
+                        if(problem.containmentHierarchies.head.containmentRelations.contains(relation)) {
+                                unfinishedContainmentMultiplicities.put(relation,query->amount)
+                        } else {
+                                unfinishedNonContainmentMultiplicities.put(relation,query->amount)
+                        }
+                }
+//              val Map<Relation,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>
+//                      unfinishedMultiplicityQueries = patternGenerator.unfinishedIndexer.getUnfinishedMultiplicityQueries(problem).mapValues[it.lookup(queries)]
+//                      
+                        
                val Map<ObjectCreationPrecondition,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>
                        refineObjectsQueries = patternGenerator.typeRefinementGenerator.getRefineObjectQueryNames(problem,emptySolution,typeAnalysisResult).mapValues[it.lookup(queries)]
                val Map<? extends Type,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>
@@ -92,15 +113,19 @@ class PatternProvider {
                val Map<Pair<RelationDeclaration, Relation>,  IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>
                        refineRelationQueries = patternGenerator.relationRefinementGenerator.getRefineRelationQueries(problem).mapValues[it.lookup(queries)]
                val Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> 
-                        unitPropagationPreconditionPatterns = unitPropagationTrace.mapValues[it.lookup(queries)]
+                        mustUnitPropagationPreconditionPatterns = mustUnitPropagationTrace.mapValues[it.lookup(queries)]
+                val Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> 
+                        currentUnitPropagationPreconditionPatterns = currentUnitPropagationTrace.mapValues[it.lookup(queries)]
                return new GeneratedPatterns(
                        invalidWFQueries,
                        unfinishedWFQueries,
-                        unfinishedMultiplicityQueries,
+                        unfinishedContainmentMultiplicities,
+                        unfinishedNonContainmentMultiplicities,
                        refineObjectsQueries,
                        refineTypeQueries,
                        refineRelationQueries,
-                        unitPropagationPreconditionPatterns,
+                        mustUnitPropagationPreconditionPatterns,
+                        currentUnitPropagationPreconditionPatterns,
                        queries.values
                )
        }

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 18e3018a..f3de4ccc 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
@@ -27,11 +27,13 @@ import java.util.HashMap
27	@Data class GeneratedPatterns {	27	@Data class GeneratedPatterns {
28	public Map<Relation, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> invalidWFQueries	28	public Map<Relation, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> invalidWFQueries
29	public Map<Relation, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> unfinishedWFQueries	29	public Map<Relation, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> unfinishedWFQueries
30	public Map<Relation, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> unfinishedMulticiplicityQueries	30	public Map<Relation, Pair<IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>,Integer>> unfinishedContainmentMulticiplicityQueries
		31	public Map<Relation, Pair<IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>,Integer>> unfinishedNonContainmentMulticiplicityQueries
31	public Map<ObjectCreationPrecondition, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> refineObjectQueries	32	public Map<ObjectCreationPrecondition, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> refineObjectQueries
32	public Map<? extends Type, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> refineTypeQueries	33	public Map<? extends Type, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> refineTypeQueries
33	public Map<Pair<RelationDeclaration, Relation>, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> refinerelationQueries	34	public Map<Pair<RelationDeclaration, Relation>, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> refinerelationQueries
34	public Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> unitPropagationPreconditionPatterns	35	public Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> mustUnitPropagationPreconditionPatterns
		36	public Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> currentUnitPropagationPreconditionPatterns
35	public Collection<IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> allQueries	37	public Collection<IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> allQueries
36	}	38	}
37		39
@@ -60,14 +62,15 @@ class PatternProvider {
60	null	62	null
61	}	63	}
62	val patternGeneratorResult = patternGenerator.transformBaseProperties(problem,emptySolution,fqn2Query,typeAnalysisResult)	64	val patternGeneratorResult = patternGenerator.transformBaseProperties(problem,emptySolution,fqn2Query,typeAnalysisResult)
63	val baseIndexerFile = patternGeneratorResult.key	65	val baseIndexerFile = patternGeneratorResult.patternText
64	val unitPropagationTrace = patternGeneratorResult.value	66	val mustUnitPropagationTrace = patternGeneratorResult.constraint2MustPreconditionName
		67	val currentUnitPropagationTrace = patternGeneratorResult.constraint2CurrentPreconditionName
65	if(writeToFile) {	68	if(writeToFile) {
66	workspace.writeText('''generated3valued.vql_deactivated''',baseIndexerFile)	69	workspace.writeText('''generated3valued.vql_deactivated''',baseIndexerFile)
67	}	70	}
68	val ParseUtil parseUtil = new ParseUtil	71	val ParseUtil parseUtil = new ParseUtil
69	val generatedQueries = parseUtil.parse(baseIndexerFile)	72	val generatedQueries = parseUtil.parse(baseIndexerFile)
70	val runtimeQueries = calclulateRuntimeQueries(patternGenerator,problem,emptySolution,typeAnalysisResult,unitPropagationTrace,generatedQueries);	73	val runtimeQueries = calclulateRuntimeQueries(patternGenerator,problem,emptySolution,typeAnalysisResult,mustUnitPropagationTrace,currentUnitPropagationTrace,generatedQueries);
71	return runtimeQueries	74	return runtimeQueries
72	}	75	}
73		76
@@ -76,15 +79,33 @@ class PatternProvider {
76	LogicProblem problem,	79	LogicProblem problem,
77	PartialInterpretation emptySolution,	80	PartialInterpretation emptySolution,
78	TypeAnalysisResult typeAnalysisResult,	81	TypeAnalysisResult typeAnalysisResult,
79	HashMap<PConstraint, String> unitPropagationTrace,	82	HashMap<PConstraint, String> mustUnitPropagationTrace,
		83	HashMap<PConstraint, String> currentUnitPropagationTrace,
80	Map<String, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> queries	84	Map<String, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>> queries
81	) {	85	) {
82	val Map<Relation, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>	86	val Map<Relation, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>
83	invalidWFQueries = patternGenerator.invalidIndexer.getInvalidateByWfQueryNames(problem).mapValues[it.lookup(queries)]	87	invalidWFQueries = patternGenerator.invalidIndexer.getInvalidateByWfQueryNames(problem).mapValues[it.lookup(queries)]
84	val Map<Relation, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>	88	val Map<Relation, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>
85	unfinishedWFQueries = patternGenerator.unfinishedIndexer.getUnfinishedWFQueryNames(problem).mapValues[it.lookup(queries)]	89	unfinishedWFQueries = patternGenerator.unfinishedIndexer.getUnfinishedWFQueryNames(problem).mapValues[it.lookup(queries)]
86	val Map<Relation, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>	90
87	unfinishedMultiplicityQueries = patternGenerator.unfinishedIndexer.getUnfinishedMultiplicityQueries(problem).mapValues[it.lookup(queries)]	91	val unfinishedMultiplicities = patternGenerator.unfinishedIndexer.getUnfinishedMultiplicityQueries(problem)
		92	val unfinishedContainmentMultiplicities = new HashMap
		93	val unfinishedNonContainmentMultiplicities = new HashMap
		94	for(entry : unfinishedMultiplicities.entrySet) {
		95	val relation = entry.key
		96	val name = entry.value.key
		97	val amount = entry.value.value
		98	val query = name.lookup(queries)
		99	if(problem.containmentHierarchies.head.containmentRelations.contains(relation)) {
		100	unfinishedContainmentMultiplicities.put(relation,query->amount)
		101	} else {
		102	unfinishedNonContainmentMultiplicities.put(relation,query->amount)
		103	}
		104	}
		105	// val Map<Relation, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>
		106	// unfinishedMultiplicityQueries = patternGenerator.unfinishedIndexer.getUnfinishedMultiplicityQueries(problem).mapValues[it.lookup(queries)]
		107	//
		108
88	val Map<ObjectCreationPrecondition, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>	109	val Map<ObjectCreationPrecondition, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>
89	refineObjectsQueries = patternGenerator.typeRefinementGenerator.getRefineObjectQueryNames(problem,emptySolution,typeAnalysisResult).mapValues[it.lookup(queries)]	110	refineObjectsQueries = patternGenerator.typeRefinementGenerator.getRefineObjectQueryNames(problem,emptySolution,typeAnalysisResult).mapValues[it.lookup(queries)]
90	val Map<? extends Type, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>	111	val Map<? extends Type, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>
@@ -92,15 +113,19 @@ class PatternProvider {
92	val Map<Pair<RelationDeclaration, Relation>, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>	113	val Map<Pair<RelationDeclaration, Relation>, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>
93	refineRelationQueries = patternGenerator.relationRefinementGenerator.getRefineRelationQueries(problem).mapValues[it.lookup(queries)]	114	refineRelationQueries = patternGenerator.relationRefinementGenerator.getRefineRelationQueries(problem).mapValues[it.lookup(queries)]
94	val Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>	115	val Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>
95	unitPropagationPreconditionPatterns = unitPropagationTrace.mapValues[it.lookup(queries)]	116	mustUnitPropagationPreconditionPatterns = mustUnitPropagationTrace.mapValues[it.lookup(queries)]
		117	val Map<PConstraint, IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>>>
		118	currentUnitPropagationPreconditionPatterns = currentUnitPropagationTrace.mapValues[it.lookup(queries)]
96	return new GeneratedPatterns(	119	return new GeneratedPatterns(
97	invalidWFQueries,	120	invalidWFQueries,
98	unfinishedWFQueries,	121	unfinishedWFQueries,
99	unfinishedMultiplicityQueries,	122	unfinishedContainmentMultiplicities,
		123	unfinishedNonContainmentMultiplicities,
100	refineObjectsQueries,	124	refineObjectsQueries,
101	refineTypeQueries,	125	refineTypeQueries,
102	refineRelationQueries,	126	refineRelationQueries,
103	unitPropagationPreconditionPatterns,	127	mustUnitPropagationPreconditionPatterns,
		128	currentUnitPropagationPreconditionPatterns,
104	queries.values	129	queries.values
105	)	130	)
106	}	131	}