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

move matlab.h, containing matlab ultility functions, to nonlinear/utilities.h so it can be installed properly and can be used with the cython wrapper

release/4.3a0
Duy-Nguyen Ta 2016-11-22 17:34:21 -05:00
parent 6ef6457e51
commit d772e52512
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cython/gtsam.h
View File

@ -2639,7 +2639,7 @@ virtual class Pose3AttitudeFactor : gtsam::NonlinearFactor{
namespace utilities { namespace utilities {
#include <matlab.h> #include <gtsam/nonlinear/utilities.h>
gtsam::KeyList createKeyList(Vector I); gtsam::KeyList createKeyList(Vector I);
gtsam::KeyList createKeyList(string s, Vector I); gtsam::KeyList createKeyList(string s, Vector I);
gtsam::KeyVector createKeyVector(Vector I); gtsam::KeyVector createKeyVector(Vector I);

7
matlab.h → gtsam/nonlinear/utilities.h
View File

@ -17,6 +17,7 @@
#pragma once #pragma once
#include <gtsam/inference/Symbol.h>
#include <gtsam/slam/ProjectionFactor.h> #include <gtsam/slam/ProjectionFactor.h>
#include <gtsam/nonlinear/NonlinearFactorGraph.h> #include <gtsam/nonlinear/NonlinearFactorGraph.h>
#include <gtsam/nonlinear/NonlinearFactor.h> #include <gtsam/nonlinear/NonlinearFactor.h>
@ -43,7 +44,7 @@ FastList<Key> createKeyList(const Vector& I) {
} }
// Create a KeyList from indices using symbol // Create a KeyList from indices using symbol
FastList<Key> createKeyList(string s, const Vector& I) { FastList<Key> createKeyList(std::string s, const Vector& I) {
FastList<Key> set; FastList<Key> set;
char c = s[0]; char c = s[0];
for (int i = 0; i < I.size(); i++) for (int i = 0; i < I.size(); i++)
@ -60,7 +61,7 @@ FastVector<Key> createKeyVector(const Vector& I) {
} }
// Create a KeyVector from indices using symbol // Create a KeyVector from indices using symbol
FastVector<Key> createKeyVector(string s, const Vector& I) { FastVector<Key> createKeyVector(std::string s, const Vector& I) {
FastVector<Key> set; FastVector<Key> set;
char c = s[0]; char c = s[0];
for (int i = 0; i < I.size(); i++) for (int i = 0; i < I.size(); i++)
@ -77,7 +78,7 @@ KeySet createKeySet(const Vector& I) {
} }
// Create a KeySet from indices using symbol // Create a KeySet from indices using symbol
KeySet createKeySet(string s, const Vector& I) { KeySet createKeySet(std::string s, const Vector& I) {
KeySet set; KeySet set;
char c = s[0]; char c = s[0];
for (int i = 0; i < I.size(); i++) for (int i = 0; i < I.size(); i++)