diff options
author | OszkarSemerath <oszkar.semerath@gmail.com> | 2018-05-08 17:03:07 +0200 |
---|---|---|
committer | OszkarSemerath <oszkar.semerath@gmail.com> | 2018-05-08 17:03:07 +0200 |
commit | 4585a4d344da5498200548e7add61e5cccd44924 (patch) | |
tree | 3a030bea39db36db43d97b62124f6c2a7db111a7 /Framework/hu.bme.mit.inf.dslreasoner.logic.model | |
parent | Updated and fixed dependencies: (diff) | |
download | VIATRA-Generator-4585a4d344da5498200548e7add61e5cccd44924.tar.gz VIATRA-Generator-4585a4d344da5498200548e7add61e5cccd44924.tar.zst VIATRA-Generator-4585a4d344da5498200548e7add61e5cccd44924.zip |
Refactored to the milestone version of Viatra 2.0
Diffstat (limited to 'Framework/hu.bme.mit.inf.dslreasoner.logic.model')
2 files changed, 16 insertions, 16 deletions
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF index b4f60202..763ba19c 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF | |||
@@ -29,7 +29,7 @@ Require-Bundle: org.eclipse.core.runtime, | |||
29 | org.eclipse.core.resources;bundle-version="3.8.101", | 29 | org.eclipse.core.resources;bundle-version="3.8.101", |
30 | org.eclipse.viatra.query.runtime;bundle-version="1.3.0", | 30 | org.eclipse.viatra.query.runtime;bundle-version="1.3.0", |
31 | org.apache.commons.lang;bundle-version="2.6.0" | 31 | org.apache.commons.lang;bundle-version="2.6.0" |
32 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 | ||
33 | Bundle-ActivationPolicy: lazy | ||
34 | Import-Package: org.apache.log4j | 32 | Import-Package: org.apache.log4j |
35 | Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.logic.model | 33 | Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.logic.model |
34 | Bundle-ActivationPolicy: lazy | ||
35 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 | ||
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/consistencychecker/TypeConsistencyChecker.xtend b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/consistencychecker/TypeConsistencyChecker.xtend index 9148424c..7e9dd5fb 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/consistencychecker/TypeConsistencyChecker.xtend +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/src/hu/bme/mit/inf/dslreasoner/logic/model/builder/consistencychecker/TypeConsistencyChecker.xtend | |||
@@ -1,19 +1,19 @@ | |||
1 | package hu.bme.mit.inf.dslreasoner.logic.model.builder.consistencychecker | 1 | package hu.bme.mit.inf.dslreasoner.logic.model.builder.consistencychecker |
2 | 2 | ||
3 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner | 3 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner |
4 | import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem | ||
5 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicSolverConfiguration | ||
6 | import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace | ||
7 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasonerException | 4 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasonerException |
8 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult | 5 | import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicSolverConfiguration |
9 | import org.eclipse.viatra.query.runtime.emf.EMFScope | 6 | import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem |
10 | import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine | ||
11 | import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage | 7 | import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage |
12 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicresultFactory | 8 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicresultFactory |
13 | import hu.bme.mit.inf.dslreasoner.logic.model.patterns.TypeSystemIsInconsistentMatcher | 9 | import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult |
14 | import hu.bme.mit.inf.dslreasoner.logic.model.patterns.ElementNotDefinedInSupertypeMatcher | 10 | import hu.bme.mit.inf.dslreasoner.logic.model.patterns.ElementNotDefinedInSupertype |
15 | import hu.bme.mit.inf.dslreasoner.logic.model.patterns.ElementWithNoPossibleDynamicTypeMatcher | 11 | import hu.bme.mit.inf.dslreasoner.logic.model.patterns.ElementWithNoPossibleDynamicType |
16 | import hu.bme.mit.inf.dslreasoner.logic.model.patterns.PossibleDynamicTypeMatcher | 12 | import hu.bme.mit.inf.dslreasoner.logic.model.patterns.PossibleDynamicType |
13 | import hu.bme.mit.inf.dslreasoner.logic.model.patterns.TypeSystemIsInconsistent | ||
14 | import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace | ||
15 | import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine | ||
16 | import org.eclipse.viatra.query.runtime.emf.EMFScope | ||
17 | 17 | ||
18 | class TypeConsistencyChecker extends LogicReasoner{ | 18 | class TypeConsistencyChecker extends LogicReasoner{ |
19 | val extension LogicresultFactory factory = LogicresultFactory.eINSTANCE | 19 | val extension LogicresultFactory factory = LogicresultFactory.eINSTANCE |
@@ -32,10 +32,10 @@ class TypeConsistencyChecker extends LogicReasoner{ | |||
32 | 32 | ||
33 | val queryEngine = ViatraQueryEngine.on(new EMFScope(problem)) | 33 | val queryEngine = ViatraQueryEngine.on(new EMFScope(problem)) |
34 | 34 | ||
35 | val typeSystemInconsistencyMatcher = TypeSystemIsInconsistentMatcher.on(queryEngine) | 35 | val typeSystemInconsistencyMatcher = TypeSystemIsInconsistent.Matcher.on(queryEngine) |
36 | val elementNotDefinedInSupertype = ElementNotDefinedInSupertypeMatcher.on(queryEngine) | 36 | val elementNotDefinedInSupertype = ElementNotDefinedInSupertype.Matcher.on(queryEngine) |
37 | val elementWithNoPossibleDynamicType = ElementWithNoPossibleDynamicTypeMatcher.on(queryEngine) | 37 | val elementWithNoPossibleDynamicType = ElementWithNoPossibleDynamicType.Matcher.on(queryEngine) |
38 | val possibleDynamicType = PossibleDynamicTypeMatcher.on(queryEngine) | 38 | val possibleDynamicType = PossibleDynamicType.Matcher.on(queryEngine) |
39 | 39 | ||
40 | val hasErrorPatternMatch = typeSystemInconsistencyMatcher.hasMatch(problem) | 40 | val hasErrorPatternMatch = typeSystemInconsistencyMatcher.hasMatch(problem) |
41 | 41 | ||