diff --git a/src/test/java/teetime/variant/methodcall/examples/experiment01/MethodCallThoughputTimestampAnalysis1Test.java b/src/test/java/teetime/variant/methodcall/examples/experiment01/MethodCallThoughputTimestampAnalysis1Test.java index aa1b32ab88f514b2a2d5a585ba4c46501e2792d8..940e090b729c95bef7c65ed8086169c0eaed7590 100644 --- a/src/test/java/teetime/variant/methodcall/examples/experiment01/MethodCallThoughputTimestampAnalysis1Test.java +++ b/src/test/java/teetime/variant/methodcall/examples/experiment01/MethodCallThoughputTimestampAnalysis1Test.java @@ -15,14 +15,9 @@ ***************************************************************************/ package teetime.variant.methodcall.examples.experiment01; -import java.util.ArrayList; -import java.util.List; - import org.junit.Test; import teetime.util.ConstructorClosure; -import teetime.util.StatisticsUtil; -import teetime.util.StopWatch; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import test.PerformanceTest; @@ -40,12 +35,10 @@ public class MethodCallThoughputTimestampAnalysis1Test extends PerformanceTest { public void testWithManyObjects() { System.out.println("Testing teetime (mc) with NUM_OBJECTS_TO_CREATE=" + NUM_OBJECTS_TO_CREATE + ", NUM_NOOP_FILTERS=" + NUM_NOOP_FILTERS + "..."); - final StopWatch stopWatch = new StopWatch(); - final List<TimestampObject> timestampObjects = new ArrayList<TimestampObject>(NUM_OBJECTS_TO_CREATE); final MethodCallThroughputAnalysis1 analysis = new MethodCallThroughputAnalysis1(); analysis.setNumNoopFilters(NUM_NOOP_FILTERS); - analysis.setTimestampObjects(timestampObjects); + analysis.setTimestampObjects(this.timestampObjects); analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() { @Override public TimestampObject create() { @@ -54,14 +47,13 @@ public class MethodCallThoughputTimestampAnalysis1Test extends PerformanceTest { }); analysis.init(); - stopWatch.start(); + this.stopWatch.start(); try { analysis.start(); } finally { - stopWatch.end(); + this.stopWatch.end(); } - StatisticsUtil.printStatistics(stopWatch.getDurationInNs(), timestampObjects); } } diff --git a/src/test/java/teetime/variant/methodcall/examples/experiment02/MethodCallThoughputTimestampAnalysis2Test.java b/src/test/java/teetime/variant/methodcall/examples/experiment02/MethodCallThoughputTimestampAnalysis2Test.java index 08bb696740bf5979054b51219e8424a1b6cc1417..59743fcd55434adea3aef91dce03d8576c55ba7b 100644 --- a/src/test/java/teetime/variant/methodcall/examples/experiment02/MethodCallThoughputTimestampAnalysis2Test.java +++ b/src/test/java/teetime/variant/methodcall/examples/experiment02/MethodCallThoughputTimestampAnalysis2Test.java @@ -15,14 +15,9 @@ ***************************************************************************/ package teetime.variant.methodcall.examples.experiment02; -import java.util.ArrayList; -import java.util.List; - import org.junit.Test; import teetime.util.ConstructorClosure; -import teetime.util.StatisticsUtil; -import teetime.util.StopWatch; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import test.PerformanceTest; @@ -40,12 +35,10 @@ public class MethodCallThoughputTimestampAnalysis2Test extends PerformanceTest { public void testWithManyObjects() { System.out.println("Testing teetime (mc) with NUM_OBJECTS_TO_CREATE=" + NUM_OBJECTS_TO_CREATE + ", NUM_NOOP_FILTERS=" + NUM_NOOP_FILTERS + "..."); - final StopWatch stopWatch = new StopWatch(); - final List<TimestampObject> timestampObjects = new ArrayList<TimestampObject>(NUM_OBJECTS_TO_CREATE); final MethodCallThroughputAnalysis2 analysis = new MethodCallThroughputAnalysis2(); analysis.setNumNoopFilters(NUM_NOOP_FILTERS); - analysis.setTimestampObjects(timestampObjects); + analysis.setTimestampObjects(this.timestampObjects); analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() { @Override public TimestampObject create() { @@ -54,14 +47,12 @@ public class MethodCallThoughputTimestampAnalysis2Test extends PerformanceTest { }); analysis.init(); - stopWatch.start(); + this.stopWatch.start(); try { analysis.start(); } finally { - stopWatch.end(); + this.stopWatch.end(); } - - StatisticsUtil.printStatistics(stopWatch.getDurationInNs(), timestampObjects); } } diff --git a/src/test/java/teetime/variant/methodcall/examples/experiment03/MethodCallThoughputTimestampAnalysis3Test.java b/src/test/java/teetime/variant/methodcall/examples/experiment03/MethodCallThoughputTimestampAnalysis3Test.java index 65020939db10f8bb7f2d8a6259a3cc3d5462d881..0bfc8205242b935b6bd8c0dfe99433910761d2cc 100644 --- a/src/test/java/teetime/variant/methodcall/examples/experiment03/MethodCallThoughputTimestampAnalysis3Test.java +++ b/src/test/java/teetime/variant/methodcall/examples/experiment03/MethodCallThoughputTimestampAnalysis3Test.java @@ -15,14 +15,9 @@ ***************************************************************************/ package teetime.variant.methodcall.examples.experiment03; -import java.util.ArrayList; -import java.util.List; - import org.junit.Test; import teetime.util.ConstructorClosure; -import teetime.util.StatisticsUtil; -import teetime.util.StopWatch; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import test.PerformanceTest; @@ -40,12 +35,10 @@ public class MethodCallThoughputTimestampAnalysis3Test extends PerformanceTest { public void testWithManyObjects() { System.out.println("Testing teetime (mc) with NUM_OBJECTS_TO_CREATE=" + NUM_OBJECTS_TO_CREATE + ", NUM_NOOP_FILTERS=" + NUM_NOOP_FILTERS + "..."); - final StopWatch stopWatch = new StopWatch(); - final List<TimestampObject> timestampObjects = new ArrayList<TimestampObject>(NUM_OBJECTS_TO_CREATE); final MethodCallThroughputAnalysis3 analysis = new MethodCallThroughputAnalysis3(); analysis.setNumNoopFilters(NUM_NOOP_FILTERS); - analysis.setTimestampObjects(timestampObjects); + analysis.setTimestampObjects(this.timestampObjects); analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() { @Override public TimestampObject create() { @@ -54,14 +47,12 @@ public class MethodCallThoughputTimestampAnalysis3Test extends PerformanceTest { }); analysis.init(); - stopWatch.start(); + this.stopWatch.start(); try { analysis.start(); } finally { - stopWatch.end(); + this.stopWatch.end(); } - - StatisticsUtil.printStatistics(stopWatch.getDurationInNs(), timestampObjects); } } diff --git a/src/test/java/teetime/variant/methodcall/examples/experiment04/MethodCallThoughputTimestampAnalysis4Test.java b/src/test/java/teetime/variant/methodcall/examples/experiment04/MethodCallThoughputTimestampAnalysis4Test.java index a1adcac9acfb0f643c6c9db704852fc2cc93dca9..ba5f80958544c78d5be12f3ca4ee490674443925 100644 --- a/src/test/java/teetime/variant/methodcall/examples/experiment04/MethodCallThoughputTimestampAnalysis4Test.java +++ b/src/test/java/teetime/variant/methodcall/examples/experiment04/MethodCallThoughputTimestampAnalysis4Test.java @@ -15,14 +15,9 @@ ***************************************************************************/ package teetime.variant.methodcall.examples.experiment04; -import java.util.ArrayList; -import java.util.List; - import org.junit.Test; import teetime.util.ConstructorClosure; -import teetime.util.StatisticsUtil; -import teetime.util.StopWatch; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import test.PerformanceTest; @@ -40,12 +35,10 @@ public class MethodCallThoughputTimestampAnalysis4Test extends PerformanceTest { public void testWithManyObjects() { System.out.println("Testing teetime (mc) with NUM_OBJECTS_TO_CREATE=" + NUM_OBJECTS_TO_CREATE + ", NUM_NOOP_FILTERS=" + NUM_NOOP_FILTERS + "..."); - final StopWatch stopWatch = new StopWatch(); - final List<TimestampObject> timestampObjects = new ArrayList<TimestampObject>(NUM_OBJECTS_TO_CREATE); final MethodCallThroughputAnalysis4 analysis = new MethodCallThroughputAnalysis4(); analysis.setNumNoopFilters(NUM_NOOP_FILTERS); - analysis.setTimestampObjects(timestampObjects); + analysis.setTimestampObjects(this.timestampObjects); analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() { @Override public TimestampObject create() { @@ -54,14 +47,12 @@ public class MethodCallThoughputTimestampAnalysis4Test extends PerformanceTest { }); analysis.init(); - stopWatch.start(); + this.stopWatch.start(); try { analysis.start(); } finally { - stopWatch.end(); + this.stopWatch.end(); } - - StatisticsUtil.printStatistics(stopWatch.getDurationInNs(), timestampObjects); } } diff --git a/src/test/java/teetime/variant/methodcall/examples/experiment05/MethodCallThoughputTimestampAnalysis5Test.java b/src/test/java/teetime/variant/methodcall/examples/experiment05/MethodCallThoughputTimestampAnalysis5Test.java index 63e5c16e006e93b1e379c5584dce02521dd35f1f..22c2ec2bbf9f8d6e8dc89ab8bf87de105dcb87c2 100644 --- a/src/test/java/teetime/variant/methodcall/examples/experiment05/MethodCallThoughputTimestampAnalysis5Test.java +++ b/src/test/java/teetime/variant/methodcall/examples/experiment05/MethodCallThoughputTimestampAnalysis5Test.java @@ -15,14 +15,9 @@ ***************************************************************************/ package teetime.variant.methodcall.examples.experiment05; -import java.util.ArrayList; -import java.util.List; - import org.junit.Test; import teetime.util.ConstructorClosure; -import teetime.util.StatisticsUtil; -import teetime.util.StopWatch; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import test.PerformanceTest; @@ -40,12 +35,10 @@ public class MethodCallThoughputTimestampAnalysis5Test extends PerformanceTest { public void testWithManyObjects() { System.out.println("Testing teetime (mc) with NUM_OBJECTS_TO_CREATE=" + NUM_OBJECTS_TO_CREATE + ", NUM_NOOP_FILTERS=" + NUM_NOOP_FILTERS + "..."); - final StopWatch stopWatch = new StopWatch(); - final List<TimestampObject> timestampObjects = new ArrayList<TimestampObject>(NUM_OBJECTS_TO_CREATE); final MethodCallThroughputAnalysis5 analysis = new MethodCallThroughputAnalysis5(); analysis.setNumNoopFilters(NUM_NOOP_FILTERS); - analysis.setTimestampObjects(timestampObjects); + analysis.setTimestampObjects(this.timestampObjects); analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() { @Override public TimestampObject create() { @@ -54,14 +47,12 @@ public class MethodCallThoughputTimestampAnalysis5Test extends PerformanceTest { }); analysis.init(); - stopWatch.start(); + this.stopWatch.start(); try { analysis.start(); } finally { - stopWatch.end(); + this.stopWatch.end(); } - - StatisticsUtil.printStatistics(stopWatch.getDurationInNs(), timestampObjects); } } diff --git a/src/test/java/teetime/variant/methodcall/examples/experiment06/MethodCallThoughputTimestampAnalysis6Test.java b/src/test/java/teetime/variant/methodcall/examples/experiment06/MethodCallThoughputTimestampAnalysis6Test.java index 126742c2ef55bdc15378e367a2c92632226692dd..fa2150df78a88f01344bb24eaa2257c89adc9d08 100644 --- a/src/test/java/teetime/variant/methodcall/examples/experiment06/MethodCallThoughputTimestampAnalysis6Test.java +++ b/src/test/java/teetime/variant/methodcall/examples/experiment06/MethodCallThoughputTimestampAnalysis6Test.java @@ -15,14 +15,9 @@ ***************************************************************************/ package teetime.variant.methodcall.examples.experiment06; -import java.util.ArrayList; -import java.util.List; - import org.junit.Test; import teetime.util.ConstructorClosure; -import teetime.util.StatisticsUtil; -import teetime.util.StopWatch; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import test.PerformanceTest; @@ -37,12 +32,10 @@ public class MethodCallThoughputTimestampAnalysis6Test extends PerformanceTest { public void testWithManyObjects() { System.out.println("Testing teetime (mc) with NUM_OBJECTS_TO_CREATE=" + NUM_OBJECTS_TO_CREATE + ", NUM_NOOP_FILTERS=" + NUM_NOOP_FILTERS + "..."); - final StopWatch stopWatch = new StopWatch(); - final List<TimestampObject> timestampObjects = new ArrayList<TimestampObject>(NUM_OBJECTS_TO_CREATE); final MethodCallThroughputAnalysis6 analysis = new MethodCallThroughputAnalysis6(); analysis.setNumNoopFilters(NUM_NOOP_FILTERS); - analysis.setTimestampObjects(timestampObjects); + analysis.setTimestampObjects(this.timestampObjects); analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() { @Override public TimestampObject create() { @@ -51,14 +44,12 @@ public class MethodCallThoughputTimestampAnalysis6Test extends PerformanceTest { }); analysis.init(); - stopWatch.start(); + this.stopWatch.start(); try { analysis.start(); } finally { - stopWatch.end(); + this.stopWatch.end(); } - - StatisticsUtil.printStatistics(stopWatch.getDurationInNs(), timestampObjects); } } diff --git a/src/test/java/teetime/variant/methodcall/examples/experiment07/MethodCallThoughputTimestampAnalysis7Test.java b/src/test/java/teetime/variant/methodcall/examples/experiment07/MethodCallThoughputTimestampAnalysis7Test.java index 050d96d4f81bddebfd11105debc31d8d6f6dfba9..7ced7c151c8b57d85aae9cff88a3678fb9319c33 100644 --- a/src/test/java/teetime/variant/methodcall/examples/experiment07/MethodCallThoughputTimestampAnalysis7Test.java +++ b/src/test/java/teetime/variant/methodcall/examples/experiment07/MethodCallThoughputTimestampAnalysis7Test.java @@ -15,14 +15,9 @@ ***************************************************************************/ package teetime.variant.methodcall.examples.experiment07; -import java.util.ArrayList; -import java.util.List; - import org.junit.Test; import teetime.util.ConstructorClosure; -import teetime.util.StatisticsUtil; -import teetime.util.StopWatch; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import test.PerformanceTest; @@ -37,12 +32,10 @@ public class MethodCallThoughputTimestampAnalysis7Test extends PerformanceTest { public void testWithManyObjects() { System.out.println("Testing teetime (mc) with NUM_OBJECTS_TO_CREATE=" + NUM_OBJECTS_TO_CREATE + ", NUM_NOOP_FILTERS=" + NUM_NOOP_FILTERS + "..."); - final StopWatch stopWatch = new StopWatch(); - final List<TimestampObject> timestampObjects = new ArrayList<TimestampObject>(NUM_OBJECTS_TO_CREATE); final MethodCallThroughputAnalysis7 analysis = new MethodCallThroughputAnalysis7(); analysis.setNumNoopFilters(NUM_NOOP_FILTERS); - analysis.setTimestampObjects(timestampObjects); + analysis.setTimestampObjects(this.timestampObjects); analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() { @Override public TimestampObject create() { @@ -51,14 +44,12 @@ public class MethodCallThoughputTimestampAnalysis7Test extends PerformanceTest { }); analysis.init(); - stopWatch.start(); + this.stopWatch.start(); try { analysis.start(); } finally { - stopWatch.end(); + this.stopWatch.end(); } - - StatisticsUtil.printStatistics(stopWatch.getDurationInNs(), timestampObjects); } } diff --git a/src/test/java/teetime/variant/methodcall/examples/experiment08/MethodCallThoughputTimestampAnalysis8Test.java b/src/test/java/teetime/variant/methodcall/examples/experiment08/MethodCallThoughputTimestampAnalysis8Test.java index 8ab1b3d89038e9d1ea21c099ac6112f6816c6cd3..e2de139f3433d905100410c3c699c44ed8e3b69d 100644 --- a/src/test/java/teetime/variant/methodcall/examples/experiment08/MethodCallThoughputTimestampAnalysis8Test.java +++ b/src/test/java/teetime/variant/methodcall/examples/experiment08/MethodCallThoughputTimestampAnalysis8Test.java @@ -15,14 +15,9 @@ ***************************************************************************/ package teetime.variant.methodcall.examples.experiment08; -import java.util.ArrayList; -import java.util.List; - import org.junit.Test; import teetime.util.ConstructorClosure; -import teetime.util.StatisticsUtil; -import teetime.util.StopWatch; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import test.PerformanceTest; @@ -37,12 +32,10 @@ public class MethodCallThoughputTimestampAnalysis8Test extends PerformanceTest { public void testWithManyObjects() { System.out.println("Testing teetime (mc) with NUM_OBJECTS_TO_CREATE=" + NUM_OBJECTS_TO_CREATE + ", NUM_NOOP_FILTERS=" + NUM_NOOP_FILTERS + "..."); - final StopWatch stopWatch = new StopWatch(); - final List<TimestampObject> timestampObjects = new ArrayList<TimestampObject>(NUM_OBJECTS_TO_CREATE); final MethodCallThroughputAnalysis8 analysis = new MethodCallThroughputAnalysis8(); analysis.setNumNoopFilters(NUM_NOOP_FILTERS); - analysis.setTimestampObjects(timestampObjects); + analysis.setTimestampObjects(this.timestampObjects); analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() { @Override public TimestampObject create() { @@ -51,14 +44,12 @@ public class MethodCallThoughputTimestampAnalysis8Test extends PerformanceTest { }); analysis.init(); - stopWatch.start(); + this.stopWatch.start(); try { analysis.start(); } finally { - stopWatch.end(); + this.stopWatch.end(); } - - StatisticsUtil.printStatistics(stopWatch.getDurationInNs(), timestampObjects); } } diff --git a/src/test/java/teetime/variant/methodcall/examples/experiment12/MethodCallThoughputTimestampAnalysis12Test.java b/src/test/java/teetime/variant/methodcall/examples/experiment12/MethodCallThoughputTimestampAnalysis12Test.java index c6fe784eab61434021090b0e2a5555f657bc346e..86e662f9ce0501b4af2e4e69dbc0ef832e6b4d5a 100644 --- a/src/test/java/teetime/variant/methodcall/examples/experiment12/MethodCallThoughputTimestampAnalysis12Test.java +++ b/src/test/java/teetime/variant/methodcall/examples/experiment12/MethodCallThoughputTimestampAnalysis12Test.java @@ -15,14 +15,9 @@ ***************************************************************************/ package teetime.variant.methodcall.examples.experiment12; -import java.util.ArrayList; -import java.util.List; - import org.junit.Test; import teetime.util.ConstructorClosure; -import teetime.util.StatisticsUtil; -import teetime.util.StopWatch; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import test.PerformanceTest; @@ -37,12 +32,10 @@ public class MethodCallThoughputTimestampAnalysis12Test extends PerformanceTest public void testWithManyObjects() { System.out.println("Testing teetime (mc) with NUM_OBJECTS_TO_CREATE=" + NUM_OBJECTS_TO_CREATE + ", NUM_NOOP_FILTERS=" + NUM_NOOP_FILTERS + "..."); - final StopWatch stopWatch = new StopWatch(); - final List<TimestampObject> timestampObjects = new ArrayList<TimestampObject>(NUM_OBJECTS_TO_CREATE); final MethodCallThroughputAnalysis12 analysis = new MethodCallThroughputAnalysis12(); analysis.setNumNoopFilters(NUM_NOOP_FILTERS); - analysis.setTimestampObjects(timestampObjects); + analysis.setTimestampObjects(this.timestampObjects); analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() { @Override public TimestampObject create() { @@ -51,14 +44,12 @@ public class MethodCallThoughputTimestampAnalysis12Test extends PerformanceTest }); analysis.init(); - stopWatch.start(); + this.stopWatch.start(); try { analysis.start(); } finally { - stopWatch.end(); + this.stopWatch.end(); } - - StatisticsUtil.printStatistics(stopWatch.getDurationInNs(), timestampObjects); } } diff --git a/src/test/java/teetime/variant/methodcall/examples/experiment13/MethodCallThoughputTimestampAnalysis13Test.java b/src/test/java/teetime/variant/methodcall/examples/experiment13/MethodCallThoughputTimestampAnalysis13Test.java index 05449afb7084d89915fab6ca3e5bafe95ddaf85b..246a968a7d3297c49e6725bb6130dd3c6066125a 100644 --- a/src/test/java/teetime/variant/methodcall/examples/experiment13/MethodCallThoughputTimestampAnalysis13Test.java +++ b/src/test/java/teetime/variant/methodcall/examples/experiment13/MethodCallThoughputTimestampAnalysis13Test.java @@ -15,14 +15,9 @@ ***************************************************************************/ package teetime.variant.methodcall.examples.experiment13; -import java.util.ArrayList; -import java.util.List; - import org.junit.Test; import teetime.util.ConstructorClosure; -import teetime.util.StatisticsUtil; -import teetime.util.StopWatch; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import test.PerformanceTest; @@ -37,12 +32,10 @@ public class MethodCallThoughputTimestampAnalysis13Test extends PerformanceTest public void testWithManyObjects() { System.out.println("Testing teetime (mc) with NUM_OBJECTS_TO_CREATE=" + NUM_OBJECTS_TO_CREATE + ", NUM_NOOP_FILTERS=" + NUM_NOOP_FILTERS + "..."); - final StopWatch stopWatch = new StopWatch(); - final List<TimestampObject> timestampObjects = new ArrayList<TimestampObject>(NUM_OBJECTS_TO_CREATE); final MethodCallThroughputAnalysis13 analysis = new MethodCallThroughputAnalysis13(); analysis.setNumNoopFilters(NUM_NOOP_FILTERS); - analysis.setTimestampObjects(timestampObjects); + analysis.setTimestampObjects(this.timestampObjects); analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() { @Override public TimestampObject create() { @@ -51,14 +44,12 @@ public class MethodCallThoughputTimestampAnalysis13Test extends PerformanceTest }); analysis.init(); - stopWatch.start(); + this.stopWatch.start(); try { analysis.start(); } finally { - stopWatch.end(); + this.stopWatch.end(); } - - StatisticsUtil.printStatistics(stopWatch.getDurationInNs(), timestampObjects); } } diff --git a/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment09/MethodCallThoughputTimestampAnalysis9Test.java b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment09/MethodCallThoughputTimestampAnalysis9Test.java index 431e58967051a12d1c86e4e35a90698960f4412c..ba57740c74ceaa10f8ef7470708aabed4a0f7b4b 100644 --- a/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment09/MethodCallThoughputTimestampAnalysis9Test.java +++ b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment09/MethodCallThoughputTimestampAnalysis9Test.java @@ -15,14 +15,9 @@ ***************************************************************************/ package teetime.variant.methodcallWithPorts.examples.experiment09; -import java.util.ArrayList; -import java.util.List; - import org.junit.Test; import teetime.util.ConstructorClosure; -import teetime.util.StatisticsUtil; -import teetime.util.StopWatch; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import test.PerformanceTest; @@ -37,12 +32,10 @@ public class MethodCallThoughputTimestampAnalysis9Test extends PerformanceTest { public void testWithManyObjects() { System.out.println("Testing teetime (mc) with NUM_OBJECTS_TO_CREATE=" + NUM_OBJECTS_TO_CREATE + ", NUM_NOOP_FILTERS=" + NUM_NOOP_FILTERS + "..."); - final StopWatch stopWatch = new StopWatch(); - final List<TimestampObject> timestampObjects = new ArrayList<TimestampObject>(NUM_OBJECTS_TO_CREATE); final MethodCallThroughputAnalysis9 analysis = new MethodCallThroughputAnalysis9(); analysis.setNumNoopFilters(NUM_NOOP_FILTERS); - analysis.setTimestampObjects(timestampObjects); + analysis.setTimestampObjects(this.timestampObjects); analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() { @Override public TimestampObject create() { @@ -51,14 +44,12 @@ public class MethodCallThoughputTimestampAnalysis9Test extends PerformanceTest { }); analysis.init(); - stopWatch.start(); + this.stopWatch.start(); try { analysis.start(); } finally { - stopWatch.end(); + this.stopWatch.end(); } - - StatisticsUtil.printStatistics(stopWatch.getDurationInNs(), timestampObjects); } } diff --git a/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment10/MethodCallThoughputTimestampAnalysis10Test.java b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment10/MethodCallThoughputTimestampAnalysis10Test.java index d7a804aa08da090b222754e8ea46d02c5bb8b079..0024fa18e9621e0bc930afffac660a13146bdc02 100644 --- a/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment10/MethodCallThoughputTimestampAnalysis10Test.java +++ b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment10/MethodCallThoughputTimestampAnalysis10Test.java @@ -15,14 +15,9 @@ ***************************************************************************/ package teetime.variant.methodcallWithPorts.examples.experiment10; -import java.util.ArrayList; -import java.util.List; - import org.junit.Test; import teetime.util.ConstructorClosure; -import teetime.util.StatisticsUtil; -import teetime.util.StopWatch; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import test.PerformanceTest; @@ -37,12 +32,10 @@ public class MethodCallThoughputTimestampAnalysis10Test extends PerformanceTest public void testWithManyObjects() { System.out.println("Testing teetime (mc) with NUM_OBJECTS_TO_CREATE=" + NUM_OBJECTS_TO_CREATE + ", NUM_NOOP_FILTERS=" + NUM_NOOP_FILTERS + "..."); - final StopWatch stopWatch = new StopWatch(); - final List<TimestampObject> timestampObjects = new ArrayList<TimestampObject>(NUM_OBJECTS_TO_CREATE); final MethodCallThroughputAnalysis10 analysis = new MethodCallThroughputAnalysis10(); analysis.setNumNoopFilters(NUM_NOOP_FILTERS); - analysis.setTimestampObjects(timestampObjects); + analysis.setTimestampObjects(this.timestampObjects); analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() { @Override public TimestampObject create() { @@ -51,14 +44,12 @@ public class MethodCallThoughputTimestampAnalysis10Test extends PerformanceTest }); analysis.init(); - stopWatch.start(); + this.stopWatch.start(); try { analysis.start(); } finally { - stopWatch.end(); + this.stopWatch.end(); } - - StatisticsUtil.printStatistics(stopWatch.getDurationInNs(), timestampObjects); } } diff --git a/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment11/MethodCallThoughputTimestampAnalysis11Test.java b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment11/MethodCallThoughputTimestampAnalysis11Test.java index 4cd04b305aa684d37e08ff0de492fac2f9cc6c7b..c9dc1645f3f22bbd6ae5f4aa203d0a54f58849b1 100644 --- a/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment11/MethodCallThoughputTimestampAnalysis11Test.java +++ b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment11/MethodCallThoughputTimestampAnalysis11Test.java @@ -15,14 +15,9 @@ ***************************************************************************/ package teetime.variant.methodcallWithPorts.examples.experiment11; -import java.util.ArrayList; -import java.util.List; - import org.junit.Test; import teetime.util.ConstructorClosure; -import teetime.util.StatisticsUtil; -import teetime.util.StopWatch; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import test.PerformanceTest; @@ -37,12 +32,10 @@ public class MethodCallThoughputTimestampAnalysis11Test extends PerformanceTest public void testWithManyObjects() { System.out.println("Testing teetime (mc) with NUM_OBJECTS_TO_CREATE=" + NUM_OBJECTS_TO_CREATE + ", NUM_NOOP_FILTERS=" + NUM_NOOP_FILTERS + "..."); - final StopWatch stopWatch = new StopWatch(); - final List<TimestampObject> timestampObjects = new ArrayList<TimestampObject>(NUM_OBJECTS_TO_CREATE); final MethodCallThroughputAnalysis11 analysis = new MethodCallThroughputAnalysis11(); analysis.setNumNoopFilters(NUM_NOOP_FILTERS); - analysis.setTimestampObjects(timestampObjects); + analysis.setTimestampObjects(this.timestampObjects); analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() { @Override public TimestampObject create() { @@ -51,14 +44,12 @@ public class MethodCallThoughputTimestampAnalysis11Test extends PerformanceTest }); analysis.init(); - stopWatch.start(); + this.stopWatch.start(); try { analysis.start(); } finally { - stopWatch.end(); + this.stopWatch.end(); } - - StatisticsUtil.printStatistics(stopWatch.getDurationInNs(), timestampObjects); } } diff --git a/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment14/MethodCallThoughputTimestampAnalysis14Test.java b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment14/MethodCallThoughputTimestampAnalysis14Test.java index 18a9e2a3ba0aba9689289f483ab04f0a643d492f..6a49130a55995e59d6e5408ae653e5c05226966a 100644 --- a/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment14/MethodCallThoughputTimestampAnalysis14Test.java +++ b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment14/MethodCallThoughputTimestampAnalysis14Test.java @@ -15,14 +15,9 @@ ***************************************************************************/ package teetime.variant.methodcallWithPorts.examples.experiment14; -import java.util.ArrayList; -import java.util.List; - import org.junit.Test; import teetime.util.ConstructorClosure; -import teetime.util.StatisticsUtil; -import teetime.util.StopWatch; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import test.PerformanceTest; @@ -37,12 +32,10 @@ public class MethodCallThoughputTimestampAnalysis14Test extends PerformanceTest public void testWithManyObjects() { System.out.println("Testing teetime (mc) with NUM_OBJECTS_TO_CREATE=" + NUM_OBJECTS_TO_CREATE + ", NUM_NOOP_FILTERS=" + NUM_NOOP_FILTERS + "..."); - final StopWatch stopWatch = new StopWatch(); - final List<TimestampObject> timestampObjects = new ArrayList<TimestampObject>(NUM_OBJECTS_TO_CREATE); final MethodCallThroughputAnalysis14 analysis = new MethodCallThroughputAnalysis14(); analysis.setNumNoopFilters(NUM_NOOP_FILTERS); - analysis.setTimestampObjects(timestampObjects); + analysis.setTimestampObjects(this.timestampObjects); analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() { @Override public TimestampObject create() { @@ -51,14 +44,12 @@ public class MethodCallThoughputTimestampAnalysis14Test extends PerformanceTest }); analysis.init(); - stopWatch.start(); + this.stopWatch.start(); try { analysis.start(); } finally { - stopWatch.end(); + this.stopWatch.end(); } - - StatisticsUtil.printStatistics(stopWatch.getDurationInNs(), timestampObjects); } } diff --git a/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment15/MethodCallThoughputTimestampAnalysis15Test.java b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment15/MethodCallThoughputTimestampAnalysis15Test.java index 0d0149f17ba2249120a21600656ec0a212fbe685..d6a5f58602343fe138213f4f19ff7673a25bfbfa 100644 --- a/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment15/MethodCallThoughputTimestampAnalysis15Test.java +++ b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment15/MethodCallThoughputTimestampAnalysis15Test.java @@ -15,14 +15,9 @@ ***************************************************************************/ package teetime.variant.methodcallWithPorts.examples.experiment15; -import java.util.ArrayList; -import java.util.List; - import org.junit.Test; import teetime.util.ConstructorClosure; -import teetime.util.StatisticsUtil; -import teetime.util.StopWatch; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import test.PerformanceTest; @@ -37,12 +32,10 @@ public class MethodCallThoughputTimestampAnalysis15Test extends PerformanceTest public void testWithManyObjects() { System.out.println("Testing teetime (mc) with NUM_OBJECTS_TO_CREATE=" + NUM_OBJECTS_TO_CREATE + ", NUM_NOOP_FILTERS=" + NUM_NOOP_FILTERS + "..."); - final StopWatch stopWatch = new StopWatch(); - final List<TimestampObject> timestampObjects = new ArrayList<TimestampObject>(NUM_OBJECTS_TO_CREATE); final MethodCallThroughputAnalysis15 analysis = new MethodCallThroughputAnalysis15(); analysis.setNumNoopFilters(NUM_NOOP_FILTERS); - analysis.setTimestampObjects(timestampObjects); + analysis.setTimestampObjects(this.timestampObjects); analysis.setInput(NUM_OBJECTS_TO_CREATE, new ConstructorClosure<TimestampObject>() { @Override public TimestampObject create() { @@ -51,14 +44,12 @@ public class MethodCallThoughputTimestampAnalysis15Test extends PerformanceTest }); analysis.init(); - stopWatch.start(); + this.stopWatch.start(); try { analysis.start(); } finally { - stopWatch.end(); + this.stopWatch.end(); } - - StatisticsUtil.printStatistics(stopWatch.getDurationInNs(), timestampObjects); } } diff --git a/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment16/MethodCallThoughputTimestampAnalysis16Test.java b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment16/MethodCallThoughputTimestampAnalysis16Test.java index 24938afade7d8bcf65147463a2379c3a3eee1bb7..da53b65840e5548aa47bd36f4d6948a7d8c70042 100644 --- a/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment16/MethodCallThoughputTimestampAnalysis16Test.java +++ b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment16/MethodCallThoughputTimestampAnalysis16Test.java @@ -22,7 +22,6 @@ import org.junit.Test; import teetime.util.ConstructorClosure; import teetime.util.ListUtil; import teetime.util.StatisticsUtil; -import teetime.util.StopWatch; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import test.PerformanceTest; @@ -44,7 +43,6 @@ public class MethodCallThoughputTimestampAnalysis16Test extends PerformanceTest private long performAnalysis(final int numThreads, final long durationWith1Thread) { System.out.println("Testing teetime (mc) with NUM_OBJECTS_TO_CREATE=" + NUM_OBJECTS_TO_CREATE + ", NUM_NOOP_FILTERS=" + NUM_NOOP_FILTERS + "..."); - final StopWatch stopWatch = new StopWatch(); final MethodCallThroughputAnalysis16 analysis = new MethodCallThroughputAnalysis16(); analysis.setNumWorkerThreads(numThreads); @@ -57,23 +55,25 @@ public class MethodCallThoughputTimestampAnalysis16Test extends PerformanceTest }); analysis.init(); - stopWatch.start(); + this.stopWatch.start(); try { analysis.start(); } finally { - stopWatch.end(); + this.stopWatch.end(); analysis.onTerminate(); } + // TODO refactor test + List<TimestampObject> timestampObjects = ListUtil.merge(analysis.getTimestampObjectsList()); - StatisticsUtil.printStatistics(stopWatch.getDurationInNs(), timestampObjects); + StatisticsUtil.printStatistics(this.stopWatch.getDurationInNs(), timestampObjects); if (durationWith1Thread != -1) { - double speedup = (double) durationWith1Thread / stopWatch.getDurationInNs(); + double speedup = (double) durationWith1Thread / this.stopWatch.getDurationInNs(); System.out.println("Speedup (from 1 to " + numThreads + " threads): " + String.format("%.2f", speedup)); } - return stopWatch.getDurationInNs(); + return this.stopWatch.getDurationInNs(); } public static void main(final String[] args) { diff --git a/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment17/MethodCallThoughputTimestampAnalysis17Test.java b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment17/MethodCallThoughputTimestampAnalysis17Test.java index 315b3b57eaa4cc4d140c0ba5aed16c1ae41fcd0b..a861ed382dbb652ef6b39d65ba2deca351f2176c 100644 --- a/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment17/MethodCallThoughputTimestampAnalysis17Test.java +++ b/src/test/java/teetime/variant/methodcallWithPorts/examples/experiment17/MethodCallThoughputTimestampAnalysis17Test.java @@ -22,7 +22,6 @@ import org.junit.Test; import teetime.util.ConstructorClosure; import teetime.util.ListUtil; import teetime.util.StatisticsUtil; -import teetime.util.StopWatch; import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import test.PerformanceTest; @@ -37,7 +36,6 @@ public class MethodCallThoughputTimestampAnalysis17Test extends PerformanceTest public void testWithManyObjects() { System.out.println("Testing teetime (mc) with NUM_OBJECTS_TO_CREATE=" + NUM_OBJECTS_TO_CREATE + ", NUM_NOOP_FILTERS=" + NUM_NOOP_FILTERS + "..."); - final StopWatch stopWatch = new StopWatch(); // int count = 10; // while (count-- > 0) { @@ -52,16 +50,18 @@ public class MethodCallThoughputTimestampAnalysis17Test extends PerformanceTest analysis.init(); System.out.println("starting"); - stopWatch.start(); + this.stopWatch.start(); try { analysis.start(); } finally { - stopWatch.end(); + this.stopWatch.end(); analysis.onTerminate(); } + // TODO refactor test + List<TimestampObject> timestampObjects = ListUtil.merge(analysis.getTimestampObjectsList()); - StatisticsUtil.printStatistics(stopWatch.getDurationInNs(), timestampObjects); + StatisticsUtil.printStatistics(this.stopWatch.getDurationInNs(), timestampObjects); // } } } diff --git a/src/test/java/test/PerformanceTest.java b/src/test/java/test/PerformanceTest.java index c84310284d1289680713fd36cd688f474a5a5e0b..910053b08feb75fd0fba2389732628f31e6f84cd 100644 --- a/src/test/java/test/PerformanceTest.java +++ b/src/test/java/test/PerformanceTest.java @@ -1,6 +1,18 @@ package test; +import java.util.ArrayList; +import java.util.List; + +import org.junit.After; import org.junit.Before; +import org.junit.Rule; +import org.junit.rules.TestRule; +import org.junit.rules.TestWatcher; +import org.junit.runner.Description; + +import teetime.util.StatisticsUtil; +import teetime.util.StopWatch; +import teetime.variant.explicitScheduling.examples.throughput.TimestampObject; import kieker.common.logging.LogFactory; @@ -9,8 +21,32 @@ public abstract class PerformanceTest { protected static final int NUM_OBJECTS_TO_CREATE = 100000; protected static final int NUM_NOOP_FILTERS = 800; + private static MeasurementRepository measurementRepository = new MeasurementRepository(); + + private Description description; + + protected StopWatch stopWatch; + protected List<TimestampObject> timestampObjects; + + @Rule + public final TestRule watcher = new TestWatcher() { + @Override + protected void starting(final Description description) { + PerformanceTest.this.description = description; + // System.out.println("getDisplayName(): " + description.getDisplayName()); + } + }; + @Before public void before() { System.setProperty(LogFactory.CUSTOM_LOGGER_JVM, "NONE"); + this.stopWatch = new StopWatch(); + this.timestampObjects = new ArrayList<TimestampObject>(NUM_OBJECTS_TO_CREATE); + } + + @After + public void after() { + PerformanceResult performanceResult = StatisticsUtil.printStatistics(this.stopWatch.getDurationInNs(), this.timestampObjects); + measurementRepository.performanceResults.put(this.description.getDisplayName(), performanceResult); } } diff --git a/variants.xlsx b/variants.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..2407d072a795b93f981e2ec67d2e0e02308b6107 Binary files /dev/null and b/variants.xlsx differ