From a0b2def97fc535b3318c6e79f46a440aed38bd1d Mon Sep 17 00:00:00 2001 From: Sergi Pujol <sergi.pujol.badell@estudiantat.upc.edu> Date: Thu, 18 Feb 2021 09:43:59 +0100 Subject: [PATCH] renaming of loop_closure_base --- src/CMakeLists.txt | 4 ++-- src/{loop_closure_base_2d.cpp => loop_closure_base.cpp} | 2 +- src/{loop_closure_base_2d.h => loop_closure_base.h} | 0 src/loop_closure_falko.h | 2 +- test/CMakeLists.txt | 4 ++-- ...loop_closure_base_2d.cpp => gtest_loop_closure_falko.cpp} | 5 ++--- 6 files changed, 8 insertions(+), 9 deletions(-) rename src/{loop_closure_base_2d.cpp => loop_closure_base.cpp} (93%) rename src/{loop_closure_base_2d.h => loop_closure_base.h} (100%) rename test/{gtest_loop_closure_base_2d.cpp => gtest_loop_closure_falko.cpp} (94%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b913435..2ce8fcf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -56,7 +56,7 @@ SET(HDRS point_set.h polyline.h scan_segment.h - loop_closure_base_2d.h + loop_closure_base.h scene_base.h ) @@ -90,7 +90,7 @@ SET(SRCS point_set.cpp polyline.cpp scan_segment.cpp - loop_closure_base_2d.cpp + loop_closure_base.cpp ) IF(csm_FOUND) SET(SRCS ${SRCS} diff --git a/src/loop_closure_base_2d.cpp b/src/loop_closure_base.cpp similarity index 93% rename from src/loop_closure_base_2d.cpp rename to src/loop_closure_base.cpp index 5274d20..adf300d 100644 --- a/src/loop_closure_base_2d.cpp +++ b/src/loop_closure_base.cpp @@ -5,7 +5,7 @@ * \author: spujol */ -# include "loop_closure_base_2d.h" +# include "loop_closure_base.h" namespace laserscanutils{ diff --git a/src/loop_closure_base_2d.h b/src/loop_closure_base.h similarity index 100% rename from src/loop_closure_base_2d.h rename to src/loop_closure_base.h diff --git a/src/loop_closure_falko.h b/src/loop_closure_falko.h index 0785cb1..c4ee28a 100644 --- a/src/loop_closure_falko.h +++ b/src/loop_closure_falko.h @@ -19,7 +19,7 @@ **************************/ #include "laser_scan.h" #include "scene_falko.h" -#include "loop_closure_base_2d.h" +#include "loop_closure_base.h" #include "match_loop_closure.h" /************************** diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 386aea8..89062a0 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -22,5 +22,5 @@ INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIRS}) gnss_utils_add_gtest(gtest_example gtest_example.cpp) target_link_libraries(gtest_example ${PROJECT_NAME}) -gnss_utils_add_gtest(gtest_loop_closure_base_2d gtest_loop_closure_base_2d.cpp ${PROJECT_SOURCE_DIR}/test/testData2.cpp) -target_link_libraries(gtest_loop_closure_base_2d ${PROJECT_NAME}) +gnss_utils_add_gtest(gtest_loop_closure_falko gtest_loop_closure_falko.cpp ${PROJECT_SOURCE_DIR}/test/testData2.cpp) +target_link_libraries(gtest_loop_closure_falko ${PROJECT_NAME}) diff --git a/test/gtest_loop_closure_base_2d.cpp b/test/gtest_loop_closure_falko.cpp similarity index 94% rename from test/gtest_loop_closure_base_2d.cpp rename to test/gtest_loop_closure_falko.cpp index f7f7457..e004f63 100644 --- a/test/gtest_loop_closure_base_2d.cpp +++ b/test/gtest_loop_closure_falko.cpp @@ -1,13 +1,12 @@ #include "gtest/utils_gtest.h" #include "testData2.h" -#include "../src/loop_closure_base_2d.h" +#include "../src/loop_closure_base.h" #include "../src/loop_closure_falko.h" -//#include "laser_scan_utils.h" using namespace laserscanutils; -TEST(loop_closure_falko, TestExtractSceneAndMatcher) +TEST(loop_closure_falko, TestLoopClosureFalkoAllFunctions) { int scanSize = 1440; -- GitLab