From f6faabf5421a7059a1d1bc2832714c21eee5558b Mon Sep 17 00:00:00 2001 From: dellaert Date: Sun, 30 Nov 2014 23:47:55 +0100 Subject: [PATCH] Temporarily checked in wrong tests to be able to fix everything else --- wrap/tests/expected2/MyTemplatePoint2.m | 4 +- wrap/tests/expected2/MyTemplatePoint3.m | 4 +- wrap/tests/expected2/geometry_wrapper.cpp | 60 +++++++++++------------ 3 files changed, 32 insertions(+), 36 deletions(-) diff --git a/wrap/tests/expected2/MyTemplatePoint2.m b/wrap/tests/expected2/MyTemplatePoint2.m index ace466ed7..d7d84876b 100644 --- a/wrap/tests/expected2/MyTemplatePoint2.m +++ b/wrap/tests/expected2/MyTemplatePoint2.m @@ -83,7 +83,7 @@ classdef MyTemplatePoint2 < MyBase % RETURN_T usage: return_T(Point2 value) : returns gtsam::Point2 % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html if length(varargin) == 1 && isa(varargin{1},'gtsam.Point2') - varargout{1} = geometry_wrapper(52, this, varargin{:}); + geometry_wrapper(52, this, varargin{:}); else error('Arguments do not match any overload of function MyTemplatePoint2.return_T'); end @@ -93,7 +93,7 @@ classdef MyTemplatePoint2 < MyBase % RETURN_TPTR usage: return_Tptr(Point2 value) : returns gtsam::Point2 % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html if length(varargin) == 1 && isa(varargin{1},'gtsam.Point2') - varargout{1} = geometry_wrapper(53, this, varargin{:}); + geometry_wrapper(53, this, varargin{:}); else error('Arguments do not match any overload of function MyTemplatePoint2.return_Tptr'); end diff --git a/wrap/tests/expected2/MyTemplatePoint3.m b/wrap/tests/expected2/MyTemplatePoint3.m index bd0966ef1..190b3eca0 100644 --- a/wrap/tests/expected2/MyTemplatePoint3.m +++ b/wrap/tests/expected2/MyTemplatePoint3.m @@ -83,7 +83,7 @@ classdef MyTemplatePoint3 < MyBase % RETURN_T usage: return_T(Point3 value) : returns gtsam::Point3 % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html if length(varargin) == 1 && isa(varargin{1},'gtsam.Point3') - varargout{1} = geometry_wrapper(67, this, varargin{:}); + geometry_wrapper(67, this, varargin{:}); else error('Arguments do not match any overload of function MyTemplatePoint3.return_T'); end @@ -93,7 +93,7 @@ classdef MyTemplatePoint3 < MyBase % RETURN_TPTR usage: return_Tptr(Point3 value) : returns gtsam::Point3 % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html if length(varargin) == 1 && isa(varargin{1},'gtsam.Point3') - varargout{1} = geometry_wrapper(68, this, varargin{:}); + geometry_wrapper(68, this, varargin{:}); else error('Arguments do not match any overload of function MyTemplatePoint3.return_Tptr'); end diff --git a/wrap/tests/expected2/geometry_wrapper.cpp b/wrap/tests/expected2/geometry_wrapper.cpp index dbe60bb63..c937a2f5d 100644 --- a/wrap/tests/expected2/geometry_wrapper.cpp +++ b/wrap/tests/expected2/geometry_wrapper.cpp @@ -618,60 +618,58 @@ void MyTemplatePoint2_accept_Tptr_49(int nargout, mxArray *out[], int nargin, co void MyTemplatePoint2_create_MixedPtrs_50(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { - typedef boost::shared_ptr SharedPoint2; - typedef boost::shared_ptr SharedPoint2; typedef boost::shared_ptr Shared; checkArguments("create_MixedPtrs",nargout,nargin-1,0); Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplatePoint2"); pair< gtsam::Point2, SharedPoint2 > pairResult = obj->create_MixedPtrs(); - out[0] = wrap_shared_ptr(SharedPoint2(new gtsam::Point2(pairResult.first)),"gtsam.Point2", false); - out[1] = wrap_shared_ptr(pairResult.second,"gtsam.Point2", false); + out[0] = wrap< gtsam::Point2 >(pairResult.first); + SharedPoint2* ret = new SharedPoint2(pairResult.second); + out[1] = wrap_shared_ptr(ret,"gtsam.Point2"); } void MyTemplatePoint2_create_ptrs_51(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { - typedef boost::shared_ptr SharedPoint2; - typedef boost::shared_ptr SharedPoint2; typedef boost::shared_ptr Shared; checkArguments("create_ptrs",nargout,nargin-1,0); Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplatePoint2"); pair< SharedPoint2, SharedPoint2 > pairResult = obj->create_ptrs(); - out[0] = wrap_shared_ptr(pairResult.first,"gtsam.Point2", false); - out[1] = wrap_shared_ptr(pairResult.second,"gtsam.Point2", false); + SharedPoint2* ret = new SharedPoint2(pairResult.first); + out[0] = wrap_shared_ptr(ret,"gtsam.Point2"); + SharedPoint2* ret = new SharedPoint2(pairResult.second); + out[1] = wrap_shared_ptr(ret,"gtsam.Point2"); } void MyTemplatePoint2_return_T_52(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { - typedef boost::shared_ptr SharedPoint2; typedef boost::shared_ptr Shared; checkArguments("return_T",nargout,nargin-1,1); Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplatePoint2"); boost::shared_ptr value = unwrap_shared_ptr< gtsam::Point2 >(in[1], "ptr_gtsamPoint2"); - out[0] = wrap_shared_ptr(SharedPoint2(new gtsam::Point2(obj->return_T(value))),"gtsam.Point2", false); + out[0] = wrap< gtsam::Point2 >(obj->return_T(value)); } void MyTemplatePoint2_return_Tptr_53(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { - typedef boost::shared_ptr SharedPoint2; typedef boost::shared_ptr Shared; checkArguments("return_Tptr",nargout,nargin-1,1); Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplatePoint2"); boost::shared_ptr value = unwrap_shared_ptr< gtsam::Point2 >(in[1], "ptr_gtsamPoint2"); - out[0] = wrap_shared_ptr(obj->return_Tptr(value),"gtsam.Point2", false); + SharedPoint2* ret = new SharedPoint2(obj->return_Tptr(value)); + out[0] = wrap_shared_ptr(ret,"gtsam.Point2"); } void MyTemplatePoint2_return_ptrs_54(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { - typedef boost::shared_ptr SharedPoint2; - typedef boost::shared_ptr SharedPoint2; typedef boost::shared_ptr Shared; checkArguments("return_ptrs",nargout,nargin-1,2); Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplatePoint2"); boost::shared_ptr p1 = unwrap_shared_ptr< gtsam::Point2 >(in[1], "ptr_gtsamPoint2"); boost::shared_ptr p2 = unwrap_shared_ptr< gtsam::Point2 >(in[2], "ptr_gtsamPoint2"); pair< SharedPoint2, SharedPoint2 > pairResult = obj->return_ptrs(p1,p2); - out[0] = wrap_shared_ptr(pairResult.first,"gtsam.Point2", false); - out[1] = wrap_shared_ptr(pairResult.second,"gtsam.Point2", false); + SharedPoint2* ret = new SharedPoint2(pairResult.first); + out[0] = wrap_shared_ptr(ret,"gtsam.Point2"); + SharedPoint2* ret = new SharedPoint2(pairResult.second); + out[1] = wrap_shared_ptr(ret,"gtsam.Point2"); } void MyTemplatePoint2_templatedMethod_55(int nargout, mxArray *out[], int nargin, const mxArray *in[]) @@ -780,60 +778,58 @@ void MyTemplatePoint3_accept_Tptr_64(int nargout, mxArray *out[], int nargin, co void MyTemplatePoint3_create_MixedPtrs_65(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { - typedef boost::shared_ptr SharedPoint3; - typedef boost::shared_ptr SharedPoint3; typedef boost::shared_ptr Shared; checkArguments("create_MixedPtrs",nargout,nargin-1,0); Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplatePoint3"); pair< gtsam::Point3, SharedPoint3 > pairResult = obj->create_MixedPtrs(); - out[0] = wrap_shared_ptr(SharedPoint3(new gtsam::Point3(pairResult.first)),"gtsam.Point3", false); - out[1] = wrap_shared_ptr(pairResult.second,"gtsam.Point3", false); + out[0] = wrap< gtsam::Point3 >(pairResult.first); + SharedPoint3* ret = new SharedPoint3(pairResult.second); + out[1] = wrap_shared_ptr(ret,"gtsam.Point3"); } void MyTemplatePoint3_create_ptrs_66(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { - typedef boost::shared_ptr SharedPoint3; - typedef boost::shared_ptr SharedPoint3; typedef boost::shared_ptr Shared; checkArguments("create_ptrs",nargout,nargin-1,0); Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplatePoint3"); pair< SharedPoint3, SharedPoint3 > pairResult = obj->create_ptrs(); - out[0] = wrap_shared_ptr(pairResult.first,"gtsam.Point3", false); - out[1] = wrap_shared_ptr(pairResult.second,"gtsam.Point3", false); + SharedPoint3* ret = new SharedPoint3(pairResult.first); + out[0] = wrap_shared_ptr(ret,"gtsam.Point3"); + SharedPoint3* ret = new SharedPoint3(pairResult.second); + out[1] = wrap_shared_ptr(ret,"gtsam.Point3"); } void MyTemplatePoint3_return_T_67(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { - typedef boost::shared_ptr SharedPoint3; typedef boost::shared_ptr Shared; checkArguments("return_T",nargout,nargin-1,1); Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplatePoint3"); boost::shared_ptr value = unwrap_shared_ptr< gtsam::Point3 >(in[1], "ptr_gtsamPoint3"); - out[0] = wrap_shared_ptr(SharedPoint3(new gtsam::Point3(obj->return_T(value))),"gtsam.Point3", false); + out[0] = wrap< gtsam::Point3 >(obj->return_T(value)); } void MyTemplatePoint3_return_Tptr_68(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { - typedef boost::shared_ptr SharedPoint3; typedef boost::shared_ptr Shared; checkArguments("return_Tptr",nargout,nargin-1,1); Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplatePoint3"); boost::shared_ptr value = unwrap_shared_ptr< gtsam::Point3 >(in[1], "ptr_gtsamPoint3"); - out[0] = wrap_shared_ptr(obj->return_Tptr(value),"gtsam.Point3", false); + SharedPoint3* ret = new SharedPoint3(obj->return_Tptr(value)); + out[0] = wrap_shared_ptr(ret,"gtsam.Point3"); } void MyTemplatePoint3_return_ptrs_69(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { - typedef boost::shared_ptr SharedPoint3; - typedef boost::shared_ptr SharedPoint3; typedef boost::shared_ptr Shared; checkArguments("return_ptrs",nargout,nargin-1,2); Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplatePoint3"); boost::shared_ptr p1 = unwrap_shared_ptr< gtsam::Point3 >(in[1], "ptr_gtsamPoint3"); boost::shared_ptr p2 = unwrap_shared_ptr< gtsam::Point3 >(in[2], "ptr_gtsamPoint3"); pair< SharedPoint3, SharedPoint3 > pairResult = obj->return_ptrs(p1,p2); - out[0] = wrap_shared_ptr(pairResult.first,"gtsam.Point3", false); - out[1] = wrap_shared_ptr(pairResult.second,"gtsam.Point3", false); + SharedPoint3* ret = new SharedPoint3(pairResult.first); + out[0] = wrap_shared_ptr(ret,"gtsam.Point3"); + SharedPoint3* ret = new SharedPoint3(pairResult.second); + out[1] = wrap_shared_ptr(ret,"gtsam.Point3"); } void MyTemplatePoint3_templatedMethod_70(int nargout, mxArray *out[], int nargin, const mxArray *in[])