Initialize sim extensions before adding system-defined listeners to the sim listener list. This has the effect of running the user-defined listeners before evaluating custom expressions, so custom expressions can use the results from the user-defined listeners.
This commit is contained in:
parent
3f013d9d83
commit
e1490e0d3d
@ -419,14 +419,15 @@ public class Simulation implements ChangeSource, Cloneable {
|
|||||||
|
|
||||||
SimulationConditions simulationConditions = options.toSimulationConditions();
|
SimulationConditions simulationConditions = options.toSimulationConditions();
|
||||||
simulationConditions.setSimulation(this);
|
simulationConditions.setSimulation(this);
|
||||||
for (SimulationListener l : additionalListeners) {
|
|
||||||
simulationConditions.getSimulationListenerList().add(l);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (SimulationExtension extension : simulationExtensions) {
|
for (SimulationExtension extension : simulationExtensions) {
|
||||||
extension.initialize(simulationConditions);
|
extension.initialize(simulationConditions);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (SimulationListener l : additionalListeners) {
|
||||||
|
simulationConditions.getSimulationListenerList().add(l);
|
||||||
|
}
|
||||||
|
|
||||||
long t1, t2;
|
long t1, t2;
|
||||||
log.debug("Simulation: calling simulator");
|
log.debug("Simulation: calling simulator");
|
||||||
t1 = System.currentTimeMillis();
|
t1 = System.currentTimeMillis();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user