Moved tensor code back to geometry

gtsam/geometry/Tensor1.h

@@ -17,7 +17,7 @@
  */
 
 #pragma once
-#include <gtsam_unstable/geometry/tensors.h>
+#include <gtsam/geometry/tensors.h>
 
 namespace tensors {
 

gtsam/geometry/Tensor1Expression.h

@@ -21,7 +21,7 @@
 #include <cmath>
 #include <iostream>
 #include <stdexcept>
-#include <gtsam_unstable/geometry/tensors.h>
+#include <gtsam/geometry/tensors.h>
 
 namespace tensors {
 

gtsam/geometry/Tensor2.h

@@ -17,7 +17,7 @@
  */
 
 #pragma once
-#include <gtsam_unstable/geometry/tensors.h>
+#include <gtsam/geometry/tensors.h>
 
 namespace tensors {
 

gtsam/geometry/Tensor2Expression.h

@@ -20,7 +20,7 @@
 
 #include <stdexcept>
 #include <iostream>
-#include <gtsam_unstable/geometry/tensors.h>
+#include <gtsam/geometry/tensors.h>
 
 namespace tensors {
 

gtsam/geometry/Tensor3.h

@@ -17,7 +17,7 @@
  */
 
 #pragma once
-#include <gtsam_unstable/geometry/tensors.h>
+#include <gtsam/geometry/tensors.h>
 
 namespace tensors {
 

gtsam/geometry/Tensor3Expression.h

@@ -19,7 +19,7 @@
 #pragma once
 
 #include <iostream>
-#include <gtsam_unstable/geometry/tensors.h>
+#include <gtsam/geometry/tensors.h>
 
 namespace tensors {
 

gtsam/geometry/Tensor4.h

@@ -17,7 +17,7 @@
  */
 
 #pragma once
-#include <gtsam_unstable/geometry/tensors.h>
+#include <gtsam/geometry/tensors.h>
 
 namespace tensors {
 

gtsam/geometry/Tensor5.h

@@ -17,7 +17,7 @@
  */
 
 #pragma once
-#include <gtsam_unstable/geometry/tensors.h>
+#include <gtsam/geometry/tensors.h>
 
 namespace tensors {
 

gtsam/geometry/Tensor5Expression.h

@@ -19,7 +19,7 @@
 #pragma once
 
 #include <iostream>
-#include <gtsam_unstable/geometry/tensors.h>
+#include <gtsam/geometry/tensors.h>
 
 namespace tensors {
 

gtsam/geometry/projectiveGeometry.cpp

@@ -19,8 +19,8 @@
 #include <boost/foreach.hpp>
 #include <gtsam/base/Matrix.h>
 
-#include <gtsam_unstable/geometry/tensorInterface.h>
-#include <gtsam_unstable/geometry/projectiveGeometry.h>
+#include <gtsam/geometry/tensorInterface.h>
+#include <gtsam/geometry/projectiveGeometry.h>
 
 namespace gtsam {
 

gtsam/geometry/projectiveGeometry.h

@@ -19,7 +19,7 @@
 #pragma once
 
 #include <list>
-#include <gtsam_unstable/geometry/tensors.h>
+#include <gtsam/geometry/tensors.h>
 
 namespace gtsam {
 

gtsam/geometry/tensorInterface.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <gtsam_unstable/geometry/tensors.h>
+#include <gtsam/geometry/tensors.h>
 #include <gtsam/base/Matrix.h>
 
 namespace gtsam {

gtsam/geometry/tensors.h

@@ -29,17 +29,17 @@ namespace tensors {
 } // namespace tensors
 
 // Expression templates
-#include <gtsam_unstable/geometry/Tensor1Expression.h>
-#include <gtsam_unstable/geometry/Tensor2Expression.h>
-#include <gtsam_unstable/geometry/Tensor3Expression.h>
+#include <gtsam/geometry/Tensor1Expression.h>
+#include <gtsam/geometry/Tensor2Expression.h>
+#include <gtsam/geometry/Tensor3Expression.h>
 // Tensor4 not needed so far
-#include <gtsam_unstable/geometry/Tensor5Expression.h>
+#include <gtsam/geometry/Tensor5Expression.h>
 
 // Actual tensor classes
-#include <gtsam_unstable/geometry/Tensor1.h>
-#include <gtsam_unstable/geometry/Tensor2.h>
-#include <gtsam_unstable/geometry/Tensor3.h>
-#include <gtsam_unstable/geometry/Tensor4.h>
-#include <gtsam_unstable/geometry/Tensor5.h>
+#include <gtsam/geometry/Tensor1.h>
+#include <gtsam/geometry/Tensor2.h>
+#include <gtsam/geometry/Tensor3.h>
+#include <gtsam/geometry/Tensor4.h>
+#include <gtsam/geometry/Tensor5.h>
 
 

gtsam/geometry/tests/testFundamental.cpp

@@ -23,9 +23,9 @@ using namespace boost::assign;
 
 #include <CppUnitLite/TestHarness.h>
 
-#include <gtsam_unstable/geometry/tensors.h>
-#include <gtsam_unstable/geometry/tensorInterface.h>
-#include <gtsam_unstable/geometry/projectiveGeometry.h>
+#include <gtsam/geometry/tensors.h>
+#include <gtsam/geometry/tensorInterface.h>
+#include <gtsam/geometry/projectiveGeometry.h>
 
 using namespace std;
 using namespace gtsam;

gtsam/geometry/tests/testHomography2.cpp

@@ -24,9 +24,9 @@ using namespace boost::assign;
 #include <CppUnitLite/TestHarness.h>
 
 #include <gtsam/base/Testable.h>
-#include <gtsam_unstable/geometry/tensors.h>
-#include <gtsam_unstable/geometry/tensorInterface.h>
-#include <gtsam_unstable/geometry/projectiveGeometry.h>
+#include <gtsam/geometry/tensors.h>
+#include <gtsam/geometry/tensorInterface.h>
+#include <gtsam/geometry/projectiveGeometry.h>
 #include <gtsam/geometry/Pose3.h>
 
 using namespace std;

gtsam/geometry/tests/testTensors.cpp

@@ -23,9 +23,9 @@ using namespace boost::assign;
 
 #include <CppUnitLite/TestHarness.h>
 
-#include <gtsam_unstable/geometry/tensors.h>
-#include <gtsam_unstable/geometry/tensorInterface.h>
-#include <gtsam_unstable/geometry/projectiveGeometry.h>
+#include <gtsam/geometry/tensors.h>
+#include <gtsam/geometry/tensorInterface.h>
+#include <gtsam/geometry/projectiveGeometry.h>
 
 using namespace std;
 using namespace gtsam;

gtsam_unstable/CMakeLists.txt

@@ -3,7 +3,6 @@
 set (gtsam_unstable_subdirs
     base 
     dynamics
-    geometry
     slam 
 )
 
@@ -27,7 +26,6 @@ set(gtsam_unstable_srcs
     ${base_srcs} 
     ${discrete_srcs}
     ${dynamics_srcs}
-    ${geometry_srcs}
     ${slam_srcs} 
 )
 

gtsam_unstable/geometry/CMakeLists.txt

@@ -1,20 +0,0 @@
-# Install headers
-file(GLOB geometry_headers "*.h")
-install(FILES ${geometry_headers} DESTINATION include/gtsam_unstable/geometry)
-
-# Components to link tests in this subfolder against
-set(geometry_local_libs
-    base 
-    geometry
-    geometry_unstable)
-
-set (geometry_full_libs
-    gtsam-static
-    gtsam_unstable-static)
-
-# Exclude tests that don't work
-set (geometry_excluded_tests "")
-
-# Add all tests
-gtsam_add_subdir_tests(geometry_unstable "${geometry_local_libs}" "${geometry_full_libs}" "${geometry_excluded_tests}") 
-