minor refactorings

src/main/java/experiment/fse15/teetime/MatrixMultiplicationConfig.java

@@ -17,10 +17,7 @@ import teetime.framework.Analysis;
 import teetime.framework.AnalysisConfiguration;
 import teetime.framework.MonitoringThread;
 import teetime.framework.pipe.IPipe;
-import teetime.framework.pipe.IPipeFactory;
-import teetime.framework.pipe.PipeFactoryRegistry.PipeOrdering;
-import teetime.framework.pipe.PipeFactoryRegistry.ThreadCommunication;
-import teetime.stage.IterableProducer;
+import teetime.stage.InitialElementProducer;
 import teetime.stage.basic.distributor.Distributor;
 import teetime.util.Pair;
 import teetime.util.StopWatch;
@@ -46,13 +43,10 @@ public class MatrixMultiplicationConfig extends AnalysisConfiguration {
 			nums.add(new Integer(i));
 		}
 
-		final IPipeFactory interFact = PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTER, PipeOrdering.QUEUE_BASED, false);
-		final IPipeFactory intraFact = PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false);
-
-		final IterableProducer<Integer> init = new IterableProducer<Integer>(nums);
+		final InitialElementProducer<Integer> init = new InitialElementProducer<Integer>(nums);
 		final Distributor<Integer> dist = new Distributor<Integer>();
 
-		intraFact.create(init.getOutputPort(), dist.getInputPort());
+		connectIntraThreads(init.getOutputPort(), dist.getInputPort());
 		addThreadableStage(init);
 
 		monitoringThread = new MonitoringThread();
@@ -62,7 +56,7 @@ public class MatrixMultiplicationConfig extends AnalysisConfiguration {
 			final MatrixMultiplier mm = new MatrixMultiplier(first, second, result);
 			// intraFact.create(inputPortSizePrinter.getOutputPort(), wc.getInputPort());
 
-			final IPipe distributorPipe = interFact.create(dist.getNewOutputPort(), mm.getInputPort(), 100);
+			final IPipe distributorPipe = connectBoundedInterThreads(dist.getNewOutputPort(), mm.getInputPort(), 100);
 			// Add WordCounter as a threadable stage, so it runs in its own thread
 			addThreadableStage(mm);