FAM metamodel loader experiments

4 files changed, 13 insertions, 9 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
index 47676d41..8925abcb 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
index e477a075..2b883b66 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/configs/FAM_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json b/Tests/hu.bme.mit.inf.dslreasoner.run/configs/FAM_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json
index 26df3c74..1e2d4dd4 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/configs/FAM_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/configs/FAM_useful_ViatraSolver_polyhedral_typeHierarchy_Clp.json
@@ -4,10 +4,13 @@
         "timeout": 1200,
         "saveModels": true,
         "warmupIterations": 0,
-        "iterations": 1,
+        "iterations": 5,
         "domain": "FAM",
         "scope": "none",
         "sizes": [500],
         "solver": "ViatraSolver",
-        "scopePropagator": "basic"
+        "scopePropagator": "polyhedral",
+        "propagatedConstraints": "hints",
+        "polyhedronSolver": "Clp",
+        "scopeHeuristics": "polyhedral"
 }
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend
index 4b0791d4..1be03eed 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend
+++ b/Tests/hu.bme.mit.inf.dslreasoner.run/src/hu/bme/mit/inf/dslreasoner/run/MetamodelLoader.xtend
@@ -85,8 +85,9 @@ class FAMLoader extends MetamodelLoader {
                 val List<EClass> classes = package.EClassifiers.filter(EClass).toList

                 val List<EEnum> enums = package.EClassifiers.filter(EEnum).toList

                 val List<EEnumLiteral> literals = enums.map[ELiterals].flatten.toList

-                val List<EReference> references = classes.map[EReferences].flatten.filter[name != "type" && name != "model"].

-                        toList

+                val List<EReference> references = classes.map[EReferences].flatten.filter [ reference |

+                        !#{"model", "type"}.contains(reference.name)

+                ].toList

                 val List<EAttribute> attributes = classes.map[EAttributes].flatten.toList

                 return new EcoreMetamodelDescriptor(classes, #{}, false, enums, literals, references, attributes)

         }

@@ -196,7 +197,7 @@ class YakinduLoader extends MetamodelLoader {
         }

 

         override additionalConstraints() {

-                //#[[method|new SGraphInconsistencyDetector(method)]]

+                // #[[method|new SGraphInconsistencyDetector(method)]]

                 emptyList

         }

 

@@ -261,7 +262,7 @@ class FileSystemLoader extends MetamodelLoader {
         }

 

         override additionalConstraints() {

-                //#[[method|new FileSystemInconsistencyDetector(method)]]

+                // #[[method|new FileSystemInconsistencyDetector(method)]]

                 emptyList

         }

 

@@ -386,11 +387,11 @@ class SatelliteLoader extends MetamodelLoader {
         }

 

         override additionalConstraints() { #[] }

-        

+

         override getHints(Ecore2Logic ecore2Logic, Ecore2Logic_Trace trace) {

                 #[new SatelliteHint(ecore2Logic, trace)]

         }

-        

+

         override getTypeQuantiles() {

                 #{

                         "CubeSat3U" -> new TypeQuantiles(0.1, 0.25),

@@ -402,5 +403,5 @@ class SatelliteLoader extends MetamodelLoader {
                         "InterferometryPayload" -> new TypeQuantiles(0.15, 0.25)

                 }

         }

-        

+

 }