diff options
58 files changed, 433 insertions, 200 deletions
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.java b/Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.java index 0b5b8f03..dbe4b17b 100644 --- a/Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.java +++ b/Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.java | |||
@@ -1,3 +1,4 @@ | |||
1 | <<<<<<< HEAD | ||
1 | package hu.bme.mit.inf.dslreasoner.application.validation; | 2 | package hu.bme.mit.inf.dslreasoner.application.validation; |
2 | 3 | ||
3 | import com.google.common.collect.Iterables; | 4 | import com.google.common.collect.Iterables; |
@@ -84,3 +85,91 @@ public class QueryAndMetamodelValidator { | |||
84 | return Iterables.<ENamedElement>concat(ListExtensions.<EObject, Iterable<ENamedElement>>map(elements, _function)); | 85 | return Iterables.<ENamedElement>concat(ListExtensions.<EObject, Iterable<ENamedElement>>map(elements, _function)); |
85 | } | 86 | } |
86 | } | 87 | } |
88 | ======= | ||
89 | package hu.bme.mit.inf.dslreasoner.application.validation; | ||
90 | |||
91 | import com.google.common.collect.Iterables; | ||
92 | import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor; | ||
93 | import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor; | ||
94 | import java.util.Collections; | ||
95 | import java.util.LinkedList; | ||
96 | import java.util.List; | ||
97 | import java.util.Set; | ||
98 | import org.eclipse.emf.common.util.EList; | ||
99 | import org.eclipse.emf.ecore.EAttribute; | ||
100 | import org.eclipse.emf.ecore.EClass; | ||
101 | import org.eclipse.emf.ecore.EClassifier; | ||
102 | import org.eclipse.emf.ecore.EEnum; | ||
103 | import org.eclipse.emf.ecore.EEnumLiteral; | ||
104 | import org.eclipse.emf.ecore.ENamedElement; | ||
105 | import org.eclipse.emf.ecore.EObject; | ||
106 | import org.eclipse.emf.ecore.EReference; | ||
107 | import org.eclipse.viatra.query.patternlanguage.emf.vql.Pattern; | ||
108 | import org.eclipse.xtend2.lib.StringConcatenation; | ||
109 | import org.eclipse.xtext.xbase.lib.CollectionLiterals; | ||
110 | import org.eclipse.xtext.xbase.lib.Functions.Function1; | ||
111 | import org.eclipse.xtext.xbase.lib.IterableExtensions; | ||
112 | import org.eclipse.xtext.xbase.lib.IteratorExtensions; | ||
113 | import org.eclipse.xtext.xbase.lib.ListExtensions; | ||
114 | import org.eclipse.xtext.xbase.lib.Pair; | ||
115 | |||
116 | @SuppressWarnings("all") | ||
117 | public class QueryAndMetamodelValidator { | ||
118 | public LinkedList<String> validateQueryAndMetamodel(final EcoreMetamodelDescriptor metamodel, final Pair<ViatraQuerySetDescriptor, Set<Pattern>> viatra) { | ||
119 | final Set<Pattern> patterns = viatra.getValue(); | ||
120 | List<EClass> _classes = metamodel.getClasses(); | ||
121 | List<EEnum> _enums = metamodel.getEnums(); | ||
122 | Iterable<EClassifier> _plus = Iterables.<EClassifier>concat(_classes, _enums); | ||
123 | List<EEnumLiteral> _literals = metamodel.getLiterals(); | ||
124 | Iterable<ENamedElement> _plus_1 = Iterables.<ENamedElement>concat(_plus, _literals); | ||
125 | List<EAttribute> _attributes = metamodel.getAttributes(); | ||
126 | Iterable<ENamedElement> _plus_2 = Iterables.<ENamedElement>concat(_plus_1, _attributes); | ||
127 | List<EReference> _references = metamodel.getReferences(); | ||
128 | final Set<ENamedElement> elementsInMetamodel = IterableExtensions.<ENamedElement>toSet(Iterables.<ENamedElement>concat(_plus_2, _references)); | ||
129 | final LinkedList<String> errors = new LinkedList<String>(); | ||
130 | for (final Pattern pattern : patterns) { | ||
131 | { | ||
132 | final Iterable<ENamedElement> elements = this.getReferredNamedElements(pattern); | ||
133 | for (final ENamedElement element : elements) { | ||
134 | boolean _contains = elementsInMetamodel.contains(element); | ||
135 | boolean _not = (!_contains); | ||
136 | if (_not) { | ||
137 | StringConcatenation _builder = new StringConcatenation(); | ||
138 | _builder.append("Pattern \""); | ||
139 | String _name = pattern.getName(); | ||
140 | _builder.append(_name); | ||
141 | _builder.append("\" refers to an element \""); | ||
142 | _builder.append(element); | ||
143 | _builder.append("\" that is not included to the selected metamodel!"); | ||
144 | errors.add(_builder.toString()); | ||
145 | } | ||
146 | } | ||
147 | } | ||
148 | } | ||
149 | return errors; | ||
150 | } | ||
151 | |||
152 | public Iterable<ENamedElement> getReferredNamedElements(final Pattern pattern) { | ||
153 | final List<EObject> elements = IteratorExtensions.<EObject>toList(pattern.eAllContents()); | ||
154 | final Function1<EObject, Iterable<ENamedElement>> _function = (EObject element) -> { | ||
155 | final EList<EReference> references = element.eClass().getEAllReferences(); | ||
156 | final Function1<EReference, Iterable<ENamedElement>> _function_1 = (EReference r) -> { | ||
157 | boolean _isMany = r.isMany(); | ||
158 | if (_isMany) { | ||
159 | Object _eGet = element.eGet(r); | ||
160 | return Iterables.<ENamedElement>filter(((List<?>) _eGet), ENamedElement.class); | ||
161 | } else { | ||
162 | final Object value = element.eGet(r); | ||
163 | if ((value instanceof ENamedElement)) { | ||
164 | return Collections.<ENamedElement>unmodifiableList(CollectionLiterals.<ENamedElement>newArrayList(((ENamedElement)value))); | ||
165 | } else { | ||
166 | return Collections.<ENamedElement>unmodifiableList(CollectionLiterals.<ENamedElement>newArrayList()); | ||
167 | } | ||
168 | } | ||
169 | }; | ||
170 | return Iterables.<ENamedElement>filter((Iterables.<ENamedElement>concat(ListExtensions.<EReference, Iterable<ENamedElement>>map(references, _function_1))), ENamedElement.class); | ||
171 | }; | ||
172 | return Iterables.<ENamedElement>concat(ListExtensions.<EObject, Iterable<ENamedElement>>map(elements, _function)); | ||
173 | } | ||
174 | } | ||
175 | >>>>>>> 8ecc73c4... VAMPIRE: Rebase on Master | ||
diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml b/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml index d4dfa1c9..2355fff1 100644 --- a/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml +++ b/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml | |||
@@ -2,6 +2,7 @@ | |||
2 | <<<<<<< HEAD | 2 | <<<<<<< HEAD |
3 | <<<<<<< HEAD | 3 | <<<<<<< HEAD |
4 | <<<<<<< HEAD | 4 | <<<<<<< HEAD |
5 | <<<<<<< HEAD | ||
5 | <?xml version="1.0" encoding="UTF-8"?><plugin> | 6 | <?xml version="1.0" encoding="UTF-8"?><plugin> |
6 | <extension id="extension.derived.hu.bme.mit.inf.dslreasoner.domains.transima.fam.model" point="org.eclipse.viatra.query.runtime.base.wellbehaving.derived.features"> | 7 | <extension id="extension.derived.hu.bme.mit.inf.dslreasoner.domains.transima.fam.model" point="org.eclipse.viatra.query.runtime.base.wellbehaving.derived.features"> |
7 | <wellbehaving-derived-feature classifier-name="FunctionalElement" feature-name="model" package-nsUri="http://www.inf.mit.bme.hu/viatrasolver/example/fam"/> | 8 | <wellbehaving-derived-feature classifier-name="FunctionalElement" feature-name="model" package-nsUri="http://www.inf.mit.bme.hu/viatrasolver/example/fam"/> |
@@ -99,3 +100,20 @@ | |||
99 | </extension> | 100 | </extension> |
100 | </plugin> | 101 | </plugin> |
101 | >>>>>>> 4d27f278... VAMPIRE: last commit | 102 | >>>>>>> 4d27f278... VAMPIRE: last commit |
103 | ======= | ||
104 | <?xml version="1.0" encoding="UTF-8"?><plugin> | ||
105 | <extension point="org.eclipse.emf.ecore.generated_package"> | ||
106 | <!-- @generated FamMetamodel --> | ||
107 | <package class="functionalarchitecture.FunctionalarchitecturePackage" genModel="model/FamMetamodel.genmodel" uri="http://www.inf.mit.bme.hu/viatrasolver/example/fam"/> | ||
108 | </extension> | ||
109 | <extension id="hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns" point="org.eclipse.viatra.query.runtime.queryspecification"> | ||
110 | <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns" id="hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns"> | ||
111 | <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.terminatorAndInformation"/> | ||
112 | <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.type"/> | ||
113 | <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.rootElements"/> | ||
114 | <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.parent"/> | ||
115 | <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.model"/> | ||
116 | </group> | ||
117 | </extension> | ||
118 | </plugin> | ||
119 | >>>>>>> 8ecc73c4... VAMPIRE: Rebase on Master | ||
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 878247b1..c3f42035 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 | |||
@@ -22,6 +22,9 @@ Export-Package: hu.bme.mit.inf.dslreasoner.logic.model.builder, | |||
22 | hu.bme.mit.inf.dslreasoner.workspace | 22 | hu.bme.mit.inf.dslreasoner.workspace |
23 | Require-Bundle: org.eclipse.core.runtime, | 23 | Require-Bundle: org.eclipse.core.runtime, |
24 | <<<<<<< HEAD | 24 | <<<<<<< HEAD |
25 | <<<<<<< HEAD | ||
26 | ======= | ||
27 | >>>>>>> 8ecc73c4... VAMPIRE: Rebase on Master | ||
25 | org.eclipse.emf.ecore;visibility:=reexport, | 28 | org.eclipse.emf.ecore;visibility:=reexport, |
26 | com.google.guava, | 29 | com.google.guava, |
27 | org.eclipse.xtend.lib, | 30 | org.eclipse.xtend.lib, |
@@ -30,6 +33,7 @@ Require-Bundle: org.eclipse.core.runtime, | |||
30 | org.eclipse.viatra.query.runtime;bundle-version="1.3.0", | 33 | org.eclipse.viatra.query.runtime;bundle-version="1.3.0", |
31 | org.apache.commons.lang;bundle-version="2.6.0", | 34 | org.apache.commons.lang;bundle-version="2.6.0", |
32 | org.eclipse.emf.ecore.xmi;bundle-version="2.13.0" | 35 | org.eclipse.emf.ecore.xmi;bundle-version="2.13.0" |
36 | <<<<<<< HEAD | ||
33 | ======= | 37 | ======= |
34 | org.eclipse.emf.ecore;visibility:=reexport, | 38 | org.eclipse.emf.ecore;visibility:=reexport, |
35 | com.google.guava, | 39 | com.google.guava, |
@@ -39,6 +43,8 @@ Require-Bundle: org.eclipse.core.runtime, | |||
39 | org.eclipse.viatra.query.runtime;bundle-version="1.3.0", | 43 | org.eclipse.viatra.query.runtime;bundle-version="1.3.0", |
40 | org.apache.commons.lang;bundle-version="2.6.0", | 44 | org.apache.commons.lang;bundle-version="2.6.0", |
41 | org.eclipse.emf.ecore.xmi;bundle-version="2.13.0" | 45 | org.eclipse.emf.ecore.xmi;bundle-version="2.13.0" |
46 | ======= | ||
47 | >>>>>>> 8ecc73c4... VAMPIRE: Rebase on Master | ||
42 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 | 48 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 |
43 | Bundle-ActivationPolicy: lazy | 49 | Bundle-ActivationPolicy: lazy |
44 | >>>>>>> b42fb751... Add gitignore, commit everything | 50 | >>>>>>> b42fb751... Add gitignore, commit everything |
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/META-INF/MANIFEST.MF b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/META-INF/MANIFEST.MF index acaf466f..23e3ad13 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/META-INF/MANIFEST.MF +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/META-INF/MANIFEST.MF | |||
@@ -4,23 +4,23 @@ Bundle-Name: Logic2viatra | |||
4 | Bundle-SymbolicName: hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatraquery;singleton:=true | 4 | Bundle-SymbolicName: hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatraquery;singleton:=true |
5 | Bundle-Version: 1.0.0.qualifier | 5 | Bundle-Version: 1.0.0.qualifier |
6 | Export-Package: hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra, | 6 | Export-Package: hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra, |
7 | hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns, | 7 | hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns, |
8 | hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.queries | 8 | hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.queries |
9 | Require-Bundle: hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0", | 9 | Require-Bundle: hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0", |
10 | hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage;bundle-version="1.0.0", | 10 | hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage;bundle-version="1.0.0", |
11 | hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0", | 11 | hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0", |
12 | hu.bme.mit.inf.dslreasoner.viatra2logic;bundle-version="1.0.0", | 12 | hu.bme.mit.inf.dslreasoner.viatra2logic;bundle-version="1.0.0", |
13 | com.google.guava, | 13 | com.google.guava, |
14 | org.eclipse.xtext.xbase.lib, | 14 | org.eclipse.xtext.xbase.lib, |
15 | org.eclipse.xtend.lib, | 15 | org.eclipse.xtend.lib, |
16 | org.eclipse.xtend.lib.macro, | 16 | org.eclipse.xtend.lib.macro, |
17 | org.eclipse.viatra.query.runtime;bundle-version="1.5.0", | 17 | org.eclipse.viatra.query.runtime;bundle-version="1.5.0", |
18 | org.eclipse.viatra.query.runtime.base.itc;bundle-version="1.5.0", | 18 | org.eclipse.viatra.query.runtime.base.itc;bundle-version="1.5.0", |
19 | org.eclipse.viatra.query.patternlanguage.emf;bundle-version="1.5.0", | 19 | org.eclipse.viatra.query.patternlanguage.emf;bundle-version="1.5.0", |
20 | com.google.inject;bundle-version="3.0.0", | 20 | com.google.inject;bundle-version="3.0.0", |
21 | org.eclipse.xtext;bundle-version="2.10.0", | 21 | org.eclipse.xtext;bundle-version="2.10.0", |
22 | org.eclipse.viatra.transformation.runtime.emf;bundle-version="1.5.0", | 22 | org.eclipse.viatra.transformation.runtime.emf;bundle-version="1.5.0", |
23 | org.eclipse.xtext.xbase;bundle-version="2.10.0" | 23 | org.eclipse.xtext.xbase;bundle-version="2.10.0" |
24 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 | 24 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 |
25 | Import-Package: org.apache.log4j | 25 | Import-Package: org.apache.log4j |
26 | Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatraquery | 26 | Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatraquery |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin index 313b9c2d..8e73c63a 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin index 97ee1913..a5248945 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin index 3424dc60..20e0c17a 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin index 3b0345ce..f3d2dece 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageDescriptionLabelProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageDescriptionLabelProvider.xtendbin index 3a05d228..1d0354a7 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageDescriptionLabelProvider.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageDescriptionLabelProvider.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageLabelProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageLabelProvider.xtendbin index 418ee88d..c64b5e2f 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageLabelProvider.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageLabelProvider.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/outline/.VampireLanguageOutlineTreeProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/outline/.VampireLanguageOutlineTreeProvider.xtendbin index b4a32db5..ef4b984c 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/outline/.VampireLanguageOutlineTreeProvider.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/outline/.VampireLanguageOutlineTreeProvider.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/quickfix/.VampireLanguageQuickfixProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/quickfix/.VampireLanguageQuickfixProvider.xtendbin index 89284901..38907aa5 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/quickfix/.VampireLanguageQuickfixProvider.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/quickfix/.VampireLanguageQuickfixProvider.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin index 633cd134..d1d2ff77 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageStandaloneSetup.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageStandaloneSetup.xtendbin index 75f7c519..27afa8ba 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageStandaloneSetup.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageStandaloneSetup.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin index b9ec3204..d1a3a13d 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.VampireLanguageGenerator.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.VampireLanguageGenerator.xtendbin index 3052ed33..6d2a9063 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.VampireLanguageGenerator.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.VampireLanguageGenerator.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.VampireLanguageScopeProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.VampireLanguageScopeProvider.xtendbin index 67b4ffcc..a9942913 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.VampireLanguageScopeProvider.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.VampireLanguageScopeProvider.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.VampireLanguageValidator.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.VampireLanguageValidator.xtendbin index 297a4f85..cd467bbd 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.VampireLanguageValidator.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.VampireLanguageValidator.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/META-INF/MANIFEST.MF b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/META-INF/MANIFEST.MF index 1c1d9dba..c1928ca0 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/META-INF/MANIFEST.MF +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.queries/META-INF/MANIFEST.MF | |||
@@ -5,11 +5,11 @@ Bundle-SymbolicName: ca.mcgill.ecse.dslreasoner.vampire.queries;singleton:=true | |||
5 | Bundle-Version: 1.0.0.qualifier | 5 | Bundle-Version: 1.0.0.qualifier |
6 | Export-Package: ca.mcgill.ecse.dslreasoner.vampire.queries | 6 | Export-Package: ca.mcgill.ecse.dslreasoner.vampire.queries |
7 | Require-Bundle: org.eclipse.emf.ecore, | 7 | Require-Bundle: org.eclipse.emf.ecore, |
8 | org.eclipse.viatra.query.runtime.rete, | 8 | org.eclipse.viatra.query.runtime.rete, |
9 | org.eclipse.viatra.query.runtime.localsearch, | 9 | org.eclipse.viatra.query.runtime.localsearch, |
10 | org.eclipse.xtext.xbase.lib, | 10 | org.eclipse.xtext.xbase.lib, |
11 | ca.mcgill.ecse.dslreasoner.vampire.language;bundle-version="1.0.0", | 11 | ca.mcgill.ecse.dslreasoner.vampire.language;bundle-version="1.0.0", |
12 | org.eclipse.viatra.query.runtime;bundle-version="2.1.0" | 12 | org.eclipse.viatra.query.runtime;bundle-version="2.1.0" |
13 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 | 13 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 |
14 | Import-Package: org.apache.log4j | 14 | Import-Package: org.apache.log4j |
15 | Automatic-Module-Name: ca.mcgill.ecse.dslreasoner.vampire.queries | 15 | Automatic-Module-Name: ca.mcgill.ecse.dslreasoner.vampire.queries |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/META-INF/MANIFEST.MF b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/META-INF/MANIFEST.MF index 6ed29084..31a52d09 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/META-INF/MANIFEST.MF +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/META-INF/MANIFEST.MF | |||
@@ -4,19 +4,19 @@ Bundle-Name: Reasoner | |||
4 | Bundle-SymbolicName: ca.mcgill.ecse.dslreasoner.vampire.reasoner;singleton:=true | 4 | Bundle-SymbolicName: ca.mcgill.ecse.dslreasoner.vampire.reasoner;singleton:=true |
5 | Bundle-Version: 1.0.0.qualifier | 5 | Bundle-Version: 1.0.0.qualifier |
6 | Export-Package: ca.mcgill.ecse.dslreasoner.vampire.reasoner, | 6 | Export-Package: ca.mcgill.ecse.dslreasoner.vampire.reasoner, |
7 | ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder, | 7 | ca.mcgill.ecse.dslreasoner.vampire.reasoner.builder, |
8 | ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries | 8 | ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries |
9 | Require-Bundle: org.eclipse.emf.ecore, | 9 | Require-Bundle: org.eclipse.emf.ecore, |
10 | org.eclipse.viatra.query.runtime.rete, | 10 | org.eclipse.viatra.query.runtime.rete, |
11 | org.eclipse.viatra.query.runtime.localsearch, | 11 | org.eclipse.viatra.query.runtime.localsearch, |
12 | org.eclipse.xtext.xbase.lib, | 12 | org.eclipse.xtext.xbase.lib, |
13 | org.eclipse.xtend.lib, | 13 | org.eclipse.xtend.lib, |
14 | hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0", | 14 | hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0", |
15 | hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0", | 15 | hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0", |
16 | ca.mcgill.ecse.dslreasoner.vampire.language;bundle-version="1.0.0", | 16 | ca.mcgill.ecse.dslreasoner.vampire.language;bundle-version="1.0.0", |
17 | org.eclipse.viatra.query.runtime;bundle-version="2.1.0", | 17 | org.eclipse.viatra.query.runtime;bundle-version="2.1.0", |
18 | org.eclipse.viatra.query.runtime.base.itc;bundle-version="2.1.0", | 18 | org.eclipse.viatra.query.runtime.base.itc;bundle-version="2.1.0", |
19 | org.apache.log4j;bundle-version="1.2.15" | 19 | org.apache.log4j;bundle-version="1.2.15" |
20 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 | 20 | Bundle-RequiredExecutionEnvironment: JavaSE-1.8 |
21 | Import-Package: org.apache.log4j | 21 | Import-Package: org.apache.log4j |
22 | Automatic-Module-Name: ca.mcgill.ecse.dslreasoner.vampire.reasoner | 22 | Automatic-Module-Name: ca.mcgill.ecse.dslreasoner.vampire.reasoner |
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSAnd.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSAnd.java index 68bebb93..553d455c 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSAnd.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSAnd.java | |||
@@ -74,8 +74,18 @@ public final class VLSAnd extends BaseGeneratedEMFQuerySpecification<VLSAnd.Matc | |||
74 | 74 | ||
75 | @Override | 75 | @Override |
76 | public Object get(final String parameterName) { | 76 | public Object get(final String parameterName) { |
77 | if ("term".equals(parameterName)) return this.fTerm; | 77 | switch(parameterName) { |
78 | return null; | 78 | case "term": return this.fTerm; |
79 | default: return null; | ||
80 | } | ||
81 | } | ||
82 | |||
83 | @Override | ||
84 | public Object get(final int index) { | ||
85 | switch(index) { | ||
86 | case 0: return this.fTerm; | ||
87 | default: return null; | ||
88 | } | ||
79 | } | 89 | } |
80 | 90 | ||
81 | public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd getTerm() { | 91 | public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd getTerm() { |
@@ -260,9 +270,9 @@ public final class VLSAnd extends BaseGeneratedEMFQuerySpecification<VLSAnd.Matc | |||
260 | return new Matcher(); | 270 | return new Matcher(); |
261 | } | 271 | } |
262 | 272 | ||
263 | private final static int POSITION_TERM = 0; | 273 | private static final int POSITION_TERM = 0; |
264 | 274 | ||
265 | private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSAnd.Matcher.class); | 275 | private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSAnd.Matcher.class); |
266 | 276 | ||
267 | /** | 277 | /** |
268 | * Initializes the pattern matcher within an existing VIATRA Query engine. | 278 | * Initializes the pattern matcher within an existing VIATRA Query engine. |
@@ -461,15 +471,15 @@ public final class VLSAnd extends BaseGeneratedEMFQuerySpecification<VLSAnd.Matc | |||
461 | } | 471 | } |
462 | 472 | ||
463 | /** | 473 | /** |
464 | * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSAnd (visibility: PUBLIC, simpleName: VLSAnd, identifier: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSAnd, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created | 474 | * Inner class allowing the singleton instance of {@link VLSAnd} to be created |
465 | * <b>not</b> at the class load time of the outer class, | 475 | * <b>not</b> at the class load time of the outer class, |
466 | * but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSAnd (visibility: PUBLIC, simpleName: VLSAnd, identifier: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSAnd, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}. | 476 | * but rather at the first call to {@link VLSAnd#instance()}. |
467 | * | 477 | * |
468 | * <p> This workaround is required e.g. to support recursion. | 478 | * <p> This workaround is required e.g. to support recursion. |
469 | * | 479 | * |
470 | */ | 480 | */ |
471 | private static class LazyHolder { | 481 | private static class LazyHolder { |
472 | private final static VLSAnd INSTANCE = new VLSAnd(); | 482 | private static final VLSAnd INSTANCE = new VLSAnd(); |
473 | 483 | ||
474 | /** | 484 | /** |
475 | * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned. | 485 | * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned. |
@@ -478,7 +488,7 @@ public final class VLSAnd extends BaseGeneratedEMFQuerySpecification<VLSAnd.Matc | |||
478 | * <p> The static initializer is defined using a helper field to work around limitations of the code generator. | 488 | * <p> The static initializer is defined using a helper field to work around limitations of the code generator. |
479 | * | 489 | * |
480 | */ | 490 | */ |
481 | private final static Object STATIC_INITIALIZER = ensureInitialized(); | 491 | private static final Object STATIC_INITIALIZER = ensureInitialized(); |
482 | 492 | ||
483 | public static Object ensureInitialized() { | 493 | public static Object ensureInitialized() { |
484 | INSTANCE.ensureInitializedInternal(); | 494 | INSTANCE.ensureInitializedInternal(); |
@@ -487,7 +497,7 @@ public final class VLSAnd extends BaseGeneratedEMFQuerySpecification<VLSAnd.Matc | |||
487 | } | 497 | } |
488 | 498 | ||
489 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { | 499 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { |
490 | private final static VLSAnd.GeneratedPQuery INSTANCE = new GeneratedPQuery(); | 500 | private static final VLSAnd.GeneratedPQuery INSTANCE = new GeneratedPQuery(); |
491 | 501 | ||
492 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSAnd")), PParameterDirection.INOUT); | 502 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnd", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSAnd")), PParameterDirection.INOUT); |
493 | 503 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSAnnotation.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSAnnotation.java index c7d691f9..3096531d 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSAnnotation.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSAnnotation.java | |||
@@ -74,8 +74,18 @@ public final class VLSAnnotation extends BaseGeneratedEMFQuerySpecification<VLSA | |||
74 | 74 | ||
75 | @Override | 75 | @Override |
76 | public Object get(final String parameterName) { | 76 | public Object get(final String parameterName) { |
77 | if ("term".equals(parameterName)) return this.fTerm; | 77 | switch(parameterName) { |
78 | return null; | 78 | case "term": return this.fTerm; |
79 | default: return null; | ||
80 | } | ||
81 | } | ||
82 | |||
83 | @Override | ||
84 | public Object get(final int index) { | ||
85 | switch(index) { | ||
86 | case 0: return this.fTerm; | ||
87 | default: return null; | ||
88 | } | ||
79 | } | 89 | } |
80 | 90 | ||
81 | public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation getTerm() { | 91 | public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation getTerm() { |
@@ -260,9 +270,9 @@ public final class VLSAnnotation extends BaseGeneratedEMFQuerySpecification<VLSA | |||
260 | return new Matcher(); | 270 | return new Matcher(); |
261 | } | 271 | } |
262 | 272 | ||
263 | private final static int POSITION_TERM = 0; | 273 | private static final int POSITION_TERM = 0; |
264 | 274 | ||
265 | private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSAnnotation.Matcher.class); | 275 | private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSAnnotation.Matcher.class); |
266 | 276 | ||
267 | /** | 277 | /** |
268 | * Initializes the pattern matcher within an existing VIATRA Query engine. | 278 | * Initializes the pattern matcher within an existing VIATRA Query engine. |
@@ -461,15 +471,15 @@ public final class VLSAnnotation extends BaseGeneratedEMFQuerySpecification<VLSA | |||
461 | } | 471 | } |
462 | 472 | ||
463 | /** | 473 | /** |
464 | * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSAnnotation (visibility: PUBLIC, simpleName: VLSAnnotation, identifier: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSAnnotation, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created | 474 | * Inner class allowing the singleton instance of {@link VLSAnnotation} to be created |
465 | * <b>not</b> at the class load time of the outer class, | 475 | * <b>not</b> at the class load time of the outer class, |
466 | * but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSAnnotation (visibility: PUBLIC, simpleName: VLSAnnotation, identifier: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSAnnotation, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}. | 476 | * but rather at the first call to {@link VLSAnnotation#instance()}. |
467 | * | 477 | * |
468 | * <p> This workaround is required e.g. to support recursion. | 478 | * <p> This workaround is required e.g. to support recursion. |
469 | * | 479 | * |
470 | */ | 480 | */ |
471 | private static class LazyHolder { | 481 | private static class LazyHolder { |
472 | private final static VLSAnnotation INSTANCE = new VLSAnnotation(); | 482 | private static final VLSAnnotation INSTANCE = new VLSAnnotation(); |
473 | 483 | ||
474 | /** | 484 | /** |
475 | * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned. | 485 | * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned. |
@@ -478,7 +488,7 @@ public final class VLSAnnotation extends BaseGeneratedEMFQuerySpecification<VLSA | |||
478 | * <p> The static initializer is defined using a helper field to work around limitations of the code generator. | 488 | * <p> The static initializer is defined using a helper field to work around limitations of the code generator. |
479 | * | 489 | * |
480 | */ | 490 | */ |
481 | private final static Object STATIC_INITIALIZER = ensureInitialized(); | 491 | private static final Object STATIC_INITIALIZER = ensureInitialized(); |
482 | 492 | ||
483 | public static Object ensureInitialized() { | 493 | public static Object ensureInitialized() { |
484 | INSTANCE.ensureInitializedInternal(); | 494 | INSTANCE.ensureInitializedInternal(); |
@@ -487,7 +497,7 @@ public final class VLSAnnotation extends BaseGeneratedEMFQuerySpecification<VLSA | |||
487 | } | 497 | } |
488 | 498 | ||
489 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { | 499 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { |
490 | private final static VLSAnnotation.GeneratedPQuery INSTANCE = new GeneratedPQuery(); | 500 | private static final VLSAnnotation.GeneratedPQuery INSTANCE = new GeneratedPQuery(); |
491 | 501 | ||
492 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSAnnotation")), PParameterDirection.INOUT); | 502 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSAnnotation", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSAnnotation")), PParameterDirection.INOUT); |
493 | 503 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSComment.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSComment.java index 534f0b0b..f2b34120 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSComment.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSComment.java | |||
@@ -74,8 +74,18 @@ public final class VLSComment extends BaseGeneratedEMFQuerySpecification<VLSComm | |||
74 | 74 | ||
75 | @Override | 75 | @Override |
76 | public Object get(final String parameterName) { | 76 | public Object get(final String parameterName) { |
77 | if ("term".equals(parameterName)) return this.fTerm; | 77 | switch(parameterName) { |
78 | return null; | 78 | case "term": return this.fTerm; |
79 | default: return null; | ||
80 | } | ||
81 | } | ||
82 | |||
83 | @Override | ||
84 | public Object get(final int index) { | ||
85 | switch(index) { | ||
86 | case 0: return this.fTerm; | ||
87 | default: return null; | ||
88 | } | ||
79 | } | 89 | } |
80 | 90 | ||
81 | public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment getTerm() { | 91 | public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment getTerm() { |
@@ -260,9 +270,9 @@ public final class VLSComment extends BaseGeneratedEMFQuerySpecification<VLSComm | |||
260 | return new Matcher(); | 270 | return new Matcher(); |
261 | } | 271 | } |
262 | 272 | ||
263 | private final static int POSITION_TERM = 0; | 273 | private static final int POSITION_TERM = 0; |
264 | 274 | ||
265 | private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSComment.Matcher.class); | 275 | private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSComment.Matcher.class); |
266 | 276 | ||
267 | /** | 277 | /** |
268 | * Initializes the pattern matcher within an existing VIATRA Query engine. | 278 | * Initializes the pattern matcher within an existing VIATRA Query engine. |
@@ -461,15 +471,15 @@ public final class VLSComment extends BaseGeneratedEMFQuerySpecification<VLSComm | |||
461 | } | 471 | } |
462 | 472 | ||
463 | /** | 473 | /** |
464 | * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSComment (visibility: PUBLIC, simpleName: VLSComment, identifier: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSComment, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created | 474 | * Inner class allowing the singleton instance of {@link VLSComment} to be created |
465 | * <b>not</b> at the class load time of the outer class, | 475 | * <b>not</b> at the class load time of the outer class, |
466 | * but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSComment (visibility: PUBLIC, simpleName: VLSComment, identifier: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSComment, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}. | 476 | * but rather at the first call to {@link VLSComment#instance()}. |
467 | * | 477 | * |
468 | * <p> This workaround is required e.g. to support recursion. | 478 | * <p> This workaround is required e.g. to support recursion. |
469 | * | 479 | * |
470 | */ | 480 | */ |
471 | private static class LazyHolder { | 481 | private static class LazyHolder { |
472 | private final static VLSComment INSTANCE = new VLSComment(); | 482 | private static final VLSComment INSTANCE = new VLSComment(); |
473 | 483 | ||
474 | /** | 484 | /** |
475 | * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned. | 485 | * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned. |
@@ -478,7 +488,7 @@ public final class VLSComment extends BaseGeneratedEMFQuerySpecification<VLSComm | |||
478 | * <p> The static initializer is defined using a helper field to work around limitations of the code generator. | 488 | * <p> The static initializer is defined using a helper field to work around limitations of the code generator. |
479 | * | 489 | * |
480 | */ | 490 | */ |
481 | private final static Object STATIC_INITIALIZER = ensureInitialized(); | 491 | private static final Object STATIC_INITIALIZER = ensureInitialized(); |
482 | 492 | ||
483 | public static Object ensureInitialized() { | 493 | public static Object ensureInitialized() { |
484 | INSTANCE.ensureInitializedInternal(); | 494 | INSTANCE.ensureInitializedInternal(); |
@@ -487,7 +497,7 @@ public final class VLSComment extends BaseGeneratedEMFQuerySpecification<VLSComm | |||
487 | } | 497 | } |
488 | 498 | ||
489 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { | 499 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { |
490 | private final static VLSComment.GeneratedPQuery INSTANCE = new GeneratedPQuery(); | 500 | private static final VLSComment.GeneratedPQuery INSTANCE = new GeneratedPQuery(); |
491 | 501 | ||
492 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSComment")), PParameterDirection.INOUT); | 502 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSComment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSComment")), PParameterDirection.INOUT); |
493 | 503 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSEquivalent.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSEquivalent.java index e8e1475f..3ed03d34 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSEquivalent.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSEquivalent.java | |||
@@ -74,8 +74,18 @@ public final class VLSEquivalent extends BaseGeneratedEMFQuerySpecification<VLSE | |||
74 | 74 | ||
75 | @Override | 75 | @Override |
76 | public Object get(final String parameterName) { | 76 | public Object get(final String parameterName) { |
77 | if ("term".equals(parameterName)) return this.fTerm; | 77 | switch(parameterName) { |
78 | return null; | 78 | case "term": return this.fTerm; |
79 | default: return null; | ||
80 | } | ||
81 | } | ||
82 | |||
83 | @Override | ||
84 | public Object get(final int index) { | ||
85 | switch(index) { | ||
86 | case 0: return this.fTerm; | ||
87 | default: return null; | ||
88 | } | ||
79 | } | 89 | } |
80 | 90 | ||
81 | public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent getTerm() { | 91 | public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent getTerm() { |
@@ -260,9 +270,9 @@ public final class VLSEquivalent extends BaseGeneratedEMFQuerySpecification<VLSE | |||
260 | return new Matcher(); | 270 | return new Matcher(); |
261 | } | 271 | } |
262 | 272 | ||
263 | private final static int POSITION_TERM = 0; | 273 | private static final int POSITION_TERM = 0; |
264 | 274 | ||
265 | private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSEquivalent.Matcher.class); | 275 | private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSEquivalent.Matcher.class); |
266 | 276 | ||
267 | /** | 277 | /** |
268 | * Initializes the pattern matcher within an existing VIATRA Query engine. | 278 | * Initializes the pattern matcher within an existing VIATRA Query engine. |
@@ -461,15 +471,15 @@ public final class VLSEquivalent extends BaseGeneratedEMFQuerySpecification<VLSE | |||
461 | } | 471 | } |
462 | 472 | ||
463 | /** | 473 | /** |
464 | * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSEquivalent (visibility: PUBLIC, simpleName: VLSEquivalent, identifier: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSEquivalent, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created | 474 | * Inner class allowing the singleton instance of {@link VLSEquivalent} to be created |
465 | * <b>not</b> at the class load time of the outer class, | 475 | * <b>not</b> at the class load time of the outer class, |
466 | * but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSEquivalent (visibility: PUBLIC, simpleName: VLSEquivalent, identifier: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSEquivalent, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}. | 476 | * but rather at the first call to {@link VLSEquivalent#instance()}. |
467 | * | 477 | * |
468 | * <p> This workaround is required e.g. to support recursion. | 478 | * <p> This workaround is required e.g. to support recursion. |
469 | * | 479 | * |
470 | */ | 480 | */ |
471 | private static class LazyHolder { | 481 | private static class LazyHolder { |
472 | private final static VLSEquivalent INSTANCE = new VLSEquivalent(); | 482 | private static final VLSEquivalent INSTANCE = new VLSEquivalent(); |
473 | 483 | ||
474 | /** | 484 | /** |
475 | * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned. | 485 | * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned. |
@@ -478,7 +488,7 @@ public final class VLSEquivalent extends BaseGeneratedEMFQuerySpecification<VLSE | |||
478 | * <p> The static initializer is defined using a helper field to work around limitations of the code generator. | 488 | * <p> The static initializer is defined using a helper field to work around limitations of the code generator. |
479 | * | 489 | * |
480 | */ | 490 | */ |
481 | private final static Object STATIC_INITIALIZER = ensureInitialized(); | 491 | private static final Object STATIC_INITIALIZER = ensureInitialized(); |
482 | 492 | ||
483 | public static Object ensureInitialized() { | 493 | public static Object ensureInitialized() { |
484 | INSTANCE.ensureInitializedInternal(); | 494 | INSTANCE.ensureInitializedInternal(); |
@@ -487,7 +497,7 @@ public final class VLSEquivalent extends BaseGeneratedEMFQuerySpecification<VLSE | |||
487 | } | 497 | } |
488 | 498 | ||
489 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { | 499 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { |
490 | private final static VLSEquivalent.GeneratedPQuery INSTANCE = new GeneratedPQuery(); | 500 | private static final VLSEquivalent.GeneratedPQuery INSTANCE = new GeneratedPQuery(); |
491 | 501 | ||
492 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSEquivalent")), PParameterDirection.INOUT); | 502 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSEquivalent", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSEquivalent")), PParameterDirection.INOUT); |
493 | 503 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSExistentialQuantifier.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSExistentialQuantifier.java index 1d9c93b1..643c2b60 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSExistentialQuantifier.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSExistentialQuantifier.java | |||
@@ -74,8 +74,18 @@ public final class VLSExistentialQuantifier extends BaseGeneratedEMFQuerySpecifi | |||
74 | 74 | ||
75 | @Override | 75 | @Override |
76 | public Object get(final String parameterName) { | 76 | public Object get(final String parameterName) { |
77 | if ("term".equals(parameterName)) return this.fTerm; | 77 | switch(parameterName) { |
78 | return null; | 78 | case "term": return this.fTerm; |
79 | default: return null; | ||
80 | } | ||
81 | } | ||
82 | |||
83 | @Override | ||
84 | public Object get(final int index) { | ||
85 | switch(index) { | ||
86 | case 0: return this.fTerm; | ||
87 | default: return null; | ||
88 | } | ||
79 | } | 89 | } |
80 | 90 | ||
81 | public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier getTerm() { | 91 | public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier getTerm() { |
@@ -260,9 +270,9 @@ public final class VLSExistentialQuantifier extends BaseGeneratedEMFQuerySpecifi | |||
260 | return new Matcher(); | 270 | return new Matcher(); |
261 | } | 271 | } |
262 | 272 | ||
263 | private final static int POSITION_TERM = 0; | 273 | private static final int POSITION_TERM = 0; |
264 | 274 | ||
265 | private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSExistentialQuantifier.Matcher.class); | 275 | private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSExistentialQuantifier.Matcher.class); |
266 | 276 | ||
267 | /** | 277 | /** |
268 | * Initializes the pattern matcher within an existing VIATRA Query engine. | 278 | * Initializes the pattern matcher within an existing VIATRA Query engine. |
@@ -461,15 +471,15 @@ public final class VLSExistentialQuantifier extends BaseGeneratedEMFQuerySpecifi | |||
461 | } | 471 | } |
462 | 472 | ||
463 | /** | 473 | /** |
464 | * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSExistentialQuantifier (visibility: PUBLIC, simpleName: VLSExistentialQuantifier, identifier: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSExistentialQuantifier, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created | 474 | * Inner class allowing the singleton instance of {@link VLSExistentialQuantifier} to be created |
465 | * <b>not</b> at the class load time of the outer class, | 475 | * <b>not</b> at the class load time of the outer class, |
466 | * but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSExistentialQuantifier (visibility: PUBLIC, simpleName: VLSExistentialQuantifier, identifier: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSExistentialQuantifier, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}. | 476 | * but rather at the first call to {@link VLSExistentialQuantifier#instance()}. |
467 | * | 477 | * |
468 | * <p> This workaround is required e.g. to support recursion. | 478 | * <p> This workaround is required e.g. to support recursion. |
469 | * | 479 | * |
470 | */ | 480 | */ |
471 | private static class LazyHolder { | 481 | private static class LazyHolder { |
472 | private final static VLSExistentialQuantifier INSTANCE = new VLSExistentialQuantifier(); | 482 | private static final VLSExistentialQuantifier INSTANCE = new VLSExistentialQuantifier(); |
473 | 483 | ||
474 | /** | 484 | /** |
475 | * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned. | 485 | * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned. |
@@ -478,7 +488,7 @@ public final class VLSExistentialQuantifier extends BaseGeneratedEMFQuerySpecifi | |||
478 | * <p> The static initializer is defined using a helper field to work around limitations of the code generator. | 488 | * <p> The static initializer is defined using a helper field to work around limitations of the code generator. |
479 | * | 489 | * |
480 | */ | 490 | */ |
481 | private final static Object STATIC_INITIALIZER = ensureInitialized(); | 491 | private static final Object STATIC_INITIALIZER = ensureInitialized(); |
482 | 492 | ||
483 | public static Object ensureInitialized() { | 493 | public static Object ensureInitialized() { |
484 | INSTANCE.ensureInitializedInternal(); | 494 | INSTANCE.ensureInitializedInternal(); |
@@ -487,7 +497,7 @@ public final class VLSExistentialQuantifier extends BaseGeneratedEMFQuerySpecifi | |||
487 | } | 497 | } |
488 | 498 | ||
489 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { | 499 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { |
490 | private final static VLSExistentialQuantifier.GeneratedPQuery INSTANCE = new GeneratedPQuery(); | 500 | private static final VLSExistentialQuantifier.GeneratedPQuery INSTANCE = new GeneratedPQuery(); |
491 | 501 | ||
492 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSExistentialQuantifier")), PParameterDirection.INOUT); | 502 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSExistentialQuantifier", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSExistentialQuantifier")), PParameterDirection.INOUT); |
493 | 503 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSFofFormula.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSFofFormula.java index e35ffaa2..666795b5 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSFofFormula.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSFofFormula.java | |||
@@ -74,8 +74,18 @@ public final class VLSFofFormula extends BaseGeneratedEMFQuerySpecification<VLSF | |||
74 | 74 | ||
75 | @Override | 75 | @Override |
76 | public Object get(final String parameterName) { | 76 | public Object get(final String parameterName) { |
77 | if ("term".equals(parameterName)) return this.fTerm; | 77 | switch(parameterName) { |
78 | return null; | 78 | case "term": return this.fTerm; |
79 | default: return null; | ||
80 | } | ||
81 | } | ||
82 | |||
83 | @Override | ||
84 | public Object get(final int index) { | ||
85 | switch(index) { | ||
86 | case 0: return this.fTerm; | ||
87 | default: return null; | ||
88 | } | ||
79 | } | 89 | } |
80 | 90 | ||
81 | public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula getTerm() { | 91 | public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula getTerm() { |
@@ -260,9 +270,9 @@ public final class VLSFofFormula extends BaseGeneratedEMFQuerySpecification<VLSF | |||
260 | return new Matcher(); | 270 | return new Matcher(); |
261 | } | 271 | } |
262 | 272 | ||
263 | private final static int POSITION_TERM = 0; | 273 | private static final int POSITION_TERM = 0; |
264 | 274 | ||
265 | private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSFofFormula.Matcher.class); | 275 | private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSFofFormula.Matcher.class); |
266 | 276 | ||
267 | /** | 277 | /** |
268 | * Initializes the pattern matcher within an existing VIATRA Query engine. | 278 | * Initializes the pattern matcher within an existing VIATRA Query engine. |
@@ -461,15 +471,15 @@ public final class VLSFofFormula extends BaseGeneratedEMFQuerySpecification<VLSF | |||
461 | } | 471 | } |
462 | 472 | ||
463 | /** | 473 | /** |
464 | * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSFofFormula (visibility: PUBLIC, simpleName: VLSFofFormula, identifier: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSFofFormula, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created | 474 | * Inner class allowing the singleton instance of {@link VLSFofFormula} to be created |
465 | * <b>not</b> at the class load time of the outer class, | 475 | * <b>not</b> at the class load time of the outer class, |
466 | * but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSFofFormula (visibility: PUBLIC, simpleName: VLSFofFormula, identifier: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSFofFormula, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}. | 476 | * but rather at the first call to {@link VLSFofFormula#instance()}. |
467 | * | 477 | * |
468 | * <p> This workaround is required e.g. to support recursion. | 478 | * <p> This workaround is required e.g. to support recursion. |
469 | * | 479 | * |
470 | */ | 480 | */ |
471 | private static class LazyHolder { | 481 | private static class LazyHolder { |
472 | private final static VLSFofFormula INSTANCE = new VLSFofFormula(); | 482 | private static final VLSFofFormula INSTANCE = new VLSFofFormula(); |
473 | 483 | ||
474 | /** | 484 | /** |
475 | * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned. | 485 | * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned. |
@@ -478,7 +488,7 @@ public final class VLSFofFormula extends BaseGeneratedEMFQuerySpecification<VLSF | |||
478 | * <p> The static initializer is defined using a helper field to work around limitations of the code generator. | 488 | * <p> The static initializer is defined using a helper field to work around limitations of the code generator. |
479 | * | 489 | * |
480 | */ | 490 | */ |
481 | private final static Object STATIC_INITIALIZER = ensureInitialized(); | 491 | private static final Object STATIC_INITIALIZER = ensureInitialized(); |
482 | 492 | ||
483 | public static Object ensureInitialized() { | 493 | public static Object ensureInitialized() { |
484 | INSTANCE.ensureInitializedInternal(); | 494 | INSTANCE.ensureInitializedInternal(); |
@@ -487,7 +497,7 @@ public final class VLSFofFormula extends BaseGeneratedEMFQuerySpecification<VLSF | |||
487 | } | 497 | } |
488 | 498 | ||
489 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { | 499 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { |
490 | private final static VLSFofFormula.GeneratedPQuery INSTANCE = new GeneratedPQuery(); | 500 | private static final VLSFofFormula.GeneratedPQuery INSTANCE = new GeneratedPQuery(); |
491 | 501 | ||
492 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFofFormula")), PParameterDirection.INOUT); | 502 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFofFormula", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFofFormula")), PParameterDirection.INOUT); |
493 | 503 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSFunction.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSFunction.java index 47097005..8fff7789 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSFunction.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSFunction.java | |||
@@ -74,8 +74,18 @@ public final class VLSFunction extends BaseGeneratedEMFQuerySpecification<VLSFun | |||
74 | 74 | ||
75 | @Override | 75 | @Override |
76 | public Object get(final String parameterName) { | 76 | public Object get(final String parameterName) { |
77 | if ("term".equals(parameterName)) return this.fTerm; | 77 | switch(parameterName) { |
78 | return null; | 78 | case "term": return this.fTerm; |
79 | default: return null; | ||
80 | } | ||
81 | } | ||
82 | |||
83 | @Override | ||
84 | public Object get(final int index) { | ||
85 | switch(index) { | ||
86 | case 0: return this.fTerm; | ||
87 | default: return null; | ||
88 | } | ||
79 | } | 89 | } |
80 | 90 | ||
81 | public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction getTerm() { | 91 | public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction getTerm() { |
@@ -260,9 +270,9 @@ public final class VLSFunction extends BaseGeneratedEMFQuerySpecification<VLSFun | |||
260 | return new Matcher(); | 270 | return new Matcher(); |
261 | } | 271 | } |
262 | 272 | ||
263 | private final static int POSITION_TERM = 0; | 273 | private static final int POSITION_TERM = 0; |
264 | 274 | ||
265 | private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSFunction.Matcher.class); | 275 | private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSFunction.Matcher.class); |
266 | 276 | ||
267 | /** | 277 | /** |
268 | * Initializes the pattern matcher within an existing VIATRA Query engine. | 278 | * Initializes the pattern matcher within an existing VIATRA Query engine. |
@@ -461,15 +471,15 @@ public final class VLSFunction extends BaseGeneratedEMFQuerySpecification<VLSFun | |||
461 | } | 471 | } |
462 | 472 | ||
463 | /** | 473 | /** |
464 | * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSFunction (visibility: PUBLIC, simpleName: VLSFunction, identifier: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSFunction, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created | 474 | * Inner class allowing the singleton instance of {@link VLSFunction} to be created |
465 | * <b>not</b> at the class load time of the outer class, | 475 | * <b>not</b> at the class load time of the outer class, |
466 | * but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSFunction (visibility: PUBLIC, simpleName: VLSFunction, identifier: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSFunction, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}. | 476 | * but rather at the first call to {@link VLSFunction#instance()}. |
467 | * | 477 | * |
468 | * <p> This workaround is required e.g. to support recursion. | 478 | * <p> This workaround is required e.g. to support recursion. |
469 | * | 479 | * |
470 | */ | 480 | */ |
471 | private static class LazyHolder { | 481 | private static class LazyHolder { |
472 | private final static VLSFunction INSTANCE = new VLSFunction(); | 482 | private static final VLSFunction INSTANCE = new VLSFunction(); |
473 | 483 | ||
474 | /** | 484 | /** |
475 | * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned. | 485 | * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned. |
@@ -478,7 +488,7 @@ public final class VLSFunction extends BaseGeneratedEMFQuerySpecification<VLSFun | |||
478 | * <p> The static initializer is defined using a helper field to work around limitations of the code generator. | 488 | * <p> The static initializer is defined using a helper field to work around limitations of the code generator. |
479 | * | 489 | * |
480 | */ | 490 | */ |
481 | private final static Object STATIC_INITIALIZER = ensureInitialized(); | 491 | private static final Object STATIC_INITIALIZER = ensureInitialized(); |
482 | 492 | ||
483 | public static Object ensureInitialized() { | 493 | public static Object ensureInitialized() { |
484 | INSTANCE.ensureInitializedInternal(); | 494 | INSTANCE.ensureInitializedInternal(); |
@@ -487,7 +497,7 @@ public final class VLSFunction extends BaseGeneratedEMFQuerySpecification<VLSFun | |||
487 | } | 497 | } |
488 | 498 | ||
489 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { | 499 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { |
490 | private final static VLSFunction.GeneratedPQuery INSTANCE = new GeneratedPQuery(); | 500 | private static final VLSFunction.GeneratedPQuery INSTANCE = new GeneratedPQuery(); |
491 | 501 | ||
492 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFunction")), PParameterDirection.INOUT); | 502 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunction", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFunction")), PParameterDirection.INOUT); |
493 | 503 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSFunctionFof.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSFunctionFof.java index 0e82d459..e7a2295c 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSFunctionFof.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSFunctionFof.java | |||
@@ -75,8 +75,18 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
75 | 75 | ||
76 | @Override | 76 | @Override |
77 | public Object get(final String parameterName) { | 77 | public Object get(final String parameterName) { |
78 | if ("term".equals(parameterName)) return this.fTerm; | 78 | switch(parameterName) { |
79 | return null; | 79 | case "term": return this.fTerm; |
80 | default: return null; | ||
81 | } | ||
82 | } | ||
83 | |||
84 | @Override | ||
85 | public Object get(final int index) { | ||
86 | switch(index) { | ||
87 | case 0: return this.fTerm; | ||
88 | default: return null; | ||
89 | } | ||
80 | } | 90 | } |
81 | 91 | ||
82 | public VLSFunctionAsTerm getTerm() { | 92 | public VLSFunctionAsTerm getTerm() { |
@@ -261,9 +271,9 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
261 | return new Matcher(); | 271 | return new Matcher(); |
262 | } | 272 | } |
263 | 273 | ||
264 | private final static int POSITION_TERM = 0; | 274 | private static final int POSITION_TERM = 0; |
265 | 275 | ||
266 | private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSFunctionFof.Matcher.class); | 276 | private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSFunctionFof.Matcher.class); |
267 | 277 | ||
268 | /** | 278 | /** |
269 | * Initializes the pattern matcher within an existing VIATRA Query engine. | 279 | * Initializes the pattern matcher within an existing VIATRA Query engine. |
@@ -462,15 +472,15 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
462 | } | 472 | } |
463 | 473 | ||
464 | /** | 474 | /** |
465 | * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSFunctionFof (visibility: PUBLIC, simpleName: VLSFunctionFof, identifier: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSFunctionFof, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created | 475 | * Inner class allowing the singleton instance of {@link VLSFunctionFof} to be created |
466 | * <b>not</b> at the class load time of the outer class, | 476 | * <b>not</b> at the class load time of the outer class, |
467 | * but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSFunctionFof (visibility: PUBLIC, simpleName: VLSFunctionFof, identifier: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSFunctionFof, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}. | 477 | * but rather at the first call to {@link VLSFunctionFof#instance()}. |
468 | * | 478 | * |
469 | * <p> This workaround is required e.g. to support recursion. | 479 | * <p> This workaround is required e.g. to support recursion. |
470 | * | 480 | * |
471 | */ | 481 | */ |
472 | private static class LazyHolder { | 482 | private static class LazyHolder { |
473 | private final static VLSFunctionFof INSTANCE = new VLSFunctionFof(); | 483 | private static final VLSFunctionFof INSTANCE = new VLSFunctionFof(); |
474 | 484 | ||
475 | /** | 485 | /** |
476 | * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned. | 486 | * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned. |
@@ -479,7 +489,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
479 | * <p> The static initializer is defined using a helper field to work around limitations of the code generator. | 489 | * <p> The static initializer is defined using a helper field to work around limitations of the code generator. |
480 | * | 490 | * |
481 | */ | 491 | */ |
482 | private final static Object STATIC_INITIALIZER = ensureInitialized(); | 492 | private static final Object STATIC_INITIALIZER = ensureInitialized(); |
483 | 493 | ||
484 | public static Object ensureInitialized() { | 494 | public static Object ensureInitialized() { |
485 | INSTANCE.ensureInitializedInternal(); | 495 | INSTANCE.ensureInitializedInternal(); |
@@ -488,7 +498,7 @@ public final class VLSFunctionFof extends BaseGeneratedEMFQuerySpecification<VLS | |||
488 | } | 498 | } |
489 | 499 | ||
490 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { | 500 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { |
491 | private final static VLSFunctionFof.GeneratedPQuery INSTANCE = new GeneratedPQuery(); | 501 | private static final VLSFunctionFof.GeneratedPQuery INSTANCE = new GeneratedPQuery(); |
492 | 502 | ||
493 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFunctionAsTerm")), PParameterDirection.INOUT); | 503 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSFunctionAsTerm", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSFunctionAsTerm")), PParameterDirection.INOUT); |
494 | 504 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSInequality.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSInequality.java index 71c4bc61..2a58e99c 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSInequality.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSInequality.java | |||
@@ -74,8 +74,18 @@ public final class VLSInequality extends BaseGeneratedEMFQuerySpecification<VLSI | |||
74 | 74 | ||
75 | @Override | 75 | @Override |
76 | public Object get(final String parameterName) { | 76 | public Object get(final String parameterName) { |
77 | if ("term".equals(parameterName)) return this.fTerm; | 77 | switch(parameterName) { |
78 | return null; | 78 | case "term": return this.fTerm; |
79 | default: return null; | ||
80 | } | ||
81 | } | ||
82 | |||
83 | @Override | ||
84 | public Object get(final int index) { | ||
85 | switch(index) { | ||
86 | case 0: return this.fTerm; | ||
87 | default: return null; | ||
88 | } | ||
79 | } | 89 | } |
80 | 90 | ||
81 | public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality getTerm() { | 91 | public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality getTerm() { |
@@ -260,9 +270,9 @@ public final class VLSInequality extends BaseGeneratedEMFQuerySpecification<VLSI | |||
260 | return new Matcher(); | 270 | return new Matcher(); |
261 | } | 271 | } |
262 | 272 | ||
263 | private final static int POSITION_TERM = 0; | 273 | private static final int POSITION_TERM = 0; |
264 | 274 | ||
265 | private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSInequality.Matcher.class); | 275 | private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSInequality.Matcher.class); |
266 | 276 | ||
267 | /** | 277 | /** |
268 | * Initializes the pattern matcher within an existing VIATRA Query engine. | 278 | * Initializes the pattern matcher within an existing VIATRA Query engine. |
@@ -461,15 +471,15 @@ public final class VLSInequality extends BaseGeneratedEMFQuerySpecification<VLSI | |||
461 | } | 471 | } |
462 | 472 | ||
463 | /** | 473 | /** |
464 | * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSInequality (visibility: PUBLIC, simpleName: VLSInequality, identifier: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSInequality, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created | 474 | * Inner class allowing the singleton instance of {@link VLSInequality} to be created |
465 | * <b>not</b> at the class load time of the outer class, | 475 | * <b>not</b> at the class load time of the outer class, |
466 | * but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSInequality (visibility: PUBLIC, simpleName: VLSInequality, identifier: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSInequality, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}. | 476 | * but rather at the first call to {@link VLSInequality#instance()}. |
467 | * | 477 | * |
468 | * <p> This workaround is required e.g. to support recursion. | 478 | * <p> This workaround is required e.g. to support recursion. |
469 | * | 479 | * |
470 | */ | 480 | */ |
471 | private static class LazyHolder { | 481 | private static class LazyHolder { |
472 | private final static VLSInequality INSTANCE = new VLSInequality(); | 482 | private static final VLSInequality INSTANCE = new VLSInequality(); |
473 | 483 | ||
474 | /** | 484 | /** |
475 | * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned. | 485 | * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned. |
@@ -478,7 +488,7 @@ public final class VLSInequality extends BaseGeneratedEMFQuerySpecification<VLSI | |||
478 | * <p> The static initializer is defined using a helper field to work around limitations of the code generator. | 488 | * <p> The static initializer is defined using a helper field to work around limitations of the code generator. |
479 | * | 489 | * |
480 | */ | 490 | */ |
481 | private final static Object STATIC_INITIALIZER = ensureInitialized(); | 491 | private static final Object STATIC_INITIALIZER = ensureInitialized(); |
482 | 492 | ||
483 | public static Object ensureInitialized() { | 493 | public static Object ensureInitialized() { |
484 | INSTANCE.ensureInitializedInternal(); | 494 | INSTANCE.ensureInitializedInternal(); |
@@ -487,7 +497,7 @@ public final class VLSInequality extends BaseGeneratedEMFQuerySpecification<VLSI | |||
487 | } | 497 | } |
488 | 498 | ||
489 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { | 499 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { |
490 | private final static VLSInequality.GeneratedPQuery INSTANCE = new GeneratedPQuery(); | 500 | private static final VLSInequality.GeneratedPQuery INSTANCE = new GeneratedPQuery(); |
491 | 501 | ||
492 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSInequality")), PParameterDirection.INOUT); | 502 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSInequality", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSInequality")), PParameterDirection.INOUT); |
493 | 503 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSOr.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSOr.java index fcbbd7cc..f254b92c 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSOr.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSOr.java | |||
@@ -75,8 +75,18 @@ public final class VLSOr extends BaseGeneratedEMFQuerySpecification<VLSOr.Matche | |||
75 | 75 | ||
76 | @Override | 76 | @Override |
77 | public Object get(final String parameterName) { | 77 | public Object get(final String parameterName) { |
78 | if ("term".equals(parameterName)) return this.fTerm; | 78 | switch(parameterName) { |
79 | return null; | 79 | case "term": return this.fTerm; |
80 | default: return null; | ||
81 | } | ||
82 | } | ||
83 | |||
84 | @Override | ||
85 | public Object get(final int index) { | ||
86 | switch(index) { | ||
87 | case 0: return this.fTerm; | ||
88 | default: return null; | ||
89 | } | ||
80 | } | 90 | } |
81 | 91 | ||
82 | public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr getTerm() { | 92 | public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr getTerm() { |
@@ -262,9 +272,9 @@ public final class VLSOr extends BaseGeneratedEMFQuerySpecification<VLSOr.Matche | |||
262 | return new Matcher(); | 272 | return new Matcher(); |
263 | } | 273 | } |
264 | 274 | ||
265 | private final static int POSITION_TERM = 0; | 275 | private static final int POSITION_TERM = 0; |
266 | 276 | ||
267 | private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSOr.Matcher.class); | 277 | private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSOr.Matcher.class); |
268 | 278 | ||
269 | /** | 279 | /** |
270 | * Initializes the pattern matcher within an existing VIATRA Query engine. | 280 | * Initializes the pattern matcher within an existing VIATRA Query engine. |
@@ -463,15 +473,15 @@ public final class VLSOr extends BaseGeneratedEMFQuerySpecification<VLSOr.Matche | |||
463 | } | 473 | } |
464 | 474 | ||
465 | /** | 475 | /** |
466 | * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSOr (visibility: PUBLIC, simpleName: VLSOr, identifier: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSOr, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created | 476 | * Inner class allowing the singleton instance of {@link VLSOr} to be created |
467 | * <b>not</b> at the class load time of the outer class, | 477 | * <b>not</b> at the class load time of the outer class, |
468 | * but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSOr (visibility: PUBLIC, simpleName: VLSOr, identifier: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSOr, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}. | 478 | * but rather at the first call to {@link VLSOr#instance()}. |
469 | * | 479 | * |
470 | * <p> This workaround is required e.g. to support recursion. | 480 | * <p> This workaround is required e.g. to support recursion. |
471 | * | 481 | * |
472 | */ | 482 | */ |
473 | private static class LazyHolder { | 483 | private static class LazyHolder { |
474 | private final static VLSOr INSTANCE = new VLSOr(); | 484 | private static final VLSOr INSTANCE = new VLSOr(); |
475 | 485 | ||
476 | /** | 486 | /** |
477 | * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned. | 487 | * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned. |
@@ -480,7 +490,7 @@ public final class VLSOr extends BaseGeneratedEMFQuerySpecification<VLSOr.Matche | |||
480 | * <p> The static initializer is defined using a helper field to work around limitations of the code generator. | 490 | * <p> The static initializer is defined using a helper field to work around limitations of the code generator. |
481 | * | 491 | * |
482 | */ | 492 | */ |
483 | private final static Object STATIC_INITIALIZER = ensureInitialized(); | 493 | private static final Object STATIC_INITIALIZER = ensureInitialized(); |
484 | 494 | ||
485 | public static Object ensureInitialized() { | 495 | public static Object ensureInitialized() { |
486 | INSTANCE.ensureInitializedInternal(); | 496 | INSTANCE.ensureInitializedInternal(); |
@@ -489,7 +499,7 @@ public final class VLSOr extends BaseGeneratedEMFQuerySpecification<VLSOr.Matche | |||
489 | } | 499 | } |
490 | 500 | ||
491 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { | 501 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { |
492 | private final static VLSOr.GeneratedPQuery INSTANCE = new GeneratedPQuery(); | 502 | private static final VLSOr.GeneratedPQuery INSTANCE = new GeneratedPQuery(); |
493 | 503 | ||
494 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSOr")), PParameterDirection.INOUT); | 504 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSOr", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSOr")), PParameterDirection.INOUT); |
495 | 505 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSUnaryNegation.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSUnaryNegation.java index 5763bf4d..e8a1b315 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSUnaryNegation.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSUnaryNegation.java | |||
@@ -74,8 +74,18 @@ public final class VLSUnaryNegation extends BaseGeneratedEMFQuerySpecification<V | |||
74 | 74 | ||
75 | @Override | 75 | @Override |
76 | public Object get(final String parameterName) { | 76 | public Object get(final String parameterName) { |
77 | if ("term".equals(parameterName)) return this.fTerm; | 77 | switch(parameterName) { |
78 | return null; | 78 | case "term": return this.fTerm; |
79 | default: return null; | ||
80 | } | ||
81 | } | ||
82 | |||
83 | @Override | ||
84 | public Object get(final int index) { | ||
85 | switch(index) { | ||
86 | case 0: return this.fTerm; | ||
87 | default: return null; | ||
88 | } | ||
79 | } | 89 | } |
80 | 90 | ||
81 | public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation getTerm() { | 91 | public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation getTerm() { |
@@ -260,9 +270,9 @@ public final class VLSUnaryNegation extends BaseGeneratedEMFQuerySpecification<V | |||
260 | return new Matcher(); | 270 | return new Matcher(); |
261 | } | 271 | } |
262 | 272 | ||
263 | private final static int POSITION_TERM = 0; | 273 | private static final int POSITION_TERM = 0; |
264 | 274 | ||
265 | private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSUnaryNegation.Matcher.class); | 275 | private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSUnaryNegation.Matcher.class); |
266 | 276 | ||
267 | /** | 277 | /** |
268 | * Initializes the pattern matcher within an existing VIATRA Query engine. | 278 | * Initializes the pattern matcher within an existing VIATRA Query engine. |
@@ -461,15 +471,15 @@ public final class VLSUnaryNegation extends BaseGeneratedEMFQuerySpecification<V | |||
461 | } | 471 | } |
462 | 472 | ||
463 | /** | 473 | /** |
464 | * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSUnaryNegation (visibility: PUBLIC, simpleName: VLSUnaryNegation, identifier: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSUnaryNegation, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created | 474 | * Inner class allowing the singleton instance of {@link VLSUnaryNegation} to be created |
465 | * <b>not</b> at the class load time of the outer class, | 475 | * <b>not</b> at the class load time of the outer class, |
466 | * but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSUnaryNegation (visibility: PUBLIC, simpleName: VLSUnaryNegation, identifier: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSUnaryNegation, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}. | 476 | * but rather at the first call to {@link VLSUnaryNegation#instance()}. |
467 | * | 477 | * |
468 | * <p> This workaround is required e.g. to support recursion. | 478 | * <p> This workaround is required e.g. to support recursion. |
469 | * | 479 | * |
470 | */ | 480 | */ |
471 | private static class LazyHolder { | 481 | private static class LazyHolder { |
472 | private final static VLSUnaryNegation INSTANCE = new VLSUnaryNegation(); | 482 | private static final VLSUnaryNegation INSTANCE = new VLSUnaryNegation(); |
473 | 483 | ||
474 | /** | 484 | /** |
475 | * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned. | 485 | * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned. |
@@ -478,7 +488,7 @@ public final class VLSUnaryNegation extends BaseGeneratedEMFQuerySpecification<V | |||
478 | * <p> The static initializer is defined using a helper field to work around limitations of the code generator. | 488 | * <p> The static initializer is defined using a helper field to work around limitations of the code generator. |
479 | * | 489 | * |
480 | */ | 490 | */ |
481 | private final static Object STATIC_INITIALIZER = ensureInitialized(); | 491 | private static final Object STATIC_INITIALIZER = ensureInitialized(); |
482 | 492 | ||
483 | public static Object ensureInitialized() { | 493 | public static Object ensureInitialized() { |
484 | INSTANCE.ensureInitializedInternal(); | 494 | INSTANCE.ensureInitializedInternal(); |
@@ -487,7 +497,7 @@ public final class VLSUnaryNegation extends BaseGeneratedEMFQuerySpecification<V | |||
487 | } | 497 | } |
488 | 498 | ||
489 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { | 499 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { |
490 | private final static VLSUnaryNegation.GeneratedPQuery INSTANCE = new GeneratedPQuery(); | 500 | private static final VLSUnaryNegation.GeneratedPQuery INSTANCE = new GeneratedPQuery(); |
491 | 501 | ||
492 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSUnaryNegation")), PParameterDirection.INOUT); | 502 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUnaryNegation", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSUnaryNegation")), PParameterDirection.INOUT); |
493 | 503 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSUniversalQuantifier.java b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSUniversalQuantifier.java index a0ce1383..39605b34 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSUniversalQuantifier.java +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/src-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/queries/VLSUniversalQuantifier.java | |||
@@ -74,8 +74,18 @@ public final class VLSUniversalQuantifier extends BaseGeneratedEMFQuerySpecifica | |||
74 | 74 | ||
75 | @Override | 75 | @Override |
76 | public Object get(final String parameterName) { | 76 | public Object get(final String parameterName) { |
77 | if ("term".equals(parameterName)) return this.fTerm; | 77 | switch(parameterName) { |
78 | return null; | 78 | case "term": return this.fTerm; |
79 | default: return null; | ||
80 | } | ||
81 | } | ||
82 | |||
83 | @Override | ||
84 | public Object get(final int index) { | ||
85 | switch(index) { | ||
86 | case 0: return this.fTerm; | ||
87 | default: return null; | ||
88 | } | ||
79 | } | 89 | } |
80 | 90 | ||
81 | public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier getTerm() { | 91 | public ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier getTerm() { |
@@ -260,9 +270,9 @@ public final class VLSUniversalQuantifier extends BaseGeneratedEMFQuerySpecifica | |||
260 | return new Matcher(); | 270 | return new Matcher(); |
261 | } | 271 | } |
262 | 272 | ||
263 | private final static int POSITION_TERM = 0; | 273 | private static final int POSITION_TERM = 0; |
264 | 274 | ||
265 | private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSUniversalQuantifier.Matcher.class); | 275 | private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(VLSUniversalQuantifier.Matcher.class); |
266 | 276 | ||
267 | /** | 277 | /** |
268 | * Initializes the pattern matcher within an existing VIATRA Query engine. | 278 | * Initializes the pattern matcher within an existing VIATRA Query engine. |
@@ -461,15 +471,15 @@ public final class VLSUniversalQuantifier extends BaseGeneratedEMFQuerySpecifica | |||
461 | } | 471 | } |
462 | 472 | ||
463 | /** | 473 | /** |
464 | * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSUniversalQuantifier (visibility: PUBLIC, simpleName: VLSUniversalQuantifier, identifier: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSUniversalQuantifier, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created | 474 | * Inner class allowing the singleton instance of {@link VLSUniversalQuantifier} to be created |
465 | * <b>not</b> at the class load time of the outer class, | 475 | * <b>not</b> at the class load time of the outer class, |
466 | * but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSUniversalQuantifier (visibility: PUBLIC, simpleName: VLSUniversalQuantifier, identifier: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries.VLSUniversalQuantifier, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.vampire.reasoner.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}. | 476 | * but rather at the first call to {@link VLSUniversalQuantifier#instance()}. |
467 | * | 477 | * |
468 | * <p> This workaround is required e.g. to support recursion. | 478 | * <p> This workaround is required e.g. to support recursion. |
469 | * | 479 | * |
470 | */ | 480 | */ |
471 | private static class LazyHolder { | 481 | private static class LazyHolder { |
472 | private final static VLSUniversalQuantifier INSTANCE = new VLSUniversalQuantifier(); | 482 | private static final VLSUniversalQuantifier INSTANCE = new VLSUniversalQuantifier(); |
473 | 483 | ||
474 | /** | 484 | /** |
475 | * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned. | 485 | * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned. |
@@ -478,7 +488,7 @@ public final class VLSUniversalQuantifier extends BaseGeneratedEMFQuerySpecifica | |||
478 | * <p> The static initializer is defined using a helper field to work around limitations of the code generator. | 488 | * <p> The static initializer is defined using a helper field to work around limitations of the code generator. |
479 | * | 489 | * |
480 | */ | 490 | */ |
481 | private final static Object STATIC_INITIALIZER = ensureInitialized(); | 491 | private static final Object STATIC_INITIALIZER = ensureInitialized(); |
482 | 492 | ||
483 | public static Object ensureInitialized() { | 493 | public static Object ensureInitialized() { |
484 | INSTANCE.ensureInitializedInternal(); | 494 | INSTANCE.ensureInitializedInternal(); |
@@ -487,7 +497,7 @@ public final class VLSUniversalQuantifier extends BaseGeneratedEMFQuerySpecifica | |||
487 | } | 497 | } |
488 | 498 | ||
489 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { | 499 | private static class GeneratedPQuery extends BaseGeneratedEMFPQuery { |
490 | private final static VLSUniversalQuantifier.GeneratedPQuery INSTANCE = new GeneratedPQuery(); | 500 | private static final VLSUniversalQuantifier.GeneratedPQuery INSTANCE = new GeneratedPQuery(); |
491 | 501 | ||
492 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSUniversalQuantifier")), PParameterDirection.INOUT); | 502 | private final PParameter parameter_term = new PParameter("term", "ca.mcgill.ecse.dslreasoner.vampireLanguage.VLSUniversalQuantifier", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.mcgill.ca/ecse/dslreasoner/VampireLanguage", "VLSUniversalQuantifier")), PParameterDirection.INOUT); |
493 | 503 | ||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin index d21e62df..e999bce6 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin index 6fa1ad33..28154d14 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin index 16598303..18da19a9 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin index 760c5e1f..37c845cd 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin index db66ddba..d8c61adc 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin index d6fe4078..1a86a55f 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin index 81468f27..216b3a4b 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin index d6924639..8733e530 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin index 9541df30..634dab6a 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin index bb87d246..28c93f34 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin index 61879add..faef07c1 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin index 1d6d6da8..3d96efbf 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin index 3a055e01..b3756706 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin | |||
Binary files differ | |||
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin index e7c2bd91..f75b4eaf 100644 --- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin +++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin | |||
Binary files differ | |||
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/META-INF/MANIFEST.MF b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/META-INF/MANIFEST.MF index bca8e840..25c8cbb9 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/META-INF/MANIFEST.MF +++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/META-INF/MANIFEST.MF | |||
@@ -7,27 +7,27 @@ Bundle-ClassPath: . | |||
7 | Bundle-Vendor: %providerName | 7 | Bundle-Vendor: %providerName |
8 | Bundle-Localization: plugin | 8 | Bundle-Localization: plugin |
9 | Export-Package: ca.mcgill.ecse.dslreasoner.standalone.test.ecore.queries, | 9 | Export-Package: ca.mcgill.ecse.dslreasoner.standalone.test.ecore.queries, |
10 | ca.mcgill.ecse.dslreasoner.standalone.test.fam, | 10 | ca.mcgill.ecse.dslreasoner.standalone.test.fam, |
11 | ca.mcgill.ecse.dslreasoner.standalone.test.fam.impl, | 11 | ca.mcgill.ecse.dslreasoner.standalone.test.fam.impl, |
12 | ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries, | 12 | ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries, |
13 | ca.mcgill.ecse.dslreasoner.standalone.test.fam.util, | 13 | ca.mcgill.ecse.dslreasoner.standalone.test.fam.util, |
14 | ca.mcgill.ecse.dslreasoner.standalone.test.filesystem, | 14 | ca.mcgill.ecse.dslreasoner.standalone.test.filesystem, |
15 | ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.impl, | 15 | ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.impl, |
16 | ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.queries, | 16 | ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.queries, |
17 | ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.util, | 17 | ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.util, |
18 | ca.mcgill.ecse.dslreasoner.standalone.test.yakindu, | 18 | ca.mcgill.ecse.dslreasoner.standalone.test.yakindu, |
19 | ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl, | 19 | ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl, |
20 | ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries, | 20 | ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries, |
21 | ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.util | 21 | ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.util |
22 | Require-Bundle: org.eclipse.viatra.addon.querybasedfeatures.runtime, | 22 | Require-Bundle: org.eclipse.viatra.addon.querybasedfeatures.runtime, |
23 | org.eclipse.core.runtime;bundle-version="3.13.0", | 23 | org.eclipse.core.runtime;bundle-version="3.13.0", |
24 | org.eclipse.emf.ecore;bundle-version="2.13.0";visibility:=reexport, | 24 | org.eclipse.emf.ecore;bundle-version="2.13.0";visibility:=reexport, |
25 | org.eclipse.viatra.query.runtime;bundle-version="2.1.0", | 25 | org.eclipse.viatra.query.runtime;bundle-version="2.1.0", |
26 | org.eclipse.viatra.query.runtime.rete;bundle-version="2.1.0", | 26 | org.eclipse.viatra.query.runtime.rete;bundle-version="2.1.0", |
27 | org.eclipse.viatra.query.runtime.localsearch;bundle-version="2.1.0", | 27 | org.eclipse.viatra.query.runtime.localsearch;bundle-version="2.1.0", |
28 | org.eclipse.xtext.xbase.lib;bundle-version="2.12.0", | 28 | org.eclipse.xtext.xbase.lib;bundle-version="2.12.0", |
29 | hu.bme.mit.inf.dslreasoner.application;bundle-version="1.0.0", | 29 | hu.bme.mit.inf.dslreasoner.application;bundle-version="1.0.0", |
30 | hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph;bundle-version="1.0.0" | 30 | hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph;bundle-version="1.0.0" |
31 | Import-Package: org.apache.log4j | 31 | Import-Package: org.apache.log4j |
32 | Automatic-Module-Name: ca.mcgill.ecse.dslreasoner.standalone.test | 32 | Automatic-Module-Name: ca.mcgill.ecse.dslreasoner.standalone.test |
33 | Bundle-ActivationPolicy: lazy | 33 | Bundle-ActivationPolicy: lazy |
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/META-INF/MANIFEST.MF b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/META-INF/MANIFEST.MF index 6ab952ff..10da7ca1 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/META-INF/MANIFEST.MF +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/META-INF/MANIFEST.MF | |||
@@ -7,45 +7,45 @@ Bundle-ClassPath: . | |||
7 | Bundle-Vendor: %providerName | 7 | Bundle-Vendor: %providerName |
8 | Bundle-Localization: plugin | 8 | Bundle-Localization: plugin |
9 | Export-Package: ca.mcgill.ecse.dslreasoner.vampire.queries, | 9 | Export-Package: ca.mcgill.ecse.dslreasoner.vampire.queries, |
10 | ca.mcgill.ecse.dslreasoner.vampire.yakindumm, | 10 | ca.mcgill.ecse.dslreasoner.vampire.yakindumm, |
11 | ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl, | 11 | ca.mcgill.ecse.dslreasoner.vampire.yakindumm.impl, |
12 | ca.mcgill.ecse.dslreasoner.vampire.yakindumm.util | 12 | ca.mcgill.ecse.dslreasoner.vampire.yakindumm.util |
13 | Require-Bundle: org.eclipse.viatra.addon.querybasedfeatures.runtime, | 13 | Require-Bundle: org.eclipse.viatra.addon.querybasedfeatures.runtime, |
14 | org.eclipse.core.runtime, | 14 | org.eclipse.core.runtime, |
15 | org.eclipse.emf.ecore;visibility:=reexport, | 15 | org.eclipse.emf.ecore;visibility:=reexport, |
16 | org.eclipse.viatra.query.runtime.rete, | 16 | org.eclipse.viatra.query.runtime.rete, |
17 | org.eclipse.viatra.query.runtime.localsearch, | 17 | org.eclipse.viatra.query.runtime.localsearch, |
18 | com.google.guava, | 18 | com.google.guava, |
19 | org.eclipse.xtext.xbase.lib, | 19 | org.eclipse.xtext.xbase.lib, |
20 | org.eclipse.xtend.lib, | 20 | org.eclipse.xtend.lib, |
21 | org.eclipse.xtend.lib.macro, | 21 | org.eclipse.xtend.lib.macro, |
22 | ca.mcgill.ecse.dslreasoner.vampire.language;bundle-version="1.0.0", | 22 | ca.mcgill.ecse.dslreasoner.vampire.language;bundle-version="1.0.0", |
23 | hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0", | 23 | hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0", |
24 | ca.mcgill.ecse.dslreasoner.vampire.reasoner;bundle-version="1.0.0", | 24 | ca.mcgill.ecse.dslreasoner.vampire.reasoner;bundle-version="1.0.0", |
25 | hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0", | 25 | hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0", |
26 | hu.bme.mit.inf.dslreasoner.viatra2logic;bundle-version="1.0.0", | 26 | hu.bme.mit.inf.dslreasoner.viatra2logic;bundle-version="1.0.0", |
27 | org.eclipse.emf.ecore.xmi;bundle-version="2.13.0", | 27 | org.eclipse.emf.ecore.xmi;bundle-version="2.13.0", |
28 | hu.bme.mit.inf.dlsreasoner.alloy.reasoner;bundle-version="1.0.0", | 28 | hu.bme.mit.inf.dlsreasoner.alloy.reasoner;bundle-version="1.0.0", |
29 | hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage;bundle-version="1.0.0", | 29 | hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage;bundle-version="1.0.0", |
30 | hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner;bundle-version="1.0.0", | 30 | hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner;bundle-version="1.0.0", |
31 | hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatraquery;bundle-version="1.0.0", | 31 | hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatraquery;bundle-version="1.0.0", |
32 | hu.bme.mit.inf.dslreasoner.logic2ecore;bundle-version="1.0.0", | 32 | hu.bme.mit.inf.dslreasoner.logic2ecore;bundle-version="1.0.0", |
33 | hu.bme.mit.inf.dslreasoner.visualisation;bundle-version="1.0.0", | 33 | hu.bme.mit.inf.dslreasoner.visualisation;bundle-version="1.0.0", |
34 | ModelGenExampleFAM_plugin;bundle-version="1.0.0", | 34 | ModelGenExampleFAM_plugin;bundle-version="1.0.0", |
35 | ModelGenExampleFAM_plugin.validation;bundle-version="0.0.1", | 35 | ModelGenExampleFAM_plugin.validation;bundle-version="0.0.1", |
36 | hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph;bundle-version="1.0.0", | 36 | hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph;bundle-version="1.0.0", |
37 | hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.validation;bundle-version="0.0.1", | 37 | hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.validation;bundle-version="0.0.1", |
38 | org.eclipse.viatra.query.runtime;bundle-version="2.1.0", | 38 | org.eclipse.viatra.query.runtime;bundle-version="2.1.0", |
39 | org.eclipse.collections;bundle-version="9.2.0", | 39 | org.eclipse.collections;bundle-version="9.2.0", |
40 | hu.bme.mit.inf.dslreasoner.application.FAMTest;bundle-version="1.0.0", | 40 | hu.bme.mit.inf.dslreasoner.application.FAMTest;bundle-version="1.0.0", |
41 | ca.mcgill.ecse.dslreasoner.standalone.test;bundle-version="1.0.0", | 41 | ca.mcgill.ecse.dslreasoner.standalone.test;bundle-version="1.0.0", |
42 | org.apache.httpcomponents.httpcore;bundle-version="4.4.6", | 42 | org.apache.httpcomponents.httpcore;bundle-version="4.4.6", |
43 | org.apache.httpcomponents.httpclient;bundle-version="4.5.2", | 43 | org.apache.httpcomponents.httpclient;bundle-version="4.5.2", |
44 | org.apache.httpcomponents.httpclient.source;bundle-version="4.5.2", | 44 | org.apache.httpcomponents.httpclient.source;bundle-version="4.5.2", |
45 | org.apache.httpcomponents.httpclient.win;bundle-version="4.5.2", | 45 | org.apache.httpcomponents.httpclient.win;bundle-version="4.5.2", |
46 | org.apache.httpcomponents.httpcore.source;bundle-version="4.4.6", | 46 | org.apache.httpcomponents.httpcore.source;bundle-version="4.4.6", |
47 | hu.bme.mit.inf.dslreasoner.alloy.language;bundle-version="1.0.0", | 47 | hu.bme.mit.inf.dslreasoner.alloy.language;bundle-version="1.0.0", |
48 | hu.bme.mit.inf.dslreasoner.alloy.language.ui;bundle-version="1.0.0" | 48 | hu.bme.mit.inf.dslreasoner.alloy.language.ui;bundle-version="1.0.0" |
49 | Import-Package: org.apache.log4j | 49 | Import-Package: org.apache.log4j |
50 | Automatic-Module-Name: ca.mcgill.ecse.dslreasoner.vampire.test | 50 | Automatic-Module-Name: ca.mcgill.ecse.dslreasoner.vampire.test |
51 | Bundle-ActivationPolicy: lazy | 51 | Bundle-ActivationPolicy: lazy |
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin index 7ccbe59f..cb9eee35 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin | |||
Binary files differ | |||
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin index b03f527f..22765580 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin | |||
Binary files differ | |||
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin index 6bc303df..4870ad10 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin | |||
Binary files differ | |||
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin index a34d7d3b..424255f4 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin | |||
Binary files differ | |||
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin index a8c5f173..aa2ddaf2 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin | |||
Binary files differ | |||
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin index 9a2c84d7..dbe4f400 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin | |||
Binary files differ | |||
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin index f39505b0..4da01ec2 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin | |||
Binary files differ | |||
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin index 51d32da7..9d323253 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin | |||
Binary files differ | |||
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/VampireTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/VampireTest.java index 0c1b3fe9..2af5d456 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/VampireTest.java +++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/VampireTest.java | |||
@@ -42,7 +42,7 @@ import org.eclipse.xtext.xbase.lib.Procedures.Procedure1; | |||
42 | @SuppressWarnings("all") | 42 | @SuppressWarnings("all") |
43 | public class VampireTest { | 43 | public class VampireTest { |
44 | @Extension | 44 | @Extension |
45 | private final static LogicProblemBuilder builder = new LogicProblemBuilder(); | 45 | private static final LogicProblemBuilder builder = new LogicProblemBuilder(); |
46 | 46 | ||
47 | public static void main(final String[] args) { | 47 | public static void main(final String[] args) { |
48 | try { | 48 | try { |
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/xtend-gen/ca/mcgill/ecse/dslreasoner/yakindu/test/.YakinduTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/xtend-gen/ca/mcgill/ecse/dslreasoner/yakindu/test/.YakinduTest.xtendbin index 0278755b..d0f61cf1 100644 --- a/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/xtend-gen/ca/mcgill/ecse/dslreasoner/yakindu/test/.YakinduTest.xtendbin +++ b/Tests/ca.mcgill.ecse.dslreasoner.yakindu.test/xtend-gen/ca/mcgill/ecse/dslreasoner/yakindu/test/.YakinduTest.xtendbin | |||
Binary files differ | |||