12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,587 Commits
1 Branch
0 Tags
79 MiB
Commit Graph

328 Commits (02524f42e7893fc7b3232f85f8077fb6c20bf45c)

Author SHA1 Message Date
Richard Roberts 90fd122876 Updated wrap expected files from double clear all bug fix 2012-07-17 22:10:39 +00:00
Richard Roberts b5e10eadb8 Fixed bug where calling 'clear all' only once caused a problem where the wrap module recreated the RTTI table but MATLAB then deletes it, causing an error about the RTTI table being missing later on. 2012-07-17 19:49:36 +00:00
Alex Cunningham 4b772b43cf Simplified include handling in wrap: no more default includes, includes are not associated with a class or a namespace. 2012-07-17 18:30:02 +00:00
Richard Roberts 4bcc974cae Updated unit tests after changing namespace handling 2012-07-17 17:38:31 +00:00
Richard Roberts 10c5ebae73 Always write and read wrap files in binary mode to prevent writing CRLF line endings on windows (messes up expected unit test files) 2012-07-17 17:38:29 +00:00
Richard Roberts e9f710a1ac More flexible handling of includes in wrap - can now use multiple includes both at the namespace and class levels, and namespace includes do not override the default class-name includes of their enclosed classes. 2012-07-17 15:51:35 +00:00
Alex Cunningham a87d12a7b7 pacified warning 2012-07-14 20:30:30 +00:00
Richard Roberts ee2889d4b3 Improved error message 2012-07-13 21:59:30 +00:00
Richard Roberts 6c9608752e Small cleanups / fixes in handling of compile options 2012-07-13 21:55:00 +00:00
Richard Roberts 4ae96c6642 Check dependencies before class attributes to avoid out-of-range exception 2012-07-13 21:54:57 +00:00
Richard Roberts aa5beafd94 Wrap include path bug fix 2012-07-13 21:54:55 +00:00
Richard Roberts 191d73df0b Simplified matlab wrapper cmake options 2012-07-13 21:54:52 +00:00
Richard Roberts 7f63d23565 Added missing files from last commit - code cleanup and comments 2012-07-13 21:54:48 +00:00
Richard Roberts ce12f3d255 Code cleanup and comments 2012-07-12 22:28:28 +00:00
Richard Roberts b1a58e4447 Updated expected wrap unit test files 2012-07-12 02:11:36 +00:00
Richard Roberts 55a153ebc6 Wrapped Cal3DS2, RangeFactor, BearingFactor, and GenericProjectionFactor 2012-07-12 02:11:32 +00:00
Richard Roberts 76e5375dea Added support for multi-argument templates that are then instantiated with typedefs in wrap interface header. 2012-07-12 02:11:29 +00:00
Richard Roberts c4f19a2b96 Can define template classes in wrap interface file with a fixed list of template argument expansions, to quickly generate many classes, e.g. template<T = {gtsam::Point2,gtsam::Point3}> class BetweenFactor ... generates gtsamBetweenFactorPoint2, gtsamBetweenFactorPoint3, etc. 2012-07-11 21:43:16 +00:00
Richard Roberts 42dec286ee Removed unused argument list member from Deconstructor 2012-07-11 21:43:13 +00:00
Alex Cunningham 774fcb5ca9 Fixed include sorting bug in wrap 2012-07-11 15:58:01 +00:00
Richard Roberts 1993e6952b Merged from branch 'branches/wrap_mods_inheritance' into branch 'branches/wrap_mods' 2012-07-11 15:45:45 +00:00
Richard Roberts 7c176dd76d Automatic returning of derived-most type in matlab wrapper working but not yet well-tested 2012-07-11 15:44:04 +00:00
Alex Cunningham f3406f3bc9 Small change to wrap to avoid redundant includes in cpp file 2012-07-11 14:54:13 +00:00
Alex Cunningham 2e6de9e9a1 Fixed wrap unit test 2012-07-11 14:54:11 +00:00
Richard Roberts 33a64fc7b5 Removed debug prints 2012-07-10 22:53:35 +00:00
Richard Roberts af11b6c0a0 Create table of RTTI type names at wrap module creation time - will support code to create most derived type from base type in matlab wrapper 2012-07-10 22:51:19 +00:00
Richard Roberts 0c384dc35a Added a check that all wrapped classes involved in a heirarchy are marked virtual 2012-07-10 22:38:21 +00:00
Alex Cunningham 5d58dbd512 Fixed testWrap so that it passes, fixed dependency checking in codegen, fixed warnings 2012-07-10 14:21:58 +00:00
Alex Cunningham 6daa86f137 Fixed C++ versioning issue in wrap, now compiles and toolbox passes matlab tests, testWrap now compiles but does not pass 2012-07-10 14:21:56 +00:00
Richard Roberts 4a0866b519 Merge remote-tracking branch 'svn/branches/wrap_mods' into wrap_mods_inheritance 
Conflicts:
	gtsam.h
 2012-07-09 20:27:23 +00:00
Richard Roberts e915e666b5 Can return abstract base classes from functions in matlab wrapper, i.e. Values::at 2012-07-09 20:19:37 +00:00
Alex Cunningham e451a95991 Added wrap target to exported/installed targets 2012-07-09 17:14:21 +00:00
Richard Roberts 8a8b27005f wrap_mods_inheritance branch - Can now pass derived classes in as base class arguments (i.e. pass gtsamPose2 where gtsamValues.insert expects gtsamValue) 2012-07-09 00:02:43 +00:00
Alex Cunningham 9c876ed6b0 Wrap tests now pass with new file structure 2012-07-08 20:23:47 +00:00
Richard Roberts 3c27daae18 wrap_mods_inheritance branch: in progress with inheritance in matlab wrapper 2012-07-08 12:27:39 +00:00
Alex Cunningham 169c0191c6 Added header needed for uint64_t 2012-07-06 18:58:35 +00:00
Richard Roberts da5c924d58 Merged from branch 'trunk' 2012-07-06 18:37:55 +00:00
Alex Cunningham fe133ef97c Updated expected files to match current wrap test 2012-07-05 17:14:40 +00:00
Richard Roberts b460f2a721 Added missing 'typename's 2012-07-05 17:08:40 +00:00
Richard Roberts f774a380ec Implemented method overloading in matlab wrapper, made static functions static in matlab classes 2012-07-05 14:05:00 +00:00
Richard Roberts 8ab18498ad Add to collector through matlab function to allow returning objects from other wrap modules 2012-07-05 14:04:57 +00:00
Richard Roberts 8f8975f47f Removed obsolete code for generating matlab wrapper makefiles and build script 2012-07-05 14:04:51 +00:00
Richard Roberts 1ee7162383 Fixed warnings 2012-07-05 14:04:46 +00:00
Richard Roberts b5937ce35d Modified wrap to generate a single cpp wrapper file containing all wrapped functions, and one .m file per class and static method. 2012-07-05 14:04:36 +00:00
Richard Roberts d2620d2ebc Add headers to wrap_lib target 2012-07-03 15:33:16 +00:00
Andrew Melim e40ce8b44d Fixed class issue calling destructor 2012-07-03 01:28:41 +00:00
Richard Roberts b163d26d5e Fixed invalid iterator bug during clear all in Matlab wrapper 2012-07-02 22:33:36 +00:00
Richard Roberts b8a627b19c Fixed 64/32-bit pointer detection in Matlab wrapper under Windows 2012-07-02 22:33:28 +00:00
Andrew Melim 15b3dd9d5f adding new constructors for matlab wrap tests 2012-07-02 19:09:50 +00:00
Andrew Melim ead88ae35a Changes to wrap requested by frank. Wrap now allows for multiple includes. Changes to wrap tests 2012-07-02 18:18:11 +00:00
Alex Cunningham 9273c3d18c Added minimal output to wrap generation 2012-07-01 18:00:35 +00:00
Alex Cunningham 7ba7aa6cfc Updated wrap unit tests for new wrap changes 2012-06-30 20:04:16 +00:00
Alex Cunningham b33713a02e Merge branch 'master' into new_wrap_local 
Conflicts:
	.cproject
	gtsam.h
 2012-06-30 20:04:12 +00:00
Andrew Melim 02df40bd73 Dependency checking for matlab.h 2012-06-30 01:33:41 +00:00
Andrew Melim f0c8c023a0 Added small verbosity changes, verbose now defaults to false in wrap.cpp 2012-06-29 18:38:54 +00:00
Alex Cunningham 3ab79d1597 Fixed wrap test 2012-06-28 16:13:22 +00:00
Andrew Melim fb00f4b834 fixes for two word args 2012-06-27 21:50:45 +00:00
Andrew Melim ea0c85ef06 Crash for some objects is now fixed 2012-06-27 16:22:12 +00:00
Andrew Melim 6d776812d3 new wrap! :) 2012-06-26 18:52:27 +00:00
Frank Dellaert 1b23ebbdbf Fixed wrap unit test after adding documentation 2012-06-24 14:49:35 +00:00
Frank Dellaert ce767762e9 Better documentation for MATLAB methods 2012-06-24 14:32:06 +00:00
Duy-Nguyen Ta 6f1ea87a00 clean up noise model: Remove Shared[NoiseModel] classes and headers, typedef for backward compatibility in NoiseModel.h. Fix all tests and examples to create shared noise models through static functions in noise model classes. Fix MATLAB wrapper and examples as well. Add tests for MATLAB examples 2012-06-22 19:36:49 +00:00
Duy-Nguyen Ta f9a8d69a75 specialized templates to support noise model class inheritance 2012-06-19 06:06:26 +00:00
Frank Dellaert 7832b586e6 Small detail in constructors 2012-06-15 01:00:50 +00:00
Frank Dellaert d13db7a997 Fixed wrap problem where a double could not be passed to a method taking a size_t. Also, if a method takes a bool, you now *have* to pass a logical in matlab (i.e., true or false) 2012-06-13 12:03:33 +00:00
Alex Cunningham 3a9b647b8f Updated expected wrap values 2012-06-06 12:03:49 +00:00
Frank Dellaert 76a1ae0102 Fixed emit of comment string 2012-06-06 04:28:50 +00:00
Alex Cunningham 00b6f177d2 Removing unnecessary boost dependencies - may need more fixing 2012-06-05 19:25:31 +00:00
Alex Cunningham ad3b431c4d Moved building of wrap libraries to a cmake macro and moved install for matlab components to the appropriate folder 2012-06-05 18:05:00 +00:00
Alex Cunningham 02ce40546f Changed names of cmake flags to be more intuitive, fixed include/library path issues for building the mex binaries 2012-06-05 17:20:19 +00:00
Richard Roberts 90578e2532 Merge remote-tracking branch 'svn/trunk' into windows 
Conflicts:
	gtsam.h
	wrap/CMakeLists.txt
 2012-06-05 13:11:34 +00:00
Chris Beall 129e29d4b2 fix related to mex command 2012-06-04 22:09:33 +00:00
Alex Cunningham cc2351da68 Fixed documentation for wrap 2012-06-04 21:14:47 +00:00
Alex Cunningham 9efcf8e17c Added option to include path to mex executable in CMake 2012-06-04 21:01:25 +00:00
Alex Cunningham a07e4a7368 Fixed handling of char in wrap, updated README 2012-06-04 19:45:32 +00:00
Alex Cunningham 73b4f35e02 Fixed matlab issue with unsigned char types 2012-06-04 19:23:25 +00:00
Alex Cunningham e1725fb8e3 Fleshed out support for building MEX binaries during gtsam build 2012-06-04 15:33:16 +00:00
Richard Roberts 9c8377f476 Merge remote-tracking branch 'svn/trunk' into windows 
Conflicts:
	examples/Pose2SLAMExample.cpp
	examples/vSLAMexample/CMakeLists.txt
	examples/vSLAMexample/vISAMexample.cpp
	gtsam/nonlinear/ISAM2-impl.cpp
	gtsam/slam/pose2SLAM.cpp
	gtsam/slam/tests/testGeneralSFMFactor.cpp
	gtsam/slam/tests/testGeneralSFMFactor_Cal3Bundler.cpp
	gtsam/slam/tests/testPlanarSLAM.cpp
	gtsam/slam/tests/testPose2SLAM.cpp
	tests/testDoglegOptimizer.cpp
	tests/testGraph.cpp
 2012-06-04 14:13:37 +00:00
Alex Cunningham 2f9ed9abf2 Changed data install path for toolbox 2012-06-04 14:12:51 +00:00
Alex Cunningham 839b539aad Fixed a bug in cmake install that tried to copy a .svn folder 2012-06-03 20:08:46 +00:00
Alex Cunningham 720db709be Examples install now installs data for Matlab examples. Fixed typo in examples documentation 2012-06-03 19:26:28 +00:00
Alex Cunningham 8bcd2da2f0 Fixed wrap support for unsigned char 2012-05-31 15:06:21 +00:00
Richard Roberts cf232fe4a8 Added missing boost filesystem library to link with wrap 2012-05-29 20:03:15 +00:00
Richard Roberts d636534e40 Updated wrap unit tests 2012-05-29 19:30:59 +00:00
Richard Roberts dc036a0891 Updated wrap unit tests 2012-05-29 19:29:29 +00:00
Richard Roberts 592a251a05 Fixed path and compile problems with matlab wrapper on windows 2012-05-28 20:48:36 +00:00
Richard Roberts 1ca9e7049e Merge remote-tracking branch 'svn/trunk' into windows 
Conflicts:
	gtsam/linear/HessianFactor.h
	gtsam/nonlinear/Marginals.cpp
 2012-05-28 12:22:36 +00:00
Alex Cunningham 0d597082f2 Added optional target to build the matlab toolbox as a part of the gtsam build process 2012-05-25 21:18:41 +00:00
Richard Roberts ac150043bd Fixed wrap under windows 2012-05-23 21:23:27 +00:00
Frank Dellaert 8a69bb8bcb Added marginals in MATLAB, but had to fix a bug in converting from 64 bit ints to size_t. This begs the question what happens on 32-bit machines with Symbols. 2012-05-22 19:01:40 +00:00
Alex Cunningham f8a03ddbca Added better support for "using namespace x" to wrap - only applies to classes *after* it is called 2012-05-04 19:14:58 +00:00
Alex Cunningham f2c7e891c4 Added 'unsigned char' as argument option to wrap, added make targets 2012-05-04 18:50:36 +00:00
Richard Roberts 824e163926 Added missing header 2012-04-21 01:45:04 +00:00
Alex Cunningham da63e6757c Fixed cpack install to work with tgz, deb and rpm 2012-04-10 16:47:02 +00:00
Alex Cunningham 204b36fc05 Changes to make ROS hooks work with cmake 2012-04-01 22:21:07 +00:00
Andrew Melim 1ea890f4e5 Fixed testWrap failures with the new wrapper 2012-03-30 18:06:58 +00:00
Andrew Melim 0c1ebb046d Removing print line 2012-03-30 06:19:59 +00:00
Andrew Melim a1da906d33 Memory leak fixed within wrap. Must call 'clear' before 'clear all' and 'clear classes'. Wrap now creates delete_classname files for all wrapped classes. MATLAB classes now derive from the handle superclass. 2012-03-30 05:34:23 +00:00
Alex Cunningham b67707542d Updated CMakeLists to use newer cmake scripts 2012-03-29 18:57:31 +00:00
Alex Cunningham 58b64da525 Added better printout of configurable cmake options at the end of configuration 2012-02-29 04:11:48 +00:00
Alex Cunningham 12351dbfea Updated find scripts to work by testing against gtsam2, no longer depends on build folders 2012-02-25 22:35:09 +00:00
Richard Roberts 1d0aaacbd6 Removed use of GTSAM_MAGIC_KEY for constructing Symbols from strings 2012-02-22 23:38:09 +00:00
Richard Roberts 5939ec2371 Merge commit '69c480490e0bc18ea897f1c96d8dd0bdc9b50fd5' into 2.0_prep (trunk r9251) 
Conflicts:
	gtsam/linear/SubgraphSolver.h
	tests/Makefile.am
 2012-02-15 23:43:25 +00:00
Alex Cunningham d0bb9855f1 Switched wrap test targets to using macro 2012-02-14 21:57:16 +00:00
Alex Cunningham 23971aa044 Added macros to remove copy/paste in cmake. Added support for building without convenience libraries. 2012-02-14 20:00:42 +00:00
Alex Cunningham 0409c1c7ee Adding faster compilation options for distribution in CMake 2012-02-14 18:03:29 +00:00
Alex Cunningham 6f09998e10 Removed autotools from gtsam2 branch 2012-02-13 21:13:07 +00:00
Alex Cunningham ded872af5f Forced wrap to always add a "generated by" header, updated expected test code 2012-02-06 19:45:40 +00:00
Frank Dellaert c2e14b9f06 No more date to avoid triggering svn changes 2012-02-06 17:18:25 +00:00
Duy-Nguyen Ta 6f4c95a65b apply bug fixes in MATLAB wrapper shared_ptr return from trunk. All tests work now. 2012-02-06 03:29:14 +00:00
Alex Cunningham fab5717917 Fixed namespace return type bug with pointers in wrap. Matlab tests now pass. 2012-02-06 01:59:45 +00:00
Alex Cunningham c901ceee27 wrap: forward declarations now allow for namespaces 2012-02-01 15:19:34 +00:00
Alex Cunningham 28f2276cc4 Added flag to link against local convenience libraries for tests 2012-01-31 19:59:19 +00:00
Alex Cunningham c3f8c791b2 Added missing dependency 2012-01-31 19:59:17 +00:00
Alex Cunningham 2f44444efe cmake codegen and install now works 2012-01-31 19:59:16 +00:00
Alex Cunningham c43a9b4852 Added a variety of options to the cmake build, working on automating wrap execution/install 2012-01-31 19:59:15 +00:00
Alex Cunningham ec1053bfc2 Wrap now works in cmake 2012-01-31 05:28:05 +00:00
Alex Cunningham 910beebb8f Added wrap to build, assorted cleanup 2012-01-31 05:28:03 +00:00
Chris Beall 537a1a3fae Matlab wrapped classes now live within the gtsam namespace, meaning you have to use gtsamPose2 instead of just Pose2 in Matlab. This fixes the Point2 and Point3 issues we had with Matlab 2011b. 
promote pose2SLAM planarSLAM etc. namespaces to be next to gtsam instead of within
 2012-01-30 22:00:13 +00:00
Frank Dellaert a1aba7d6ff Fixed argument parse error. Somehow it could parse either refs or ptrs, but noth both, and it depended on the order in which the rules were given in the argList_p. I just combined ptr and ref in one and now it works. Go figure. 2012-01-28 19:44:33 +00:00
Alex Cunningham 6d8c2133b6 Updated wrap usage message 2012-01-28 04:07:35 +00:00
Chris Beall 9bceda3f57 typos 2012-01-28 02:39:50 +00:00
Alex Cunningham a8607d284d Added wrap support for char as a argument or return value type 2012-01-23 18:28:11 +00:00
Frank Dellaert 1dc669d463 more debug code (turns out wrap works quite well) 2012-01-20 22:28:29 +00:00
Alex Cunningham 269ac46bd9 Fixed install problems with wrap so headers now go in include/wrap 2012-01-18 15:12:58 +00:00
Alex Cunningham 3942f28a68 Wrap now only writes new files when there is a change, and install only updates files if necessary 2012-01-15 21:42:44 +00:00
Alex Cunningham 66a9d635b3 Unified file writing to use a custom class to allow for smart checking 2012-01-15 21:42:41 +00:00
Alex Cunningham 500d509f81 Added another expected value for toolbox codegen 2012-01-15 19:09:36 +00:00
Alex Cunningham 94cbee4208 Updated expected toolbox code to match updated states 2012-01-15 19:09:34 +00:00
Frank Dellaert 9868355b40 Changed & to && to avoid MATLAB warnings 2012-01-15 04:17:21 +00:00
Frank Dellaert 33d6934a44 forgot string will be 'char' class and some basic types (bool, int, size_t) that will be 'double' 2012-01-10 05:35:12 +00:00
Frank Dellaert 0c03fd010d Constructors now check argument types to allow multiple constructors in MATLAB with the same number of arguments 2012-01-10 05:06:46 +00:00
Alex Cunningham 3ccb670e92 changed wrap install script to use correct flags for cp on macs 2011-12-21 14:06:37 +00:00
Alex Cunningham 7c6068fbf7 fixed depenency issue with wrap so make -j6 works 2011-12-16 14:44:04 +00:00
Andrew Melim 316709b898 Fixed Arguments.cpp causing testing failures 2011-12-15 22:26:39 +00:00
Alex Cunningham 56bce0ca9f Added dependency checking to return values in wrap, as well as forward declarations 2011-12-15 21:23:20 +00:00
Alex Cunningham 44aff08d56 Added support for namespace includes to wrap 2011-12-15 19:39:14 +00:00
Alex Cunningham ea1f1e8b65 Parser now handles both namespace and class headers 2011-12-15 19:39:11 +00:00
Alex Cunningham dbc6a8aeec Reverted wrap argument change due to failing tests 2011-12-15 19:39:09 +00:00
Alex Cunningham 99338805c0 re-enabled test 2011-12-15 16:18:04 +00:00
Alex Cunningham 694320388f Moved includes outside of classes in wrap parser 2011-12-15 16:18:03 +00:00
Alex Cunningham 17bf0f0169 Added static and shared versions of gtsam 2011-12-15 16:17:58 +00:00
Andrew Melim 5a75c9e963 Fixed bug with Argument.cpp due to different constructor argument starting with the name letter 2011-12-14 21:10:56 +00:00
Alex Cunningham 3afc03cf04 Moved installation of 3rdparty headers into separate cmake file, install some wrap components 2011-12-14 02:24:25 +00:00
Alex Cunningham 5dd461c5b1 Added make check equivalent 2011-12-14 02:24:23 +00:00
Alex Cunningham 61d05813ff Library now builds and all tests run with cmake 2011-12-14 02:24:21 +00:00
Alex Cunningham 6a0da1519a Cleanup in wrap 2011-12-11 21:09:07 +00:00
Alex Cunningham 06dbc2b650 Changed namespace mechanism in wrap to "using namespace gtsam;" inside gtsam.h 2011-12-09 20:29:47 +00:00
Alex Cunningham 4e5a80aa56 Removed extraneous headers that were previously needed for wrap, added start of simulated2D and simulated2DOriented domains to gtsam.h, more wrap documentation 2011-12-09 16:36:50 +00:00
Alex Cunningham c302a50146 Added an implementation of the planarSLAM to gtsam.h using manual includes and namespaces, removed old duplicate header files 2011-12-09 15:44:37 +00:00