diff options
author | ArenBabikian <aren.babikian@mail.mcgill.ca> | 2019-02-17 15:12:05 -0500 |
---|---|---|
committer | ArenBabikian <aren.babikian@mail.mcgill.ca> | 2019-02-17 15:12:05 -0500 |
commit | 2e5968a5162b04d33eb1d3a60dd394b68583a4b6 (patch) | |
tree | d3797fcf89614b1f7c69917dc6849585dd555fad /Solvers | |
parent | Commit before merge (diff) | |
parent | Created new module to load referred patterns. hacked metamodel linking. (diff) | |
download | VIATRA-Generator-2e5968a5162b04d33eb1d3a60dd394b68583a4b6.tar.gz VIATRA-Generator-2e5968a5162b04d33eb1d3a60dd394b68583a4b6.tar.zst VIATRA-Generator-2e5968a5162b04d33eb1d3a60dd394b68583a4b6.zip |
Merge remote-tracking branch 'origin/master' into Vampire-New
Merge Oszkar's Java-related commit
Diffstat (limited to 'Solvers')
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 @@ | |||
10 | <genPackages prefix="Partial2logicannotations" basePackage="hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage" | 10 | <genPackages prefix="Partial2logicannotations" basePackage="hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage" |
11 | disposableProviderFactory="true" ecorePackage="PartialModelAnnotations.ecore#/"> | 11 | disposableProviderFactory="true" ecorePackage="PartialModelAnnotations.ecore#/"> |
12 | <genClasses ecoreClass="PartialModelAnnotations.ecore#//PartialModelRelation2Assertion"> | 12 | <genClasses ecoreClass="PartialModelAnnotations.ecore#//PartialModelRelation2Assertion"> |
13 | <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference PartialModelAnnotations.ecore#//PartialModelRelation2Assertion/links"/> | ||
14 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PartialModelAnnotations.ecore#//PartialModelRelation2Assertion/targetRelation"/> | 13 | <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PartialModelAnnotations.ecore#//PartialModelRelation2Assertion/targetRelation"/> |
15 | </genClasses> | 14 | </genClasses> |
16 | </genPackages> | 15 | </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 { | |||
68 | val differentCodes = codes.filter[!solutionCodeList.contains(it)] | 68 | val differentCodes = codes.filter[!solutionCodeList.contains(it)] |
69 | //println(differentCodes.size) | 69 | //println(differentCodes.size) |
70 | 70 | ||
71 | isDifferent = differentCodes.size>=3 | 71 | isDifferent = differentCodes.size>=1 |
72 | if(isDifferent)println(differentCodes.size) | ||
73 | } else { | 72 | } else { |
74 | throw new UnsupportedOperationException('''Unsupported diversity type: «this.granularity»''') | 73 | throw new UnsupportedOperationException('''Unsupported diversity type: «this.granularity»''') |
75 | } | 74 | } |
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, | |||
27 | org.apache.batik.util.gui;bundle-version="[1.6.0,1.6.1]", | 27 | org.apache.batik.util.gui;bundle-version="[1.6.0,1.6.1]", |
28 | org.apache.xerces;bundle-version="2.9.0", | 28 | org.apache.xerces;bundle-version="2.9.0", |
29 | org.w3c.dom.svg;bundle-version="1.1.0", | 29 | org.w3c.dom.svg;bundle-version="1.1.0", |
30 | org.w3c.css.sac;bundle-version="1.3.1" | 30 | org.w3c.css.sac;bundle-version="1.3.1", |
31 | org.eclipse.m2e.maven.runtime.slf4j.simple;bundle-version="1.10.0" | ||
31 | Import-Package: com.eclipsesource.v8;version="4.6.0", | 32 | Import-Package: com.eclipsesource.v8;version="4.6.0", |
32 | com.eclipsesource.v8.debug;version="4.6.0", | 33 | com.eclipsesource.v8.debug;version="4.6.0", |
33 | com.eclipsesource.v8.utils;version="4.6.0", | 34 | com.eclipsesource.v8.utils;version="4.6.0", |
@@ -36,9 +37,9 @@ Import-Package: com.eclipsesource.v8;version="4.6.0", | |||
36 | javax.xml.parsers, | 37 | javax.xml.parsers, |
37 | org.apache.log4j;version="1.2.15", | 38 | org.apache.log4j;version="1.2.15", |
38 | org.slf4j;version="1.7.2", | 39 | org.slf4j;version="1.7.2", |
40 | org.slf4j.helpers;version="1.7.2", | ||
39 | org.w3c.dom, | 41 | org.w3c.dom, |
40 | org.xml.sax, | 42 | org.xml.sax, |
41 | org.xml.sax.helpers | 43 | org.xml.sax.helpers |
42 | Export-Package: hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz | 44 | Export-Package: hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz |
43 | Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.visualisation | 45 | Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.visualisation |
44 | |||
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 @@ | |||
1 | package hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz | ||
2 | |||
3 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation | ||
4 | import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage | ||
5 | import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace | ||
6 | import org.eclipse.emf.ecore.resource.Resource | ||
7 | import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl | ||
8 | |||
9 | class Test { | ||
10 | def static void main(String[] args) { | ||
11 | println("xxx") | ||
12 | val workspace = new FileSystemWorkspace("input/","") | ||
13 | |||
14 | PartialinterpretationPackage.eINSTANCE.eClass | ||
15 | Resource.Factory.Registry.INSTANCE.extensionToFactoryMap.put("*",new XMIResourceFactoryImpl) | ||
16 | |||
17 | val model = workspace.readModel(PartialInterpretation,"solution1.partialinterpretation") | ||
18 | println("loaded") | ||
19 | val translator = new GraphvizVisualiser | ||
20 | val visualisation = translator.visualiseConcretization(model) | ||
21 | println("visualised") | ||
22 | visualisation.writeToFile(workspace,"output") | ||
23 | println("saved") | ||
24 | } | ||
25 | } \ No newline at end of file | ||