From 4585a4d344da5498200548e7add61e5cccd44924 Mon Sep 17 00:00:00 2001 From: OszkarSemerath Date: Tue, 8 May 2018 17:03:07 +0200 Subject: Refactored to the milestone version of Viatra 2.0 --- .../application/execution/GenerationTaskExecutor.xtend | 2 +- .../inf/dslreasoner/application/execution/QueryLoader.xtend | 6 +++--- .../dslreasoner/application/execution/util/VQLParser.xtend | 12 ++++-------- 3 files changed, 8 insertions(+), 12 deletions(-) (limited to 'Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution') diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend index 5506d762..2cbfc20d 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/GenerationTaskExecutor.xtend @@ -198,7 +198,7 @@ class GenerationTaskExecutor { val vis1 = new PartialInterpretation2Gml val gml = vis1.transform(representation) outputWorkspaceForRun.writeText('''model«IF runs>1»_«run»«ENDIF»_«interpretationIndex+1».gml''',gml) - if(false && representation.newElements.size + representation.problem.elements.size < 150) { + if(representation.newElements.size + representation.problem.elements.size < 150) { val vis2 = new GraphvizVisualisation val dot = vis2.visualiseConcretization(representation) dot.writeToFile(outputWorkspaceForRun,'''model«IF runs>1»_«run»«ENDIF»_«interpretationIndex+1»''') diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/QueryLoader.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/QueryLoader.xtend index 73a8ad59..c25bfb07 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/QueryLoader.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/QueryLoader.xtend @@ -13,10 +13,10 @@ import java.util.List import java.util.Set import org.eclipse.emf.ecore.EClass import org.eclipse.emf.ecore.EPackage -import org.eclipse.viatra.query.patternlanguage.emf.eMFPatternLanguage.PatternModel import org.eclipse.viatra.query.patternlanguage.emf.specification.SpecificationBuilder -import org.eclipse.viatra.query.patternlanguage.patternLanguage.Pattern -import org.eclipse.viatra.query.patternlanguage.patternLanguage.PatternCompositionConstraint +import org.eclipse.viatra.query.patternlanguage.emf.vql.Pattern +import org.eclipse.viatra.query.patternlanguage.emf.vql.PatternCompositionConstraint +import org.eclipse.viatra.query.patternlanguage.emf.vql.PatternModel import org.eclipse.viatra.query.runtime.api.IQuerySpecification import org.eclipse.xtext.EcoreUtil2 diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/util/VQLParser.xtend b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/util/VQLParser.xtend index 0da42e0f..e458267c 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/util/VQLParser.xtend +++ b/Application/hu.bme.mit.inf.dslreasoner.application/src/hu/bme/mit/inf/dslreasoner/application/execution/util/VQLParser.xtend @@ -10,24 +10,21 @@ import org.eclipse.emf.common.util.URI import org.eclipse.emf.ecore.resource.Resource import org.eclipse.emf.ecore.resource.ResourceSet import org.eclipse.emf.ecore.util.EcoreUtil -import org.eclipse.viatra.query.patternlanguage.PatternLanguageStandaloneSetup -import org.eclipse.viatra.query.patternlanguage.annotations.ExtensionBasedAnnotationValidatorLoader -import org.eclipse.viatra.query.patternlanguage.annotations.IAnnotationValidatorLoader import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguageRuntimeModule import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguageStandaloneSetup import org.eclipse.viatra.query.patternlanguage.emf.GenmodelExtensionLoader import org.eclipse.viatra.query.patternlanguage.emf.IGenmodelMappingLoader -import org.eclipse.viatra.query.patternlanguage.emf.eMFPatternLanguage.PatternModel import org.eclipse.viatra.query.patternlanguage.emf.scoping.CompoundMetamodelProviderService import org.eclipse.viatra.query.patternlanguage.emf.scoping.IMetamodelProvider import org.eclipse.viatra.query.patternlanguage.emf.specification.SpecificationBuilder +import org.eclipse.viatra.query.patternlanguage.emf.vql.PatternModel import org.eclipse.viatra.query.runtime.api.IQuerySpecification import org.eclipse.xtext.resource.XtextResourceSet class MyModule extends EMFPatternLanguageRuntimeModule implements Module { - def public Class bindAnnotationValidatorLoader() { - return typeof(ExtensionBasedAnnotationValidatorLoader); - } +// override public Class bindAnnotationValidatorLoader() { +// return typeof(ExtensionBasedAnnotationValidatorLoader); +// } def public Class bindGenmodelMappingLoader() { return typeof(GenmodelExtensionLoader); } @@ -42,7 +39,6 @@ class VQLParser { val SpecificationBuilder builder = new SpecificationBuilder new() { - PatternLanguageStandaloneSetup.doSetup EMFPatternLanguageStandaloneSetup.doSetup; injector = internalCreateInjector -- cgit v1.2.3-70-g09d2