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

fix Vector/Matrix and Map[Vector/Matrix] ambiguity. 

That also fixes the problem of function templated on Matrix/Vector
release/4.3a0
Duy-Nguyen Ta 2016-09-11 08:24:45 -04:00
parent cf51c85391
commit b91a7d368d
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wrap/Argument.cpp
View File

@ -103,7 +103,7 @@ void Argument::emit_cython_pxd(FileWriter& file) const {
string typeName = type.cythonClassName();
string cythonType = typeName;
if (type.isEigen()) {
cythonType = "Map[" + typeName + "Xd]&";
cythonType = "const " + typeName + "Xd&";
} else {
if (is_ptr) cythonType = "shared_ptr[" + typeName + "]&";
if (is_ref) cythonType = cythonType + "&";
@ -130,7 +130,7 @@ void Argument::emit_cython_pyx_asParam(FileWriter& file) const {
cythonVar = name + "." + type.pyxCythonObj();
if (!is_ptr) cythonVar = "deref(" + cythonVar + ")";
} else if (type.isEigen()) {
cythonVar = "Map[" + cythonType + "Xd](" + name + ")";
cythonVar = "<" + cythonType + "Xd>" + "(Map[" + cythonType + "Xd](" + name + "))";
} else {
cythonVar = name;
}

11
wrap/tests/cythontest.h
View File

@ -2,7 +2,7 @@ namespace gtsam {
#include <gtsam/base/FastVector.h>
template<T> class FastVector{};
typedef gtsam::FastVector<Point3> KeyVector;
typedef gtsam::FastVector<size_t> KeyVector;
#include <gtsam/base/FastList.h>
template<T> class FastList{};
@ -20,7 +20,7 @@ class Point2 {
// Standard Constructors
Point2();
Point2(double x, double y);
// Point2(Vector v);
Point2(Vector v);
// Testable
void print(string s) const;
@ -92,7 +92,8 @@ class Pose2 {
Pose2(double x, double y, double theta);
Pose2(double theta, const gtsam::Point2& t);
Pose2(const gtsam::Rot2& r, const gtsam::Point2& t);
// Pose2(Vector v);
Pose2(Vector v);
Pose2(Matrix T);
// Testable
void print(string s) const;
@ -460,10 +461,10 @@ class Values {
// void update(size_t j, const gtsam::Value& val);
// gtsam::Value at(size_t j) const;
template<T = {gtsam::Point3, gtsam::Rot3}>
template<T = {gtsam::Point3, gtsam::Rot3, Matrix, Vector}>
void insert(size_t j, const T& t);
template<T = {gtsam::Point3, gtsam::Rot3}>
template<T = {gtsam::Point3, gtsam::Rot3, Matrix, Vector}>
void update(size_t j, const T& t);
template<T = {gtsam::Point3, gtsam::Rot3, Vector, Matrix}>