4 files changed, 4 insertions, 30 deletions

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialModelAnnotations.genmodel b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialModelAnnotations.genmodel
index 6c2f83c1..cfc356ca 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialModelAnnotations.genmodel
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage/model/PartialModelAnnotations.genmodel
@@ -10,7 +10,6 @@
   <genPackages prefix="Partial2logicannotations" basePackage="hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage"

       disposableProviderFactory="true" ecorePackage="PartialModelAnnotations.ecore#/">

     <genClasses ecoreClass="PartialModelAnnotations.ecore#//PartialModelRelation2Assertion">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference PartialModelAnnotations.ecore#//PartialModelRelation2Assertion/links"/>

       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PartialModelAnnotations.ecore#//PartialModelRelation2Assertion/targetRelation"/>

     </genClasses>

   </genPackages>

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/SolutionStoreWithDiversityDescriptor.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/SolutionStoreWithDiversityDescriptor.xtend
index a6e49d53..1e7f18a8 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/SolutionStoreWithDiversityDescriptor.xtend
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/dse/SolutionStoreWithDiversityDescriptor.xtend
@@ -68,8 +68,7 @@ class SolutionStoreWithDiversityDescriptor {
                                 val differentCodes = codes.filter[!solutionCodeList.contains(it)]

                                 //println(differentCodes.size)

                                 

-                                isDifferent = differentCodes.size>=3

-                                if(isDifferent)println(differentCodes.size)

+                                isDifferent = differentCodes.size>=1

                         } else {

                                 throw new UnsupportedOperationException('''Unsupported diversity type: «this.granularity»''')

                         }

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF
index 699c9308..2abc6d50 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF
@@ -27,7 +27,8 @@ Require-Bundle: com.google.guava,
  org.apache.batik.util.gui;bundle-version="[1.6.0,1.6.1]",

  org.apache.xerces;bundle-version="2.9.0",

  org.w3c.dom.svg;bundle-version="1.1.0",

- org.w3c.css.sac;bundle-version="1.3.1"

+ org.w3c.css.sac;bundle-version="1.3.1",

+ org.eclipse.m2e.maven.runtime.slf4j.simple;bundle-version="1.10.0"

 Import-Package: com.eclipsesource.v8;version="4.6.0",

  com.eclipsesource.v8.debug;version="4.6.0",

  com.eclipsesource.v8.utils;version="4.6.0",

@@ -36,9 +37,9 @@ Import-Package: com.eclipsesource.v8;version="4.6.0",
  javax.xml.parsers,

  org.apache.log4j;version="1.2.15",

  org.slf4j;version="1.7.2",

+ org.slf4j.helpers;version="1.7.2",

  org.w3c.dom,

  org.xml.sax,

  org.xml.sax.helpers

 Export-Package: hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz

 Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.visualisation

-

diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/Test.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/Test.xtend
deleted file mode 100644
index 6680c780..00000000
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/src/hu/bme/mit/inf/dslreasoner/visualisation/pi2graphviz/Test.xtend
+++ /dev/null
@@ -1,25 +0,0 @@
-package hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz

-

-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation

-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage

-import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace

-import org.eclipse.emf.ecore.resource.Resource

-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl

-

-class Test {

-        def static void main(String[] args) {

-                println("xxx")
-                val workspace = new FileSystemWorkspace("input/","")

-                

-                PartialinterpretationPackage.eINSTANCE.eClass

-                Resource.Factory.Registry.INSTANCE.extensionToFactoryMap.put("*",new XMIResourceFactoryImpl)

-                

-                val model = workspace.readModel(PartialInterpretation,"solution1.partialinterpretation")

-                println("loaded")

-                val translator = new GraphvizVisualiser

-                val visualisation = translator.visualiseConcretization(model)

-                println("visualised")

-                visualisation.writeToFile(workspace,"output")

-                println("saved")
-        }

-}
\ No newline at end of file