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

Fixed template expansion of classes

release/4.3a0
dellaert 2014-11-13 21:53:58 +01:00
parent a4fe404d82
commit 8ef78db9d8
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wrap/Class.cpp
View File

@ -248,7 +248,6 @@ Class Class::expandTemplate(const TemplateSubstitution& ts) const {
inst.static_methods = expandMethodTemplate(static_methods, ts); inst.static_methods = expandMethodTemplate(static_methods, ts);
inst.constructor = constructor.expandTemplate(ts); inst.constructor = constructor.expandTemplate(ts);
inst.deconstructor.name = inst.name; inst.deconstructor.name = inst.name;
cout << inst << endl;
return inst; return inst;
} }
@ -256,12 +255,10 @@ Class Class::expandTemplate(const TemplateSubstitution& ts) const {
vector<Class> Class::expandTemplate(Str templateArg, vector<Class> Class::expandTemplate(Str templateArg,
const vector<Qualified>& instantiations) const { const vector<Qualified>& instantiations) const {
vector<Class> result; vector<Class> result;
cout << *this << endl;
BOOST_FOREACH(const Qualified& instName, instantiations) { BOOST_FOREACH(const Qualified& instName, instantiations) {
Qualified expandedClass = (Qualified) (*this); Qualified expandedClass = (Qualified) (*this);
expandedClass.name += instName.name; expandedClass.name += instName.name;
const TemplateSubstitution ts(templateArg, instName, expandedClass); const TemplateSubstitution ts(templateArg, instName, expandedClass);
cout << ts << endl;
Class inst = expandTemplate(ts); Class inst = expandTemplate(ts);
inst.name = expandedClass.name; inst.name = expandedClass.name;
inst.templateArgs.clear(); inst.templateArgs.clear();

11
wrap/Function.h
View File

@ -187,13 +187,6 @@ public:
// Templated checking functions // Templated checking functions
// TODO: do this via polymorphism ? // TODO: do this via polymorphism ?
template<class F>
F expandMethodTemplate(F& method, const TemplateSubstitution& ts) {
F instMethod = method;
method.expandTemplate(ts);
return instMethod;
}
// TODO use transform // TODO use transform
template<class F> template<class F>
static std::map<std::string, F> expandMethodTemplate( static std::map<std::string, F> expandMethodTemplate(
@ -201,7 +194,9 @@ static std::map<std::string, F> expandMethodTemplate(
std::map<std::string, F> result; std::map<std::string, F> result;
typedef std::pair<const std::string, F> NamedMethod; typedef std::pair<const std::string, F> NamedMethod;
BOOST_FOREACH(NamedMethod namedMethod, methods) { BOOST_FOREACH(NamedMethod namedMethod, methods) {
namedMethod.second = expandMethodTemplate(namedMethod.second, ts); F instMethod = namedMethod.second;
instMethod.expandTemplate(ts);
namedMethod.second = instMethod;
result.insert(namedMethod); result.insert(namedMethod);
} }
return result; return result;

2
wrap/tests/expected2/geometry_wrapper.cpp
View File

@ -672,6 +672,7 @@ void MyTemplatePoint2_templatedMethod_54(int nargout, mxArray *out[], int nargin
gtsam::Point2& t = *unwrap_shared_ptr< gtsam::Point2 >(in[1], "ptr_gtsamPoint2"); gtsam::Point2& t = *unwrap_shared_ptr< gtsam::Point2 >(in[1], "ptr_gtsamPoint2");
obj->templatedMethod<gtsam::Point2>(t); obj->templatedMethod<gtsam::Point2>(t);
} }
void MyTemplatePoint2_templatedMethod_55(int nargout, mxArray *out[], int nargin, const mxArray *in[]) void MyTemplatePoint2_templatedMethod_55(int nargout, mxArray *out[], int nargin, const mxArray *in[])
{ {
typedef boost::shared_ptr<MyTemplatePoint2> Shared; typedef boost::shared_ptr<MyTemplatePoint2> Shared;
@ -815,6 +816,7 @@ void MyTemplatePoint3_templatedMethod_67(int nargout, mxArray *out[], int nargin
gtsam::Point2& t = *unwrap_shared_ptr< gtsam::Point2 >(in[1], "ptr_gtsamPoint2"); gtsam::Point2& t = *unwrap_shared_ptr< gtsam::Point2 >(in[1], "ptr_gtsamPoint2");
obj->templatedMethod<gtsam::Point2>(t); obj->templatedMethod<gtsam::Point2>(t);
} }
void MyTemplatePoint3_templatedMethod_68(int nargout, mxArray *out[], int nargin, const mxArray *in[]) void MyTemplatePoint3_templatedMethod_68(int nargout, mxArray *out[], int nargin, const mxArray *in[])
{ {
typedef boost::shared_ptr<MyTemplatePoint3> Shared; typedef boost::shared_ptr<MyTemplatePoint3> Shared;