Skip to content

Commit 1101ab9

Browse files
committed
Modify or-tools code & Add to CMake build
* Remove absl flags -- hardcode values instead * Cleanup dangling includes * Remove stats macros * Replace DCHECK macros with assert statements * Convert logging macros to the nearest journal equivalent * Remove dependencies on abseil-cpp * Manually expand utility macros * Remove extra semicolons after macro invocations * Remove protobuf serialization methods * Replace `MathUtil::Abs` with `std::abs` * Remove SWIG macros * Address unused-parameter warnings * Address implicit-fallthrough warnings * Address unused-variable warnings
1 parent faf1f47 commit 1101ab9

File tree

11 files changed

+582
-587
lines changed

11 files changed

+582
-587
lines changed

cxx/isce3/Headers.cmake

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,14 @@ unwrap/icu/LabelMap.icc
172172
unwrap/icu/PhaseGrad.h
173173
unwrap/icu/SearchTable.h
174174
unwrap/icu/SearchTable.icc
175+
unwrap/ortools/ebert_graph.h
176+
unwrap/ortools/graph.h
177+
unwrap/ortools/graphs.h
178+
unwrap/ortools/iterators.h
179+
unwrap/ortools/max_flow.h
180+
unwrap/ortools/min_cost_flow.h
181+
unwrap/ortools/permutation.h
182+
unwrap/ortools/zvector.h
175183
unwrap/phass/ASSP.h
176184
unwrap/phass/BMFS.h
177185
unwrap/phass/CannyEdgeDetector.h

cxx/isce3/Sources.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ unwrap/icu/PhaseGrad.cpp
9191
unwrap/icu/Residue.cpp
9292
unwrap/icu/Tree.cpp
9393
unwrap/icu/Unwrap.cpp
94+
unwrap/ortools/max_flow.cc
95+
unwrap/ortools/min_cost_flow.cc
9496
unwrap/phass/ASSP.cc
9597
unwrap/phass/BMFS.cc
9698
unwrap/phass/CannyEdgeDetector.cc

0 commit comments

Comments
 (0)