Skip to content

Commit

Permalink
UPdate to 2021x
Browse files Browse the repository at this point in the history 
GH-12
  • Loading branch information
@kkadosa
kkadosa committed Nov 13, 2020
1 parent 504ddba commit bf28b6d
Show file tree
Hide file tree
Showing 47 changed files with 295 additions and 307 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ pipeline {
}

tools {
jdk 'OpenJDK 8'
jdk 'AdoptOpenJDK 11'
}

stages {
Expand Down
8 changes: 1 addition & 7 deletions com.incquerylabs.magicdraw.benchmark/.classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,13 @@
<attribute name="gradle_used_by_scope" value="main,test"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="bin/main" path="build/xtend-gen">
<attributes>
<attribute name="gradle_scope" value="main"/>
<attribute name="gradle_used_by_scope" value="main,test"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="bin/main" path="src/generated/vql">
<attributes>
<attribute name="gradle_scope" value="main"/>
<attribute name="gradle_used_by_scope" value="main,test"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin/default"/>
</classpath>
Binary file modified com.incquerylabs.magicdraw.benchmark/.gradle/buildOutputCleanup/buildOutputCleanup.lock
View file
Binary file not shown.
18 changes: 8 additions & 10 deletions com.incquerylabs.magicdraw.benchmark/.settings/org.eclipse.jdt.core.prefs
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
#
#Thu Nov 28 09:27:25 CET 2019
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=11
7 changes: 6 additions & 1 deletion com.incquerylabs.magicdraw.benchmark/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ repositories {
maven { url "https://repo.eclipse.org/content/groups/viatra/" }
}

java {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

configurations {
plugin
implementation.extendsFrom plugin
Expand All @@ -91,7 +96,7 @@ dependencies {
}


preCompile group: 'com.nomagic', name: 'csm', version: '190sp4', classifier: 'no_install', ext: 'zip'
preCompile group: 'com.nomagic', name: 'csm', version: '2021x', classifier: 'no_install', ext: 'zip'
preCompile group: 'com.incquerylabs.v4md', name: 'com.incquerylabs.v4md', version: v4mdVersion, classifier: 'plugin', ext: 'zip'

compile group: 'org.eclipse.viatra', name: 'viatra-query-language', version: viatraVersion, exclusions
Expand Down
Binary file modified ...ated/vql/com/incquerylabs/magicdraw/benchmark/incrementalqueries/.ParentState.java._trace
View file
Binary file not shown.
Binary file modified ...uerylabs/magicdraw/benchmark/incrementalqueries/.TransitiveSubstatesWithCheck.java._trace
View file
Binary file not shown.
20 changes: 10 additions & 10 deletions ...rc/generated/vql/com/incquerylabs/magicdraw/benchmark/incrementalqueries/ParentState.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -657,9 +657,9 @@ public static Object ensureInitialized() {
private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
private static final ParentState.GeneratedPQuery INSTANCE = new GeneratedPQuery();

private final PParameter parameter_state = new PParameter("state", "com.nomagic.uml2.ext.magicdraw.statemachines.mdbehaviorstatemachines.State", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.nomagic.com/magicdraw/UML/2.5.1", "State")), PParameterDirection.INOUT);
private final PParameter parameter_state = new PParameter("state", "com.nomagic.uml2.ext.magicdraw.statemachines.mdbehaviorstatemachines.State", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.nomagic.com/magicdraw/UML/2.5.1.1", "State")), PParameterDirection.INOUT);

private final PParameter parameter_parentState = new PParameter("parentState", "com.nomagic.uml2.ext.magicdraw.statemachines.mdbehaviorstatemachines.State", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.nomagic.com/magicdraw/UML/2.5.1", "State")), PParameterDirection.INOUT);
private final PParameter parameter_parentState = new PParameter("parentState", "com.nomagic.uml2.ext.magicdraw.statemachines.mdbehaviorstatemachines.State", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.nomagic.com/magicdraw/UML/2.5.1.1", "State")), PParameterDirection.INOUT);

private final List<PParameter> parameters = Arrays.asList(parameter_state, parameter_parentState);

Expand Down Expand Up @@ -691,23 +691,23 @@ public Set<PBody> doGetContainedBodies() {
PVariable var_state = body.getOrCreateVariableByName("state");
PVariable var_parentState = body.getOrCreateVariableByName("parentState");
PVariable var_subregion = body.getOrCreateVariableByName("subregion");
new TypeConstraint(body, Tuples.flatTupleOf(var_state), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1", "State")));
new TypeConstraint(body, Tuples.flatTupleOf(var_parentState), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1", "State")));
new TypeConstraint(body, Tuples.flatTupleOf(var_state), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1.1", "State")));
new TypeConstraint(body, Tuples.flatTupleOf(var_parentState), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1.1", "State")));
body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
new ExportedParameter(body, var_state, parameter_state),
new ExportedParameter(body, var_parentState, parameter_parentState)
));
// State.region(parentState, subregion)
new TypeConstraint(body, Tuples.flatTupleOf(var_parentState), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1", "State")));
new TypeConstraint(body, Tuples.flatTupleOf(var_parentState), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1.1", "State")));
PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
new TypeConstraint(body, Tuples.flatTupleOf(var_parentState, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1", "State", "region")));
new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1", "Region")));
new TypeConstraint(body, Tuples.flatTupleOf(var_parentState, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1.1", "State", "region")));
new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1.1", "Region")));
new Equality(body, var__virtual_0_, var_subregion);
// Region.subvertex(subregion, state)
new TypeConstraint(body, Tuples.flatTupleOf(var_subregion), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1", "Region")));
new TypeConstraint(body, Tuples.flatTupleOf(var_subregion), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1.1", "Region")));
PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
new TypeConstraint(body, Tuples.flatTupleOf(var_subregion, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1", "Region", "subvertex")));
new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1", "Vertex")));
new TypeConstraint(body, Tuples.flatTupleOf(var_subregion, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1.1", "Region", "subvertex")));
new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1.1", "Vertex")));
new Equality(body, var__virtual_1_, var_state);
bodies.add(body);
}
Expand Down
8 changes: 4 additions & 4 deletions ...com/incquerylabs/magicdraw/benchmark/incrementalqueries/TransitiveSubstatesWithCheck.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -659,9 +659,9 @@ public static Object ensureInitialized() {
private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
private static final TransitiveSubstatesWithCheck.GeneratedPQuery INSTANCE = new GeneratedPQuery();

private final PParameter parameter_state = new PParameter("state", "com.nomagic.uml2.ext.magicdraw.statemachines.mdbehaviorstatemachines.State", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.nomagic.com/magicdraw/UML/2.5.1", "State")), PParameterDirection.INOUT);
private final PParameter parameter_state = new PParameter("state", "com.nomagic.uml2.ext.magicdraw.statemachines.mdbehaviorstatemachines.State", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.nomagic.com/magicdraw/UML/2.5.1.1", "State")), PParameterDirection.INOUT);

private final PParameter parameter_transitiveSubstate = new PParameter("transitiveSubstate", "com.nomagic.uml2.ext.magicdraw.statemachines.mdbehaviorstatemachines.State", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.nomagic.com/magicdraw/UML/2.5.1", "State")), PParameterDirection.INOUT);
private final PParameter parameter_transitiveSubstate = new PParameter("transitiveSubstate", "com.nomagic.uml2.ext.magicdraw.statemachines.mdbehaviorstatemachines.State", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.nomagic.com/magicdraw/UML/2.5.1.1", "State")), PParameterDirection.INOUT);

private final List<PParameter> parameters = Arrays.asList(parameter_state, parameter_transitiveSubstate);

Expand Down Expand Up @@ -692,8 +692,8 @@ public Set<PBody> doGetContainedBodies() {
PBody body = new PBody(this);
PVariable var_state = body.getOrCreateVariableByName("state");
PVariable var_transitiveSubstate = body.getOrCreateVariableByName("transitiveSubstate");
new TypeConstraint(body, Tuples.flatTupleOf(var_state), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1", "State")));
new TypeConstraint(body, Tuples.flatTupleOf(var_transitiveSubstate), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1", "State")));
new TypeConstraint(body, Tuples.flatTupleOf(var_state), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1.1", "State")));
new TypeConstraint(body, Tuples.flatTupleOf(var_transitiveSubstate), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1.1", "State")));
body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
new ExportedParameter(body, var_state, parameter_state),
new ExportedParameter(body, var_transitiveSubstate, parameter_transitiveSubstate)
Expand Down
8 changes: 4 additions & 4 deletions ...om/incquerylabs/magicdraw/benchmark/incrementalqueries/TransitiveSubstatesWithCheck2.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -665,9 +665,9 @@ public static Object ensureInitialized() {
private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
private static final TransitiveSubstatesWithCheck2.GeneratedPQuery INSTANCE = new GeneratedPQuery();

private final PParameter parameter_state = new PParameter("state", "com.nomagic.uml2.ext.magicdraw.statemachines.mdbehaviorstatemachines.State", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.nomagic.com/magicdraw/UML/2.5.1", "State")), PParameterDirection.INOUT);
private final PParameter parameter_state = new PParameter("state", "com.nomagic.uml2.ext.magicdraw.statemachines.mdbehaviorstatemachines.State", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.nomagic.com/magicdraw/UML/2.5.1.1", "State")), PParameterDirection.INOUT);

private final PParameter parameter_transitiveSubstate = new PParameter("transitiveSubstate", "com.nomagic.uml2.ext.magicdraw.statemachines.mdbehaviorstatemachines.State", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.nomagic.com/magicdraw/UML/2.5.1", "State")), PParameterDirection.INOUT);
private final PParameter parameter_transitiveSubstate = new PParameter("transitiveSubstate", "com.nomagic.uml2.ext.magicdraw.statemachines.mdbehaviorstatemachines.State", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.nomagic.com/magicdraw/UML/2.5.1.1", "State")), PParameterDirection.INOUT);

private final List<PParameter> parameters = Arrays.asList(parameter_state, parameter_transitiveSubstate);

Expand Down Expand Up @@ -700,8 +700,8 @@ public Set<PBody> doGetContainedBodies() {
PVariable var_transitiveSubstate = body.getOrCreateVariableByName("transitiveSubstate");
PVariable var_transitionCount = body.getOrCreateVariableByName("transitionCount");
PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
new TypeConstraint(body, Tuples.flatTupleOf(var_state), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1", "State")));
new TypeConstraint(body, Tuples.flatTupleOf(var_transitiveSubstate), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1", "State")));
new TypeConstraint(body, Tuples.flatTupleOf(var_state), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1.1", "State")));
new TypeConstraint(body, Tuples.flatTupleOf(var_transitiveSubstate), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1.1", "State")));
body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
new ExportedParameter(body, var_state, parameter_state),
new ExportedParameter(body, var_transitiveSubstate, parameter_transitiveSubstate)
Expand Down
8 changes: 4 additions & 4 deletions ...om/incquerylabs/magicdraw/benchmark/incrementalqueries/TransitiveSubstatesWithCheck3.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -659,9 +659,9 @@ public static Object ensureInitialized() {
private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
private static final TransitiveSubstatesWithCheck3.GeneratedPQuery INSTANCE = new GeneratedPQuery();

private final PParameter parameter_state = new PParameter("state", "com.nomagic.uml2.ext.magicdraw.statemachines.mdbehaviorstatemachines.State", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.nomagic.com/magicdraw/UML/2.5.1", "State")), PParameterDirection.INOUT);
private final PParameter parameter_state = new PParameter("state", "com.nomagic.uml2.ext.magicdraw.statemachines.mdbehaviorstatemachines.State", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.nomagic.com/magicdraw/UML/2.5.1.1", "State")), PParameterDirection.INOUT);

private final PParameter parameter_transitiveSubstate = new PParameter("transitiveSubstate", "com.nomagic.uml2.ext.magicdraw.statemachines.mdbehaviorstatemachines.State", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.nomagic.com/magicdraw/UML/2.5.1", "State")), PParameterDirection.INOUT);
private final PParameter parameter_transitiveSubstate = new PParameter("transitiveSubstate", "com.nomagic.uml2.ext.magicdraw.statemachines.mdbehaviorstatemachines.State", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.nomagic.com/magicdraw/UML/2.5.1.1", "State")), PParameterDirection.INOUT);

private final List<PParameter> parameters = Arrays.asList(parameter_state, parameter_transitiveSubstate);

Expand Down Expand Up @@ -692,8 +692,8 @@ public Set<PBody> doGetContainedBodies() {
PBody body = new PBody(this);
PVariable var_state = body.getOrCreateVariableByName("state");
PVariable var_transitiveSubstate = body.getOrCreateVariableByName("transitiveSubstate");
new TypeConstraint(body, Tuples.flatTupleOf(var_state), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1", "State")));
new TypeConstraint(body, Tuples.flatTupleOf(var_transitiveSubstate), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1", "State")));
new TypeConstraint(body, Tuples.flatTupleOf(var_state), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1.1", "State")));
new TypeConstraint(body, Tuples.flatTupleOf(var_transitiveSubstate), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.nomagic.com/magicdraw/UML/2.5.1.1", "State")));
body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
new ExportedParameter(body, var_state, parameter_state),
new ExportedParameter(body, var_transitiveSubstate, parameter_transitiveSubstate)
Expand Down
Loading

0 comments on commit bf28b6d

Please sign in to comment.