Port upstream changes from SNAPHU v2.0.5 (#995)

Author: gmgunter

cxx/isce3/unwrap/snaphu/README

@@ -1,7 +1,7 @@
 SNAPHU
 Statistical-Cost, Netowrk-Flow Algorithm for Phase Unwrapping
 Author: Curtis W. Chen
-Version 2.0.4, August 2020
+Version 2.0.5, December 2021
 
 
 Contents
@@ -10,7 +10,7 @@ Contents
   1. Bugs and Bug Reporting
   2. Notes on Compiling
   3. Run-Time Configuration Files
-  4. Copyright 
+  4. Copyright
 
 
 Bugs And Bug Reporting
@@ -66,7 +66,7 @@ accept.
 Copyright
 ---------
 
-Copyright 2002-2020 Board of Trustees, Leland Stanford Jr. University
+Copyright 2002-2021 Board of Trustees, Leland Stanford Jr. University
 
 Except as noted below, permission to use, copy, modify, and
 distribute, this software and its documentation for any purpose is

cxx/isce3/unwrap/snaphu/snaphu.cpp

@@ -599,7 +599,7 @@ int UnwrapTile(infileT *infiles, outfileT *outfiles, paramT *params,
       /* set the tree root (equivalent to source of shortest path problem) */
       Array1D<nodeT*> sourcelist;
       Array1D<long> nconnectedarr;
-      nsource=SelectSources(nodes,ground,nflow,flows,ngroundarcs,
+      nsource=SelectSources(nodes,mag,ground,nflow,flows,ngroundarcs,
                             nrow,ncol,params,&sourcelist,&nconnectedarr);
 
       /* set up network variables for tree solver */
@@ -615,8 +615,12 @@ int UnwrapTile(infileT *infiles, outfileT *outfiles, paramT *params,
         source=sourcelist[isource];
 
         /* show status if verbose */
-        fprintf(sp3,"Source %ld row, col = %d, %d\n",
-                isource,source->row,source->col);
+        if(source->row==GROUNDROW){
+          fprintf(sp3,"Source %ld: (edge ground)\n",isource);
+        }else{
+          fprintf(sp3,"Source %ld: row, col = %d, %d\n",
+                  isource,source->row,source->col);
+        }
 
         /* run the solver, and increment nflowdone if no cycles are found */
         Array2D<nodesuppT> dummy;
@@ -630,9 +634,12 @@ int UnwrapTile(infileT *infiles, outfileT *outfiles, paramT *params,
       }
 
       /* evaluate and save the total cost (skip if first loop through nflow) */
+      Array1D<int> dummy;
+      fprintf(sp2,"Current solution cost: %.16g\n",
+              (double )EvaluateTotalCost(costs,flows,nrow,ncol,dummy,params,tag));
+      fflush(NULL);
       if(notfirstloop){
         oldtotalcost=totalcost;
-        Array1D<int> dummy;
         totalcost=EvaluateTotalCost(costs,flows,nrow,ncol,dummy,params,tag);
         if(totalcost<mintotalcost){
           mintotalcost=totalcost;

cxx/isce3/unwrap/snaphu/snaphu.h

@@ -24,7 +24,7 @@
 /**********************/
 
 #define PROGRAMNAME          "snaphu"
-#define VERSION              "2.0.4"
+#define VERSION              "2.0.5"
 #define BUGREPORTEMAIL       "[email protected]"
 #ifdef PI
 #undef PI
@@ -55,7 +55,7 @@
 #define BOUNDARYCANDIDATE    -7
 #define BOUNDARYLEVEL        LARGEINT
 #define INTERIORLEVEL        (BOUNDARYLEVEL-1)
-#define MINBOUNDARYSIZE      3
+#define MINBOUNDARYSIZE      100
 #define POSINCR              0
 #define NEGINCR              1
 #define NOCOSTSHELF          -LARGESHORT
@@ -806,7 +806,7 @@ int InitNodes(long nrow, long ncol, Array2D<nodeT>& nodes, nodeT *ground);
 void BucketInsert(nodeT *node, long ind, bucketT *bkts);
 void BucketRemove(nodeT *node, long ind, bucketT *bkts);
 nodeT *ClosestNode(bucketT *bkts);
-long SelectSources(Array2D<nodeT>& nodes, nodeT *ground, long nflow,
+long SelectSources(Array2D<nodeT>& nodes, Array2D<float>& mag, nodeT *ground, long nflow,
                    Array2D<short>& flows, long ngroundarcs,
                    long nrow, long ncol, paramT *params,
                    Array1D<nodeT*>* sourcelistptr, Array1D<long>* nconnectedarrptr);