reduce memory footprint (data location)

Author: bourgesl

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

@@ -30,6 +30,9 @@
  */
 public final class DataLocation {
 
+    /** shared empty instance */
+    final static DataLocation EMPTY = new DataLocation(null);
+
     /* members */
     /** associated Rule */
     private final Rule rule;
@@ -51,6 +54,20 @@ public final class DataLocation {
         this.rule = rule;
     }
 
+    /**
+     * Clear the temporary state (cleanup)
+     */
+    void cleanup() {
+        if (!isEmpty()) {
+            values.trimToSize();
+            limits.trimToSize();
+            expecteds.trimToSize();
+            rows.trimToSize();
+            cols.trimToSize();
+            details.trimToSize();
+        }
+    }
+
     /* ------------  ALL HELPER FOR DIFFERENT ARGUMENTS  --------------- */
     // Value 
     // 1
@@ -385,14 +402,15 @@ private void setValues(Object value, Object limit, String expected, Integer row,
 
     private void ensureCapacity() {
         if (isEmpty()) {
-            values = new ArrayList<Object>(10);
-            limits = new ArrayList<Object>(10);
-            expecteds = new ArrayList<String>(10);
-            rows = new ArrayList<Integer>(10);
-            cols = new ArrayList<Integer>(10);
-            details = new ArrayList<String>(10);
+            final int newSize = 10;
+            values = new ArrayList<Object>(newSize);
+            limits = new ArrayList<Object>(newSize);
+            expecteds = new ArrayList<String>(newSize);
+            rows = new ArrayList<Integer>(newSize);
+            cols = new ArrayList<Integer>(newSize);
+            details = new ArrayList<String>(newSize);
         } else {
-            final int newSize = values.size() + 1;
+            final int newSize = values.size() * 2;
             values.ensureCapacity(newSize);
             limits.ensureCapacity(newSize);
             expecteds.ensureCapacity(newSize);
@@ -553,27 +571,27 @@ public StringBuilder toXML(final StringBuilder sb, final String ruleMessage, fin
                 sb.append("    <data>\n");
                 sb.append("      <value>").append(getValues().get(i)).append("</value>\n");
 
-                Object limit = getLimits().get(i);
+                final Object limit = getLimits().get(i);
                 if (limit != null) {
                     sb.append("      <limit>").append(limit).append("</limit>\n");
                 }
 
-                String expected = getExpecteds().get(i);
+                final String expected = getExpecteds().get(i);
                 if (expected != null) {
                     sb.append("      <expected>").append(expected).append("</expected>\n");
                 }
 
-                Integer row = getRows().get(i);
+                final Integer row = getRows().get(i);
                 if (row != null) {
                     sb.append("      <row>").append(row).append("</row>\n");
                 }
 
-                Integer col = getCols().get(i);
+                final Integer col = getCols().get(i);
                 if (col != null) {
                     sb.append("      <col>").append(col).append("</col>\n");
                 }
 
-                String detail = getDetails().get(i);
+                final String detail = getDetails().get(i);
                 if (detail != null) {
                     sb.append("      <detail>").append(detail).append("</detail>\n");
                 }

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

@@ -207,6 +207,15 @@ void cleanup() {
         setSkipFormat(false);
         fileRefStandards.clear();
         corrCheckers.clear();
+
+        /* prune failure storage */
+        for (Map.Entry<RuleFailure, DataLocation> entry : failures.entrySet()) {
+            if (entry.getValue().isEmpty()) {
+                entry.setValue(DataLocation.EMPTY);
+            } else {
+                entry.getValue().cleanup();
+            }
+        }
     }
 
     /**
@@ -500,6 +509,8 @@ public String getCheckReport(final boolean compact) {
      * @return a string containing the analysis report
      */
     public StringBuilder appendFailuresReport(final boolean compact, final StringBuilder sb, final RuleFailureComparator comparator) {
+        sb.append(getCheckStatus()).append("\n\n");
+
         FileRef last = null;
         int lastExtNb = -1;
 
@@ -543,7 +554,6 @@ public StringBuilder appendFailuresReport(final boolean compact, final StringBui
                 }
             }
         }
-        sb.append('\n').append(getCheckStatus()).append('\n');
         return sb;
     }
 

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

@@ -80,19 +80,19 @@ public boolean equals(Object obj) {
             return false;
         }
         final RuleFailure other = (RuleFailure) obj;
-        if (this.rule != other.rule) {
+        if (this.rule != other.getRule()) {
             return false;
         }
-        if (!this.fileRef.equals(other.fileRef)) {
+        if (!this.fileRef.equals(other.getFileRef())) {
             return false;
         }
-        if ((this.extName == null) ? (other.extName != null) : !this.extName.equals(other.extName)) {
+        if ((this.extName == null) ? (other.getExtName() != null) : !this.extName.equals(other.getExtName())) {
             return false;
         }
-        if (this.extNb != other.extNb) {
+        if (this.extNb != other.getExtNb()) {
             return false;
         }
-        if ((this.member == null) ? (other.member != null) : !this.member.equals(other.member)) {
+        if ((this.member == null) ? (other.getMember() != null) : !this.member.equals(other.getMember())) {
             return false;
         }
         // Do not compare Severity (not in the key)
@@ -226,17 +226,18 @@ public String toString() {
      * @return a string representation of this class
      */
     public StringBuilder toString(final StringBuilder sb) {
-
         sb.append(getSeverity()).append('\t');
 
         if (getRule() != null) {
-            sb.append(getRule().name()).append('\t');
+            sb.append(getRule().name());
         }
+        sb.append('\t');
 
-        if (getFileRef() != null && getFileRef().getAbsoluteFilePath() != null) {
+        if ((getFileRef() != null) && (getFileRef().getAbsoluteFilePath() != null)) {
             sb.append(getFileRef().getAbsoluteFilePath());
         }
         sb.append('\t');
+
         if (getExtNb() >= 0) {
             sb.append((getExtName() == null) ? "HDU" : getExtName()).append('\t');
             sb.append(getExtNb()).append('\t');
@@ -267,11 +268,8 @@ public StringBuilder toXML(StringBuilder sb) {
 
         //Display HDU#0
         if (getExtNb() >= 0) {
-            sb.append("    <extName>");
-            sb.append((getExtName() == null) ? "HDU" : getExtName());
-            sb.append("</extName>\n");
-            sb.append("    <extNb>");
-            sb.append(getExtNb()).append("</extNb>\n");
+            sb.append("    <extName>").append((getExtName() == null) ? "HDU" : getExtName()).append("</extName>\n");
+            sb.append("    <extNb>").append(getExtNb()).append("</extNb>\n");
         }
 
         if (getMember() != null) {