-
Notifications
You must be signed in to change notification settings - Fork 27
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.
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
Averager plugin: possibility to enable/disable by property and events #294
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,12 +28,10 @@ | |
|
||
import java.util.LinkedList; | ||
|
||
import eu.asterics.mw.model.runtime.*; | ||
import org.apache.commons.math3.stat.StatUtils; | ||
|
||
import eu.asterics.mw.data.ConversionUtils; | ||
import eu.asterics.mw.model.runtime.AbstractRuntimeComponentInstance; | ||
import eu.asterics.mw.model.runtime.IRuntimeInputPort; | ||
import eu.asterics.mw.model.runtime.IRuntimeOutputPort; | ||
import eu.asterics.mw.model.runtime.impl.DefaultRuntimeInputPort; | ||
import eu.asterics.mw.model.runtime.impl.DefaultRuntimeOutputPort; | ||
|
||
|
@@ -57,13 +55,15 @@ public class AveragerInstance extends AbstractRuntimeComponentInstance { | |
private IRuntimeOutputPort opOutput = new OutputPort1(); | ||
|
||
private int propBufferSize = DEFAULT_BUFFER_SIZE; | ||
private boolean propEnabled = true; | ||
private int propMode = 0; | ||
private int propAutoReenableTime = 0; | ||
|
||
private final LinkedList<Double> buffer = new LinkedList<Double>(); | ||
private long lastUpdate = 0; | ||
private double accu = 0; | ||
|
||
private double sum = 0; | ||
private long disableTime = 0; | ||
|
||
/** | ||
* The class constructor. | ||
|
@@ -104,6 +104,37 @@ public IRuntimeOutputPort getOutputPort(String portID) { | |
} | ||
} | ||
|
||
/** | ||
* returns an Event Listener Port. | ||
* | ||
* @param eventPortID | ||
* the name of the port | ||
* @return the EventListener port or null if not found | ||
*/ | ||
public IRuntimeEventListenerPort getEventListenerPort(String eventPortID) { | ||
if ("enablePlugin".equalsIgnoreCase(eventPortID)) { | ||
return elpEnablePlugin; | ||
} | ||
if ("disablePlugin".equalsIgnoreCase(eventPortID)) { | ||
return elpDisablePlugin; | ||
} | ||
|
||
return null; | ||
} | ||
|
||
private final IRuntimeEventListenerPort elpEnablePlugin = new IRuntimeEventListenerPort() { | ||
public void receiveEvent(final String data) { | ||
propEnabled = true; | ||
} | ||
}; | ||
|
||
private final IRuntimeEventListenerPort elpDisablePlugin = new IRuntimeEventListenerPort() { | ||
public void receiveEvent(final String data) { | ||
propEnabled = false; | ||
disableTime = System.currentTimeMillis(); | ||
} | ||
}; | ||
|
||
/** | ||
* returns the value of the given property. | ||
* | ||
|
@@ -113,10 +144,14 @@ public IRuntimeOutputPort getOutputPort(String portID) { | |
*/ | ||
@Override | ||
public Object getRuntimePropertyValue(String propertyName) { | ||
if ("bufferSize".equalsIgnoreCase(propertyName)) { | ||
if ("enabled".equalsIgnoreCase(propertyName)) { | ||
return propEnabled; | ||
} else if ("bufferSize".equalsIgnoreCase(propertyName)) { | ||
return propBufferSize; | ||
} else if ("mode".equalsIgnoreCase(propertyName)) { | ||
return propMode; | ||
} else if ("autoReenableTime".equalsIgnoreCase(propertyName)) { | ||
return propAutoReenableTime; | ||
} else { | ||
return null; | ||
} | ||
|
@@ -132,7 +167,11 @@ public Object getRuntimePropertyValue(String propertyName) { | |
*/ | ||
@Override | ||
public synchronized Object setRuntimePropertyValue(String propertyName, Object newValue) { | ||
if ("bufferSize".equalsIgnoreCase(propertyName)) { | ||
if ("enabled".equalsIgnoreCase(propertyName)) { | ||
final Object oldValue = propEnabled; | ||
propEnabled = Boolean.parseBoolean((String) newValue); | ||
return oldValue; | ||
} else if ("bufferSize".equalsIgnoreCase(propertyName)) { | ||
final Object oldValue = propBufferSize; | ||
|
||
if (newValue != null) { | ||
|
@@ -165,6 +204,10 @@ public synchronized Object setRuntimePropertyValue(String propertyName, Object n | |
} | ||
} | ||
return oldValue; | ||
} else if ("autoReenableTime".equalsIgnoreCase(propertyName)) { | ||
final Object oldValue = propAutoReenableTime; | ||
propAutoReenableTime = Integer.parseInt(newValue.toString()); | ||
return oldValue; | ||
} else { | ||
return null; | ||
} | ||
|
@@ -177,6 +220,12 @@ public synchronized Object setRuntimePropertyValue(String propertyName, Object n | |
* samples are summed but not divided | ||
*/ | ||
private synchronized void process(final double in) { | ||
if (!propEnabled && buffer.size() == propBufferSize) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why do you need the check There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. the idea was somehow to wait until the buffer is full, but it does not make much sense as it is now. I'll remove it. |
||
if (System.currentTimeMillis() - disableTime < propAutoReenableTime || propAutoReenableTime == 0) { | ||
return; | ||
} | ||
propEnabled = true; | ||
} | ||
if (propMode == MODE_AVERAGE) { | ||
buffer.addFirst(in); | ||
sum += in; | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what happens if newValue==null?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
since the property is defined as
integer
in the bundle descriptor, shouldn't any generic logic ensure that it is actually an integer value when arriving at this point? Otherwise, whats the point of declaring datatypes in the bundleDescriptor?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
good point, although, semantically, "no value" (null) is not the same as 0 or could be interpreted differently. So maybe that's why you can't handle it generically.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, so I should catch a NumberFormatException there? I've seen plenty plugins, where no FormatExceptions are caught at property parsing. I think any FormatExceptions in this method should be caught by default in a base plugin class, so that the creator of a plugin does not have to care about them, if he doesn't want any specific error handling.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, you are right, the generic code in the DeploymentManager should do a check, if the value is conforming to the datatype specified in the bundle descriptor. If not log exceptions and proceed with datatype-specific default values.
These are the datatypes which could be easiliy checked:
https://github.com/asterics/AsTeRICS/blob/56f59f844f2a1c038ff4807ee208127d2033298b/ARE/middleware/src/main/java/eu/asterics/mw/model/DataType.java
Let's merge this PR and see if there is enough time for a generic solution.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
opened corresponding issue #312