Merge pull request #8 from isce-3/develop

pull the most recent develop

Author: jungkyoJung

cxx/isce3/Headers.cmake

@@ -139,7 +139,8 @@ product/forward.h
 product/GeoGridParameters.h
 product/Metadata.h
 product/ProcessingInformation.h
-product/Product.h
+product/RadarGridProduct.h
+product/GeoGridProduct.h
 product/RadarGridParameters.h
 product/Serialization.h
 product/Swath.h
@@ -171,6 +172,14 @@ unwrap/icu/LabelMap.icc
 unwrap/icu/PhaseGrad.h
 unwrap/icu/SearchTable.h
 unwrap/icu/SearchTable.icc
+unwrap/ortools/ebert_graph.h
+unwrap/ortools/graph.h
+unwrap/ortools/graphs.h
+unwrap/ortools/iterators.h
+unwrap/ortools/max_flow.h
+unwrap/ortools/min_cost_flow.h
+unwrap/ortools/permutation.h
+unwrap/ortools/zvector.h
 unwrap/phass/ASSP.h
 unwrap/phass/BMFS.h
 unwrap/phass/CannyEdgeDetector.h

cxx/isce3/Sources.cmake

@@ -67,9 +67,10 @@ math/polyfunc.cpp
 math/RootFind1dNewton.cpp
 math/RootFind1dSecant.cpp
 polsar/symmetrize.cpp
-product/GeoGridParameters.cpp
-product/Product.cpp
 product/RadarGridParameters.cpp
+product/GeoGridParameters.cpp
+product/RadarGridProduct.cpp
+product/GeoGridProduct.cpp
 signal/Covariance.cpp
 signal/Crossmul.cpp
 signal/CrossMultiply.cpp
@@ -90,6 +91,8 @@ unwrap/icu/PhaseGrad.cpp
 unwrap/icu/Residue.cpp
 unwrap/icu/Tree.cpp
 unwrap/icu/Unwrap.cpp
+unwrap/ortools/max_flow.cc
+unwrap/ortools/min_cost_flow.cc
 unwrap/phass/ASSP.cc
 unwrap/phass/BMFS.cc
 unwrap/phass/CannyEdgeDetector.cc

cxx/isce3/cuda/geometry/Geo2rdr.h

@@ -17,8 +17,8 @@
 class isce3::cuda::geometry::Geo2rdr : public isce3::geometry::Geo2rdr {
 
     public:
-        /** Constructor from Product */
-        inline Geo2rdr(const isce3::product::Product & product,
+        /** Constructor from RadarGridProduct */
+        inline Geo2rdr(const isce3::product::RadarGridProduct & product,
                        char frequency = 'A',
                        bool nativeDoppler = false) :
             isce3::geometry::Geo2rdr(product, frequency, nativeDoppler) {}

cxx/isce3/cuda/geometry/Topo.h

@@ -17,8 +17,8 @@
 class isce3::cuda::geometry::Topo : public isce3::geometry::Topo {
 
     public:
-        /** Constructor from Product */
-        inline Topo(const isce3::product::Product & product,
+        /** Constructor from RadarGridProduct */
+        inline Topo(const isce3::product::RadarGridProduct & product,
                     char frequency = 'A',
                     bool nativeDoppler = false) :
             isce3::geometry::Topo(product, frequency, nativeDoppler){}

cxx/isce3/cuda/geometry/gpuRTC.cu

@@ -20,7 +20,7 @@
 #include <isce3/geometry/DEMInterpolator.h>
 #include <isce3/geometry/RTC.h>
 #include <isce3/geometry/Topo.h>
-#include <isce3/product/Product.h>
+#include <isce3/product/RadarGridProduct.h>
 
 #include <isce3/cuda/core/gpuLUT1d.h>
 #include <isce3/cuda/core/Orbit.h>
@@ -271,7 +271,7 @@ namespace isce3 { namespace cuda {
 
     namespace geometry {
 
-void computeRtc(isce3::product::Product& product, isce3::io::Raster& dem,
+void computeRtc(isce3::product::RadarGridProduct& product, isce3::io::Raster& dem,
                 isce3::io::Raster& out_raster, char frequency)
 {
 

cxx/isce3/cuda/geometry/gpuRTC.h

@@ -4,6 +4,6 @@
 #include <isce3/product/forward.h>
 
 namespace isce3 { namespace cuda { namespace geometry {
-void computeRtc(isce3::product::Product& product, isce3::io::Raster& dem,
+void computeRtc(isce3::product::RadarGridProduct& product, isce3::io::Raster& dem,
                 isce3::io::Raster& out_raster, char frequency = 'A');
 }}}

cxx/isce3/cuda/image/ResampSlc.h

@@ -10,13 +10,13 @@ class isce3::cuda::image::ResampSlc : public isce3::image::ResampSlc {
 
     public:
         // Meta-methods
-        // Constructor from an isce3::product::Product
-        inline ResampSlc(const isce3::product::Product &product, char frequency = 'A') :
+        // Constructor from an isce3::product::RadarGridProduct
+        inline ResampSlc(const isce3::product::RadarGridProduct &product, char frequency = 'A') :
             isce3::image::ResampSlc(product, frequency) {}
 
-        // Constructor from an isce3::product::Product and reference product (flattening)
-        inline ResampSlc(const isce3::product::Product & product,
-                         const isce3::product::Product & refProduct,
+        // Constructor from an isce3::product::RadarGridProduct and reference product (flattening)
+        inline ResampSlc(const isce3::product::RadarGridProduct & product,
+                         const isce3::product::RadarGridProduct & refProduct,
                          char frequency = 'A') :
             isce3::image::ResampSlc(product, refProduct, frequency) {}
 

cxx/isce3/geocode/GeocodeCov.h

@@ -15,7 +15,7 @@
 #include <isce3/io/Raster.h>
 
 // isce3::product
-#include <isce3/product/Product.h>
+#include <isce3/product/RadarGridProduct.h>
 #include <isce3/product/RadarGridParameters.h>
 
 // isce3::geometry

cxx/isce3/geocode/geocodeSlc.cpp

@@ -14,7 +14,7 @@
 #include <isce3/geometry/geometry.h>
 #include <isce3/io/Raster.h>
 #include <isce3/product/GeoGridParameters.h>
-#include <isce3/product/Product.h>
+#include <isce3/product/RadarGridProduct.h>
 #include <isce3/product/RadarGridParameters.h>
 
 

cxx/isce3/geometry/Geo2rdr.h

@@ -22,7 +22,7 @@
 #include <isce3/io/Raster.h>
 
 // isce3::product
-#include <isce3/product/Product.h>
+#include <isce3/product/RadarGridProduct.h>
 #include <isce3/product/RadarGridParameters.h>
 
 #include <limits>
@@ -50,7 +50,7 @@ class isce3::geometry::Geo2rdr {
      * @param[in] frequency Frequency designation
      * @param[in] nativeDoppler Flag for using native Doppler frequencies instead of zero-Doppler
      */
-    Geo2rdr(const isce3::product::Product &,
+    Geo2rdr(const isce3::product::RadarGridProduct &,
             char frequency = 'A',
             bool nativeDoppler = false);