Skip to content

Commit 542e803

Browse files
author
Saurav Agarwal
committed
Remove geographiclib dependency
1 parent 2899f74 commit 542e803

File tree

19 files changed

+9
-698
lines changed

19 files changed

+9
-698
lines changed

‎cppsrc/core/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ find_package(OpenMP REQUIRED)
2323
find_package(Eigen3 3.4 REQUIRED)
2424
find_package(CGAL 5.6 REQUIRED)
2525
find_package(yaml-cpp REQUIRED)
26-
find_package(GeographicLib REQUIRED)
2726

2827
configure_file(cmake/CoverageControlCoreConfig.h.in CoverageControlCoreConfig.h)
2928

‎cppsrc/core/python_bindings/CMakeLists.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ find_package(pybind11 CONFIG REQUIRED)
1010

1111
find_package(OpenMP REQUIRED)
1212
find_package(Eigen3 3.4 REQUIRED)
13-
find_package(OpenMP REQUIRED)
14-
# find_package(yaml-cpp REQUIRED)
15-
# find_package(CGAL REQUIRED)
16-
find_package(GeographicLib REQUIRED)
1713
find_package(CoverageControlCore REQUIRED)
1814

1915
pybind11_add_module(pyCoverageControl MODULE src/coverage_control_python_binds.cpp)

‎cppsrc/core/python_bindings/core_binds.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <CoverageControl/robot_model.h>
1111
#include <CoverageControl/coverage_system.h>
1212
#include <CoverageControl/voronoi.h>
13-
#include <CoverageControl/geographiclib_wrapper.h>
13+
/* #include <CoverageControl/geographiclib_wrapper.h> */
1414
#include <CoverageControl/algorithms/oracle_global_offline.h>
1515
#include <CoverageControl/algorithms/lloyd_local_voronoi.h>
1616
#include <CoverageControl/algorithms/oracle_explore_exploit.h>
@@ -198,12 +198,12 @@ typedef std::vector<BivariateNormalDistribution> BNDVector;
198198
.def_readwrite("pNumFrontiers", &Parameters::pNumFrontiers)
199199
;
200200

201-
py::class_<GeoLocalTransform>(m, "GeoLocalTransform")
202-
.def(py::init<double, double, double>())
203-
.def("Reset", &GeoLocalTransform::Reset)
204-
.def("Forward", &GeoLocalTransform::Forward)
205-
.def("Reverse", &GeoLocalTransform::Reverse)
206-
;
201+
/* py::class_<GeoLocalTransform>(m, "GeoLocalTransform") */
202+
/* .def(py::init<double, double, double>()) */
203+
/* .def("Reset", &GeoLocalTransform::Reset) */
204+
/* .def("Forward", &GeoLocalTransform::Forward) */
205+
/* .def("Reverse", &GeoLocalTransform::Reverse) */
206+
/* ; */
207207
}
208208

209209
void pyCoverageControl_core_coverage_system(py::module &m) {

‎cppsrc/main/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ endif()
2121

2222
find_package(OpenMP REQUIRED)
2323
find_package(Eigen3 3.4 REQUIRED)
24-
find_package(GeographicLib REQUIRED)
2524
find_package(CoverageControlCore REQUIRED)
2625

2726
if(WITH_TORCH)

‎cppsrc/tests/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ endif()
2424

2525
find_package(OpenMP REQUIRED)
2626
find_package(Eigen3 3.4 REQUIRED)
27-
find_package(GeographicLib REQUIRED)
2827
find_package(yaml-cpp REQUIRED)
2928
find_package(CoverageControlCore REQUIRED)
3029

‎cppsrc/torch/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORCH_CXX_FLAGS}")
2626
# find_package(OpenCV REQUIRED)
2727
find_package(OpenMP REQUIRED)
2828
find_package(Eigen3 3.4 REQUIRED)
29-
find_package(GeographicLib REQUIRED)
3029
find_package(CoverageControlCore REQUIRED)
3130

3231
configure_file(cmake/CoverageControlTorchConfig.h.in CoverageControlTorchConfig.h)

‎cppsrc/torch/python_bindings/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ find_package(pybind11 REQUIRED)
1414

1515
find_package(OpenMP REQUIRED)
1616
find_package(Eigen3 3.4 REQUIRED)
17-
find_package(GeographicLib REQUIRED)
17+
find_package(CGAL 5.6 REQUIRED)
1818
find_package(yaml-cpp REQUIRED)
1919
find_package(CoverageControlCore REQUIRED)
2020
find_package(CoverageControlTorch REQUIRED)

‎install/install_dependencies.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ InstallEigen3
175175
# InstallPybind11
176176
InstallCGAL
177177
InstallYamlCPP
178-
InstallGeoGraphicLib
178+
# InstallGeoGraphicLib
179179
# InstallOpenCV
180180
# InstallTorchVision
181181
# InstallTorchSparse

‎osm_dataset_generator/CachingNone.py‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎osm_dataset_generator/README.md‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)