option to reset prev grad scores

Author: cgoina

colormipsearch-api/src/main/java/org/janelia/colormipsearch/model/CDMatchEntity.java

@@ -103,6 +103,13 @@ public void updateNormalizedScore(Float score) {
         this.normalizedScore = score;
     }
 
+    public void resetGradientScores() {
+        this.gradientAreaGap = null;
+        this.highExpressionArea = null;
+        this.bidirectionalAreaGap = null;
+        this.normalizedScore = null;
+    }
+
     @JsonIgnore
     public boolean isMatchFound() {
         return matchFound;

colormipsearch-tools/src/main/java/org/janelia/colormipsearch/cmd/CalculateGradientScoresCmd.java

@@ -91,6 +91,11 @@ static class CalculateGradientScoresArgs extends AbstractGradientScoresArgs {
                 arity = 0)
         boolean useBidirectionalMatching = false;
 
+        @Parameter(names = {"--cancel-previous-gradient-scores"},
+                description = "Cancel existing gradient scores before calculating new ones",
+                arity = 0)
+        boolean cancelExistingGradientScores = false;
+
         CalculateGradientScoresArgs(CommonArgs commonArgs) {
             super(commonArgs);
         }
@@ -344,8 +349,14 @@ List<GroupedItems<M, CDMatchEntity<M, T>>> getCDMatchesForMaskMipID(NeuronMatche
                 /*from*/0,
                 /*nRecords*/-1,
                 /*readPageSize*/0);
-        LOG.debug("Found {} color depth matches for {} in {}ms - start selecting best matches",
+        LOG.debug("Found {} color depth matches for {} in {}ms",
                 allCDMatches.size(), maskCDMipId, System.currentTimeMillis() - startTime);
+        if (args.cancelExistingGradientScores) {
+            allCDMatches.forEach(CDMatchEntity::resetGradientScores);
+            long nScoresUpdated = updateCDMatches(allCDMatches);
+            LOG.debug("Reset gradient {} scores for {} matches for {} in {}ms",
+                    nScoresUpdated, allCDMatches.size(), maskCDMipId, System.currentTimeMillis() - startTime);
+        }
         // select best matches to process
         List<CDMatchEntity<M, T>> bestMatches = ColorMIPProcessUtils.selectBestMatches(
                 allCDMatches,