Skip to content

Commit d00bc1b

Browse files
authored
Merge pull request #363 from ethz-asl/develop
Development branch
2 parents 618a0e0 + fbb02d2 commit d00bc1b

File tree

1,174 files changed

+66049
-40000
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,174 files changed

+66049
-40000
lines changed

.gitignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,12 @@ CMakeLists.txt.user
5252

5353
# Maplab temporary files.
5454
*.vi_command_history
55+
.vscode/
56+
57+
# Documentation
58+
docs/build
59+
docs/doxyoutput
60+
docs/api
61+
62+
# Docker
63+
docker_ctx/

.gitmodules

Lines changed: 99 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,102 @@
11
[submodule "tools/maplab_test_data"]
2-
path = tools/maplab_test_data
3-
url = https://github.com/ethz-asl/maplab_test_data.git
4-
[submodule "tools/linter"]
5-
path = tools/linter
6-
url = https://github.com/ethz-asl/linter.git
2+
path = tools/maplab-test-data
3+
url = [email protected]:ethz-asl/maplab_test_data.git
74
[submodule "aslam_cv2"]
85
path = aslam_cv2
9-
url = https://github.com/ethz-asl/aslam_cv2.git
6+
url = [email protected]:ethz-asl/aslam_cv2.git
7+
[submodule "dependencies/3rdparty/protobuf_catkin"]
8+
path = dependencies/3rdparty/protobuf_catkin
9+
url = [email protected]:ethz-asl/protobuf_catkin.git
10+
[submodule "dependencies/3rdparty/glog_catkin"]
11+
path = dependencies/3rdparty/glog_catkin
12+
url = [email protected]:ethz-asl/glog_catkin.git
13+
[submodule "dependencies/3rdparty/gflags_catkin"]
14+
path = dependencies/3rdparty/gflags_catkin
15+
url = [email protected]:ethz-asl/gflags_catkin.git
16+
[submodule "dependencies/3rdparty/ceres_catkin"]
17+
path = dependencies/3rdparty/ceres_catkin
18+
url = [email protected]:ethz-asl/ceres_catkin.git
19+
[submodule "dependencies/3rdparty/suitesparse"]
20+
path = dependencies/3rdparty/suitesparse
21+
url = [email protected]:ethz-asl/suitesparse.git
22+
[submodule "dependencies/3rdparty/eigen_catkin"]
23+
path = dependencies/3rdparty/eigen_catkin
24+
url = [email protected]:ethz-asl/eigen_catkin.git
25+
[submodule "dependencies/3rdparty/yaml_cpp_catkin"]
26+
path = dependencies/3rdparty/yaml_cpp_catkin
27+
url = [email protected]:ethz-asl/yaml_cpp_catkin.git
28+
[submodule "dependencies/3rdparty/lpsolve_catkin"]
29+
path = dependencies/3rdparty/lpsolve_catkin
30+
url = [email protected]:ethz-asl/lpsolve_catkin.git
31+
[submodule "dependencies/3rdparty/metis_catkin"]
32+
path = dependencies/3rdparty/metis_catkin
33+
url = [email protected]:ethz-asl/metis_catkin.git
34+
[submodule "dependencies/3rdparty/opencv3_catkin"]
35+
path = dependencies/3rdparty/opencv3_catkin
36+
url = [email protected]:ethz-asl/opencv3_catkin.git
37+
[submodule "dependencies/3rdparty/vision_opencv"]
38+
path = dependencies/3rdparty/vision_opencv
39+
url = [email protected]:ethz-asl/vision_opencv.git
40+
[submodule "dependencies/3rdparty/opengv"]
41+
path = dependencies/3rdparty/opengv
42+
url = [email protected]:ethz-asl/opengv.git
43+
[submodule "dependencies/3rdparty/doxygen_catkin"]
44+
path = dependencies/3rdparty/doxygen_catkin
45+
url = [email protected]:ethz-asl/doxygen_catkin.git
46+
[submodule "dependencies/3rdparty/catkin_simple"]
47+
path = dependencies/3rdparty/catkin_simple
48+
url = [email protected]:catkin/catkin_simple.git
49+
[submodule "dependencies/internal/voxblox"]
50+
path = dependencies/internal/voxblox
51+
url = [email protected]:ethz-asl/voxblox.git
52+
[submodule "dependencies/internal/ethzasl_brisk"]
53+
path = dependencies/internal/ethzasl_brisk
54+
url = [email protected]:ethz-asl/ethzasl_brisk.git
55+
[submodule "dependencies/internal/ethzasl_apriltag2"]
56+
path = dependencies/internal/ethzasl_apriltag2
57+
url = [email protected]:ethz-asl/ethzasl_apriltag2.git
58+
[submodule "dependencies/internal/eigen_checks"]
59+
path = dependencies/internal/eigen_checks
60+
url = [email protected]:ethz-asl/eigen_checks.git
61+
[submodule "dependencies/internal/libnabo"]
62+
path = dependencies/internal/libnabo
63+
url = [email protected]:ethz-asl/libnabo.git
64+
[submodule "dependencies/internal/minkindr"]
65+
path = dependencies/internal/minkindr
66+
url = [email protected]:ethz-asl/minkindr.git
67+
[submodule "dependencies/internal/minkindr_ros"]
68+
path = dependencies/internal/minkindr_ros
69+
url = [email protected]:ethz-asl/minkindr_ros.git
70+
[submodule "dependencies/internal/maplab_rovio"]
71+
path = dependencies/internal/maplab_rovio
72+
url = [email protected]:ethz-asl/maplab_rovio.git
73+
[submodule "dependencies/internal/kindr"]
74+
path = dependencies/internal/kindr
75+
url = [email protected]:ethz-asl/kindr.git
76+
[submodule "dependencies/internal/plotty"]
77+
path = dependencies/internal/plotty
78+
url = [email protected]:ethz-asl/plotty.git
79+
[submodule "dependencies/3rdparty/benchmark_catkin"]
80+
path = dependencies/3rdparty/benchmark_catkin
81+
url = [email protected]:ethz-asl/benchmark_catkin.git
82+
[submodule "dependencies/internal/ros-system-monitor"]
83+
path = dependencies/internal/ros-system-monitor
84+
url = [email protected]:ethz-asl/ros-system-monitor
85+
[submodule "dependencies/internal/linter"]
86+
path = dependencies/internal/linter
87+
url = [email protected]:ethz-asl/linter.git
88+
[submodule "dependencies/internal/maplab_tools"]
89+
path = dependencies/internal/maplab_tools
90+
url = [email protected]:ethz-asl/maplab_tools.git
91+
[submodule "dependencies/internal/maplab_msgs"]
92+
path = dependencies/internal/maplab_msgs
93+
url = [email protected]:ethz-asl/maplab_msgs.git
94+
[submodule "dependencies/3rdparty/pointmatcher-ros"]
95+
path = dependencies/3rdparty/pointmatcher-ros
96+
url = [email protected]:ANYbotics/pointmatcher-ros.git
97+
[submodule "dependencies/3rdparty/libpointmatcher"]
98+
path = dependencies/3rdparty/libpointmatcher
99+
url = [email protected]:ANYbotics/libpointmatcher.git
100+
[submodule "dependencies/internal/maplab_features"]
101+
path = dependencies/internal/maplab_features
102+
url = [email protected]:ethz-asl/maplab_features.git

CONTRIBUTORS.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
* Titus Cieslewski
99
* Timo Hinzmann
1010
* Mathias Gehrig
11+
* Florian Tschopp
12+
* Andrei Cramariuc
13+
* Lukas Bernreiter
1114
* Nicolas Degen
1215
* Andreas Pfrunder
1316
* Helen Oleynikova

DISABLED.travis.yml

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

README.md

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
<img src="https://github.com/ethz-asl/maplab/wiki/logos/maplab_new.png" width="500">
22

3-
*Ubuntu 14.04+ROS indigo* and *Ubuntu 16.04+ROS kinetic*: [![Build Status](https://jenkins.asl.ethz.ch/buildStatus/icon?job=maplab_nightly)](https://jenkins.asl.ethz.ch/job/maplab_nightly)
3+
4+
5+
*Ubuntu 14.04+ROS indigo*, *Ubuntu 16.04+ROS kinetic* and *Ubuntu 18.04+ROS melodic*: [![Build Status](https://jenkins.asl.ethz.ch/buildStatus/icon?job=maplab_nightly)](https://jenkins.asl.ethz.ch/job/maplab_nightly)
6+
[![Documentation Status](https://jenkins.asl.ethz.ch/buildStatus/icon?job=maplab_docs&subject=docs)](https://jenkins.asl.ethz.ch/job/maplab_docs)
47

58
## News
69

710
* **May 2018:** maplab was presented at [ICRA](https://icra2018.org/) in Brisbane. ([paper](https://arxiv.org/abs/1711.10250))
811
* **March 2018:** Check out our release candidate with improved localization and lots of new features! [PR](https://github.com/ethz-asl/maplab/pull/55)
9-
12+
1013
## Description
1114

1215
This repository contains **maplab**, an open, research-oriented visual-inertial mapping framework, written in C++, for creating, processing and manipulating multi-session maps.
@@ -15,7 +18,7 @@ On the other hand, maplab provides the research community with a colle
1518

1619
Furthermore, it includes an online frontend, **ROVIOLI**, that can create visual-inertial maps and also track a global drift-free pose within a localization map.
1720

18-
For documentation, tutorials and datasets, please visit the [wiki](https://github.com/ethz-asl/maplab/wiki).
21+
For documentation, tutorials and datasets, please visit the [wiki](https://maplab.asl.ethz.ch/docs/develop/index.html).
1922

2023
Please also check out our video:
2124

@@ -39,14 +42,15 @@ Please also check out our video:
3942

4043
The following articles help you with getting started with maplab and ROVIOLI:
4144

45+
<!-- TODO(floriantschopp): Update links to new wiki -->
4246
- [Installation on Ubuntu 14.04 or 16.04](https://github.com/ethz-asl/maplab/wiki/Installation-Ubuntu)
4347
- [Introduction to the maplab framework](https://github.com/ethz-asl/maplab/wiki/Introduction-to-the-Maplab-Framework)
4448
- [Structure of the framework](https://github.com/ethz-asl/maplab/wiki/Structure-of-the-framework)
4549
- [Running ROVIOLI in VIO mode](https://github.com/ethz-asl/maplab/wiki/Running-ROVIOLI-in-VIO-mode)
4650
- [Basic console usage](https://github.com/ethz-asl/maplab/wiki/Basic-Console-Usage)
4751
- [Console map management](https://github.com/ethz-asl/maplab/wiki/Console-map-management)
4852

49-
More detailed information can be found in the [wiki pages](https://github.com/ethz-asl/maplab/wiki).
53+
More detailed information can be found in the [wiki pages](https://maplab.asl.ethz.ch/docs/develop/index.html).
5054

5155
## Research Results
5256

@@ -104,5 +108,8 @@ Certain components of maplab are directly using the code of the following public
104108
* Titus Cieslewski
105109
* Timo Hinzmann
106110
* Mathias Gehrig
107-
111+
* Florian Tschopp
112+
* Andrei Cramariuc
113+
* Lukas Bernreiter
114+
108115
For a complete list of contributors, have a look at [CONTRIBUTORS.md](https://github.com/ethz-asl/maplab/blob/master/CONTRIBUTORS.md)

algorithms/ceres-error-terms/CMakeLists.txt

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,15 @@ link_directories(${CATKIN_DEVEL_PREFIX}/lib)
66
find_package(catkin_simple REQUIRED)
77
catkin_simple(ALL_DEPS_REQUIRED)
88

9-
add_definitions(-std=c++11 -Wno-enum-compare)
9+
add_definitions(-Wno-enum-compare)
1010

1111
cs_add_library(${PROJECT_NAME}
1212
src/block-pose-prior-error-term.cc
13+
src/block-pose-prior-error-term-v2.cc
1314
src/ceres-signal-handler.cc
1415
src/inertial-error-term.cc
15-
src/inertial-error-term-eigen.cc
16-
src/parameterization/quaternion-param-eigen.cc
1716
src/parameterization/quaternion-param-hamilton.cc
1817
src/parameterization/quaternion-param-jpl.cc
19-
src/parameterization/unit3-param.cc
20-
src/pose-prior-error-term-eigen.cc
2118
src/pose-prior-error-term.cc
2219
src/position-error-term.cc
2320
src/problem-information.cc)
@@ -59,10 +56,6 @@ catkin_add_gtest(test_inertial_term_test
5956
test/test_inertial_term_test.cc)
6057
target_link_libraries(test_inertial_term_test ${PROJECT_NAME})
6158

62-
catkin_add_gtest(test_inertial_term_test_eigen
63-
test/test_inertial_term_test_eigen.cc)
64-
target_link_libraries(test_inertial_term_test_eigen ${PROJECT_NAME})
65-
6659
catkin_add_gtest(test_3keyframe_inertial_term_test
6760
test/test_3keyframe_inertial_term_test.cc)
6861
target_link_libraries(test_3keyframe_inertial_term_test ${PROJECT_NAME})
@@ -86,17 +79,5 @@ catkin_add_gtest(test_six_dof_block_transformation_error_term_with_extrinsics
8679
test/test_six_dof_block_transformation_error_term_with_extrinsics.cc)
8780
target_link_libraries(test_six_dof_block_transformation_error_term_with_extrinsics ${PROJECT_NAME})
8881

89-
catkin_add_gtest(test_unit3_parameterization
90-
test/test_unit3_parameterization.cc)
91-
target_link_libraries(test_unit3_parameterization ${PROJECT_NAME})
92-
93-
catkin_add_gtest(test_quaternion_parameterization_eigen
94-
test/test_quaternion_eigen_parameterization.cc)
95-
target_link_libraries(test_quaternion_parameterization_eigen ${PROJECT_NAME})
96-
97-
catkin_add_gtest(test_aid_error_term
98-
test/test_aid_error_term.cc)
99-
target_link_libraries(test_aid_error_term ${PROJECT_NAME})
100-
10182
cs_install()
10283
cs_export()

0 commit comments

Comments
 (0)