Author: echatellier Date: 2012-01-12 15:52:22 +0100 (Thu, 12 Jan 2012) New Revision: 3590 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3590 Log: #719 : Equation context value is computed from defaultValue Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2012-01-11 18:17:22 UTC (rev 3589) +++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2012-01-12 14:52:22 UTC (rev 3590) @@ -345,9 +345,9 @@ * @return computed value or <tt>defaultValue</tt> if not found */ public double getValueAndCompute(String key, double defaultValue) { - - double result = defaultValue; + double result; + // for equation, name is set not R escaped in database by swing ui // but is set escaped in prescripts because of r escape // need to be escaped here @@ -356,20 +356,21 @@ if (contextEquationValue.containsKey(localKey)) { Double value = contextEquationValue.get(localKey); - + if (log.isTraceEnabled()) { log.trace("Found key '" + localKey + "' current value = " + value); } // since 3.4.0.0, operator is always * - result = value * defaultValue; + result = value; } else { + result = defaultValue; if (log.isTraceEnabled()) { log.trace("No key defined for key '" + localKey + "' in context"); } } - + return result; } }