Merge pull request #5 from isce-3/develop

update

Author: jungkyoJung

.ci/images/centos/requirements.txt.base

@@ -13,3 +13,4 @@ scipy
 testfixtures
 scikit-image
 shapely
+backoff

.ci/images/conda/tester/Dockerfile

@@ -20,6 +20,7 @@ RUN conda install -q -y \
         shapely \
         sphinx \
         wget \
+        backoff \
  && conda install -q -y -c conda-forge \
         ruamel.yaml \
         yamale \

CMakeLists.txt

@@ -48,8 +48,8 @@ if (WITH_CUDA)
 
     # check CUDA version
     set(CUDA_VERSION ${CMAKE_CUDA_COMPILER_VERSION})
-    if (CUDA_VERSION VERSION_LESS 9)
-        message(FATAL_ERROR "CUDA version must be at least 9. Detected ${CUDA_VERSION}")
+    if (CUDA_VERSION VERSION_LESS 11)
+        message(FATAL_ERROR "CUDA version must be at least 11. Detected ${CUDA_VERSION}")
     endif()
 
     # specify target CUDA device architecture(s)

LICENSE

@@ -21,3 +21,13 @@ THE USER HAS THE RESPONSIBILITY TO OBTAIN EXPORT LICENSES, OR OTHER EXPORT
 AUTHORITY AS MAY BE REQUIRED BEFORE EXPORTING THIS SOFTWARE TO ANY 'EAR99'
 EMBARGOED FOREIGN COUNTRY OR CITIZEN OF THOSE COUNTRIES.
 
+===============================================================================
+Software from third parties included in ISCE3:
+===============================================================================
+ISCE3 contains third party software which is under different license terms. All
+such code will be identified clearly using at least one of two mechanisms:
+1) It will be in a separate directory tree with its own `LICENSE` or `README`
+   file at the top containing the specific license and restrictions which apply
+   to that software, or
+2) It will contain specific license and restriction terms at the top of every
+   file.

VERSION.txt

@@ -1 +1 @@
-0.4.0-dev
+0.5.0-dev

cxx/isce3/CMakeLists.txt

@@ -29,7 +29,7 @@ target_link_libraries(${LISCE} PRIVATE
     )
 
 target_compile_features(${LISCE} INTERFACE
-    cxx_std_14
+    cxx_std_17
     )
 
 target_include_directories(${LISCE} PUBLIC

cxx/isce3/Headers.cmake

@@ -1,12 +1,15 @@
 set(HEADERS
+antenna/detail/BinarySearchFunc.h
 antenna/detail/WinChirpRgCompPow.h
 antenna/detail/WinChirpRgCompPow.icc
-antenna/edge_method_cost_func.h
-antenna/forward.h
 antenna/ElPatternEst.h
-antenna/geometryfunc.h
+antenna/ElNullAnalyses.h
+antenna/ElNullRangeEst.h
+antenna/EdgeMethodCostFunc.h
 antenna/Frame.h
 antenna/Frame.icc
+antenna/forward.h
+antenna/geometryfunc.h
 antenna/SphGridType.h
 antenna/SphGridType.icc
 container/forward.h
@@ -80,7 +83,6 @@ focus/Presum.icc
 focus/RangeComp.h
 geocode/baseband.h
 geocode/geocodeSlc.h
-geocode/interpolate.h
 geocode/loadDem.h
 geometry/DEMInterpolator.h
 geometry/forward.h
@@ -124,7 +126,8 @@ io/Raster.h
 io/Raster.icc
 io/Serialization.h
 math/Bessel.h
-math/ComplexMultiply.h
+math/complexOperations.h
+math/Stats.h
 math/detail/RootFind1dBase.h
 math/polyfunc.h
 math/RootFind1dNewton.h
@@ -183,4 +186,6 @@ unwrap/phass/Point.h
 unwrap/phass/RegionMap.h
 unwrap/phass/Seed.h
 unwrap/phass/sort.h
+unwrap/snaphu/snaphu.h
+unwrap/snaphu/snaphu_unwrap.h
 )

cxx/isce3/Sources.cmake

@@ -1,6 +1,9 @@
 set(SRCS
-antenna/edge_method_cost_func.cpp
+antenna/detail/BinarySearchFunc.cpp
 antenna/ElPatternEst.cpp
+antenna/ElNullAnalyses.cpp
+antenna/ElNullRangeEst.cpp
+antenna/EdgeMethodCostFunc.cpp
 antenna/geometryfunc.cpp
 core/Attitude.cpp
 core/Baseline.cpp
@@ -40,7 +43,6 @@ focus/Presum.cpp
 focus/RangeComp.cpp
 geocode/baseband.cpp
 geocode/geocodeSlc.cpp
-geocode/interpolate.cpp
 geocode/loadDem.cpp
 geometry/DEMInterpolator.cpp
 geometry/Geo2rdr.cpp
@@ -60,6 +62,7 @@ io/IH5.cpp
 io/IH5Dataset.cpp
 io/Raster.cpp
 math/Bessel.cpp
+math/Stats.cpp
 math/polyfunc.cpp
 math/RootFind1dNewton.cpp
 math/RootFind1dSecant.cpp
@@ -99,4 +102,10 @@ unwrap/phass/Point.cc
 unwrap/phass/RegionMap.cc
 unwrap/phass/Seed.cc
 unwrap/phass/sort.cc
+unwrap/snaphu/snaphu_cost.cpp
+unwrap/snaphu/snaphu.cpp
+unwrap/snaphu/snaphu_io.cpp
+unwrap/snaphu/snaphu_solver.cpp
+unwrap/snaphu/snaphu_tile.cpp
+unwrap/snaphu/snaphu_util.cpp
 )

cxx/isce3/antenna/edge_method_cost_func.cpp renamed to cxx/isce3/antenna/EdgeMethodCostFunc.cpp

@@ -4,7 +4,7 @@
 
 #include <Eigen/Dense>
 
-#include <isce3/antenna/edge_method_cost_func.h>
+#include <isce3/antenna/EdgeMethodCostFunc.h>
 #include <isce3/except/Error.h>
 #include <isce3/math/RootFind1dNewton.h>
 #include <isce3/math/polyfunc.h>
@@ -137,9 +137,8 @@ std::tuple<double, double, bool, int> rollAngleOffsetFromEdge(
                 "Near-range look angle shall be smaller than "
                 "far one by at least one prec!");
 
-    const auto ang_size =
-            static_cast<int>((look_ang_far - look_ang_near) / look_ang_prec) +
-            1;
+    const auto ang_size = static_cast<int>(
+            std::round((look_ang_far - look_ang_near) / look_ang_prec) + 1);
     auto look_ang = isce3::core::Linspace<double>::from_interval(
             look_ang_near, look_ang_far, ang_size);
 

cxx/isce3/antenna/edge_method_cost_func.h renamed to cxx/isce3/antenna/EdgeMethodCostFunc.h

@@ -1,4 +1,4 @@
-/** @file edge_method_cost_func.h
+/** @file EdgeMethodCostFunc.h
  * Cost functions used in EL antenna pointing estimation via edge method
  */
 #pragma once