AUS-4285 Fixed the no countSum value in newAlgoritm Job.

AuScope · Nov 21, 2024 · de3c6e2 · de3c6e2
1 parent 92d8d5e
commit de3c6e2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/main/java/org/auscope/nvcl/server/service/TSGModJobProcessor.java b/src/main/java/org/auscope/nvcl/server/service/TSGModJobProcessor.java
@@ -41,6 +41,7 @@ public class TSGModJobProcessor  extends IJobProcessor{
     private String tsgScript;
     private String dataPath;
     private String wvLogname = "Reflectance";
+    private double countSumMax = 0.0;
 
 
     /**
@@ -416,6 +417,7 @@ else if (!Utility.stringIsBlankorNull(domainlogid))
             String fileFullPath = filePath + "/" + holeIdentifier;
             scalarArray.writeScalarCSV(fileFullPath + "-tsgScalar.csv");
             scalarArray.writeDownSampledScalarCSV(fileFullPath + "-tsgScalarDownSampled-" + host + ".csv");
+            this.countSumMax = scalarArray.queryMaxCountSum();
             scalarArray = null;
         } catch (Exception e) {
             logger.error("Exception: on getDownSampledData general failure "+e);
@@ -441,7 +443,7 @@ private String formatMessage(int type) {
             resultMsg = "InitMessage:";
             break;            
         }
-        return resultMsg;
+        return  String.valueOf(this.countSumMax) + ","+ resultMsg;
 
     }
 }
diff --git a/src/main/java/org/auscope/nvcl/server/vo/TSGScalarArrayVo.java b/src/main/java/org/auscope/nvcl/server/vo/TSGScalarArrayVo.java
@@ -232,4 +232,15 @@ public boolean query(String units, String logicalOp, double threshHold) {
 
         return isHit;
     }
+    public double queryMaxCountSum() {
+        double valueMax = 0.0;
+        /* Now, iterate over the map's contents, sorted by key. */
+        for (TSGScalarVo spectralData : downSampledScalarArray) {
+            double value = spectralData.getValue();
+            if (value>valueMax){
+                valueMax = value;
+            }
+        }
+        return valueMax;
+    }    
 }