Skip to content

Commit

Permalink
restructured package folders
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelGrupp committed Dec 8, 2017
1 parent c47b947 commit 9ec1444
Show file tree
Hide file tree
Showing 61 changed files with 32 additions and 39 deletions.
32 changes: 16 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@ Supported trajectory formats:
See [here](https://github.com/MichaelGrupp/evo/wiki/Formats) for more infos about the formats.

<!---
<img src="evo/doc/traj_demo.png" alt="evo" height="180" border="10" />
<img src="doc/assets/traj_demo.png" alt="evo" height="180" border="10" />
-->
<center>
<a href="evo/doc/ape_demo_ORB_map.png" target="_blank"><img src="evo/doc/ape_demo_ORB_map.png" alt="evo" height="200" border="5" /></a>
<a href="evo/doc/res_violin.png" target="_blank"><img src="evo/doc/res_violin.png" alt="evo" height="200" border="5" /></a>
<a href="evo/doc/res_stats.png" target="_blank"><img src="evo/doc/res_stats.png" alt="evo" height="200" border="5" /></a>
<a href="doc/assets/ape_demo_ORB_map.png" target="_blank"><img src="doc/assets/ape_demo_ORB_map.png" alt="evo" height="200" border="5" /></a>
<a href="doc/assets/res_violin.png" target="_blank"><img src="doc/assets/res_violin.png" alt="evo" height="200" border="5" /></a>
<a href="doc/assets/res_stats.png" target="_blank"><img src="doc/assets/res_stats.png" alt="evo" height="200" border="5" /></a>
</center>

---

## Installation

**Python 3.4+** and **Python 2.7** are both supported. If you want to use the ROS bagfile interface, first check which Python version is used by your ROS installation and install accordingly.
You might also want to use a [virtual environment](evo/doc/install_in_virtualenv.md).
You might also want to use a [virtual environment](doc/install_in_virtualenv.md).

### From PyPi
If you just want to use the executables of the latest release version, the easiest way is to run:
Expand Down Expand Up @@ -98,8 +98,8 @@ There are some example trajectories in the source folder in `evo/test/data`.
```

<center>
<a href="evo/doc/traj_demo.png" target="_blank"><img src="evo/doc/traj_demo.png" alt="evo" height="200" border="5" /></a>
<a href="evo/doc/traj_demo_xyz.png" target="_blank"><img src="evo/doc/traj_demo_xyz.png" alt="evo" height="200" border="5" /></a>
<a href="doc/assets/traj_demo.png" target="_blank"><img src="doc/assets/traj_demo.png" alt="evo" height="200" border="5" /></a>
<a href="doc/assets/traj_demo_xyz.png" target="_blank"><img src="doc/assets/traj_demo_xyz.png" alt="evo" height="200" border="5" /></a>
</center>

2. ***Run a metric on trajectories***
Expand All @@ -114,8 +114,8 @@ There are some example trajectories in the source folder in `evo/test/data`.
```

<center>
<a href="evo/doc/ape_demo_ORB_raw.png" target="_blank"><img src="evo/doc/ape_demo_ORB_raw.png" alt="evo" height="200" border="5" /></a>
<a href="evo/doc/ape_demo_ORB_map.png" target="_blank"><img src="evo/doc/ape_demo_ORB_map.png" alt="evo" height="200" border="5" /></a>
<a href="doc/assets/ape_demo_ORB_raw.png" target="_blank"><img src="doc/assets/ape_demo_ORB_raw.png" alt="evo" height="200" border="5" /></a>
<a href="doc/assets/ape_demo_ORB_map.png" target="_blank"><img src="doc/assets/ape_demo_ORB_map.png" alt="evo" height="200" border="5" /></a>
</center>

*Second trajectory (S-PTAM):*
Expand All @@ -125,8 +125,8 @@ There are some example trajectories in the source folder in `evo/test/data`.
```

<center>
<a href="evo/doc/ape_demo_S-PTAM_raw.png" target="_blank"><img src="evo/doc/ape_demo_S-PTAM_raw.png" alt="evo" height="200" border="5" /></a>
<a href="evo/doc/ape_demo_S-PTAM_map.png" target="_blank"><img src="evo/doc/ape_demo_S-PTAM_map.png" alt="evo" height="200" border="5" /></a>
<a href="doc/assets/ape_demo_S-PTAM_raw.png" target="_blank"><img src="doc/assets/ape_demo_S-PTAM_raw.png" alt="evo" height="200" border="5" /></a>
<a href="doc/assets/ape_demo_S-PTAM_map.png" target="_blank"><img src="doc/assets/ape_demo_S-PTAM_map.png" alt="evo" height="200" border="5" /></a>
</center>


Expand All @@ -143,11 +143,11 @@ There are some example trajectories in the source folder in `evo/test/data`.
```

<center>
<a href="evo/doc/res_raw.png" target="_blank"><img src="evo/doc/res_raw.png" alt="evo" height="200" border="5" /></a>
<a href="evo/doc/res_dist.png" target="_blank"><img src="evo/doc/res_dist.png" alt="evo" height="200" border="5" /> </a>
<a href="evo/doc/res_stats.png" target="_blank"><img src="evo/doc/res_stats.png" alt="evo" height="200" border="5" /></a>
<a href="evo/doc/res_box.png" target="_blank"><img src="evo/doc/res_box.png" alt="evo" height="200" border="5" /></a>
<a href="evo/doc/res_violin.png" target="_blank"><img src="evo/doc/res_violin.png" alt="evo" height="200" border="5" /></a>
<a href="doc/assets/res_raw.png" target="_blank"><img src="doc/assets/res_raw.png" alt="evo" height="200" border="5" /></a>
<a href="doc/assets/res_dist.png" target="_blank"><img src="doc/assets/res_dist.png" alt="evo" height="200" border="5" /> </a>
<a href="doc/assets/res_stats.png" target="_blank"><img src="doc/assets/res_stats.png" alt="evo" height="200" border="5" /></a>
<a href="doc/assets/res_box.png" target="_blank"><img src="doc/assets/res_box.png" alt="evo" height="200" border="5" /></a>
<a href="doc/assets/res_violin.png" target="_blank"><img src="doc/assets/res_violin.png" alt="evo" height="200" border="5" /></a>
</center>

---
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 0 additions & 7 deletions evo/entry_points.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,6 @@ def rpe_for_each():
launch(main_rpe_for_each, parser)


def adj_mat():
from evo.xperimental import main_adj_mat
parser = main_adj_mat.parser()
argcomplete.autocomplete(parser)
launch(main_adj_mat, parser)


def res():
from evo import main_res
parser = main_res.parser()
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
14 changes: 7 additions & 7 deletions evo/test/run_all_demos.sh → test/run_all_demos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ if [[ $* == *--no_plots* ]]; then
fi

# run all demo scripts to get cheap app tests
yes | ./demos/traj_demo.sh "$n"
yes | ./demos/ape_demo.sh "$n"
yes | ./demos/rpe_demo.sh "$n"
yes | ./demos/rpe-for-each_demo.sh "$n"
yes | ./demos/res_demo.sh "$n"
yes | ./demos/latex_demo.sh "$n"
yes | demos/traj_demo.sh "$n"
yes | demos/ape_demo.sh "$n"
yes | demos/rpe_demo.sh "$n"
yes | demos/rpe-for-each_demo.sh "$n"
yes | demos/res_demo.sh "$n"
yes | demos/latex_demo.sh "$n"

echo "enter 'y' to clean, any other key to exit"
read input
if [[ $input == y ]]; then
./demos/clean.sh
demos/clean.sh
exit 0
fi
File renamed without changes.
File renamed without changes.
18 changes: 9 additions & 9 deletions evo/test/test_executables.py → test/test_executables.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,19 @@ def blue(string):
test_bag = True

infos.append("APE with TUM files")
cmds.append(".././main_ape.py tum ../test/data/freiburg1_xyz-groundtruth.txt ../test/data/freiburg1_xyz-rgbdslam.txt")
cmds.append("evo_ape tum ../test/data/freiburg1_xyz-groundtruth.txt ../test/data/freiburg1_xyz-rgbdslam.txt")
infos.append("APE with KITTI files")
cmds.append(".././main_ape.py kitti ../test/data/KITTI_00_gt.txt ../test/data/KITTI_00_ORB.txt")
cmds.append("evo_ape kitti ../test/data/KITTI_00_gt.txt ../test/data/KITTI_00_ORB.txt")
if test_bag:
infos.append("APE with ROS bag")
cmds.append(".././main_ape.py bag ../test/data/ROS_example.bag groundtruth ORB-SLAM")
cmds.append("evo_ape bag ../test/data/ROS_example.bag groundtruth ORB-SLAM")
infos.append("RPE with TUM files")
cmds.append(".././main_rpe.py tum ../test/data/freiburg1_xyz-groundtruth.txt ../test/data/freiburg1_xyz-rgbdslam.txt")
cmds.append("evo_rpe tum ../test/data/freiburg1_xyz-groundtruth.txt ../test/data/freiburg1_xyz-rgbdslam.txt")
infos.append("RPE with KITTI files")
cmds.append(".././main_rpe.py kitti ../test/data/KITTI_00_gt.txt ../test/data/KITTI_00_ORB.txt")
cmds.append("evo_rpe kitti ../test/data/KITTI_00_gt.txt ../test/data/KITTI_00_ORB.txt")
if test_bag:
infos.append("RPE with ROS bag")
cmds.append(".././main_rpe.py bag ../test/data/ROS_example.bag groundtruth ORB-SLAM")
cmds.append("evo_rpe bag ../test/data/ROS_example.bag groundtruth ORB-SLAM")

try:
for info, cmd in zip(infos, cmds):
Expand All @@ -64,22 +64,22 @@ def blue(string):
sp.check_call(cmd, shell=True)

info = "APE with alignment"
cmd = ".././main_ape.py tum ../test/data/freiburg1_xyz-groundtruth.txt ../test/data/freiburg1_xyz-rgbdslam.txt -a"
cmd = "evo_ape tum ../test/data/freiburg1_xyz-groundtruth.txt ../test/data/freiburg1_xyz-rgbdslam.txt -a"
cmd += " --plot" if test_plot else ""
print("\n" + green(info))
print(blue(cmd))
sp.check_call(cmd, shell=True)

info = "APE with alignment and scale correction"
cmd = ".././main_ape.py tum ../test/data/freiburg1_xyz-groundtruth.txt ../test/data/freiburg1_xyz-rgbdslam.txt " \
cmd = "evo_ape tum ../test/data/freiburg1_xyz-groundtruth.txt ../test/data/freiburg1_xyz-rgbdslam.txt " \
"--correct_scale --align"
cmd += " --plot" if test_plot else ""
print("\n" + green(info))
print(blue(cmd))
sp.check_call(cmd, shell=True)

info = "APE with scale correction only"
cmd = ".././main_ape.py tum ../test/data/freiburg1_xyz-groundtruth.txt ../test/data/freiburg1_xyz-rgbdslam.txt " \
cmd = "evo_ape tum ../test/data/freiburg1_xyz-groundtruth.txt ../test/data/freiburg1_xyz-rgbdslam.txt " \
"--correct_scale"
cmd += " --plot" if test_plot else ""
print("\n" + green(info))
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 9ec1444

Please sign in to comment.