Extend hypergraph shaping functionality

3 files changed, 74 insertions, 3 deletions

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/META-INF/MANIFEST.MF b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/META-INF/MANIFEST.MF
index 83c90829..ee9f8929 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/META-INF/MANIFEST.MF
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/META-INF/MANIFEST.MF
@@ -26,7 +26,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.xtext.xbase.lib,

  org.eclipse.xtend.lib,

  org.eclipse.xtend.lib.macro,

- org.eclipse.viatra.query.runtime;bundle-version="1.5.0",

+ org.eclipse.viatra.query.runtime;bundle-version="1.5.0";visibility:=reexport,

  org.eclipse.viatra.dse;bundle-version="0.15.0",

  hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0"

 Bundle-ActivationPolicy: lazy

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend
index 8aaaacb5..1a276090 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretation2logic/InstanceModel2PartialInterpretation.xtend
@@ -40,7 +40,16 @@ class InstanceModel2PartialInterpretation {
                 return transform(metamodelTranslationResult,objects,withID)

         }

         

-        public def transform(

+        public def transformWithTrace(

+                TracedOutput<LogicProblem, Ecore2Logic_Trace> metamodelTranslationResult,

+                Resource resource,

+                boolean withID)

+        {

+                val objects = resource.allContents.toList

+                return transformWithTrace(metamodelTranslationResult,objects,withID)

+        }

+        

+        public def transformWithTrace(

                 TracedOutput<LogicProblem, Ecore2Logic_Trace> metamodelTranslationResult,

                 List<EObject> objects,

                 boolean withID) 

@@ -130,7 +139,15 @@ class InstanceModel2PartialInterpretation {
                         }

                 }

                 

-                return partialInterpretation

+                return new TracedOutput(partialInterpretation,object2DefinedElement)

+        }

+        

+        public def transform(

+                TracedOutput<LogicProblem, Ecore2Logic_Trace> metamodelTranslationResult,

+                List<EObject> objects,

+                boolean withID) 

+        {

+                return transformWithTrace(metamodelTranslationResult,objects,withID).output

         }

         

         private def createTypeScopesFromKnownAttributeValues(List<EObject> objects, Set<EAttribute> attributesUsed) {

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2NeighbourhoodRepresentation.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2NeighbourhoodRepresentation.xtend
index 8b5d7f2c..080c3b79 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2NeighbourhoodRepresentation.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/src/hu/bme/mit/inf/dslreasoner/viatrasolver/partialinterpretationlanguage/neighbourhood/PartialInterpretation2NeighbourhoodRepresentation.xtend
@@ -92,6 +92,34 @@ abstract class PartialInterpretation2NeighbourhoodRepresentation<ModelRepresenta
 

                 return res;

         }

+        

+                /**

+         * Creates a neighbourhood representation with traces

+         * @param model The model to be represented.

+         * @param range The range of the neighbourhood.

+         * @param parallels The maximal number of parallel references to be differentiated.

+         * @param maxNumber The maximal number of elements in a equivalence class that can be differentiated.

+         * @param relevantTypes The set of types to include in the diversity calculations (when value is null, all types are considered)

+         * @param relevantRelations The set of relations to include in the diversity calculations (when value is null, all relations are considered)

+         * @param relevantPatterns The set of patterns to include in the diversity calculations 

+         *                (NOT the well-formedness constraints) - when value is null, NO patterns are considered

+         */

+        def public createRepresentation(PartialInterpretation model, int range, int parallels, int maxNumber,

+                Map<String,List<List<DefinedElement>>>  relevantPatterns) {

+

+                val Map<DefinedElement, Set<String>> types = new HashMap

+                fillTypes(model, types, null)

+                val Map<DefinedElement, List<IncomingRelation<DefinedElement>>> IncomingRelations = new HashMap;

+                val Map<DefinedElement, List<OutgoingRelation<DefinedElement>>> OutgoingRelations = new HashMap;

+                fillReferences(model, IncomingRelations, OutgoingRelations, null);

+                val Map<DefinedElement, List<PatternRelation<DefinedElement>>> PatternRelations = createPatternRelations(model,

+                        relevantPatterns);

+                        

+                val res = doRecursiveNeighbourCalculation(model, types, IncomingRelations, OutgoingRelations, PatternRelations,range, parallels,

+                        maxNumber);

+                

+                return res;

+        }

 

         /**

          * Collects all pattern relations for shaping

@@ -135,6 +163,32 @@ abstract class PartialInterpretation2NeighbourhoodRepresentation<ModelRepresenta
                 return result;

                 

         }

+        

+        def Map<DefinedElement, List<PatternRelation<DefinedElement>>> createPatternRelations(

+                PartialInterpretation model, Map<String,List<List<DefinedElement>>> relevantPatterns) {

+                val Map<DefinedElement, List<PatternRelation<DefinedElement>>> result=new HashMap;

+                

+                for (element : model.elements) {

+                        result.put(element,new LinkedList<PatternRelation<DefinedElement>>)

+                }

+                if (relevantPatterns===null) return result;

+                for (patternName : relevantPatterns.keySet) {

+                        val allMatches=relevantPatterns.get(patternName)

+                        

+                        for (match : allMatches) {

+                                var id=0;

+                                for (matchedElement:match) {

+                                        if (matchedElement!==null) {

+                                                result.get(matchedElement).add(new PatternRelation<DefinedElement>(patternName,id,match))

+                                        }

+                                        id++    

+                                }

+                        }

+                }

+                

+                return result;

+                

+        }

 

         def private isRelevant(TypeDeclaration t, Set<TypeDeclaration> relevantTypes) {

                 if (relevantTypes === null) {