Skip to content

Commit f8b3eda

Browse files
committed
modified
1 parent 896a7a9 commit f8b3eda

31 files changed

+4626
-449
lines changed

.github/stale.yml

-17
This file was deleted.

.idea/.gitignore

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/.name

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/LeGO-LOAM.iml

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

LeGO-LOAM/CMakeLists.txt

+14-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
cmake_minimum_required(VERSION 2.8.3)
22
project(lego_loam)
33

4-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3")
4+
set(CMAKE_CXX_STANDARD 14)
5+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O3")
56

67
find_package(catkin REQUIRED COMPONENTS
78
tf
@@ -20,9 +21,12 @@ find_package(catkin REQUIRED COMPONENTS
2021
cloud_msgs
2122
)
2223

23-
find_package(GTSAM REQUIRED QUIET)
24+
find_package(OpenMP REQUIRED)
2425
find_package(PCL REQUIRED QUIET)
2526
find_package(OpenCV REQUIRED QUIET)
27+
find_package(GTSAM REQUIRED QUIET)
28+
find_package(Eigen3 REQUIRED)
29+
find_package(libnabo REQUIRED)
2630

2731
catkin_package(
2832
INCLUDE_DIRS include
@@ -36,6 +40,8 @@ include_directories(
3640
${PCL_INCLUDE_DIRS}
3741
${OpenCV_INCLUDE_DIRS}
3842
${GTSAM_INCLUDE_DIR}
43+
/home/yewei/catkin_ws/src/LIO-SAM-3/src/DiSCo-SLAM/third_parties
44+
3945
)
4046

4147
link_directories(
@@ -57,4 +63,9 @@ add_executable(mapOptmization src/mapOptmization.cpp)
5763
target_link_libraries(mapOptmization ${catkin_LIBRARIES} ${PCL_LIBRARIES} ${OpenCV_LIBRARIES} gtsam)
5864

5965
add_executable(transformFusion src/transformFusion.cpp)
60-
target_link_libraries(transformFusion ${catkin_LIBRARIES} ${PCL_LIBRARIES} ${OpenCV_LIBRARIES})
66+
target_link_libraries(transformFusion ${catkin_LIBRARIES} ${PCL_LIBRARIES} ${OpenCV_LIBRARIES})
67+
68+
# Map Fushion
69+
add_executable(${PROJECT_NAME}_mapFusion src/Fusion/mapFusion.cpp src/Fusion/writeMHg2o.cpp)
70+
add_dependencies(${PROJECT_NAME}_mapFusion ${catkin_EXPORTED_TARGETS} lio_sam_generate_messages_cpp)
71+
target_link_libraries(${PROJECT_NAME}_mapFusion ${catkin_LIBRARIES} ${PCL_LIBRARIES} libnabo::nabo gtsam fast_max-clique_finder scan_context)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
%%MatrixMarket matrix coordinate pattern symmetric
2+
16 16 81
3+
1 2
4+
1 3
5+
2 3
6+
4 5
7+
4 6
8+
4 7
9+
4 8
10+
4 9
11+
4 10
12+
4 11
13+
4 12
14+
4 13
15+
4 14
16+
4 15
17+
4 16
18+
5 6
19+
5 7
20+
5 8
21+
5 9
22+
5 10
23+
5 11
24+
5 12
25+
5 13
26+
5 14
27+
5 15
28+
5 16
29+
6 7
30+
6 8
31+
6 9
32+
6 10
33+
6 11
34+
6 12
35+
6 13
36+
6 14
37+
6 15
38+
6 16
39+
7 8
40+
7 9
41+
7 10
42+
7 11
43+
7 12
44+
7 13
45+
7 14
46+
7 15
47+
7 16
48+
8 9
49+
8 10
50+
8 11
51+
8 12
52+
8 13
53+
8 14
54+
8 15
55+
8 16
56+
9 10
57+
9 11
58+
9 12
59+
9 13
60+
9 14
61+
9 15
62+
9 16
63+
10 11
64+
10 12
65+
10 13
66+
10 14
67+
10 15
68+
10 16
69+
11 12
70+
11 13
71+
11 14
72+
11 15
73+
11 16
74+
12 13
75+
12 14
76+
12 15
77+
12 16
78+
13 14
79+
13 15
80+
13 16
81+
14 15
82+
14 16
83+
15 16

0 commit comments

Comments
 (0)