Skip to content
Snippets Groups Projects
Commit 961d4da8 authored by Christian Wulf's avatar Christian Wulf
Browse files

Merge remote-tracking branch 'origin/master' into find-pipefact-conf

parents 12065de9 09033375
No related branches found
No related tags found
No related merge requests found
Showing
with 28 additions and 23 deletions
...@@ -5,7 +5,7 @@ import util.test.PerformanceResult; ...@@ -5,7 +5,7 @@ import util.test.PerformanceResult;
import util.test.PerformanceTest; import util.test.PerformanceTest;
import util.test.ProfiledPerformanceAssertion; import util.test.ProfiledPerformanceAssertion;
public class ChwHomePerformanceCheck extends ProfiledPerformanceAssertion { class ChwHomePerformanceCheck extends ProfiledPerformanceAssertion {
@Override @Override
public String getCorrespondingPerformanceProfile() { public String getCorrespondingPerformanceProfile() {
......
...@@ -5,7 +5,7 @@ import util.test.PerformanceResult; ...@@ -5,7 +5,7 @@ import util.test.PerformanceResult;
import util.test.PerformanceTest; import util.test.PerformanceTest;
import util.test.ProfiledPerformanceAssertion; import util.test.ProfiledPerformanceAssertion;
public class ChwWorkPerformanceCheck extends ProfiledPerformanceAssertion { class ChwWorkPerformanceCheck extends ProfiledPerformanceAssertion {
@Override @Override
public String getCorrespondingPerformanceProfile() { public String getCorrespondingPerformanceProfile() {
......
...@@ -2,7 +2,7 @@ package teetime.examples.experiment09; ...@@ -2,7 +2,7 @@ package teetime.examples.experiment09;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
public class ChwHomePerformanceCheck extends AbstractPerformanceCheck { class ChwHomePerformanceCheck extends AbstractPerformanceCheck {
@Override @Override
public String getCorrespondingPerformanceProfile() { public String getCorrespondingPerformanceProfile() {
...@@ -21,11 +21,13 @@ public class ChwHomePerformanceCheck extends AbstractPerformanceCheck { ...@@ -21,11 +21,13 @@ public class ChwHomePerformanceCheck extends AbstractPerformanceCheck {
// assertEquals(22, (double) test9.quantiles.get(0.5) / test1.quantiles.get(0.5), 2.1); // assertEquals(22, (double) test9.quantiles.get(0.5) / test1.quantiles.get(0.5), 2.1);
// since 26.06.2014 (incl.) // since 26.06.2014 (incl.)
// assertEquals(36, value9, 2.1); // +14 // assertEquals(36, value9, 2.1); // +14
// // since 04.07.2014 (incl.) // since 04.07.2014 (incl.)
// assertEquals(42, value9, 2.1); // +6 // assertEquals(42, value9, 2.1); // +6
// since 11.08.2014 (incl.) // since 11.08.2014 (incl.)
// assertEquals(42, value9, 2.1); // +6 // assertEquals(42, value9, 2.1); // +6
// since 31.08.2014 (incl.) // since 31.08.2014 (incl.)
assertEquals(44, medianSpeedup, 2.1); // ?? // assertEquals(44, medianSpeedup, 2.1); // +2
// since 04.11.2014 (incl.)
assertEquals(71, medianSpeedup, 2.1); // +33
} }
} }
...@@ -2,7 +2,7 @@ package teetime.examples.experiment09; ...@@ -2,7 +2,7 @@ package teetime.examples.experiment09;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
public class ChwWorkPerformanceCheck extends AbstractPerformanceCheck { class ChwWorkPerformanceCheck extends AbstractPerformanceCheck {
@Override @Override
public String getCorrespondingPerformanceProfile() { public String getCorrespondingPerformanceProfile() {
......
...@@ -19,8 +19,6 @@ import org.junit.AfterClass; ...@@ -19,8 +19,6 @@ import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import teetime.examples.experiment10.ChwHomePerformanceCheck;
import teetime.examples.experiment10.ChwWorkPerformanceCheck;
import teetime.util.ConstructorClosure; import teetime.util.ConstructorClosure;
import teetime.util.TimestampObject; import teetime.util.TimestampObject;
import util.test.PerformanceTest; import util.test.PerformanceTest;
......
...@@ -2,7 +2,7 @@ package teetime.examples.experiment10; ...@@ -2,7 +2,7 @@ package teetime.examples.experiment10;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
public class ChwHomePerformanceCheck extends AbstractPerformanceCheck { class ChwHomePerformanceCheck extends AbstractPerformanceCheck {
@Override @Override
public String getCorrespondingPerformanceProfile() { public String getCorrespondingPerformanceProfile() {
...@@ -13,9 +13,9 @@ public class ChwHomePerformanceCheck extends AbstractPerformanceCheck { ...@@ -13,9 +13,9 @@ public class ChwHomePerformanceCheck extends AbstractPerformanceCheck {
public void check() { public void check() {
super.check(); super.check();
double meanSpeedup = (double) test10.quantiles.get(0.5) / test01.quantiles.get(0.5); double medianSpeedup = (double) test10.quantiles.get(0.5) / test01.quantiles.get(0.5);
System.out.println("meanSpeedup (10): " + meanSpeedup); System.out.println("meanSpeedup (10): " + medianSpeedup);
// since 26.06.2014 (incl.) // since 26.06.2014 (incl.)
// assertEquals(26, value10, 2.1); // +14 // assertEquals(26, value10, 2.1); // +14
...@@ -24,6 +24,6 @@ public class ChwHomePerformanceCheck extends AbstractPerformanceCheck { ...@@ -24,6 +24,6 @@ public class ChwHomePerformanceCheck extends AbstractPerformanceCheck {
// since 11.08.2014 (incl.) // since 11.08.2014 (incl.)
// assertEquals(47, value10, 2.1); // +21 // assertEquals(47, value10, 2.1); // +21
// since 31.08.2014 (incl.) // since 31.08.2014 (incl.)
assertEquals(51, meanSpeedup, 2.1); assertEquals(51, medianSpeedup, 3.2);
} }
} }
...@@ -2,7 +2,7 @@ package teetime.examples.experiment10; ...@@ -2,7 +2,7 @@ package teetime.examples.experiment10;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
public class ChwWorkPerformanceCheck extends AbstractPerformanceCheck { class ChwWorkPerformanceCheck extends AbstractPerformanceCheck {
@Override @Override
public String getCorrespondingPerformanceProfile() { public String getCorrespondingPerformanceProfile() {
......
...@@ -5,7 +5,7 @@ import util.test.PerformanceResult; ...@@ -5,7 +5,7 @@ import util.test.PerformanceResult;
import util.test.PerformanceTest; import util.test.PerformanceTest;
import util.test.ProfiledPerformanceAssertion; import util.test.ProfiledPerformanceAssertion;
public class ChwHomePerformanceCheck extends ProfiledPerformanceAssertion { class ChwHomePerformanceCheck extends ProfiledPerformanceAssertion {
@Override @Override
public String getCorrespondingPerformanceProfile() { public String getCorrespondingPerformanceProfile() {
......
...@@ -5,7 +5,7 @@ import util.test.PerformanceResult; ...@@ -5,7 +5,7 @@ import util.test.PerformanceResult;
import util.test.PerformanceTest; import util.test.PerformanceTest;
import util.test.ProfiledPerformanceAssertion; import util.test.ProfiledPerformanceAssertion;
public class ChwWorkPerformanceCheck extends ProfiledPerformanceAssertion { class ChwWorkPerformanceCheck extends ProfiledPerformanceAssertion {
@Override @Override
public String getCorrespondingPerformanceProfile() { public String getCorrespondingPerformanceProfile() {
......
...@@ -2,7 +2,7 @@ package teetime.examples.experiment14; ...@@ -2,7 +2,7 @@ package teetime.examples.experiment14;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
public class ChwHomePerformanceCheck extends AbstractPerformanceCheck { class ChwHomePerformanceCheck extends AbstractPerformanceCheck {
@Override @Override
public String getCorrespondingPerformanceProfile() { public String getCorrespondingPerformanceProfile() {
...@@ -26,6 +26,8 @@ public class ChwHomePerformanceCheck extends AbstractPerformanceCheck { ...@@ -26,6 +26,8 @@ public class ChwHomePerformanceCheck extends AbstractPerformanceCheck {
// since 11.08.2014 (incl.) // since 11.08.2014 (incl.)
// assertEquals(103, medianSpeedup, 5.1); // +17 // assertEquals(103, medianSpeedup, 5.1); // +17
// since 31.08.2014 (incl.) // since 31.08.2014 (incl.)
assertEquals(62, medianSpeedup, 2.1); // -41 // assertEquals(62, medianSpeedup, 2.1); // -41
// since 04.11.2014 (incl.)
assertEquals(84, medianSpeedup, 2.1); // +22
} }
} }
...@@ -2,7 +2,7 @@ package teetime.examples.experiment14; ...@@ -2,7 +2,7 @@ package teetime.examples.experiment14;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
public class ChwWorkPerformanceCheck extends AbstractPerformanceCheck { class ChwWorkPerformanceCheck extends AbstractPerformanceCheck {
@Override @Override
public String getCorrespondingPerformanceProfile() { public String getCorrespondingPerformanceProfile() {
......
...@@ -5,7 +5,7 @@ import util.test.PerformanceResult; ...@@ -5,7 +5,7 @@ import util.test.PerformanceResult;
import util.test.PerformanceTest; import util.test.PerformanceTest;
import util.test.ProfiledPerformanceAssertion; import util.test.ProfiledPerformanceAssertion;
public class ChwHomePerformanceCheck extends ProfiledPerformanceAssertion { class ChwHomePerformanceCheck extends ProfiledPerformanceAssertion {
@Override @Override
public String getCorrespondingPerformanceProfile() { public String getCorrespondingPerformanceProfile() {
...@@ -28,6 +28,9 @@ public class ChwHomePerformanceCheck extends ProfiledPerformanceAssertion { ...@@ -28,6 +28,9 @@ public class ChwHomePerformanceCheck extends ProfiledPerformanceAssertion {
System.out.println("speedupC: " + speedupC); System.out.println("speedupC: " + speedupC);
assertEquals(2, speedupB, 0.3); assertEquals(2, speedupB, 0.3);
assertEquals(3.6, speedupC, 0.3); // since 31.08.2014 (incl.)
// assertEquals(3.6, speedupC, 0.3);
// since 04.11.2014 (incl.)
assertEquals(5, speedupC, 0.3);
} }
} }
...@@ -5,7 +5,7 @@ import util.test.PerformanceResult; ...@@ -5,7 +5,7 @@ import util.test.PerformanceResult;
import util.test.PerformanceTest; import util.test.PerformanceTest;
import util.test.ProfiledPerformanceAssertion; import util.test.ProfiledPerformanceAssertion;
public class ChwWorkPerformanceCheck extends ProfiledPerformanceAssertion { class ChwWorkPerformanceCheck extends ProfiledPerformanceAssertion {
@Override @Override
public void check() { public void check() {
......
...@@ -17,9 +17,9 @@ public class Countdown extends ProducerStage<Void> { ...@@ -17,9 +17,9 @@ public class Countdown extends ProducerStage<Void> {
} }
@Override @Override
public void onStarting() { public void onStarting() throws Exception {
this.countdownInputPort.getPipe().add(this.initialCountdown);
super.onStarting(); super.onStarting();
this.countdownInputPort.getPipe().add(this.initialCountdown);
} }
@Override @Override
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment