Merge remote-tracking branch 'upstream/master'

44fa1d37 · Alex Lee · d3628a74 · 6e367f67 · 44fa1d37 · 44fa1d37
Commit 44fa1d37 authored Jun 29, 2017 by Alex Lee
20 changed files
--- a/cognitive_mapping_and_planning/scripts/script_preprocess_meshes_S3DIS.sh
+++ b/cognitive_mapping_and_planning/scripts/script_preprocess_meshes_S3DIS.sh
--- a/cognitive_mapping_and_planning/scripts/script_test_pretrained_models.sh
+++ b/cognitive_mapping_and_planning/scripts/script_test_pretrained_models.sh
--- a/cognitive_mapping_and_planning/src/__init__.py
+++ b/cognitive_mapping_and_planning/src/__init__.py
--- a/cognitive_mapping_and_planning/src/depth_utils.py
+++ b/cognitive_mapping_and_planning/src/depth_utils.py
--- a/cognitive_mapping_and_planning/src/file_utils.py
+++ b/cognitive_mapping_and_planning/src/file_utils.py
--- a/cognitive_mapping_and_planning/src/graph_utils.py
+++ b/cognitive_mapping_and_planning/src/graph_utils.py
--- a/cognitive_mapping_and_planning/src/map_utils.py
+++ b/cognitive_mapping_and_planning/src/map_utils.py
--- a/cognitive_mapping_and_planning/src/rotation_utils.py
+++ b/cognitive_mapping_and_planning/src/rotation_utils.py
--- a/cognitive_mapping_and_planning/src/utils.py
+++ b/cognitive_mapping_and_planning/src/utils.py
--- a/cognitive_mapping_and_planning/tfcode/__init__.py
+++ b/cognitive_mapping_and_planning/tfcode/__init__.py
--- a/cognitive_mapping_and_planning/tfcode/cmp.py
+++ b/cognitive_mapping_and_planning/tfcode/cmp.py
--- a/cognitive_mapping_and_planning/tfcode/cmp_summary.py
+++ b/cognitive_mapping_and_planning/tfcode/cmp_summary.py
--- a/cognitive_mapping_and_planning/tfcode/cmp_utils.py
+++ b/cognitive_mapping_and_planning/tfcode/cmp_utils.py
--- a/cognitive_mapping_and_planning/tfcode/nav_utils.py
+++ b/cognitive_mapping_and_planning/tfcode/nav_utils.py
--- a/cognitive_mapping_and_planning/tfcode/tf_utils.py
+++ b/cognitive_mapping_and_planning/tfcode/tf_utils.py
--- a/cognitive_mapping_and_planning/tfcode/vision_baseline_lstm.py
+++ b/cognitive_mapping_and_planning/tfcode/vision_baseline_lstm.py
--- a/compression/README.md
+++ b/compression/README.md
--- a/compression/entropy_coder/README.md
+++ b/compression/entropy_coder/README.md
--- a/compression/entropy_coder/__init__.py
+++ b/compression/entropy_coder/__init__.py
--- a/compression/entropy_coder/all_models/__init__.py
+++ b/compression/entropy_coder/all_models/__init__.py