diff --git a/.cproject b/.cproject index 4526f371e..3233e742e 100644 --- a/.cproject +++ b/.cproject @@ -378,14 +378,6 @@ true true - - make - -j2 - testGaussianFactor.run - true - true - true - make -j2 @@ -412,6 +404,7 @@ make + tests/testBayesTree.run true false @@ -419,6 +412,7 @@ make + testBinaryBayesNet.run true false @@ -466,6 +460,7 @@ make + testSymbolicBayesNet.run true false @@ -473,6 +468,7 @@ make + tests/testSymbolicFactor.run true false @@ -480,6 +476,7 @@ make + testSymbolicFactorGraph.run true false @@ -495,11 +492,20 @@ make + tests/testBayesTree true false true + + make + -j2 + testGaussianFactor.run + true + true + true + make -j2 @@ -526,7 +532,6 @@ make - testGraph.run true false @@ -598,7 +603,6 @@ make - testInference.run true false @@ -606,7 +610,6 @@ make - testGaussianFactor.run true false @@ -614,7 +617,6 @@ make - testJunctionTree.run true false @@ -622,7 +624,6 @@ make - testSymbolicBayesNet.run true false @@ -630,7 +631,6 @@ make - testSymbolicFactorGraph.run true false @@ -700,22 +700,6 @@ false true - - make - -j2 - all - true - true - true - - - make - -j2 - clean - true - true - true - make -j2 @@ -732,6 +716,22 @@ true true + + make + -j2 + all + true + true + true + + + make + -j2 + clean + true + true + true + make -j2 @@ -756,7 +756,15 @@ true true - + + make + -j2 + all + true + true + true + + make -j2 check @@ -764,6 +772,14 @@ true true + + make + -j2 + clean + true + true + true + make -j2 @@ -804,15 +820,7 @@ true true - - make - -j2 - all - true - true - true - - + make -j2 check @@ -820,14 +828,6 @@ true true - - make - -j2 - clean - true - true - true - make -j2 @@ -1150,6 +1150,7 @@ make + testErrors.run true false @@ -1605,7 +1606,6 @@ make - testSimulated2DOriented.run true false @@ -1645,7 +1645,6 @@ make - testSimulated2D.run true false @@ -1653,7 +1652,6 @@ make - testSimulated3D.run true false @@ -1996,7 +1994,6 @@ make - tests/testGaussianISAM2 true false @@ -2018,6 +2015,46 @@ true true + + make + -j2 + install + true + true + true + + + make + -j2 + clean + true + true + true + + + make + -j2 + check + true + true + true + + + make + -j2 + all + true + true + true + + + make + -j2 + dist + true + true + true + make -j2 @@ -2114,94 +2151,6 @@ true true - - make - -j2 - install - true - true - true - - - make - -j2 - clean - true - true - true - - - make - -j2 - check - true - true - true - - - make - -j2 - all - true - true - true - - - make - -j2 - dist - true - true - true - - - make - -j2 - check - true - true - true - - - make - -j2 - install - true - true - true - - - make - -j2 - tests/testSpirit.run - true - true - true - - - make - -j2 - tests/testWrap.run - true - true - true - - - make - -j2 - clean - true - true - true - - - make - -j2 - all - true - true - true - make -j2 @@ -2258,6 +2207,54 @@ false true + + make + -j2 + check + true + true + true + + + make + -j2 + install + true + true + true + + + make + -j2 + tests/testSpirit.run + true + true + true + + + make + -j2 + tests/testWrap.run + true + true + true + + + make + -j2 + clean + true + true + true + + + make + -j2 + all + true + true + true + diff --git a/wrap/tests/expected/@Point2/Point2.m b/wrap/tests/expected/@Point2/Point2.m index f5d177933..b8cb9a12a 100644 --- a/wrap/tests/expected/@Point2/Point2.m +++ b/wrap/tests/expected/@Point2/Point2.m @@ -5,7 +5,7 @@ classdef Point2 methods function obj = Point2(varargin) if (nargin == 0), obj.self = new_Point2_(); end - if (nargin == 2 & isa(varargin{1},'double') & isa(varargin{2},'double')), obj.self = new_Point2_dd(varargin{1},varargin{2}); end + if (nargin == 2 && isa(varargin{1},'double') && isa(varargin{2},'double')), obj.self = new_Point2_dd(varargin{1},varargin{2}); end if nargin ~= 13 && obj.self == 0, error('Point2 constructor failed'); end end function display(obj), obj.print(''); end diff --git a/wrap/tests/expected/@Point2/dim.cpp b/wrap/tests/expected/@Point2/dim.cpp index e845db94a..47a7172f5 100644 --- a/wrap/tests/expected/@Point2/dim.cpp +++ b/wrap/tests/expected/@Point2/dim.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/@Point2/vectorConfusion.cpp b/wrap/tests/expected/@Point2/vectorConfusion.cpp index cdb06b2df..2a2234529 100644 --- a/wrap/tests/expected/@Point2/vectorConfusion.cpp +++ b/wrap/tests/expected/@Point2/vectorConfusion.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/@Point2/x.cpp b/wrap/tests/expected/@Point2/x.cpp index d245748d0..f53befc28 100644 --- a/wrap/tests/expected/@Point2/x.cpp +++ b/wrap/tests/expected/@Point2/x.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/@Point2/y.cpp b/wrap/tests/expected/@Point2/y.cpp index 6342d6238..5933a554b 100644 --- a/wrap/tests/expected/@Point2/y.cpp +++ b/wrap/tests/expected/@Point2/y.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/@Point3/Point3.m b/wrap/tests/expected/@Point3/Point3.m index dd0dbfdfc..aba7ffedd 100644 --- a/wrap/tests/expected/@Point3/Point3.m +++ b/wrap/tests/expected/@Point3/Point3.m @@ -4,7 +4,7 @@ classdef Point3 end methods function obj = Point3(varargin) - if (nargin == 3 & isa(varargin{1},'double') & isa(varargin{2},'double') & isa(varargin{3},'double')), obj.self = new_Point3_ddd(varargin{1},varargin{2},varargin{3}); end + if (nargin == 3 && isa(varargin{1},'double') && isa(varargin{2},'double') && isa(varargin{3},'double')), obj.self = new_Point3_ddd(varargin{1},varargin{2},varargin{3}); end if nargin ~= 13 && obj.self == 0, error('Point3 constructor failed'); end end function display(obj), obj.print(''); end diff --git a/wrap/tests/expected/@Point3/norm.cpp b/wrap/tests/expected/@Point3/norm.cpp index ad36e32b8..f8f1318f9 100644 --- a/wrap/tests/expected/@Point3/norm.cpp +++ b/wrap/tests/expected/@Point3/norm.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/@Test/Test.m b/wrap/tests/expected/@Test/Test.m index 694c87014..7c46da816 100644 --- a/wrap/tests/expected/@Test/Test.m +++ b/wrap/tests/expected/@Test/Test.m @@ -5,7 +5,7 @@ classdef Test methods function obj = Test(varargin) if (nargin == 0), obj.self = new_Test_(); end - if (nargin == 2 & isa(varargin{1},'double') & isa(varargin{2},'double')), obj.self = new_Test_dM(varargin{1},varargin{2}); end + if (nargin == 2 && isa(varargin{1},'double') && isa(varargin{2},'double')), obj.self = new_Test_dM(varargin{1},varargin{2}); end if nargin ~= 13 && obj.self == 0, error('Test constructor failed'); end end function display(obj), obj.print(''); end diff --git a/wrap/tests/expected/@Test/arg_EigenConstRef.cpp b/wrap/tests/expected/@Test/arg_EigenConstRef.cpp index e44b74f1b..15819d68b 100644 --- a/wrap/tests/expected/@Test/arg_EigenConstRef.cpp +++ b/wrap/tests/expected/@Test/arg_EigenConstRef.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/@Test/create_MixedPtrs.cpp b/wrap/tests/expected/@Test/create_MixedPtrs.cpp index a2c237c05..27a663d81 100644 --- a/wrap/tests/expected/@Test/create_MixedPtrs.cpp +++ b/wrap/tests/expected/@Test/create_MixedPtrs.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/@Test/create_ptrs.cpp b/wrap/tests/expected/@Test/create_ptrs.cpp index 33722bd14..48a9e4645 100644 --- a/wrap/tests/expected/@Test/create_ptrs.cpp +++ b/wrap/tests/expected/@Test/create_ptrs.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/@Test/print.cpp b/wrap/tests/expected/@Test/print.cpp index e92a58b10..e945988b5 100644 --- a/wrap/tests/expected/@Test/print.cpp +++ b/wrap/tests/expected/@Test/print.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/@Test/return_Point2Ptr.cpp b/wrap/tests/expected/@Test/return_Point2Ptr.cpp index 99cf67f0b..f6f366f8d 100644 --- a/wrap/tests/expected/@Test/return_Point2Ptr.cpp +++ b/wrap/tests/expected/@Test/return_Point2Ptr.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/@Test/return_Test.cpp b/wrap/tests/expected/@Test/return_Test.cpp index 19256f9ac..0ead17cb2 100644 --- a/wrap/tests/expected/@Test/return_Test.cpp +++ b/wrap/tests/expected/@Test/return_Test.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/@Test/return_TestPtr.cpp b/wrap/tests/expected/@Test/return_TestPtr.cpp index 39ed01f15..3aae3fdb9 100644 --- a/wrap/tests/expected/@Test/return_TestPtr.cpp +++ b/wrap/tests/expected/@Test/return_TestPtr.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/@Test/return_bool.cpp b/wrap/tests/expected/@Test/return_bool.cpp index 016bf2934..3581777ed 100644 --- a/wrap/tests/expected/@Test/return_bool.cpp +++ b/wrap/tests/expected/@Test/return_bool.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/@Test/return_double.cpp b/wrap/tests/expected/@Test/return_double.cpp index c087c194b..d2f08c939 100644 --- a/wrap/tests/expected/@Test/return_double.cpp +++ b/wrap/tests/expected/@Test/return_double.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/@Test/return_field.cpp b/wrap/tests/expected/@Test/return_field.cpp index 3c2ea29b0..9de7a9ed6 100644 --- a/wrap/tests/expected/@Test/return_field.cpp +++ b/wrap/tests/expected/@Test/return_field.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/@Test/return_int.cpp b/wrap/tests/expected/@Test/return_int.cpp index c9bada69e..f94551f03 100644 --- a/wrap/tests/expected/@Test/return_int.cpp +++ b/wrap/tests/expected/@Test/return_int.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/@Test/return_matrix1.cpp b/wrap/tests/expected/@Test/return_matrix1.cpp index acd39c9f5..2e726f572 100644 --- a/wrap/tests/expected/@Test/return_matrix1.cpp +++ b/wrap/tests/expected/@Test/return_matrix1.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/@Test/return_matrix2.cpp b/wrap/tests/expected/@Test/return_matrix2.cpp index 50e2ee462..1e18e3aba 100644 --- a/wrap/tests/expected/@Test/return_matrix2.cpp +++ b/wrap/tests/expected/@Test/return_matrix2.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/@Test/return_pair.cpp b/wrap/tests/expected/@Test/return_pair.cpp index a10e79109..81802130a 100644 --- a/wrap/tests/expected/@Test/return_pair.cpp +++ b/wrap/tests/expected/@Test/return_pair.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/@Test/return_ptrs.cpp b/wrap/tests/expected/@Test/return_ptrs.cpp index 6c2ab46a6..27085fcc6 100644 --- a/wrap/tests/expected/@Test/return_ptrs.cpp +++ b/wrap/tests/expected/@Test/return_ptrs.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/@Test/return_size_t.cpp b/wrap/tests/expected/@Test/return_size_t.cpp index af1524ec7..94b7d7b6c 100644 --- a/wrap/tests/expected/@Test/return_size_t.cpp +++ b/wrap/tests/expected/@Test/return_size_t.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/@Test/return_string.cpp b/wrap/tests/expected/@Test/return_string.cpp index 71a86e63b..786d98955 100644 --- a/wrap/tests/expected/@Test/return_string.cpp +++ b/wrap/tests/expected/@Test/return_string.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/@Test/return_vector1.cpp b/wrap/tests/expected/@Test/return_vector1.cpp index df8779989..a2e5108bd 100644 --- a/wrap/tests/expected/@Test/return_vector1.cpp +++ b/wrap/tests/expected/@Test/return_vector1.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/@Test/return_vector2.cpp b/wrap/tests/expected/@Test/return_vector2.cpp index ac87ab83a..03d584d06 100644 --- a/wrap/tests/expected/@Test/return_vector2.cpp +++ b/wrap/tests/expected/@Test/return_vector2.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/Makefile b/wrap/tests/expected/Makefile index 03f69a496..6723330a3 100644 --- a/wrap/tests/expected/Makefile +++ b/wrap/tests/expected/Makefile @@ -1,4 +1,4 @@ -# automatically generated by wrap on 2011-Dec-06 +# automatically generated by wrap on 2012-Jan-15 MEX = mex MEXENDING = mexa64 diff --git a/wrap/tests/expected/Point3_StaticFunctionRet.cpp b/wrap/tests/expected/Point3_StaticFunctionRet.cpp index 657f90bb1..4be4329ed 100644 --- a/wrap/tests/expected/Point3_StaticFunctionRet.cpp +++ b/wrap/tests/expected/Point3_StaticFunctionRet.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/Point3_StaticFunctionRet.m b/wrap/tests/expected/Point3_StaticFunctionRet.m index f2ba314f1..25a9d6ff2 100644 --- a/wrap/tests/expected/Point3_StaticFunctionRet.m +++ b/wrap/tests/expected/Point3_StaticFunctionRet.m @@ -1,4 +1,4 @@ -function result = Point3_StaticFunctionRet() -% usage: x = Point3_StaticFunctionRet() +function result = Point3_StaticFunctionRet(z) +% usage: x = Point3_StaticFunctionRet(z) error('need to compile Point3_StaticFunctionRet.cpp'); end diff --git a/wrap/tests/expected/Point3_staticFunction.cpp b/wrap/tests/expected/Point3_staticFunction.cpp index e0519e20e..7024cb9d7 100644 --- a/wrap/tests/expected/Point3_staticFunction.cpp +++ b/wrap/tests/expected/Point3_staticFunction.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/make_geometry.m b/wrap/tests/expected/make_geometry.m index 39123f65d..81ddc186f 100644 --- a/wrap/tests/expected/make_geometry.m +++ b/wrap/tests/expected/make_geometry.m @@ -1,4 +1,4 @@ -% automatically generated by wrap on 2011-Dec-06 +% automatically generated by wrap on 2012-Jan-15 echo on toolboxpath = mfilename('fullpath'); diff --git a/wrap/tests/expected/new_Point2_.cpp b/wrap/tests/expected/new_Point2_.cpp index 5cfcad238..9b3aa2fa5 100644 --- a/wrap/tests/expected/new_Point2_.cpp +++ b/wrap/tests/expected/new_Point2_.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/new_Point2_.m b/wrap/tests/expected/new_Point2_.m index dc02b426b..e2215bfec 100644 --- a/wrap/tests/expected/new_Point2_.m +++ b/wrap/tests/expected/new_Point2_.m @@ -1,4 +1,4 @@ -% automatically generated by wrap on 2011-Dec-06 +% automatically generated by wrap on 2012-Jan-15 function result = new_Point2_(obj) error('need to compile new_Point2_.cpp'); end diff --git a/wrap/tests/expected/new_Point2_dd.cpp b/wrap/tests/expected/new_Point2_dd.cpp index 6ab5721a1..496e22239 100644 --- a/wrap/tests/expected/new_Point2_dd.cpp +++ b/wrap/tests/expected/new_Point2_dd.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/new_Point2_dd.m b/wrap/tests/expected/new_Point2_dd.m index 7d4bf7b86..947e9477d 100644 --- a/wrap/tests/expected/new_Point2_dd.m +++ b/wrap/tests/expected/new_Point2_dd.m @@ -1,4 +1,4 @@ -% automatically generated by wrap on 2011-Dec-06 +% automatically generated by wrap on 2012-Jan-15 function result = new_Point2_dd(obj,x,y) error('need to compile new_Point2_dd.cpp'); end diff --git a/wrap/tests/expected/new_Point3_ddd.cpp b/wrap/tests/expected/new_Point3_ddd.cpp index 285ed9ca6..b3b410443 100644 --- a/wrap/tests/expected/new_Point3_ddd.cpp +++ b/wrap/tests/expected/new_Point3_ddd.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/new_Point3_ddd.m b/wrap/tests/expected/new_Point3_ddd.m index b3004b4bb..089268cc1 100644 --- a/wrap/tests/expected/new_Point3_ddd.m +++ b/wrap/tests/expected/new_Point3_ddd.m @@ -1,4 +1,4 @@ -% automatically generated by wrap on 2011-Dec-06 +% automatically generated by wrap on 2012-Jan-15 function result = new_Point3_ddd(obj,x,y,z) error('need to compile new_Point3_ddd.cpp'); end diff --git a/wrap/tests/expected/new_Test_.cpp b/wrap/tests/expected/new_Test_.cpp index 9c9aaab88..0080e3b21 100644 --- a/wrap/tests/expected/new_Test_.cpp +++ b/wrap/tests/expected/new_Test_.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry; diff --git a/wrap/tests/expected/new_Test_.m b/wrap/tests/expected/new_Test_.m index 9064b5f23..b1b04f083 100644 --- a/wrap/tests/expected/new_Test_.m +++ b/wrap/tests/expected/new_Test_.m @@ -1,4 +1,4 @@ -% automatically generated by wrap on 2011-Dec-06 +% automatically generated by wrap on 2012-Jan-15 function result = new_Test_(obj) error('need to compile new_Test_.cpp'); end diff --git a/wrap/tests/expected/new_Test_dM.cpp b/wrap/tests/expected/new_Test_dM.cpp index 4179921da..5a4ad0bd8 100644 --- a/wrap/tests/expected/new_Test_dM.cpp +++ b/wrap/tests/expected/new_Test_dM.cpp @@ -1,4 +1,4 @@ -// automatically generated by wrap on 2011-Dec-09 +// automatically generated by wrap on 2012-Jan-15 #include #include using namespace geometry;