clear cached values (min/max, range) when removing / updating an expression column

Author: bourgesl

src/main/java/fr/jmmc/oitools/fits/FitsTable.java

@@ -1063,6 +1063,19 @@ protected final void clearColumnsRangeValue() {
         }
     }
 
+    /**
+     * Clear the Map storing min/max column values for the given column name
+     * @param name column name
+     */
+    protected final void clearColumnsRangeValue(final String name) {
+        if (this.columnsRangeValue != null) {
+            // see getColumnRange(name):
+            final String key = name + "_RANGE";
+            columnsRangeValue.remove(key); // Range
+            columnsRangeValue.remove(name); // [min;max] values
+        }
+    }
+
     /**
      * Return the Map storing min/max column values
      *
@@ -1086,7 +1099,7 @@ public Range getColumnRange(final String name) {
         final String key = name + "_RANGE";
 
         /* retrieve value in columnsRangeValue map of associated column */
-        Range cached = (Range) getColumnsRangeValue().get(key);
+        Range cached = (Range) getColumnsRangeValue().get(key); // Range
 
         if (cached == null) {
             final Object range = getMinMaxColumnValue(name);

src/main/java/fr/jmmc/oitools/model/OIData.java

@@ -312,7 +312,6 @@ public final boolean[][] getFlag() {
      * @throws RuntimeException
      */
     public void checkExpression(final String name, final String expression) throws RuntimeException {
-
         // Test if name conflicts with standard columns (VIS2DATA)
         if (getColumnDesc(name) != null) {
             throw new IllegalArgumentException("Column name [" + name + "] already existing (OIFITS standard) !");
@@ -331,11 +330,12 @@ public void updateExpressionColumn(final String name, final String expression) {
         // remove column (descriptor and values) if existing:
         removeExpressionColumn(name);
 
-        addDerivedColumnMeta(new WaveColumnMeta(name, "expression: " + expression,
-                Types.TYPE_DBL, this, expression));
+        final WaveColumnMeta colMeta = new WaveColumnMeta(name, "expression: " + expression,
+                Types.TYPE_DBL, this, expression);
+        addDerivedColumnMeta(colMeta);
 
         // Force computation now (not lazy):
-        getExprColumnDoubles(name, expression);
+        getExprColumnDoubles(name, colMeta);
     }
 
     /**
@@ -345,6 +345,9 @@ public void updateExpressionColumn(final String name, final String expression) {
     public void removeExpressionColumn(final String name) {
         final ColumnMeta column = getColumnDerivedDesc(name);
 
+        // anyway clear cached values:
+        clearColumnsRangeValue(name);
+        
         // check if the column has an expression
         if (column instanceof WaveColumnMeta) {
             final WaveColumnMeta colMeta = (WaveColumnMeta) column;
@@ -512,19 +515,19 @@ protected double[][] getSpatialCoord(final String name, final String coordName)
     }
 
     /**
-     * Return the array with the given expression
+     * Return the computed expression f[x][y] for the given column name
      * @param name derived column name
-     * @param expression expression entered by the user
+     * @param colMeta the corresponding column descriptor
      * @return the computed expression f[x][y]
      */
-    protected double[][] getExprColumnDoubles(final String name, final String expression) {
+    protected double[][] getExprColumnDoubles(final String name, final WaveColumnMeta colMeta) {
         // lazy: get previously computed results:
         double[][] exprResults = this.getColumnDerivedDoubles(name);
 
         // check if expression changed ?
-        if (exprResults == null) {
+        if ((exprResults == null) && (colMeta.getExpression() != null)) {
             // not computed; do it now (LAZY):
-            exprResults = ExpressionEvaluator.getInstance().eval(this, name, expression, false);
+            exprResults = ExpressionEvaluator.getInstance().eval(this, name, colMeta.getExpression(), false);
 
             // store computed results for next time:
             this.setColumnDerivedValue(name, exprResults);
@@ -957,14 +960,12 @@ protected double[][] getDerivedColumnAsDoubles(final String name) {
             return getSpatialFreq();
         }
         // handle user expressions
-        for (ColumnMeta column : getColumnDerivedDescCollection()) {
-            if (column.getName().equals(name)) {
-                if (column instanceof WaveColumnMeta) {
-                    WaveColumnMeta colMeta = (WaveColumnMeta) column;
+        for (final ColumnMeta column : getColumnDerivedDescCollection()) {
+            if (column.getName().equals(name) && (column instanceof WaveColumnMeta)) {
+                final WaveColumnMeta colMeta = (WaveColumnMeta) column;
 
-                    if (colMeta.getExpression() != null) {
-                        return getExprColumnDoubles(name, colMeta.getExpression());
-                    }
+                if (colMeta.getExpression() != null) {
+                    return getExprColumnDoubles(name, colMeta);
                 }
             }
         }