Fixed tests

wrap/tests/expected-python/geometry_python.cpp

@@ -64,19 +64,19 @@ class_<MyTemplatePoint2>("MyTemplatePoint2")
   .def("templatedMethod", &MyTemplatePoint2::templatedMethod);
 ;
 
-class_<MyTemplatePoint3>("MyTemplatePoint3")
+class_<MyTemplateMatrix>("MyTemplateMatrix")
-  .def("MyTemplatePoint3", &MyTemplatePoint3::MyTemplatePoint3);
+  .def("MyTemplateMatrix", &MyTemplateMatrix::MyTemplateMatrix);
-  .def("accept_T", &MyTemplatePoint3::accept_T);
+  .def("accept_T", &MyTemplateMatrix::accept_T);
-  .def("accept_Tptr", &MyTemplatePoint3::accept_Tptr);
+  .def("accept_Tptr", &MyTemplateMatrix::accept_Tptr);
-  .def("create_MixedPtrs", &MyTemplatePoint3::create_MixedPtrs);
+  .def("create_MixedPtrs", &MyTemplateMatrix::create_MixedPtrs);
-  .def("create_ptrs", &MyTemplatePoint3::create_ptrs);
+  .def("create_ptrs", &MyTemplateMatrix::create_ptrs);
-  .def("return_T", &MyTemplatePoint3::return_T);
+  .def("return_T", &MyTemplateMatrix::return_T);
-  .def("return_Tptr", &MyTemplatePoint3::return_Tptr);
+  .def("return_Tptr", &MyTemplateMatrix::return_Tptr);
-  .def("return_ptrs", &MyTemplatePoint3::return_ptrs);
+  .def("return_ptrs", &MyTemplateMatrix::return_ptrs);
-  .def("templatedMethod", &MyTemplatePoint3::templatedMethod);
+  .def("templatedMethod", &MyTemplateMatrix::templatedMethod);
-  .def("templatedMethod", &MyTemplatePoint3::templatedMethod);
+  .def("templatedMethod", &MyTemplateMatrix::templatedMethod);
-  .def("templatedMethod", &MyTemplatePoint3::templatedMethod);
+  .def("templatedMethod", &MyTemplateMatrix::templatedMethod);
-  .def("templatedMethod", &MyTemplatePoint3::templatedMethod);
+  .def("templatedMethod", &MyTemplateMatrix::templatedMethod);
 ;
 
 class_<MyFactorPosePoint2>("MyFactorPosePoint2")

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

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

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

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

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_T(Matrix value) : returns void
-%accept_Tptr(Point3 value) : returns void
+%accept_Tptr(Matrix value) : returns void
-%create_MixedPtrs() : returns pair< gtsam::Point3, gtsam::Point3 >
+%create_MixedPtrs() : returns pair< Matrix, Matrix >
-%create_ptrs() : returns pair< gtsam::Point3, gtsam::Point3 >
+%create_ptrs() : returns pair< Matrix, Matrix >
-%return_T(Point3 value) : returns gtsam::Point3
+%return_T(Matrix value) : returns Matrix
-%return_Tptr(Point3 value) : returns gtsam::Point3
+%return_Tptr(Matrix value) : returns Matrix
-%return_ptrs(Point3 p1, Point3 p2) : returns pair< gtsam::Point3, gtsam::Point3 >
+%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')
+      if length(varargin) == 1 && isa(varargin{1},'double')
-        geometry_wrapper(63, this, varargin{:});
+        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')
+      if length(varargin) == 1 && isa(varargin{1},'double')
-        geometry_wrapper(64, this, varargin{:});
+        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')
+      if length(varargin) == 1 && isa(varargin{1},'double')
-        varargout{1} = geometry_wrapper(67, this, varargin{:});
+        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')
+      if length(varargin) == 1 && isa(varargin{1},'double')
-        varargout{1} = geometry_wrapper(68, this, varargin{:});
+        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')
+      if length(varargin) == 2 && isa(varargin{1},'double') && isa(varargin{2},'double')
-        [ varargout{1} varargout{2} ] = geometry_wrapper(69, this, varargin{:});
+        [ 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
 

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
+%templatedMethodMatrix(Matrix t) : returns Matrix
-%templatedMethodPoint2(Point2 t) : returns void
+%templatedMethodPoint2(Point2 t) : returns gtsam::Point2
-%templatedMethodPoint3(Point3 t) : returns void
+%templatedMethodPoint3(Point3 t) : returns gtsam::Point3
-%templatedMethodVector(Vector t) : returns void
+%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')
+      if length(varargin) == 1 && isa(varargin{1},'double') && size(varargin{1},2)==1
-        geometry_wrapper(59, this, varargin{:});
+        varargout{1} = geometry_wrapper(60, this, varargin{:});
       else
         error('Arguments do not match any overload of function MyTemplatePoint2.templatedMethod');
       end

wrap/tests/expected/MyTemplatePoint3.m

@@ -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

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')
+      if length(varargin) == 2 && isa(varargin{1},'double') && size(varargin{1},2)==1 && isa(varargin{2},'double')
-        [ varargout{1} varargout{2} ] = geometry_wrapper(36, this, varargin{:});
+        [ 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')
+      if length(varargin) == 1 && isa(varargin{1},'double') && size(varargin{1},2)==1
-        varargout{1} = geometry_wrapper(40, this, varargin{:});
+        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')
+      if length(varargin) == 1 && isa(varargin{1},'double') && size(varargin{1},2)==1
-        varargout{1} = geometry_wrapper(41, this, varargin{:});
+        varargout{1} = geometry_wrapper(42, this, varargin{:});
       else
         error('Arguments do not match any overload of function Test.return_vector2');
       end

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

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

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"    ));