12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved tensor code back to geometry

release/4.3a0
Alex Cunningham 2012-05-04 14:44:19 +00:00
parent f7d14c87cf
commit e4bc0f9b81
18 changed files with 31 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtsam_unstable/geometry/Tensor1.h → gtsam/geometry/Tensor1.h
View File

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

2
gtsam_unstable/geometry/Tensor1Expression.h → gtsam/geometry/Tensor1Expression.h
View File

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

2
gtsam_unstable/geometry/Tensor2.h → gtsam/geometry/Tensor2.h
View File

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

2
gtsam_unstable/geometry/Tensor2Expression.h → gtsam/geometry/Tensor2Expression.h
View File

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

2
gtsam_unstable/geometry/Tensor3.h → gtsam/geometry/Tensor3.h
View File

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

2
gtsam_unstable/geometry/Tensor3Expression.h → gtsam/geometry/Tensor3Expression.h
View File

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

2
gtsam_unstable/geometry/Tensor4.h → gtsam/geometry/Tensor4.h
View File

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

2
gtsam_unstable/geometry/Tensor5.h → gtsam/geometry/Tensor5.h
View File

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

2
gtsam_unstable/geometry/Tensor5Expression.h → gtsam/geometry/Tensor5Expression.h
View File

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

4
gtsam_unstable/geometry/projectiveGeometry.cpp → gtsam/geometry/projectiveGeometry.cpp
View File

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

2
gtsam_unstable/geometry/projectiveGeometry.h → gtsam/geometry/projectiveGeometry.h
View File

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

2
gtsam_unstable/geometry/tensorInterface.h → gtsam/geometry/tensorInterface.h
View File

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

18
gtsam_unstable/geometry/tensors.h → gtsam/geometry/tensors.h
View File

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

6
gtsam_unstable/geometry/tests/testFundamental.cpp → gtsam/geometry/tests/testFundamental.cpp
View File

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

6
gtsam_unstable/geometry/tests/testHomography2.cpp → gtsam/geometry/tests/testHomography2.cpp
View File

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

6
gtsam_unstable/geometry/tests/testTensors.cpp → gtsam/geometry/tests/testTensors.cpp
View File

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

2
gtsam_unstable/CMakeLists.txt
View File

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

20
gtsam_unstable/geometry/CMakeLists.txt
View File

@ -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}")