From 3fbcd28bee5ae74feaf9b014283015e65fafa091 Mon Sep 17 00:00:00 2001
From: Nelson Tavares de Sousa <ntd@informatik.uni-kiel.de>
Date: Thu, 20 Nov 2014 13:09:40 +0100
Subject: [PATCH] first attempt on solving bug #65
---
.../teetime/stage/basic/merger/Merger.java | 35 ++++++++++++++-----
1 file changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/main/java/teetime/stage/basic/merger/Merger.java b/src/main/java/teetime/stage/basic/merger/Merger.java
index e0a187a9..06be1614 100644
--- a/src/main/java/teetime/stage/basic/merger/Merger.java
+++ b/src/main/java/teetime/stage/basic/merger/Merger.java
@@ -16,6 +16,9 @@
package teetime.stage.basic.merger;
+import java.util.HashMap;
+import java.util.Map;
+
import teetime.framework.AbstractStage;
import teetime.framework.InputPort;
import teetime.framework.OutputPort;
@@ -27,10 +30,10 @@ import teetime.framework.signal.ISignal;
*
* @author Christian Wulf
*
- * @since 1.10
+ * @since 1.0
*
* @param <T>
- * the type of the input ports and the output port
+ * the type of both the input and output ports
*/
public class Merger<T> extends AbstractStage {
@@ -40,6 +43,8 @@ public class Merger<T> extends AbstractStage {
private IMergerStrategy<T> strategy = new RoundRobinStrategy<T>();
+ private final Map<Class<?>, Integer> signalMap = new HashMap<Class<?>, Integer>();
+
@Override
public void executeWithPorts() {
final T token = this.strategy.getNextInput(this);
@@ -54,15 +59,29 @@ public class Merger<T> extends AbstractStage {
public void onSignal(final ISignal signal, final InputPort<?> inputPort) {
this.logger.trace("Got signal: " + signal + " from input port: " + inputPort);
- if (0 == finishedInputPorts) {
+ if (signalMap.containsKey(signal.getClass())) {
+ int value = signalMap.get(signal.getClass());
+ value++;
+ if (value == this.getInputPorts().length) {
+ this.outputPort.sendSignal(signal);
+ signalMap.remove(signal.getClass());
+ } else {
+ signalMap.put(signal.getClass(), value);
+ }
+ } else {
signal.trigger(this);
+ signalMap.put(signal.getClass(), 1);
}
- this.finishedInputPorts++;
- if (this.finishedInputPorts == this.getInputPorts().length) {
- this.outputPort.sendSignal(signal);
- this.finishedInputPorts = 0;
- }
+ // if (0 == finishedInputPorts) {
+ // signal.trigger(this);
+ // }
+ // this.finishedInputPorts++;
+ //
+ // if (this.finishedInputPorts == this.getInputPorts().length) {
+ // this.outputPort.sendSignal(signal);
+ // this.finishedInputPorts = 0;
+ // }
}
public IMergerStrategy<T> getMergerStrategy() {
--
GitLab