From 08c9243acb50b7151e0e1c73e56b2d78d9e78428 Mon Sep 17 00:00:00 2001 From: dellaert Date: Mon, 1 Dec 2014 14:47:09 +0100 Subject: [PATCH] Fixed tests --- .../tests/expected-python/geometry_python.cpp | 26 +- wrap/tests/expected/+gtsam/Point2.m | 19 +- wrap/tests/expected/+gtsam/Point3.m | 16 +- wrap/tests/expected/MyBase.m | 6 +- wrap/tests/expected/MyFactorPosePoint2.m | 6 +- .../MyTemplateMatrix.m} | 100 ++-- wrap/tests/expected/MyTemplatePoint2.m | 48 +- wrap/tests/expected/MyTemplatePoint3.m | 156 ------ wrap/tests/expected/Test.m | 52 +- wrap/tests/expected/aGlobalFunction.m | 2 +- wrap/tests/expected/geometry_wrapper.cpp | 475 +++++++++--------- .../tests/expected/overloadedGlobalFunction.m | 4 +- wrap/tests/testWrap.cpp | 2 +- 13 files changed, 397 insertions(+), 515 deletions(-) rename wrap/tests/{expected2/MyTemplatePoint3.m => expected/MyTemplateMatrix.m} (64%) delete mode 100644 wrap/tests/expected/MyTemplatePoint3.m diff --git a/wrap/tests/expected-python/geometry_python.cpp b/wrap/tests/expected-python/geometry_python.cpp index ca8698397..609b67476 100644 --- a/wrap/tests/expected-python/geometry_python.cpp +++ b/wrap/tests/expected-python/geometry_python.cpp @@ -64,19 +64,19 @@ class_("MyTemplatePoint2") .def("templatedMethod", &MyTemplatePoint2::templatedMethod); ; -class_("MyTemplatePoint3") - .def("MyTemplatePoint3", &MyTemplatePoint3::MyTemplatePoint3); - .def("accept_T", &MyTemplatePoint3::accept_T); - .def("accept_Tptr", &MyTemplatePoint3::accept_Tptr); - .def("create_MixedPtrs", &MyTemplatePoint3::create_MixedPtrs); - .def("create_ptrs", &MyTemplatePoint3::create_ptrs); - .def("return_T", &MyTemplatePoint3::return_T); - .def("return_Tptr", &MyTemplatePoint3::return_Tptr); - .def("return_ptrs", &MyTemplatePoint3::return_ptrs); - .def("templatedMethod", &MyTemplatePoint3::templatedMethod); - .def("templatedMethod", &MyTemplatePoint3::templatedMethod); - .def("templatedMethod", &MyTemplatePoint3::templatedMethod); - .def("templatedMethod", &MyTemplatePoint3::templatedMethod); +class_("MyTemplateMatrix") + .def("MyTemplateMatrix", &MyTemplateMatrix::MyTemplateMatrix); + .def("accept_T", &MyTemplateMatrix::accept_T); + .def("accept_Tptr", &MyTemplateMatrix::accept_Tptr); + .def("create_MixedPtrs", &MyTemplateMatrix::create_MixedPtrs); + .def("create_ptrs", &MyTemplateMatrix::create_ptrs); + .def("return_T", &MyTemplateMatrix::return_T); + .def("return_Tptr", &MyTemplateMatrix::return_Tptr); + .def("return_ptrs", &MyTemplateMatrix::return_ptrs); + .def("templatedMethod", &MyTemplateMatrix::templatedMethod); + .def("templatedMethod", &MyTemplateMatrix::templatedMethod); + .def("templatedMethod", &MyTemplateMatrix::templatedMethod); + .def("templatedMethod", &MyTemplateMatrix::templatedMethod); ; class_("MyFactorPosePoint2") diff --git a/wrap/tests/expected/+gtsam/Point2.m b/wrap/tests/expected/+gtsam/Point2.m index 308b35d9a..05ca8b9a0 100644 --- a/wrap/tests/expected/+gtsam/Point2.m +++ b/wrap/tests/expected/+gtsam/Point2.m @@ -9,6 +9,7 @@ %argChar(char a) : returns void %argUChar(unsigned char a) : returns void %dim() : returns int +%eigenArguments(Vector v, Matrix m) : returns void %returnChar() : returns char %vectorConfusion() : returns VectorNotEigen %x() : returns double @@ -59,28 +60,38 @@ classdef Point2 < handle varargout{1} = geometry_wrapper(6, this, varargin{:}); end + function varargout = eigenArguments(this, varargin) + % EIGENARGUMENTS usage: eigenArguments(Vector v, Matrix m) : returns void + % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html + if length(varargin) == 2 && isa(varargin{1},'double') && size(varargin{1},2)==1 && isa(varargin{2},'double') + geometry_wrapper(7, this, varargin{:}); + else + error('Arguments do not match any overload of function gtsam.Point2.eigenArguments'); + end + end + function varargout = returnChar(this, varargin) % RETURNCHAR usage: returnChar() : returns char % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - varargout{1} = geometry_wrapper(7, this, varargin{:}); + varargout{1} = geometry_wrapper(8, this, varargin{:}); end function varargout = vectorConfusion(this, varargin) % VECTORCONFUSION usage: vectorConfusion() : returns VectorNotEigen % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - varargout{1} = geometry_wrapper(8, this, varargin{:}); + varargout{1} = geometry_wrapper(9, this, varargin{:}); end function varargout = x(this, varargin) % X usage: x() : returns double % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - varargout{1} = geometry_wrapper(9, this, varargin{:}); + varargout{1} = geometry_wrapper(10, this, varargin{:}); end function varargout = y(this, varargin) % Y usage: y() : returns double % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - varargout{1} = geometry_wrapper(10, this, varargin{:}); + varargout{1} = geometry_wrapper(11, this, varargin{:}); end end diff --git a/wrap/tests/expected/+gtsam/Point3.m b/wrap/tests/expected/+gtsam/Point3.m index a9a28c14c..7b8a973c0 100644 --- a/wrap/tests/expected/+gtsam/Point3.m +++ b/wrap/tests/expected/+gtsam/Point3.m @@ -23,9 +23,9 @@ classdef Point3 < handle function obj = Point3(varargin) if nargin == 2 && isa(varargin{1}, 'uint64') && varargin{1} == uint64(5139824614673773682) my_ptr = varargin{2}; - geometry_wrapper(11, my_ptr); + geometry_wrapper(12, my_ptr); elseif nargin == 3 && isa(varargin{1},'double') && isa(varargin{2},'double') && isa(varargin{3},'double') - my_ptr = geometry_wrapper(12, varargin{1}, varargin{2}, varargin{3}); + my_ptr = geometry_wrapper(13, varargin{1}, varargin{2}, varargin{3}); else error('Arguments do not match any overload of gtsam.Point3 constructor'); end @@ -33,7 +33,7 @@ classdef Point3 < handle end function delete(obj) - geometry_wrapper(13, obj.ptr_gtsamPoint3); + geometry_wrapper(14, obj.ptr_gtsamPoint3); end function display(obj), obj.print(''); end @@ -43,14 +43,14 @@ classdef Point3 < handle function varargout = norm(this, varargin) % NORM usage: norm() : returns double % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - varargout{1} = geometry_wrapper(14, this, varargin{:}); + varargout{1} = geometry_wrapper(15, this, varargin{:}); end function varargout = string_serialize(this, varargin) % STRING_SERIALIZE usage: string_serialize() : returns string % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html if length(varargin) == 0 - varargout{1} = geometry_wrapper(15, this, varargin{:}); + varargout{1} = geometry_wrapper(16, this, varargin{:}); else error('Arguments do not match any overload of function gtsam.Point3.string_serialize'); end @@ -66,20 +66,20 @@ classdef Point3 < handle function varargout = StaticFunctionRet(varargin) % STATICFUNCTIONRET usage: StaticFunctionRet(double z) : returns gtsam::Point3 % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - varargout{1} = geometry_wrapper(16, varargin{:}); + varargout{1} = geometry_wrapper(17, varargin{:}); end function varargout = StaticFunction(varargin) % STATICFUNCTION usage: staticFunction() : returns double % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - varargout{1} = geometry_wrapper(17, varargin{:}); + varargout{1} = geometry_wrapper(18, varargin{:}); end function varargout = string_deserialize(varargin) % STRING_DESERIALIZE usage: string_deserialize() : returns gtsam.Point3 % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html if length(varargin) == 1 - varargout{1} = geometry_wrapper(18, varargin{:}); + varargout{1} = geometry_wrapper(19, varargin{:}); else error('Arguments do not match any overload of function gtsam.Point3.string_deserialize'); end diff --git a/wrap/tests/expected/MyBase.m b/wrap/tests/expected/MyBase.m index 34d3cb4c0..ff8179220 100644 --- a/wrap/tests/expected/MyBase.m +++ b/wrap/tests/expected/MyBase.m @@ -11,9 +11,9 @@ classdef MyBase < handle if nargin == 2 my_ptr = varargin{2}; else - my_ptr = geometry_wrapper(43, varargin{2}); + my_ptr = geometry_wrapper(44, varargin{2}); end - geometry_wrapper(42, my_ptr); + geometry_wrapper(43, my_ptr); else error('Arguments do not match any overload of MyBase constructor'); end @@ -21,7 +21,7 @@ classdef MyBase < handle end function delete(obj) - geometry_wrapper(44, obj.ptr_MyBase); + geometry_wrapper(45, obj.ptr_MyBase); end function display(obj), obj.print(''); end diff --git a/wrap/tests/expected/MyFactorPosePoint2.m b/wrap/tests/expected/MyFactorPosePoint2.m index 496a2c1e8..2dff98803 100644 --- a/wrap/tests/expected/MyFactorPosePoint2.m +++ b/wrap/tests/expected/MyFactorPosePoint2.m @@ -12,9 +12,9 @@ classdef MyFactorPosePoint2 < handle function obj = MyFactorPosePoint2(varargin) if nargin == 2 && isa(varargin{1}, 'uint64') && varargin{1} == uint64(5139824614673773682) my_ptr = varargin{2}; - geometry_wrapper(75, my_ptr); + geometry_wrapper(76, my_ptr); elseif nargin == 4 && isa(varargin{1},'numeric') && isa(varargin{2},'numeric') && isa(varargin{3},'double') && isa(varargin{4},'gtsam.noiseModel.Base') - my_ptr = geometry_wrapper(76, varargin{1}, varargin{2}, varargin{3}, varargin{4}); + my_ptr = geometry_wrapper(77, varargin{1}, varargin{2}, varargin{3}, varargin{4}); else error('Arguments do not match any overload of MyFactorPosePoint2 constructor'); end @@ -22,7 +22,7 @@ classdef MyFactorPosePoint2 < handle end function delete(obj) - geometry_wrapper(77, obj.ptr_MyFactorPosePoint2); + geometry_wrapper(78, obj.ptr_MyFactorPosePoint2); end function display(obj), obj.print(''); end diff --git a/wrap/tests/expected2/MyTemplatePoint3.m b/wrap/tests/expected/MyTemplateMatrix.m similarity index 64% rename from wrap/tests/expected2/MyTemplatePoint3.m rename to wrap/tests/expected/MyTemplateMatrix.m index 45fe34a0a..b17bbdbe7 100644 --- a/wrap/tests/expected2/MyTemplatePoint3.m +++ b/wrap/tests/expected/MyTemplateMatrix.m @@ -1,46 +1,46 @@ -%class MyTemplatePoint3, see Doxygen page for details +%class MyTemplateMatrix, see Doxygen page for details %at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html % %-------Constructors------- -%MyTemplatePoint3() +%MyTemplateMatrix() % %-------Methods------- -%accept_T(Point3 value) : returns void -%accept_Tptr(Point3 value) : returns void -%create_MixedPtrs() : returns pair< gtsam::Point3, gtsam::Point3 > -%create_ptrs() : returns pair< gtsam::Point3, gtsam::Point3 > -%return_T(Point3 value) : returns gtsam::Point3 -%return_Tptr(Point3 value) : returns gtsam::Point3 -%return_ptrs(Point3 p1, Point3 p2) : returns pair< gtsam::Point3, gtsam::Point3 > +%accept_T(Matrix value) : returns void +%accept_Tptr(Matrix value) : returns void +%create_MixedPtrs() : returns pair< Matrix, Matrix > +%create_ptrs() : returns pair< Matrix, Matrix > +%return_T(Matrix value) : returns Matrix +%return_Tptr(Matrix value) : returns Matrix +%return_ptrs(Matrix p1, Matrix p2) : returns pair< Matrix, Matrix > %templatedMethodMatrix(Matrix t) : returns Matrix %templatedMethodPoint2(Point2 t) : returns gtsam::Point2 %templatedMethodPoint3(Point3 t) : returns gtsam::Point3 %templatedMethodVector(Vector t) : returns Vector % -classdef MyTemplatePoint3 < MyBase +classdef MyTemplateMatrix < MyBase properties - ptr_MyTemplatePoint3 = 0 + ptr_MyTemplateMatrix = 0 end methods - function obj = MyTemplatePoint3(varargin) + function obj = MyTemplateMatrix(varargin) if (nargin == 2 || (nargin == 3 && strcmp(varargin{3}, 'void'))) && isa(varargin{1}, 'uint64') && varargin{1} == uint64(5139824614673773682) if nargin == 2 my_ptr = varargin{2}; else - my_ptr = geometry_wrapper(60, varargin{2}); + my_ptr = geometry_wrapper(62, varargin{2}); end - base_ptr = geometry_wrapper(59, my_ptr); + base_ptr = geometry_wrapper(61, my_ptr); elseif nargin == 0 - [ my_ptr, base_ptr ] = geometry_wrapper(61); + [ my_ptr, base_ptr ] = geometry_wrapper(63); else - error('Arguments do not match any overload of MyTemplatePoint3 constructor'); + error('Arguments do not match any overload of MyTemplateMatrix constructor'); end obj = obj@MyBase(uint64(5139824614673773682), base_ptr); - obj.ptr_MyTemplatePoint3 = my_ptr; + obj.ptr_MyTemplateMatrix = my_ptr; end function delete(obj) - geometry_wrapper(62, obj.ptr_MyTemplatePoint3); + geometry_wrapper(64, obj.ptr_MyTemplateMatrix); end function display(obj), obj.print(''); end @@ -48,64 +48,64 @@ classdef MyTemplatePoint3 < MyBase function disp(obj), obj.display; end %DISP Calls print on the object function varargout = accept_T(this, varargin) - % ACCEPT_T usage: accept_T(Point3 value) : returns void + % ACCEPT_T usage: accept_T(Matrix value) : returns void % 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') - geometry_wrapper(63, this, varargin{:}); + if length(varargin) == 1 && isa(varargin{1},'double') + geometry_wrapper(65, this, varargin{:}); else - error('Arguments do not match any overload of function MyTemplatePoint3.accept_T'); + error('Arguments do not match any overload of function MyTemplateMatrix.accept_T'); end end function varargout = accept_Tptr(this, varargin) - % ACCEPT_TPTR usage: accept_Tptr(Point3 value) : returns void + % ACCEPT_TPTR usage: accept_Tptr(Matrix value) : returns void % 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') - geometry_wrapper(64, this, varargin{:}); + if length(varargin) == 1 && isa(varargin{1},'double') + geometry_wrapper(66, this, varargin{:}); else - error('Arguments do not match any overload of function MyTemplatePoint3.accept_Tptr'); + error('Arguments do not match any overload of function MyTemplateMatrix.accept_Tptr'); end end function varargout = create_MixedPtrs(this, varargin) - % CREATE_MIXEDPTRS usage: create_MixedPtrs() : returns pair< gtsam::Point3, gtsam::Point3 > + % CREATE_MIXEDPTRS usage: create_MixedPtrs() : returns pair< Matrix, Matrix > % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - [ varargout{1} varargout{2} ] = geometry_wrapper(65, this, varargin{:}); + [ varargout{1} varargout{2} ] = geometry_wrapper(67, this, varargin{:}); end function varargout = create_ptrs(this, varargin) - % CREATE_PTRS usage: create_ptrs() : returns pair< gtsam::Point3, gtsam::Point3 > + % CREATE_PTRS usage: create_ptrs() : returns pair< Matrix, Matrix > % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - [ varargout{1} varargout{2} ] = geometry_wrapper(66, this, varargin{:}); + [ varargout{1} varargout{2} ] = geometry_wrapper(68, this, varargin{:}); end function varargout = return_T(this, varargin) - % RETURN_T usage: return_T(Point3 value) : returns gtsam::Point3 + % RETURN_T usage: return_T(Matrix value) : returns Matrix % 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{:}); + if length(varargin) == 1 && isa(varargin{1},'double') + varargout{1} = geometry_wrapper(69, this, varargin{:}); else - error('Arguments do not match any overload of function MyTemplatePoint3.return_T'); + error('Arguments do not match any overload of function MyTemplateMatrix.return_T'); end end function varargout = return_Tptr(this, varargin) - % RETURN_TPTR usage: return_Tptr(Point3 value) : returns gtsam::Point3 + % RETURN_TPTR usage: return_Tptr(Matrix value) : returns Matrix % 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{:}); + if length(varargin) == 1 && isa(varargin{1},'double') + varargout{1} = geometry_wrapper(70, this, varargin{:}); else - error('Arguments do not match any overload of function MyTemplatePoint3.return_Tptr'); + error('Arguments do not match any overload of function MyTemplateMatrix.return_Tptr'); end end function varargout = return_ptrs(this, varargin) - % RETURN_PTRS usage: return_ptrs(Point3 p1, Point3 p2) : returns pair< gtsam::Point3, gtsam::Point3 > + % RETURN_PTRS usage: return_ptrs(Matrix p1, Matrix p2) : returns pair< Matrix, Matrix > % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - if length(varargin) == 2 && isa(varargin{1},'gtsam.Point3') && isa(varargin{2},'gtsam.Point3') - [ varargout{1} varargout{2} ] = geometry_wrapper(69, this, varargin{:}); + if length(varargin) == 2 && isa(varargin{1},'double') && isa(varargin{2},'double') + [ varargout{1} varargout{2} ] = geometry_wrapper(71, this, varargin{:}); else - error('Arguments do not match any overload of function MyTemplatePoint3.return_ptrs'); + error('Arguments do not match any overload of function MyTemplateMatrix.return_ptrs'); end end @@ -113,9 +113,9 @@ classdef MyTemplatePoint3 < MyBase % TEMPLATEDMETHODMATRIX usage: templatedMethodMatrix(Matrix t) : returns Matrix % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html if length(varargin) == 1 && isa(varargin{1},'double') - varargout{1} = geometry_wrapper(70, this, varargin{:}); + varargout{1} = geometry_wrapper(72, this, varargin{:}); else - error('Arguments do not match any overload of function MyTemplatePoint3.templatedMethod'); + error('Arguments do not match any overload of function MyTemplateMatrix.templatedMethod'); end end @@ -123,9 +123,9 @@ classdef MyTemplatePoint3 < MyBase % TEMPLATEDMETHODPOINT2 usage: templatedMethodPoint2(Point2 t) : 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(71, this, varargin{:}); + varargout{1} = geometry_wrapper(73, this, varargin{:}); else - error('Arguments do not match any overload of function MyTemplatePoint3.templatedMethod'); + error('Arguments do not match any overload of function MyTemplateMatrix.templatedMethod'); end end @@ -133,9 +133,9 @@ classdef MyTemplatePoint3 < MyBase % TEMPLATEDMETHODPOINT3 usage: templatedMethodPoint3(Point3 t) : 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(72, this, varargin{:}); + varargout{1} = geometry_wrapper(74, this, varargin{:}); else - error('Arguments do not match any overload of function MyTemplatePoint3.templatedMethod'); + error('Arguments do not match any overload of function MyTemplateMatrix.templatedMethod'); end end @@ -143,9 +143,9 @@ classdef MyTemplatePoint3 < MyBase % TEMPLATEDMETHODVECTOR usage: templatedMethodVector(Vector t) : returns Vector % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html if length(varargin) == 1 && isa(varargin{1},'double') && size(varargin{1},2)==1 - varargout{1} = geometry_wrapper(73, this, varargin{:}); + varargout{1} = geometry_wrapper(75, this, varargin{:}); else - error('Arguments do not match any overload of function MyTemplatePoint3.templatedMethod'); + error('Arguments do not match any overload of function MyTemplateMatrix.templatedMethod'); end end diff --git a/wrap/tests/expected/MyTemplatePoint2.m b/wrap/tests/expected/MyTemplatePoint2.m index e6adb3d2c..d908bd365 100644 --- a/wrap/tests/expected/MyTemplatePoint2.m +++ b/wrap/tests/expected/MyTemplatePoint2.m @@ -12,10 +12,10 @@ %return_T(Point2 value) : returns gtsam::Point2 %return_Tptr(Point2 value) : returns gtsam::Point2 %return_ptrs(Point2 p1, Point2 p2) : returns pair< gtsam::Point2, gtsam::Point2 > -%templatedMethodMatrix(Matrix t) : returns void -%templatedMethodPoint2(Point2 t) : returns void -%templatedMethodPoint3(Point3 t) : returns void -%templatedMethodVector(Vector t) : returns void +%templatedMethodMatrix(Matrix t) : returns Matrix +%templatedMethodPoint2(Point2 t) : returns gtsam::Point2 +%templatedMethodPoint3(Point3 t) : returns gtsam::Point3 +%templatedMethodVector(Vector t) : returns Vector % classdef MyTemplatePoint2 < MyBase properties @@ -27,11 +27,11 @@ classdef MyTemplatePoint2 < MyBase if nargin == 2 my_ptr = varargin{2}; else - my_ptr = geometry_wrapper(46, varargin{2}); + my_ptr = geometry_wrapper(47, varargin{2}); end - base_ptr = geometry_wrapper(45, my_ptr); + base_ptr = geometry_wrapper(46, my_ptr); elseif nargin == 0 - [ my_ptr, base_ptr ] = geometry_wrapper(47); + [ my_ptr, base_ptr ] = geometry_wrapper(48); else error('Arguments do not match any overload of MyTemplatePoint2 constructor'); end @@ -40,7 +40,7 @@ classdef MyTemplatePoint2 < MyBase end function delete(obj) - geometry_wrapper(48, obj.ptr_MyTemplatePoint2); + geometry_wrapper(49, obj.ptr_MyTemplatePoint2); end function display(obj), obj.print(''); end @@ -51,7 +51,7 @@ classdef MyTemplatePoint2 < MyBase % ACCEPT_T usage: accept_T(Point2 value) : returns void % 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') - geometry_wrapper(49, this, varargin{:}); + geometry_wrapper(50, this, varargin{:}); else error('Arguments do not match any overload of function MyTemplatePoint2.accept_T'); end @@ -61,7 +61,7 @@ classdef MyTemplatePoint2 < MyBase % ACCEPT_TPTR usage: accept_Tptr(Point2 value) : returns void % 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') - geometry_wrapper(50, this, varargin{:}); + geometry_wrapper(51, this, varargin{:}); else error('Arguments do not match any overload of function MyTemplatePoint2.accept_Tptr'); end @@ -70,20 +70,20 @@ classdef MyTemplatePoint2 < MyBase function varargout = create_MixedPtrs(this, varargin) % CREATE_MIXEDPTRS usage: create_MixedPtrs() : returns pair< gtsam::Point2, gtsam::Point2 > % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - [ varargout{1} varargout{2} ] = geometry_wrapper(51, this, varargin{:}); + [ varargout{1} varargout{2} ] = geometry_wrapper(52, this, varargin{:}); end function varargout = create_ptrs(this, varargin) % CREATE_PTRS usage: create_ptrs() : returns pair< gtsam::Point2, gtsam::Point2 > % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - [ varargout{1} varargout{2} ] = geometry_wrapper(52, this, varargin{:}); + [ varargout{1} varargout{2} ] = geometry_wrapper(53, this, varargin{:}); end function varargout = return_T(this, varargin) % 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(53, this, varargin{:}); + varargout{1} = geometry_wrapper(54, 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(54, this, varargin{:}); + varargout{1} = geometry_wrapper(55, this, varargin{:}); else error('Arguments do not match any overload of function MyTemplatePoint2.return_Tptr'); end @@ -103,47 +103,47 @@ classdef MyTemplatePoint2 < MyBase % RETURN_PTRS usage: return_ptrs(Point2 p1, Point2 p2) : returns pair< gtsam::Point2, gtsam::Point2 > % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html if length(varargin) == 2 && isa(varargin{1},'gtsam.Point2') && isa(varargin{2},'gtsam.Point2') - [ varargout{1} varargout{2} ] = geometry_wrapper(55, this, varargin{:}); + [ varargout{1} varargout{2} ] = geometry_wrapper(56, this, varargin{:}); else error('Arguments do not match any overload of function MyTemplatePoint2.return_ptrs'); end end function varargout = templatedMethodMatrix(this, varargin) - % TEMPLATEDMETHODMATRIX usage: templatedMethodMatrix(Matrix t) : returns void + % TEMPLATEDMETHODMATRIX usage: templatedMethodMatrix(Matrix t) : returns Matrix % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html if length(varargin) == 1 && isa(varargin{1},'double') - geometry_wrapper(56, this, varargin{:}); + varargout{1} = geometry_wrapper(57, this, varargin{:}); else error('Arguments do not match any overload of function MyTemplatePoint2.templatedMethod'); end end function varargout = templatedMethodPoint2(this, varargin) - % TEMPLATEDMETHODPOINT2 usage: templatedMethodPoint2(Point2 t) : returns void + % TEMPLATEDMETHODPOINT2 usage: templatedMethodPoint2(Point2 t) : 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') - geometry_wrapper(57, this, varargin{:}); + varargout{1} = geometry_wrapper(58, this, varargin{:}); else error('Arguments do not match any overload of function MyTemplatePoint2.templatedMethod'); end end function varargout = templatedMethodPoint3(this, varargin) - % TEMPLATEDMETHODPOINT3 usage: templatedMethodPoint3(Point3 t) : returns void + % TEMPLATEDMETHODPOINT3 usage: templatedMethodPoint3(Point3 t) : 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') - geometry_wrapper(58, this, varargin{:}); + varargout{1} = geometry_wrapper(59, this, varargin{:}); else error('Arguments do not match any overload of function MyTemplatePoint2.templatedMethod'); end end function varargout = templatedMethodVector(this, varargin) - % TEMPLATEDMETHODVECTOR usage: templatedMethodVector(Vector t) : returns void + % TEMPLATEDMETHODVECTOR usage: templatedMethodVector(Vector t) : returns Vector % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - if length(varargin) == 1 && isa(varargin{1},'double') - geometry_wrapper(59, this, varargin{:}); + if length(varargin) == 1 && isa(varargin{1},'double') && size(varargin{1},2)==1 + varargout{1} = geometry_wrapper(60, this, varargin{:}); else error('Arguments do not match any overload of function MyTemplatePoint2.templatedMethod'); end diff --git a/wrap/tests/expected/MyTemplatePoint3.m b/wrap/tests/expected/MyTemplatePoint3.m deleted file mode 100644 index 9819b5ee1..000000000 --- a/wrap/tests/expected/MyTemplatePoint3.m +++ /dev/null @@ -1,156 +0,0 @@ -%class MyTemplatePoint3, see Doxygen page for details -%at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html -% -%-------Constructors------- -%MyTemplatePoint3() -% -%-------Methods------- -%accept_T(Point3 value) : returns void -%accept_Tptr(Point3 value) : returns void -%create_MixedPtrs() : returns pair< gtsam::Point3, gtsam::Point3 > -%create_ptrs() : returns pair< gtsam::Point3, gtsam::Point3 > -%return_T(Point3 value) : returns gtsam::Point3 -%return_Tptr(Point3 value) : returns gtsam::Point3 -%return_ptrs(Point3 p1, Point3 p2) : returns pair< gtsam::Point3, gtsam::Point3 > -%templatedMethodMatrix(Matrix t) : returns void -%templatedMethodPoint2(Point2 t) : returns void -%templatedMethodPoint3(Point3 t) : returns void -%templatedMethodVector(Vector t) : returns void -% -classdef MyTemplatePoint3 < MyBase - properties - ptr_MyTemplatePoint3 = 0 - end - methods - function obj = MyTemplatePoint3(varargin) - if (nargin == 2 || (nargin == 3 && strcmp(varargin{3}, 'void'))) && isa(varargin{1}, 'uint64') && varargin{1} == uint64(5139824614673773682) - if nargin == 2 - my_ptr = varargin{2}; - else - my_ptr = geometry_wrapper(61, varargin{2}); - end - base_ptr = geometry_wrapper(60, my_ptr); - elseif nargin == 0 - [ my_ptr, base_ptr ] = geometry_wrapper(62); - else - error('Arguments do not match any overload of MyTemplatePoint3 constructor'); - end - obj = obj@MyBase(uint64(5139824614673773682), base_ptr); - obj.ptr_MyTemplatePoint3 = my_ptr; - end - - function delete(obj) - geometry_wrapper(63, obj.ptr_MyTemplatePoint3); - end - - function display(obj), obj.print(''); end - %DISPLAY Calls print on the object - function disp(obj), obj.display; end - %DISP Calls print on the object - function varargout = accept_T(this, varargin) - % ACCEPT_T usage: accept_T(Point3 value) : returns void - % 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') - geometry_wrapper(64, this, varargin{:}); - else - error('Arguments do not match any overload of function MyTemplatePoint3.accept_T'); - end - end - - function varargout = accept_Tptr(this, varargin) - % ACCEPT_TPTR usage: accept_Tptr(Point3 value) : returns void - % 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') - geometry_wrapper(65, this, varargin{:}); - else - error('Arguments do not match any overload of function MyTemplatePoint3.accept_Tptr'); - end - end - - function varargout = create_MixedPtrs(this, varargin) - % CREATE_MIXEDPTRS usage: create_MixedPtrs() : returns pair< gtsam::Point3, gtsam::Point3 > - % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - [ varargout{1} varargout{2} ] = geometry_wrapper(66, this, varargin{:}); - end - - function varargout = create_ptrs(this, varargin) - % CREATE_PTRS usage: create_ptrs() : returns pair< gtsam::Point3, gtsam::Point3 > - % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - [ varargout{1} varargout{2} ] = geometry_wrapper(67, this, varargin{:}); - end - - function varargout = return_T(this, varargin) - % 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(68, this, varargin{:}); - else - error('Arguments do not match any overload of function MyTemplatePoint3.return_T'); - end - end - - function varargout = return_Tptr(this, varargin) - % 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(69, this, varargin{:}); - else - error('Arguments do not match any overload of function MyTemplatePoint3.return_Tptr'); - end - end - - function varargout = return_ptrs(this, varargin) - % RETURN_PTRS usage: return_ptrs(Point3 p1, Point3 p2) : returns pair< gtsam::Point3, gtsam::Point3 > - % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - if length(varargin) == 2 && isa(varargin{1},'gtsam.Point3') && isa(varargin{2},'gtsam.Point3') - [ varargout{1} varargout{2} ] = geometry_wrapper(70, this, varargin{:}); - else - error('Arguments do not match any overload of function MyTemplatePoint3.return_ptrs'); - end - end - - function varargout = templatedMethodMatrix(this, varargin) - % TEMPLATEDMETHODMATRIX usage: templatedMethodMatrix(Matrix t) : returns void - % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - if length(varargin) == 1 && isa(varargin{1},'double') - geometry_wrapper(71, this, varargin{:}); - else - error('Arguments do not match any overload of function MyTemplatePoint3.templatedMethod'); - end - end - - function varargout = templatedMethodPoint2(this, varargin) - % TEMPLATEDMETHODPOINT2 usage: templatedMethodPoint2(Point2 t) : returns void - % 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') - geometry_wrapper(72, this, varargin{:}); - else - error('Arguments do not match any overload of function MyTemplatePoint3.templatedMethod'); - end - end - - function varargout = templatedMethodPoint3(this, varargin) - % TEMPLATEDMETHODPOINT3 usage: templatedMethodPoint3(Point3 t) : returns void - % 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') - geometry_wrapper(73, this, varargin{:}); - else - error('Arguments do not match any overload of function MyTemplatePoint3.templatedMethod'); - end - end - - function varargout = templatedMethodVector(this, varargin) - % TEMPLATEDMETHODVECTOR usage: templatedMethodVector(Vector t) : returns void - % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - if length(varargin) == 1 && isa(varargin{1},'double') - geometry_wrapper(74, this, varargin{:}); - else - error('Arguments do not match any overload of function MyTemplatePoint3.templatedMethod'); - end - end - - end - - methods(Static = true) - end -end diff --git a/wrap/tests/expected/Test.m b/wrap/tests/expected/Test.m index 352312789..44b8211b9 100644 --- a/wrap/tests/expected/Test.m +++ b/wrap/tests/expected/Test.m @@ -34,11 +34,11 @@ classdef Test < handle function obj = Test(varargin) if nargin == 2 && isa(varargin{1}, 'uint64') && varargin{1} == uint64(5139824614673773682) my_ptr = varargin{2}; - geometry_wrapper(19, my_ptr); + geometry_wrapper(20, my_ptr); elseif nargin == 0 - my_ptr = geometry_wrapper(20); + my_ptr = geometry_wrapper(21); elseif nargin == 2 && isa(varargin{1},'double') && isa(varargin{2},'double') - my_ptr = geometry_wrapper(21, varargin{1}, varargin{2}); + my_ptr = geometry_wrapper(22, varargin{1}, varargin{2}); else error('Arguments do not match any overload of Test constructor'); end @@ -46,7 +46,7 @@ classdef Test < handle end function delete(obj) - geometry_wrapper(22, obj.ptr_Test); + geometry_wrapper(23, obj.ptr_Test); end function display(obj), obj.print(''); end @@ -57,7 +57,7 @@ classdef Test < handle % ARG_EIGENCONSTREF usage: arg_EigenConstRef(Matrix value) : returns void % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html if length(varargin) == 1 && isa(varargin{1},'double') - geometry_wrapper(23, this, varargin{:}); + geometry_wrapper(24, this, varargin{:}); else error('Arguments do not match any overload of function Test.arg_EigenConstRef'); end @@ -66,32 +66,32 @@ classdef Test < handle function varargout = create_MixedPtrs(this, varargin) % CREATE_MIXEDPTRS usage: create_MixedPtrs() : returns pair< Test, Test > % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - [ varargout{1} varargout{2} ] = geometry_wrapper(24, this, varargin{:}); + [ varargout{1} varargout{2} ] = geometry_wrapper(25, this, varargin{:}); end function varargout = create_ptrs(this, varargin) % CREATE_PTRS usage: create_ptrs() : returns pair< Test, Test > % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - [ varargout{1} varargout{2} ] = geometry_wrapper(25, this, varargin{:}); + [ varargout{1} varargout{2} ] = geometry_wrapper(26, this, varargin{:}); end function varargout = print(this, varargin) % PRINT usage: print() : returns void % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - geometry_wrapper(26, this, varargin{:}); + geometry_wrapper(27, this, varargin{:}); end function varargout = return_Point2Ptr(this, varargin) % RETURN_POINT2PTR usage: return_Point2Ptr(bool value) : returns gtsam::Point2 % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - varargout{1} = geometry_wrapper(27, this, varargin{:}); + varargout{1} = geometry_wrapper(28, this, varargin{:}); end function varargout = return_Test(this, varargin) % RETURN_TEST usage: return_Test(Test value) : returns Test % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html if length(varargin) == 1 && isa(varargin{1},'Test') - varargout{1} = geometry_wrapper(28, this, varargin{:}); + varargout{1} = geometry_wrapper(29, this, varargin{:}); else error('Arguments do not match any overload of function Test.return_Test'); end @@ -101,7 +101,7 @@ classdef Test < handle % RETURN_TESTPTR usage: return_TestPtr(Test value) : returns Test % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html if length(varargin) == 1 && isa(varargin{1},'Test') - varargout{1} = geometry_wrapper(29, this, varargin{:}); + varargout{1} = geometry_wrapper(30, this, varargin{:}); else error('Arguments do not match any overload of function Test.return_TestPtr'); end @@ -110,20 +110,20 @@ classdef Test < handle function varargout = return_bool(this, varargin) % RETURN_BOOL usage: return_bool(bool value) : returns bool % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - varargout{1} = geometry_wrapper(30, this, varargin{:}); + varargout{1} = geometry_wrapper(31, this, varargin{:}); end function varargout = return_double(this, varargin) % RETURN_DOUBLE usage: return_double(double value) : returns double % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - varargout{1} = geometry_wrapper(31, this, varargin{:}); + varargout{1} = geometry_wrapper(32, this, varargin{:}); end function varargout = return_field(this, varargin) % RETURN_FIELD usage: return_field(Test t) : returns bool % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html if length(varargin) == 1 && isa(varargin{1},'Test') - varargout{1} = geometry_wrapper(32, this, varargin{:}); + varargout{1} = geometry_wrapper(33, this, varargin{:}); else error('Arguments do not match any overload of function Test.return_field'); end @@ -132,14 +132,14 @@ classdef Test < handle function varargout = return_int(this, varargin) % RETURN_INT usage: return_int(int value) : returns int % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - varargout{1} = geometry_wrapper(33, this, varargin{:}); + varargout{1} = geometry_wrapper(34, this, varargin{:}); end function varargout = return_matrix1(this, varargin) % RETURN_MATRIX1 usage: return_matrix1(Matrix value) : returns Matrix % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html if length(varargin) == 1 && isa(varargin{1},'double') - varargout{1} = geometry_wrapper(34, this, varargin{:}); + varargout{1} = geometry_wrapper(35, this, varargin{:}); else error('Arguments do not match any overload of function Test.return_matrix1'); end @@ -149,7 +149,7 @@ classdef Test < handle % RETURN_MATRIX2 usage: return_matrix2(Matrix value) : returns Matrix % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html if length(varargin) == 1 && isa(varargin{1},'double') - varargout{1} = geometry_wrapper(35, this, varargin{:}); + varargout{1} = geometry_wrapper(36, this, varargin{:}); else error('Arguments do not match any overload of function Test.return_matrix2'); end @@ -158,8 +158,8 @@ classdef Test < handle function varargout = return_pair(this, varargin) % RETURN_PAIR usage: return_pair(Vector v, Matrix A) : returns pair< Vector, Matrix > % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - if length(varargin) == 2 && isa(varargin{1},'double') && isa(varargin{2},'double') - [ varargout{1} varargout{2} ] = geometry_wrapper(36, this, varargin{:}); + if length(varargin) == 2 && isa(varargin{1},'double') && size(varargin{1},2)==1 && isa(varargin{2},'double') + [ varargout{1} varargout{2} ] = geometry_wrapper(37, this, varargin{:}); else error('Arguments do not match any overload of function Test.return_pair'); end @@ -169,7 +169,7 @@ classdef Test < handle % RETURN_PTRS usage: return_ptrs(Test p1, Test p2) : returns pair< Test, Test > % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html if length(varargin) == 2 && isa(varargin{1},'Test') && isa(varargin{2},'Test') - [ varargout{1} varargout{2} ] = geometry_wrapper(37, this, varargin{:}); + [ varargout{1} varargout{2} ] = geometry_wrapper(38, this, varargin{:}); else error('Arguments do not match any overload of function Test.return_ptrs'); end @@ -178,14 +178,14 @@ classdef Test < handle function varargout = return_size_t(this, varargin) % RETURN_SIZE_T usage: return_size_t(size_t value) : returns size_t % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - varargout{1} = geometry_wrapper(38, this, varargin{:}); + varargout{1} = geometry_wrapper(39, this, varargin{:}); end function varargout = return_string(this, varargin) % RETURN_STRING usage: return_string(string value) : returns string % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html if length(varargin) == 1 && isa(varargin{1},'char') - varargout{1} = geometry_wrapper(39, this, varargin{:}); + varargout{1} = geometry_wrapper(40, this, varargin{:}); else error('Arguments do not match any overload of function Test.return_string'); end @@ -194,8 +194,8 @@ classdef Test < handle function varargout = return_vector1(this, varargin) % RETURN_VECTOR1 usage: return_vector1(Vector value) : returns Vector % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - if length(varargin) == 1 && isa(varargin{1},'double') - varargout{1} = geometry_wrapper(40, this, varargin{:}); + if length(varargin) == 1 && isa(varargin{1},'double') && size(varargin{1},2)==1 + varargout{1} = geometry_wrapper(41, this, varargin{:}); else error('Arguments do not match any overload of function Test.return_vector1'); end @@ -204,8 +204,8 @@ classdef Test < handle function varargout = return_vector2(this, varargin) % RETURN_VECTOR2 usage: return_vector2(Vector value) : returns Vector % Doxygen can be found at http://research.cc.gatech.edu/borg/sites/edu.borg/html/index.html - if length(varargin) == 1 && isa(varargin{1},'double') - varargout{1} = geometry_wrapper(41, this, varargin{:}); + if length(varargin) == 1 && isa(varargin{1},'double') && size(varargin{1},2)==1 + varargout{1} = geometry_wrapper(42, this, varargin{:}); else error('Arguments do not match any overload of function Test.return_vector2'); end diff --git a/wrap/tests/expected/aGlobalFunction.m b/wrap/tests/expected/aGlobalFunction.m index 2e725c658..df970c759 100644 --- a/wrap/tests/expected/aGlobalFunction.m +++ b/wrap/tests/expected/aGlobalFunction.m @@ -1,6 +1,6 @@ function varargout = aGlobalFunction(varargin) if length(varargin) == 0 - varargout{1} = geometry_wrapper(78, varargin{:}); + varargout{1} = geometry_wrapper(79, varargin{:}); else error('Arguments do not match any overload of function aGlobalFunction'); end diff --git a/wrap/tests/expected/geometry_wrapper.cpp b/wrap/tests/expected/geometry_wrapper.cpp index 52eb42efd..527600b47 100644 --- a/wrap/tests/expected/geometry_wrapper.cpp +++ b/wrap/tests/expected/geometry_wrapper.cpp @@ -9,7 +9,7 @@ #include typedef MyTemplate MyTemplatePoint2; -typedef MyTemplate MyTemplatePoint3; +typedef MyTemplate MyTemplateMatrix; typedef MyFactor MyFactorPosePoint2; BOOST_CLASS_EXPORT_GUID(gtsam::Point2, "gtsamPoint2"); @@ -25,8 +25,8 @@ typedef std::set*> Collector_MyBase; static Collector_MyBase collector_MyBase; typedef std::set*> Collector_MyTemplatePoint2; static Collector_MyTemplatePoint2 collector_MyTemplatePoint2; -typedef std::set*> Collector_MyTemplatePoint3; -static Collector_MyTemplatePoint3 collector_MyTemplatePoint3; +typedef std::set*> Collector_MyTemplateMatrix; +static Collector_MyTemplateMatrix collector_MyTemplateMatrix; typedef std::set*> Collector_MyFactorPosePoint2; static Collector_MyFactorPosePoint2 collector_MyFactorPosePoint2; @@ -66,10 +66,10 @@ void _deleteAllObjects() collector_MyTemplatePoint2.erase(iter++); anyDeleted = true; } } - { for(Collector_MyTemplatePoint3::iterator iter = collector_MyTemplatePoint3.begin(); - iter != collector_MyTemplatePoint3.end(); ) { + { for(Collector_MyTemplateMatrix::iterator iter = collector_MyTemplateMatrix.begin(); + iter != collector_MyTemplateMatrix.end(); ) { delete *iter; - collector_MyTemplatePoint3.erase(iter++); + collector_MyTemplateMatrix.erase(iter++); anyDeleted = true; } } { for(Collector_MyFactorPosePoint2::iterator iter = collector_MyFactorPosePoint2.begin(); @@ -92,7 +92,7 @@ void _geometry_RTTIRegister() { std::map types; types.insert(std::make_pair(typeid(MyBase).name(), "MyBase")); types.insert(std::make_pair(typeid(MyTemplatePoint2).name(), "MyTemplatePoint2")); - types.insert(std::make_pair(typeid(MyTemplatePoint3).name(), "MyTemplatePoint3")); + types.insert(std::make_pair(typeid(MyTemplateMatrix).name(), "MyTemplateMatrix")); mxArray *registry = mexGetVariable("global", "gtsamwrap_rttiRegistry"); if(!registry) @@ -188,7 +188,17 @@ void gtsamPoint2_dim_6(int nargout, mxArray *out[], int nargin, const mxArray *i out[0] = wrap< int >(obj->dim()); } -void gtsamPoint2_returnChar_7(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void gtsamPoint2_eigenArguments_7(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +{ + typedef boost::shared_ptr Shared; + checkArguments("eigenArguments",nargout,nargin-1,2); + Shared obj = unwrap_shared_ptr(in[0], "ptr_gtsamPoint2"); + Vector v = unwrap< Vector >(in[1]); + Matrix m = unwrap< Matrix >(in[2]); + obj->eigenArguments(v,m); +} + +void gtsamPoint2_returnChar_8(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("returnChar",nargout,nargin-1,0); @@ -196,7 +206,7 @@ void gtsamPoint2_returnChar_7(int nargout, mxArray *out[], int nargin, const mxA out[0] = wrap< char >(obj->returnChar()); } -void gtsamPoint2_vectorConfusion_8(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void gtsamPoint2_vectorConfusion_9(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr SharedVectorNotEigen; typedef boost::shared_ptr Shared; @@ -205,7 +215,7 @@ void gtsamPoint2_vectorConfusion_8(int nargout, mxArray *out[], int nargin, cons out[0] = wrap_shared_ptr(SharedVectorNotEigen(new VectorNotEigen(obj->vectorConfusion())),"VectorNotEigen", false); } -void gtsamPoint2_x_9(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void gtsamPoint2_x_10(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("x",nargout,nargin-1,0); @@ -213,7 +223,7 @@ void gtsamPoint2_x_9(int nargout, mxArray *out[], int nargin, const mxArray *in[ out[0] = wrap< double >(obj->x()); } -void gtsamPoint2_y_10(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void gtsamPoint2_y_11(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("y",nargout,nargin-1,0); @@ -221,7 +231,7 @@ void gtsamPoint2_y_10(int nargout, mxArray *out[], int nargin, const mxArray *in out[0] = wrap< double >(obj->y()); } -void gtsamPoint3_collectorInsertAndMakeBase_11(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void gtsamPoint3_collectorInsertAndMakeBase_12(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { mexAtExit(&_deleteAllObjects); typedef boost::shared_ptr Shared; @@ -230,7 +240,7 @@ void gtsamPoint3_collectorInsertAndMakeBase_11(int nargout, mxArray *out[], int collector_gtsamPoint3.insert(self); } -void gtsamPoint3_constructor_12(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void gtsamPoint3_constructor_13(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { mexAtExit(&_deleteAllObjects); typedef boost::shared_ptr Shared; @@ -244,7 +254,7 @@ void gtsamPoint3_constructor_12(int nargout, mxArray *out[], int nargin, const m *reinterpret_cast (mxGetData(out[0])) = self; } -void gtsamPoint3_deconstructor_13(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void gtsamPoint3_deconstructor_14(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("delete_gtsamPoint3",nargout,nargin,1); @@ -257,7 +267,7 @@ void gtsamPoint3_deconstructor_13(int nargout, mxArray *out[], int nargin, const } } -void gtsamPoint3_norm_14(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void gtsamPoint3_norm_15(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("norm",nargout,nargin-1,0); @@ -265,7 +275,7 @@ void gtsamPoint3_norm_14(int nargout, mxArray *out[], int nargin, const mxArray out[0] = wrap< double >(obj->norm()); } -void gtsamPoint3_string_serialize_15(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void gtsamPoint3_string_serialize_16(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("string_serialize",nargout,nargin-1,0); @@ -275,7 +285,7 @@ void gtsamPoint3_string_serialize_15(int nargout, mxArray *out[], int nargin, co out_archive << *obj; out[0] = wrap< string >(out_archive_stream.str()); } -void gtsamPoint3_StaticFunctionRet_16(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void gtsamPoint3_StaticFunctionRet_17(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr SharedPoint3; typedef boost::shared_ptr Shared; @@ -284,14 +294,14 @@ void gtsamPoint3_StaticFunctionRet_16(int nargout, mxArray *out[], int nargin, c out[0] = wrap_shared_ptr(SharedPoint3(new gtsam::Point3(gtsam::Point3::StaticFunctionRet(z))),"gtsam.Point3", false); } -void gtsamPoint3_staticFunction_17(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void gtsamPoint3_staticFunction_18(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("gtsamPoint3.staticFunction",nargout,nargin,0); out[0] = wrap< double >(gtsam::Point3::staticFunction()); } -void gtsamPoint3_string_deserialize_18(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void gtsamPoint3_string_deserialize_19(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("gtsamPoint3.string_deserialize",nargout,nargin,1); @@ -302,7 +312,7 @@ void gtsamPoint3_string_deserialize_18(int nargout, mxArray *out[], int nargin, in_archive >> *output; out[0] = wrap_shared_ptr(output,"gtsam.Point3", false); } -void Test_collectorInsertAndMakeBase_19(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void Test_collectorInsertAndMakeBase_20(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { mexAtExit(&_deleteAllObjects); typedef boost::shared_ptr Shared; @@ -311,7 +321,7 @@ void Test_collectorInsertAndMakeBase_19(int nargout, mxArray *out[], int nargin, collector_Test.insert(self); } -void Test_constructor_20(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void Test_constructor_21(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { mexAtExit(&_deleteAllObjects); typedef boost::shared_ptr Shared; @@ -322,7 +332,7 @@ void Test_constructor_20(int nargout, mxArray *out[], int nargin, const mxArray *reinterpret_cast (mxGetData(out[0])) = self; } -void Test_constructor_21(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void Test_constructor_22(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { mexAtExit(&_deleteAllObjects); typedef boost::shared_ptr Shared; @@ -335,7 +345,7 @@ void Test_constructor_21(int nargout, mxArray *out[], int nargin, const mxArray *reinterpret_cast (mxGetData(out[0])) = self; } -void Test_deconstructor_22(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void Test_deconstructor_23(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("delete_Test",nargout,nargin,1); @@ -348,7 +358,7 @@ void Test_deconstructor_22(int nargout, mxArray *out[], int nargin, const mxArra } } -void Test_arg_EigenConstRef_23(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void Test_arg_EigenConstRef_24(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("arg_EigenConstRef",nargout,nargin-1,1); @@ -357,7 +367,7 @@ void Test_arg_EigenConstRef_23(int nargout, mxArray *out[], int nargin, const mx obj->arg_EigenConstRef(value); } -void Test_create_MixedPtrs_24(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void Test_create_MixedPtrs_25(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr SharedTest; typedef boost::shared_ptr SharedTest; @@ -369,7 +379,7 @@ void Test_create_MixedPtrs_24(int nargout, mxArray *out[], int nargin, const mxA out[1] = wrap_shared_ptr(pairResult.second,"Test", false); } -void Test_create_ptrs_25(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void Test_create_ptrs_26(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr SharedTest; typedef boost::shared_ptr SharedTest; @@ -381,7 +391,7 @@ void Test_create_ptrs_25(int nargout, mxArray *out[], int nargin, const mxArray out[1] = wrap_shared_ptr(pairResult.second,"Test", false); } -void Test_print_26(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void Test_print_27(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("print",nargout,nargin-1,0); @@ -389,7 +399,7 @@ void Test_print_26(int nargout, mxArray *out[], int nargin, const mxArray *in[]) obj->print(); } -void Test_return_Point2Ptr_27(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void Test_return_Point2Ptr_28(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr SharedPoint2; typedef boost::shared_ptr Shared; @@ -399,7 +409,7 @@ void Test_return_Point2Ptr_27(int nargout, mxArray *out[], int nargin, const mxA out[0] = wrap_shared_ptr(obj->return_Point2Ptr(value),"gtsam.Point2", false); } -void Test_return_Test_28(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void Test_return_Test_29(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr SharedTest; typedef boost::shared_ptr Shared; @@ -409,7 +419,7 @@ void Test_return_Test_28(int nargout, mxArray *out[], int nargin, const mxArray out[0] = wrap_shared_ptr(SharedTest(new Test(obj->return_Test(value))),"Test", false); } -void Test_return_TestPtr_29(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void Test_return_TestPtr_30(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr SharedTest; typedef boost::shared_ptr Shared; @@ -419,7 +429,7 @@ void Test_return_TestPtr_29(int nargout, mxArray *out[], int nargin, const mxArr out[0] = wrap_shared_ptr(obj->return_TestPtr(value),"Test", false); } -void Test_return_bool_30(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void Test_return_bool_31(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("return_bool",nargout,nargin-1,1); @@ -428,7 +438,7 @@ void Test_return_bool_30(int nargout, mxArray *out[], int nargin, const mxArray out[0] = wrap< bool >(obj->return_bool(value)); } -void Test_return_double_31(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void Test_return_double_32(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("return_double",nargout,nargin-1,1); @@ -437,7 +447,7 @@ void Test_return_double_31(int nargout, mxArray *out[], int nargin, const mxArra out[0] = wrap< double >(obj->return_double(value)); } -void Test_return_field_32(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void Test_return_field_33(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("return_field",nargout,nargin-1,1); @@ -446,7 +456,7 @@ void Test_return_field_32(int nargout, mxArray *out[], int nargin, const mxArray out[0] = wrap< bool >(obj->return_field(t)); } -void Test_return_int_33(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void Test_return_int_34(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("return_int",nargout,nargin-1,1); @@ -455,7 +465,7 @@ void Test_return_int_33(int nargout, mxArray *out[], int nargin, const mxArray * out[0] = wrap< int >(obj->return_int(value)); } -void Test_return_matrix1_34(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void Test_return_matrix1_35(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("return_matrix1",nargout,nargin-1,1); @@ -464,7 +474,7 @@ void Test_return_matrix1_34(int nargout, mxArray *out[], int nargin, const mxArr out[0] = wrap< Matrix >(obj->return_matrix1(value)); } -void Test_return_matrix2_35(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void Test_return_matrix2_36(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("return_matrix2",nargout,nargin-1,1); @@ -473,7 +483,7 @@ void Test_return_matrix2_35(int nargout, mxArray *out[], int nargin, const mxArr out[0] = wrap< Matrix >(obj->return_matrix2(value)); } -void Test_return_pair_36(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void Test_return_pair_37(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("return_pair",nargout,nargin-1,2); @@ -485,7 +495,7 @@ void Test_return_pair_36(int nargout, mxArray *out[], int nargin, const mxArray out[1] = wrap< Matrix >(pairResult.second); } -void Test_return_ptrs_37(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void Test_return_ptrs_38(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr SharedTest; typedef boost::shared_ptr SharedTest; @@ -499,7 +509,7 @@ void Test_return_ptrs_37(int nargout, mxArray *out[], int nargin, const mxArray out[1] = wrap_shared_ptr(pairResult.second,"Test", false); } -void Test_return_size_t_38(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void Test_return_size_t_39(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("return_size_t",nargout,nargin-1,1); @@ -508,7 +518,7 @@ void Test_return_size_t_38(int nargout, mxArray *out[], int nargin, const mxArra out[0] = wrap< size_t >(obj->return_size_t(value)); } -void Test_return_string_39(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void Test_return_string_40(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("return_string",nargout,nargin-1,1); @@ -517,7 +527,7 @@ void Test_return_string_39(int nargout, mxArray *out[], int nargin, const mxArra out[0] = wrap< string >(obj->return_string(value)); } -void Test_return_vector1_40(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void Test_return_vector1_41(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("return_vector1",nargout,nargin-1,1); @@ -526,7 +536,7 @@ void Test_return_vector1_40(int nargout, mxArray *out[], int nargin, const mxArr out[0] = wrap< Vector >(obj->return_vector1(value)); } -void Test_return_vector2_41(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void Test_return_vector2_42(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("return_vector2",nargout,nargin-1,1); @@ -535,7 +545,7 @@ void Test_return_vector2_41(int nargout, mxArray *out[], int nargin, const mxArr out[0] = wrap< Vector >(obj->return_vector2(value)); } -void MyBase_collectorInsertAndMakeBase_42(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyBase_collectorInsertAndMakeBase_43(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { mexAtExit(&_deleteAllObjects); typedef boost::shared_ptr Shared; @@ -544,7 +554,7 @@ void MyBase_collectorInsertAndMakeBase_42(int nargout, mxArray *out[], int nargi collector_MyBase.insert(self); } -void MyBase_upcastFromVoid_43(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { +void MyBase_upcastFromVoid_44(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { mexAtExit(&_deleteAllObjects); typedef boost::shared_ptr Shared; boost::shared_ptr *asVoid = *reinterpret_cast**> (mxGetData(in[0])); @@ -553,7 +563,7 @@ void MyBase_upcastFromVoid_43(int nargout, mxArray *out[], int nargin, const mxA *reinterpret_cast(mxGetData(out[0])) = self; } -void MyBase_deconstructor_44(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyBase_deconstructor_45(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("delete_MyBase",nargout,nargin,1); @@ -566,7 +576,7 @@ void MyBase_deconstructor_44(int nargout, mxArray *out[], int nargin, const mxAr } } -void MyTemplatePoint2_collectorInsertAndMakeBase_45(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplatePoint2_collectorInsertAndMakeBase_46(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { mexAtExit(&_deleteAllObjects); typedef boost::shared_ptr Shared; @@ -579,7 +589,7 @@ void MyTemplatePoint2_collectorInsertAndMakeBase_45(int nargout, mxArray *out[], *reinterpret_cast(mxGetData(out[0])) = new SharedBase(*self); } -void MyTemplatePoint2_upcastFromVoid_46(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { +void MyTemplatePoint2_upcastFromVoid_47(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { mexAtExit(&_deleteAllObjects); typedef boost::shared_ptr Shared; boost::shared_ptr *asVoid = *reinterpret_cast**> (mxGetData(in[0])); @@ -588,7 +598,7 @@ void MyTemplatePoint2_upcastFromVoid_46(int nargout, mxArray *out[], int nargin, *reinterpret_cast(mxGetData(out[0])) = self; } -void MyTemplatePoint2_constructor_47(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplatePoint2_constructor_48(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { mexAtExit(&_deleteAllObjects); typedef boost::shared_ptr Shared; @@ -603,7 +613,7 @@ void MyTemplatePoint2_constructor_47(int nargout, mxArray *out[], int nargin, co *reinterpret_cast(mxGetData(out[1])) = new SharedBase(*self); } -void MyTemplatePoint2_deconstructor_48(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplatePoint2_deconstructor_49(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("delete_MyTemplatePoint2",nargout,nargin,1); @@ -616,7 +626,7 @@ void MyTemplatePoint2_deconstructor_48(int nargout, mxArray *out[], int nargin, } } -void MyTemplatePoint2_accept_T_49(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplatePoint2_accept_T_50(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("accept_T",nargout,nargin-1,1); @@ -625,7 +635,7 @@ void MyTemplatePoint2_accept_T_49(int nargout, mxArray *out[], int nargin, const obj->accept_T(value); } -void MyTemplatePoint2_accept_Tptr_50(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplatePoint2_accept_Tptr_51(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("accept_Tptr",nargout,nargin-1,1); @@ -634,7 +644,7 @@ void MyTemplatePoint2_accept_Tptr_50(int nargout, mxArray *out[], int nargin, co obj->accept_Tptr(value); } -void MyTemplatePoint2_create_MixedPtrs_51(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplatePoint2_create_MixedPtrs_52(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr SharedPoint2; typedef boost::shared_ptr SharedPoint2; @@ -646,7 +656,7 @@ void MyTemplatePoint2_create_MixedPtrs_51(int nargout, mxArray *out[], int nargi out[1] = wrap_shared_ptr(pairResult.second,"gtsam.Point2", false); } -void MyTemplatePoint2_create_ptrs_52(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplatePoint2_create_ptrs_53(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr SharedPoint2; typedef boost::shared_ptr SharedPoint2; @@ -658,7 +668,7 @@ void MyTemplatePoint2_create_ptrs_52(int nargout, mxArray *out[], int nargin, co out[1] = wrap_shared_ptr(pairResult.second,"gtsam.Point2", false); } -void MyTemplatePoint2_return_T_53(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplatePoint2_return_T_54(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr SharedPoint2; typedef boost::shared_ptr Shared; @@ -668,7 +678,7 @@ void MyTemplatePoint2_return_T_53(int nargout, mxArray *out[], int nargin, const out[0] = wrap_shared_ptr(SharedPoint2(new gtsam::Point2(obj->return_T(value))),"gtsam.Point2", false); } -void MyTemplatePoint2_return_Tptr_54(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplatePoint2_return_Tptr_55(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr SharedPoint2; typedef boost::shared_ptr Shared; @@ -678,7 +688,7 @@ void MyTemplatePoint2_return_Tptr_54(int nargout, mxArray *out[], int nargin, co out[0] = wrap_shared_ptr(obj->return_Tptr(value),"gtsam.Point2", false); } -void MyTemplatePoint2_return_ptrs_55(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplatePoint2_return_ptrs_56(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr SharedPoint2; typedef boost::shared_ptr SharedPoint2; @@ -692,71 +702,73 @@ void MyTemplatePoint2_return_ptrs_55(int nargout, mxArray *out[], int nargin, co out[1] = wrap_shared_ptr(pairResult.second,"gtsam.Point2", false); } -void MyTemplatePoint2_templatedMethod_56(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplatePoint2_templatedMethod_57(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("templatedMethodMatrix",nargout,nargin-1,1); Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplatePoint2"); Matrix& t = *unwrap_shared_ptr< Matrix >(in[1], "ptr_Matrix"); - obj->templatedMethod(t); -} - -void MyTemplatePoint2_templatedMethod_57(int nargout, mxArray *out[], int nargin, const mxArray *in[]) -{ - typedef boost::shared_ptr Shared; - checkArguments("templatedMethodPoint2",nargout,nargin-1,1); - Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplatePoint2"); - gtsam::Point2& t = *unwrap_shared_ptr< gtsam::Point2 >(in[1], "ptr_gtsamPoint2"); - obj->templatedMethod(t); + out[0] = wrap< Matrix >(obj->templatedMethod(t)); } void MyTemplatePoint2_templatedMethod_58(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { + typedef boost::shared_ptr SharedPoint2; + typedef boost::shared_ptr Shared; + checkArguments("templatedMethodPoint2",nargout,nargin-1,1); + Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplatePoint2"); + gtsam::Point2& t = *unwrap_shared_ptr< gtsam::Point2 >(in[1], "ptr_gtsamPoint2"); + out[0] = wrap_shared_ptr(SharedPoint2(new gtsam::Point2(obj->templatedMethod(t))),"gtsam.Point2", false); +} + +void MyTemplatePoint2_templatedMethod_59(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +{ + typedef boost::shared_ptr SharedPoint3; typedef boost::shared_ptr Shared; checkArguments("templatedMethodPoint3",nargout,nargin-1,1); Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplatePoint2"); gtsam::Point3& t = *unwrap_shared_ptr< gtsam::Point3 >(in[1], "ptr_gtsamPoint3"); - obj->templatedMethod(t); + out[0] = wrap_shared_ptr(SharedPoint3(new gtsam::Point3(obj->templatedMethod(t))),"gtsam.Point3", false); } -void MyTemplatePoint2_templatedMethod_59(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplatePoint2_templatedMethod_60(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("templatedMethodVector",nargout,nargin-1,1); Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplatePoint2"); Vector& t = *unwrap_shared_ptr< Vector >(in[1], "ptr_Vector"); - obj->templatedMethod(t); + out[0] = wrap< Vector >(obj->templatedMethod(t)); } -void MyTemplatePoint3_collectorInsertAndMakeBase_60(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplateMatrix_collectorInsertAndMakeBase_61(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { mexAtExit(&_deleteAllObjects); - typedef boost::shared_ptr Shared; + typedef boost::shared_ptr Shared; Shared *self = *reinterpret_cast (mxGetData(in[0])); - collector_MyTemplatePoint3.insert(self); + collector_MyTemplateMatrix.insert(self); typedef boost::shared_ptr SharedBase; out[0] = mxCreateNumericMatrix(1, 1, mxUINT32OR64_CLASS, mxREAL); *reinterpret_cast(mxGetData(out[0])) = new SharedBase(*self); } -void MyTemplatePoint3_upcastFromVoid_61(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { +void MyTemplateMatrix_upcastFromVoid_62(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { mexAtExit(&_deleteAllObjects); - typedef boost::shared_ptr Shared; + typedef boost::shared_ptr Shared; boost::shared_ptr *asVoid = *reinterpret_cast**> (mxGetData(in[0])); out[0] = mxCreateNumericMatrix(1, 1, mxUINT32OR64_CLASS, mxREAL); - Shared *self = new Shared(boost::static_pointer_cast(*asVoid)); + Shared *self = new Shared(boost::static_pointer_cast(*asVoid)); *reinterpret_cast(mxGetData(out[0])) = self; } -void MyTemplatePoint3_constructor_62(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplateMatrix_constructor_63(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { mexAtExit(&_deleteAllObjects); - typedef boost::shared_ptr Shared; + typedef boost::shared_ptr Shared; - Shared *self = new Shared(new MyTemplatePoint3()); - collector_MyTemplatePoint3.insert(self); + Shared *self = new Shared(new MyTemplateMatrix()); + collector_MyTemplateMatrix.insert(self); out[0] = mxCreateNumericMatrix(1, 1, mxUINT32OR64_CLASS, mxREAL); *reinterpret_cast (mxGetData(out[0])) = self; @@ -765,132 +777,144 @@ void MyTemplatePoint3_constructor_62(int nargout, mxArray *out[], int nargin, co *reinterpret_cast(mxGetData(out[1])) = new SharedBase(*self); } -void MyTemplatePoint3_deconstructor_63(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplateMatrix_deconstructor_64(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { - typedef boost::shared_ptr Shared; - checkArguments("delete_MyTemplatePoint3",nargout,nargin,1); + typedef boost::shared_ptr Shared; + checkArguments("delete_MyTemplateMatrix",nargout,nargin,1); Shared *self = *reinterpret_cast(mxGetData(in[0])); - Collector_MyTemplatePoint3::iterator item; - item = collector_MyTemplatePoint3.find(self); - if(item != collector_MyTemplatePoint3.end()) { + Collector_MyTemplateMatrix::iterator item; + item = collector_MyTemplateMatrix.find(self); + if(item != collector_MyTemplateMatrix.end()) { delete self; - collector_MyTemplatePoint3.erase(item); + collector_MyTemplateMatrix.erase(item); } } -void MyTemplatePoint3_accept_T_64(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplateMatrix_accept_T_65(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { - typedef boost::shared_ptr Shared; + typedef boost::shared_ptr Shared; checkArguments("accept_T",nargout,nargin-1,1); - Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplatePoint3"); - gtsam::Point3& value = *unwrap_shared_ptr< gtsam::Point3 >(in[1], "ptr_gtsamPoint3"); + Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplateMatrix"); + Matrix& value = *unwrap_shared_ptr< Matrix >(in[1], "ptr_Matrix"); obj->accept_T(value); } -void MyTemplatePoint3_accept_Tptr_65(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplateMatrix_accept_Tptr_66(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { - typedef boost::shared_ptr Shared; + typedef boost::shared_ptr Shared; checkArguments("accept_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"); + Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplateMatrix"); + boost::shared_ptr value = unwrap_shared_ptr< Matrix >(in[1], "ptr_Matrix"); obj->accept_Tptr(value); } -void MyTemplatePoint3_create_MixedPtrs_66(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplateMatrix_create_MixedPtrs_67(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { - typedef boost::shared_ptr SharedPoint3; - typedef boost::shared_ptr SharedPoint3; - typedef boost::shared_ptr Shared; + 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); + Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplateMatrix"); + pair< Matrix, SharedMatrix > pairResult = obj->create_MixedPtrs(); + out[0] = wrap< Matrix >(pairResult.first); + { + SharedMatrix* ret = new SharedMatrix(pairResult.second); + out[1] = wrap_shared_ptr(ret,"Matrix"); + } } -void MyTemplatePoint3_create_ptrs_67(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplateMatrix_create_ptrs_68(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { - typedef boost::shared_ptr SharedPoint3; - typedef boost::shared_ptr SharedPoint3; - typedef boost::shared_ptr Shared; + 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); + Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplateMatrix"); + pair< SharedMatrix, SharedMatrix > pairResult = obj->create_ptrs(); + { + SharedMatrix* ret = new SharedMatrix(pairResult.first); + out[0] = wrap_shared_ptr(ret,"Matrix"); + } + { + SharedMatrix* ret = new SharedMatrix(pairResult.second); + out[1] = wrap_shared_ptr(ret,"Matrix"); + } } -void MyTemplatePoint3_return_T_68(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplateMatrix_return_T_69(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { - typedef boost::shared_ptr SharedPoint3; - typedef boost::shared_ptr Shared; + 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); + Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplateMatrix"); + boost::shared_ptr value = unwrap_shared_ptr< Matrix >(in[1], "ptr_Matrix"); + out[0] = wrap< Matrix >(obj->return_T(value)); } -void MyTemplatePoint3_return_Tptr_69(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplateMatrix_return_Tptr_70(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { - typedef boost::shared_ptr SharedPoint3; - typedef boost::shared_ptr Shared; + 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); + Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplateMatrix"); + boost::shared_ptr value = unwrap_shared_ptr< Matrix >(in[1], "ptr_Matrix"); + { + SharedMatrix* ret = new SharedMatrix(obj->return_Tptr(value)); + out[0] = wrap_shared_ptr(ret,"Matrix"); + } } -void MyTemplatePoint3_return_ptrs_70(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplateMatrix_return_ptrs_71(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { - typedef boost::shared_ptr SharedPoint3; - typedef boost::shared_ptr SharedPoint3; - typedef boost::shared_ptr Shared; + 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); + Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplateMatrix"); + boost::shared_ptr p1 = unwrap_shared_ptr< Matrix >(in[1], "ptr_Matrix"); + boost::shared_ptr p2 = unwrap_shared_ptr< Matrix >(in[2], "ptr_Matrix"); + pair< SharedMatrix, SharedMatrix > pairResult = obj->return_ptrs(p1,p2); + { + SharedMatrix* ret = new SharedMatrix(pairResult.first); + out[0] = wrap_shared_ptr(ret,"Matrix"); + } + { + SharedMatrix* ret = new SharedMatrix(pairResult.second); + out[1] = wrap_shared_ptr(ret,"Matrix"); + } } -void MyTemplatePoint3_templatedMethod_71(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplateMatrix_templatedMethod_72(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { - typedef boost::shared_ptr Shared; + typedef boost::shared_ptr Shared; checkArguments("templatedMethodMatrix",nargout,nargin-1,1); - Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplatePoint3"); + Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplateMatrix"); Matrix& t = *unwrap_shared_ptr< Matrix >(in[1], "ptr_Matrix"); - obj->templatedMethod(t); + out[0] = wrap< Matrix >(obj->templatedMethod(t)); } -void MyTemplatePoint3_templatedMethod_72(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplateMatrix_templatedMethod_73(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { - typedef boost::shared_ptr Shared; + typedef boost::shared_ptr SharedPoint2; + typedef boost::shared_ptr Shared; checkArguments("templatedMethodPoint2",nargout,nargin-1,1); - Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplatePoint3"); + Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplateMatrix"); gtsam::Point2& t = *unwrap_shared_ptr< gtsam::Point2 >(in[1], "ptr_gtsamPoint2"); - obj->templatedMethod(t); + out[0] = wrap_shared_ptr(SharedPoint2(new gtsam::Point2(obj->templatedMethod(t))),"gtsam.Point2", false); } -void MyTemplatePoint3_templatedMethod_73(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplateMatrix_templatedMethod_74(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { - typedef boost::shared_ptr Shared; + typedef boost::shared_ptr SharedPoint3; + typedef boost::shared_ptr Shared; checkArguments("templatedMethodPoint3",nargout,nargin-1,1); - Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplatePoint3"); + Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplateMatrix"); gtsam::Point3& t = *unwrap_shared_ptr< gtsam::Point3 >(in[1], "ptr_gtsamPoint3"); - obj->templatedMethod(t); + out[0] = wrap_shared_ptr(SharedPoint3(new gtsam::Point3(obj->templatedMethod(t))),"gtsam.Point3", false); } -void MyTemplatePoint3_templatedMethod_74(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyTemplateMatrix_templatedMethod_75(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { - typedef boost::shared_ptr Shared; + typedef boost::shared_ptr Shared; checkArguments("templatedMethodVector",nargout,nargin-1,1); - Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplatePoint3"); + Shared obj = unwrap_shared_ptr(in[0], "ptr_MyTemplateMatrix"); Vector& t = *unwrap_shared_ptr< Vector >(in[1], "ptr_Vector"); - obj->templatedMethod(t); + out[0] = wrap< Vector >(obj->templatedMethod(t)); } -void MyFactorPosePoint2_collectorInsertAndMakeBase_75(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyFactorPosePoint2_collectorInsertAndMakeBase_76(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { mexAtExit(&_deleteAllObjects); typedef boost::shared_ptr Shared; @@ -899,7 +923,7 @@ void MyFactorPosePoint2_collectorInsertAndMakeBase_75(int nargout, mxArray *out[ collector_MyFactorPosePoint2.insert(self); } -void MyFactorPosePoint2_constructor_76(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyFactorPosePoint2_constructor_77(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { mexAtExit(&_deleteAllObjects); typedef boost::shared_ptr Shared; @@ -914,7 +938,7 @@ void MyFactorPosePoint2_constructor_76(int nargout, mxArray *out[], int nargin, *reinterpret_cast (mxGetData(out[0])) = self; } -void MyFactorPosePoint2_deconstructor_77(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void MyFactorPosePoint2_deconstructor_78(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { typedef boost::shared_ptr Shared; checkArguments("delete_MyFactorPosePoint2",nargout,nargin,1); @@ -927,18 +951,18 @@ void MyFactorPosePoint2_deconstructor_77(int nargout, mxArray *out[], int nargin } } -void aGlobalFunction_78(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void aGlobalFunction_79(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { checkArguments("aGlobalFunction",nargout,nargin,0); out[0] = wrap< Vector >(aGlobalFunction()); } -void overloadedGlobalFunction_79(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void overloadedGlobalFunction_80(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { checkArguments("overloadedGlobalFunction",nargout,nargin,1); int a = unwrap< int >(in[0]); out[0] = wrap< Vector >(overloadedGlobalFunction(a)); } -void overloadedGlobalFunction_80(int nargout, mxArray *out[], int nargin, const mxArray *in[]) +void overloadedGlobalFunction_81(int nargout, mxArray *out[], int nargin, const mxArray *in[]) { checkArguments("overloadedGlobalFunction",nargout,nargin,2); int a = unwrap< int >(in[0]); @@ -979,154 +1003,154 @@ void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[]) gtsamPoint2_dim_6(nargout, out, nargin-1, in+1); break; case 7: - gtsamPoint2_returnChar_7(nargout, out, nargin-1, in+1); + gtsamPoint2_eigenArguments_7(nargout, out, nargin-1, in+1); break; case 8: - gtsamPoint2_vectorConfusion_8(nargout, out, nargin-1, in+1); + gtsamPoint2_returnChar_8(nargout, out, nargin-1, in+1); break; case 9: - gtsamPoint2_x_9(nargout, out, nargin-1, in+1); + gtsamPoint2_vectorConfusion_9(nargout, out, nargin-1, in+1); break; case 10: - gtsamPoint2_y_10(nargout, out, nargin-1, in+1); + gtsamPoint2_x_10(nargout, out, nargin-1, in+1); break; case 11: - gtsamPoint3_collectorInsertAndMakeBase_11(nargout, out, nargin-1, in+1); + gtsamPoint2_y_11(nargout, out, nargin-1, in+1); break; case 12: - gtsamPoint3_constructor_12(nargout, out, nargin-1, in+1); + gtsamPoint3_collectorInsertAndMakeBase_12(nargout, out, nargin-1, in+1); break; case 13: - gtsamPoint3_deconstructor_13(nargout, out, nargin-1, in+1); + gtsamPoint3_constructor_13(nargout, out, nargin-1, in+1); break; case 14: - gtsamPoint3_norm_14(nargout, out, nargin-1, in+1); + gtsamPoint3_deconstructor_14(nargout, out, nargin-1, in+1); break; case 15: - gtsamPoint3_string_serialize_15(nargout, out, nargin-1, in+1); + gtsamPoint3_norm_15(nargout, out, nargin-1, in+1); break; case 16: - gtsamPoint3_StaticFunctionRet_16(nargout, out, nargin-1, in+1); + gtsamPoint3_string_serialize_16(nargout, out, nargin-1, in+1); break; case 17: - gtsamPoint3_staticFunction_17(nargout, out, nargin-1, in+1); + gtsamPoint3_StaticFunctionRet_17(nargout, out, nargin-1, in+1); break; case 18: - gtsamPoint3_string_deserialize_18(nargout, out, nargin-1, in+1); + gtsamPoint3_staticFunction_18(nargout, out, nargin-1, in+1); break; case 19: - Test_collectorInsertAndMakeBase_19(nargout, out, nargin-1, in+1); + gtsamPoint3_string_deserialize_19(nargout, out, nargin-1, in+1); break; case 20: - Test_constructor_20(nargout, out, nargin-1, in+1); + Test_collectorInsertAndMakeBase_20(nargout, out, nargin-1, in+1); break; case 21: Test_constructor_21(nargout, out, nargin-1, in+1); break; case 22: - Test_deconstructor_22(nargout, out, nargin-1, in+1); + Test_constructor_22(nargout, out, nargin-1, in+1); break; case 23: - Test_arg_EigenConstRef_23(nargout, out, nargin-1, in+1); + Test_deconstructor_23(nargout, out, nargin-1, in+1); break; case 24: - Test_create_MixedPtrs_24(nargout, out, nargin-1, in+1); + Test_arg_EigenConstRef_24(nargout, out, nargin-1, in+1); break; case 25: - Test_create_ptrs_25(nargout, out, nargin-1, in+1); + Test_create_MixedPtrs_25(nargout, out, nargin-1, in+1); break; case 26: - Test_print_26(nargout, out, nargin-1, in+1); + Test_create_ptrs_26(nargout, out, nargin-1, in+1); break; case 27: - Test_return_Point2Ptr_27(nargout, out, nargin-1, in+1); + Test_print_27(nargout, out, nargin-1, in+1); break; case 28: - Test_return_Test_28(nargout, out, nargin-1, in+1); + Test_return_Point2Ptr_28(nargout, out, nargin-1, in+1); break; case 29: - Test_return_TestPtr_29(nargout, out, nargin-1, in+1); + Test_return_Test_29(nargout, out, nargin-1, in+1); break; case 30: - Test_return_bool_30(nargout, out, nargin-1, in+1); + Test_return_TestPtr_30(nargout, out, nargin-1, in+1); break; case 31: - Test_return_double_31(nargout, out, nargin-1, in+1); + Test_return_bool_31(nargout, out, nargin-1, in+1); break; case 32: - Test_return_field_32(nargout, out, nargin-1, in+1); + Test_return_double_32(nargout, out, nargin-1, in+1); break; case 33: - Test_return_int_33(nargout, out, nargin-1, in+1); + Test_return_field_33(nargout, out, nargin-1, in+1); break; case 34: - Test_return_matrix1_34(nargout, out, nargin-1, in+1); + Test_return_int_34(nargout, out, nargin-1, in+1); break; case 35: - Test_return_matrix2_35(nargout, out, nargin-1, in+1); + Test_return_matrix1_35(nargout, out, nargin-1, in+1); break; case 36: - Test_return_pair_36(nargout, out, nargin-1, in+1); + Test_return_matrix2_36(nargout, out, nargin-1, in+1); break; case 37: - Test_return_ptrs_37(nargout, out, nargin-1, in+1); + Test_return_pair_37(nargout, out, nargin-1, in+1); break; case 38: - Test_return_size_t_38(nargout, out, nargin-1, in+1); + Test_return_ptrs_38(nargout, out, nargin-1, in+1); break; case 39: - Test_return_string_39(nargout, out, nargin-1, in+1); + Test_return_size_t_39(nargout, out, nargin-1, in+1); break; case 40: - Test_return_vector1_40(nargout, out, nargin-1, in+1); + Test_return_string_40(nargout, out, nargin-1, in+1); break; case 41: - Test_return_vector2_41(nargout, out, nargin-1, in+1); + Test_return_vector1_41(nargout, out, nargin-1, in+1); break; case 42: - MyBase_collectorInsertAndMakeBase_42(nargout, out, nargin-1, in+1); + Test_return_vector2_42(nargout, out, nargin-1, in+1); break; case 43: - MyBase_upcastFromVoid_43(nargout, out, nargin-1, in+1); + MyBase_collectorInsertAndMakeBase_43(nargout, out, nargin-1, in+1); break; case 44: - MyBase_deconstructor_44(nargout, out, nargin-1, in+1); + MyBase_upcastFromVoid_44(nargout, out, nargin-1, in+1); break; case 45: - MyTemplatePoint2_collectorInsertAndMakeBase_45(nargout, out, nargin-1, in+1); + MyBase_deconstructor_45(nargout, out, nargin-1, in+1); break; case 46: - MyTemplatePoint2_upcastFromVoid_46(nargout, out, nargin-1, in+1); + MyTemplatePoint2_collectorInsertAndMakeBase_46(nargout, out, nargin-1, in+1); break; case 47: - MyTemplatePoint2_constructor_47(nargout, out, nargin-1, in+1); + MyTemplatePoint2_upcastFromVoid_47(nargout, out, nargin-1, in+1); break; case 48: - MyTemplatePoint2_deconstructor_48(nargout, out, nargin-1, in+1); + MyTemplatePoint2_constructor_48(nargout, out, nargin-1, in+1); break; case 49: - MyTemplatePoint2_accept_T_49(nargout, out, nargin-1, in+1); + MyTemplatePoint2_deconstructor_49(nargout, out, nargin-1, in+1); break; case 50: - MyTemplatePoint2_accept_Tptr_50(nargout, out, nargin-1, in+1); + MyTemplatePoint2_accept_T_50(nargout, out, nargin-1, in+1); break; case 51: - MyTemplatePoint2_create_MixedPtrs_51(nargout, out, nargin-1, in+1); + MyTemplatePoint2_accept_Tptr_51(nargout, out, nargin-1, in+1); break; case 52: - MyTemplatePoint2_create_ptrs_52(nargout, out, nargin-1, in+1); + MyTemplatePoint2_create_MixedPtrs_52(nargout, out, nargin-1, in+1); break; case 53: - MyTemplatePoint2_return_T_53(nargout, out, nargin-1, in+1); + MyTemplatePoint2_create_ptrs_53(nargout, out, nargin-1, in+1); break; case 54: - MyTemplatePoint2_return_Tptr_54(nargout, out, nargin-1, in+1); + MyTemplatePoint2_return_T_54(nargout, out, nargin-1, in+1); break; case 55: - MyTemplatePoint2_return_ptrs_55(nargout, out, nargin-1, in+1); + MyTemplatePoint2_return_Tptr_55(nargout, out, nargin-1, in+1); break; case 56: - MyTemplatePoint2_templatedMethod_56(nargout, out, nargin-1, in+1); + MyTemplatePoint2_return_ptrs_56(nargout, out, nargin-1, in+1); break; case 57: MyTemplatePoint2_templatedMethod_57(nargout, out, nargin-1, in+1); @@ -1138,68 +1162,71 @@ void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[]) MyTemplatePoint2_templatedMethod_59(nargout, out, nargin-1, in+1); break; case 60: - MyTemplatePoint3_collectorInsertAndMakeBase_60(nargout, out, nargin-1, in+1); + MyTemplatePoint2_templatedMethod_60(nargout, out, nargin-1, in+1); break; case 61: - MyTemplatePoint3_upcastFromVoid_61(nargout, out, nargin-1, in+1); + MyTemplateMatrix_collectorInsertAndMakeBase_61(nargout, out, nargin-1, in+1); break; case 62: - MyTemplatePoint3_constructor_62(nargout, out, nargin-1, in+1); + MyTemplateMatrix_upcastFromVoid_62(nargout, out, nargin-1, in+1); break; case 63: - MyTemplatePoint3_deconstructor_63(nargout, out, nargin-1, in+1); + MyTemplateMatrix_constructor_63(nargout, out, nargin-1, in+1); break; case 64: - MyTemplatePoint3_accept_T_64(nargout, out, nargin-1, in+1); + MyTemplateMatrix_deconstructor_64(nargout, out, nargin-1, in+1); break; case 65: - MyTemplatePoint3_accept_Tptr_65(nargout, out, nargin-1, in+1); + MyTemplateMatrix_accept_T_65(nargout, out, nargin-1, in+1); break; case 66: - MyTemplatePoint3_create_MixedPtrs_66(nargout, out, nargin-1, in+1); + MyTemplateMatrix_accept_Tptr_66(nargout, out, nargin-1, in+1); break; case 67: - MyTemplatePoint3_create_ptrs_67(nargout, out, nargin-1, in+1); + MyTemplateMatrix_create_MixedPtrs_67(nargout, out, nargin-1, in+1); break; case 68: - MyTemplatePoint3_return_T_68(nargout, out, nargin-1, in+1); + MyTemplateMatrix_create_ptrs_68(nargout, out, nargin-1, in+1); break; case 69: - MyTemplatePoint3_return_Tptr_69(nargout, out, nargin-1, in+1); + MyTemplateMatrix_return_T_69(nargout, out, nargin-1, in+1); break; case 70: - MyTemplatePoint3_return_ptrs_70(nargout, out, nargin-1, in+1); + MyTemplateMatrix_return_Tptr_70(nargout, out, nargin-1, in+1); break; case 71: - MyTemplatePoint3_templatedMethod_71(nargout, out, nargin-1, in+1); + MyTemplateMatrix_return_ptrs_71(nargout, out, nargin-1, in+1); break; case 72: - MyTemplatePoint3_templatedMethod_72(nargout, out, nargin-1, in+1); + MyTemplateMatrix_templatedMethod_72(nargout, out, nargin-1, in+1); break; case 73: - MyTemplatePoint3_templatedMethod_73(nargout, out, nargin-1, in+1); + MyTemplateMatrix_templatedMethod_73(nargout, out, nargin-1, in+1); break; case 74: - MyTemplatePoint3_templatedMethod_74(nargout, out, nargin-1, in+1); + MyTemplateMatrix_templatedMethod_74(nargout, out, nargin-1, in+1); break; case 75: - MyFactorPosePoint2_collectorInsertAndMakeBase_75(nargout, out, nargin-1, in+1); + MyTemplateMatrix_templatedMethod_75(nargout, out, nargin-1, in+1); break; case 76: - MyFactorPosePoint2_constructor_76(nargout, out, nargin-1, in+1); + MyFactorPosePoint2_collectorInsertAndMakeBase_76(nargout, out, nargin-1, in+1); break; case 77: - MyFactorPosePoint2_deconstructor_77(nargout, out, nargin-1, in+1); + MyFactorPosePoint2_constructor_77(nargout, out, nargin-1, in+1); break; case 78: - aGlobalFunction_78(nargout, out, nargin-1, in+1); + MyFactorPosePoint2_deconstructor_78(nargout, out, nargin-1, in+1); break; case 79: - overloadedGlobalFunction_79(nargout, out, nargin-1, in+1); + aGlobalFunction_79(nargout, out, nargin-1, in+1); break; case 80: overloadedGlobalFunction_80(nargout, out, nargin-1, in+1); break; + case 81: + overloadedGlobalFunction_81(nargout, out, nargin-1, in+1); + break; } } catch(const std::exception& e) { mexErrMsgTxt(("Exception from gtsam:\n" + std::string(e.what()) + "\n").c_str()); diff --git a/wrap/tests/expected/overloadedGlobalFunction.m b/wrap/tests/expected/overloadedGlobalFunction.m index 04b12e081..16d24021e 100644 --- a/wrap/tests/expected/overloadedGlobalFunction.m +++ b/wrap/tests/expected/overloadedGlobalFunction.m @@ -1,8 +1,8 @@ function varargout = overloadedGlobalFunction(varargin) if length(varargin) == 1 && isa(varargin{1},'numeric') - varargout{1} = geometry_wrapper(79, varargin{:}); - elseif length(varargin) == 2 && isa(varargin{1},'numeric') && isa(varargin{2},'double') varargout{1} = geometry_wrapper(80, varargin{:}); + elseif length(varargin) == 2 && isa(varargin{1},'numeric') && isa(varargin{2},'double') + varargout{1} = geometry_wrapper(81, varargin{:}); else error('Arguments do not match any overload of function overloadedGlobalFunction'); end diff --git a/wrap/tests/testWrap.cpp b/wrap/tests/testWrap.cpp index 8f8c1994c..1a9c82143 100644 --- a/wrap/tests/testWrap.cpp +++ b/wrap/tests/testWrap.cpp @@ -454,7 +454,7 @@ TEST( wrap, matlab_code_geometry ) { EXPECT(files_equal(epath + "Test.m" , apath + "Test.m" )); EXPECT(files_equal(epath + "MyBase.m" , apath + "MyBase.m" )); EXPECT(files_equal(epath + "MyTemplatePoint2.m" , apath + "MyTemplatePoint2.m" )); - EXPECT(files_equal(epath + "MyTemplatePoint3.m" , apath + "MyTemplatePoint3.m" )); + EXPECT(files_equal(epath + "MyTemplateMatrix.m" , apath + "MyTemplateMatrix.m" )); EXPECT(files_equal(epath + "MyFactorPosePoint2.m" , apath + "MyFactorPosePoint2.m")); EXPECT(files_equal(epath + "aGlobalFunction.m" , apath + "aGlobalFunction.m" )); EXPECT(files_equal(epath + "overloadedGlobalFunction.m" , apath + "overloadedGlobalFunction.m" ));