Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Bugfix] Use four instead of one ResourceSet in performance benchmark #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Bugfix] Use four instead of one ResourceSet in performance benchmark #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions de.hub.mse.ttc2020.benchmark/src/de/hub/mse/ttc2020/benchmark/AbstractBenchmarkTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@ public abstract class AbstractBenchmarkTests {
protected static String pathScenario3 = "data/scenario3/";
protected static String pathScenario4 = "data/scenario4/";

protected static ResourceSet resSet;
protected static ResourceSet resSet1;
protected static ResourceSet resSet2;
protected static ResourceSet resSet3;
protected static ResourceSet resSet4;

@BeforeClass
public static void init() throws CoreException {
Expand All @@ -61,7 +64,10 @@ public static void init() throws CoreException {
}
}

resSet = new ResourceSetImpl();
resSet1 = new ResourceSetImpl();
resSet2 = new ResourceSetImpl();
resSet3 = new ResourceSetImpl();
resSet4 = new ResourceSetImpl();

// Initialize EMF resource factories
Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE;
Expand All @@ -73,19 +79,27 @@ public static void init() throws CoreException {
Logger.getRootLogger().setLevel(Level.OFF);
}

protected EPackage getModel(String path) throws IOException {
protected EPackage getModel(String path, ResourceSet resSet) throws IOException {
Resource resource = resSet.getResource(URI.createURI(path), true);
resource.load(Collections.EMPTY_MAP);
EPackage model = (EPackage) resource.getContents().get(0);
resSet.getPackageRegistry().put(model.getNsURI(), model);
return model;
}

protected EObject getInstance(String path) throws IOException {
protected EObject getInstance(String path, ResourceSet resSet) throws IOException {
Resource resource = resSet.getResource(URI.createURI(path), true);
resource.load(Collections.EMPTY_MAP);
return resource.getContents().get(0);
}

protected EPackage getModel(String path) throws IOException {
return getModel(path, resSet1);
}

protected EObject getInstance(String path) throws IOException {
return getInstance(path, resSet1);
}

protected boolean isEqual(EObject out, EObject expout) {
// Configure EMF Compare
Expand Down
48 changes: 24 additions & 24 deletions de.hub.mse.ttc2020.benchmark/src/de/hub/mse/ttc2020/benchmark/PerformanceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,45 +21,45 @@ public class PerformanceTests extends AbstractBenchmarkTests {
@Test
public void testPerformance() throws IOException {
// TASK 1
EPackage task1_model1 = getModel(pathScenario1 + "models/V1.ecore");
EPackage task1_model2 = getModel(pathScenario1 + "models/V2.ecore");
EObject task1_inputV1a = getInstance(pathScenario1 + "instances/input/V1a.xmi");
EObject task1_inputV1b = getInstance(pathScenario1 + "instances/input/V1b.xmi");
EObject task1_inputV2a = getInstance(pathScenario1 + "instances/input/V2a.xmi");
EObject task1_inputV2b = getInstance(pathScenario1 + "instances/input/V2b.xmi");
EPackage task1_model1 = getModel(pathScenario1 + "models/V1.ecore", resSet1);
EPackage task1_model2 = getModel(pathScenario1 + "models/V2.ecore", resSet1);
EObject task1_inputV1a = getInstance(pathScenario1 + "instances/input/V1a.xmi", resSet1);
EObject task1_inputV1b = getInstance(pathScenario1 + "instances/input/V1b.xmi", resSet1);
EObject task1_inputV2a = getInstance(pathScenario1 + "instances/input/V2a.xmi", resSet1);
EObject task1_inputV2b = getInstance(pathScenario1 + "instances/input/V2b.xmi", resSet1);

AbstractTask task1_1_2_1 = taskFactory.createTask(TaskInfo.TASK_1_M1_M2_M1, task1_model1, task1_model2);
AbstractTask task1_2_1_2 = taskFactory.createTask(TaskInfo.TASK_1_M2_M1_M2, task1_model1, task1_model2);

// TASK 2
EPackage task2_model1 = getModel(pathScenario2 + "models/V1.ecore");
EPackage task2_model2 = getModel(pathScenario2 + "models/V2.ecore");
EObject task2_inputV1a = getInstance(pathScenario2 + "instances/input/V1a.xmi");
EObject task2_inputV1b = getInstance(pathScenario2 + "instances/input/V1b.xmi");
EObject task2_inputV2a = getInstance(pathScenario2 + "instances/input/V2a.xmi");
EObject task2_inputV2b = getInstance(pathScenario2 + "instances/input/V2b.xmi");
EPackage task2_model1 = getModel(pathScenario2 + "models/V1.ecore", resSet2);
EPackage task2_model2 = getModel(pathScenario2 + "models/V2.ecore", resSet2);
EObject task2_inputV1a = getInstance(pathScenario2 + "instances/input/V1a.xmi", resSet2);
EObject task2_inputV1b = getInstance(pathScenario2 + "instances/input/V1b.xmi", resSet2);
EObject task2_inputV2a = getInstance(pathScenario2 + "instances/input/V2a.xmi", resSet2);
EObject task2_inputV2b = getInstance(pathScenario2 + "instances/input/V2b.xmi", resSet2);

AbstractTask task2_1_2_1 = taskFactory.createTask(TaskInfo.TASK_2_M1_M2_M1, task2_model1, task2_model2);
AbstractTask task2_2_1_2 = taskFactory.createTask(TaskInfo.TASK_2_M2_M1_M2, task2_model1, task2_model2);

// TASK 3
EPackage task3_model1 = getModel(pathScenario3 + "models/V1.ecore");
EPackage task3_model2 = getModel(pathScenario3 + "models/V2.ecore");
EObject task3_inputV1a = getInstance(pathScenario3 + "instances/input/V1a.xmi");
EObject task3_inputV1b = getInstance(pathScenario3 + "instances/input/V1b.xmi");
EObject task3_inputV2a = getInstance(pathScenario3 + "instances/input/V2a.xmi");
EObject task3_inputV2b = getInstance(pathScenario3 + "instances/input/V2b.xmi");
EPackage task3_model1 = getModel(pathScenario3 + "models/V1.ecore", resSet3);
EPackage task3_model2 = getModel(pathScenario3 + "models/V2.ecore", resSet3);
EObject task3_inputV1a = getInstance(pathScenario3 + "instances/input/V1a.xmi", resSet3);
EObject task3_inputV1b = getInstance(pathScenario3 + "instances/input/V1b.xmi", resSet3);
EObject task3_inputV2a = getInstance(pathScenario3 + "instances/input/V2a.xmi", resSet3);
EObject task3_inputV2b = getInstance(pathScenario3 + "instances/input/V2b.xmi", resSet3);

AbstractTask task3_1_2_1 = taskFactory.createTask(TaskInfo.TASK_3_M1_M2_M1, task3_model1, task3_model2);
AbstractTask task3_2_1_2 = taskFactory.createTask(TaskInfo.TASK_3_M2_M1_M2, task3_model1, task3_model2);

// TASK 4
EPackage task4_model1 = getModel(pathScenario4 + "models/V1.ecore");
EPackage task4_model2 = getModel(pathScenario4 + "models/V2.ecore");
EObject task4_inputV1a = getInstance(pathScenario4 + "instances/input/V1a.xmi");
EObject task4_inputV1b = getInstance(pathScenario4 + "instances/input/V1b.xmi");
EObject task4_inputV2a = getInstance(pathScenario4 + "instances/input/V2a.xmi");
EObject task4_inputV2b = getInstance(pathScenario4 + "instances/input/V2b.xmi");
EPackage task4_model1 = getModel(pathScenario4 + "models/V1.ecore", resSet4);
EPackage task4_model2 = getModel(pathScenario4 + "models/V2.ecore", resSet4);
EObject task4_inputV1a = getInstance(pathScenario4 + "instances/input/V1a.xmi", resSet4);
EObject task4_inputV1b = getInstance(pathScenario4 + "instances/input/V1b.xmi", resSet4);
EObject task4_inputV2a = getInstance(pathScenario4 + "instances/input/V2a.xmi", resSet4);
EObject task4_inputV2b = getInstance(pathScenario4 + "instances/input/V2b.xmi", resSet4);

AbstractTask task4_1_2_1 = taskFactory.createTask(TaskInfo.TASK_4_M1_M2_M1, task4_model1, task4_model2);
AbstractTask task4_2_1_2 = taskFactory.createTask(TaskInfo.TASK_4_M2_M1_M2, task4_model1, task4_model2);
Expand Down