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

fix bugs on returned values

release/4.3a0
Duy-Nguyen Ta 2016-11-21 17:14:30 -05:00
parent 7d8992c00a
commit 52a85f23f8
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cython/gtsam.h
View File

@ -1756,7 +1756,7 @@ class NonlinearFactorGraph {
#include <gtsam/nonlinear/NonlinearFactor.h> #include <gtsam/nonlinear/NonlinearFactor.h>
virtual class NoiseModelFactor: gtsam::NonlinearFactor { virtual class NoiseModelFactor: gtsam::NonlinearFactor {
void equals(const gtsam::NoiseModelFactor& other, double tol) const; bool equals(const gtsam::NoiseModelFactor& other, double tol) const;
gtsam::noiseModel::Base* get_noiseModel() const; // deprecated by below gtsam::noiseModel::Base* get_noiseModel() const; // deprecated by below
gtsam::noiseModel::Base* noiseModel() const; gtsam::noiseModel::Base* noiseModel() const;
Vector unwhitenedError(const gtsam::Values& x) const; Vector unwhitenedError(const gtsam::Values& x) const;

2
wrap/Constructor.cpp
View File

@ -147,7 +147,7 @@ void Constructor::emit_cython_pyx(FileWriter& pyxFile, const Class& cls) const {
ArgumentList args = argumentList(i); ArgumentList args = argumentList(i);
pyxFile.oss << "\tdef " + name_ + "_" + to_string(i) + pyxFile.oss << "\tdef " + name_ + "_" + to_string(i) +
"(self, *args, **kwargs):\n"; "(self, *args, **kwargs):\n";
pyxFile.oss << pyx_resolveOverloadParams(args); pyxFile.oss << pyx_resolveOverloadParams(args, true);
pyxFile.oss << "\t\tself." << cls.pyxCythonObj() << " = " pyxFile.oss << "\t\tself." << cls.pyxCythonObj() << " = "
<< cls.pyxSharedCythonClass() << "(new " << cls.pyxCythonClass() << cls.pyxSharedCythonClass() << "(new " << cls.pyxCythonClass()

4
wrap/Method.cpp
View File

@ -166,13 +166,13 @@ void Method::emit_cython_pyx(FileWriter& file, const Class& cls) const {
ArgumentList args = argumentList(i); ArgumentList args = argumentList(i);
file.oss << "\tdef " + instantiatedName + "_" + to_string(i) + file.oss << "\tdef " + instantiatedName + "_" + to_string(i) +
"(self, *args, **kwargs):\n"; "(self, *args, **kwargs):\n";
file.oss << pyx_resolveOverloadParams(args); file.oss << pyx_resolveOverloadParams(args, false); // lazy: always return None even if it's a void function
/// Call cython corresponding function /// Call cython corresponding function
string caller = "self." + cls.pyxCythonObj() + ".get()"; string caller = "self." + cls.pyxCythonObj() + ".get()";
string ret = pyx_functionCall(caller, funcName, i); string ret = pyx_functionCall(caller, funcName, i);
if (!returnVals_[0].isVoid()) { if (!returnVals_[i].isVoid()) {
file.oss << "\t\tcdef " << returnVals_[i].pyx_returnType() file.oss << "\t\tcdef " << returnVals_[i].pyx_returnType()
<< " ret = " << ret << "\n"; << " ret = " << ret << "\n";
file.oss << "\t\treturn True, " << returnVals_[i].pyx_casting("ret") << "\n"; file.oss << "\t\treturn True, " << returnVals_[i].pyx_casting("ret") << "\n";

8
wrap/OverloadedFunction.h
View File

@ -71,10 +71,11 @@ public:
return os; return os;
} }
std::string pyx_resolveOverloadParams(const ArgumentList& args) const { std::string pyx_resolveOverloadParams(const ArgumentList& args, bool isVoid) const {
std::string s; std::string s;
s += "\t\tif len(args)+len(kwargs) !=" + std::to_string(args.size()) + ":\n"; s += "\t\tif len(args)+len(kwargs) !=" + std::to_string(args.size()) + ":\n";
s += "\t\t\treturn False\n"; s += "\t\t\treturn False";
s += (!isVoid) ? ", None\n" : "\n";
if (args.size() > 0) { if (args.size() > 0) {
s += "\t\t__params = kwargs.copy()\n"; s += "\t\t__params = kwargs.copy()\n";
s += "\t\t__names = [" + args.pyx_paramsList() + "]\n"; s += "\t\t__names = [" + args.pyx_paramsList() + "]\n";
@ -83,7 +84,8 @@ public:
s += "\t\ttry:\n"; s += "\t\ttry:\n";
s += args.pyx_castParamsToPythonType(); s += args.pyx_castParamsToPythonType();
s += "\t\texcept:\n"; s += "\t\texcept:\n";
s += "\t\t\treturn False\n"; s += "\t\t\treturn False";
s += (!isVoid) ? ", None\n" : "\n";
} }
return s; return s;
} }

2
wrap/StaticMethod.cpp
View File

@ -115,7 +115,7 @@ void StaticMethod::emit_cython_pyx(FileWriter& file, const Class& cls) const {
string pxdFuncName = name_ + ((i>0)?"_" + to_string(i):""); string pxdFuncName = name_ + ((i>0)?"_" + to_string(i):"");
ArgumentList args = argumentList(i); ArgumentList args = argumentList(i);
file.oss << "\tdef " + funcName + "(*args, **kwargs):\n"; file.oss << "\tdef " + funcName + "(*args, **kwargs):\n";
file.oss << pyx_resolveOverloadParams(args); file.oss << pyx_resolveOverloadParams(args, false); // lazy: always return None even if it's a void function
/// Call cython corresponding function and return /// Call cython corresponding function and return
string ret = pyx_functionCall(cls.pyxCythonClass(), pxdFuncName, i); string ret = pyx_functionCall(cls.pyxCythonClass(), pxdFuncName, i);