Commit Graph

528 Commits (4fb83694a70396e70a492a76eb3ae16f4e94547f)

Author SHA1 Message Date
Richard Roberts 5dcfa04eb1 Fixed BayesTree joint marginals for the case of joints across disjoint trees in a forest 2013-08-16 21:24:34 +00:00
Richard Roberts 68c6bf4a38 Added CMake code and preprocessor macros so that everything works without TBB and falls back on single-threading 2013-08-16 20:26:07 +00:00
Richard Roberts e2733d9899 Fixed serialization problems with tbb data structures 2013-08-16 04:10:29 +00:00
Richard Roberts 6d4c101d86 Fixed empty list bug in COLAMDConstrainFirst 2013-08-16 04:09:48 +00:00
Richard Roberts 165e0b8797 Quick attempt at parallelizing back-substitution 2013-08-15 18:16:32 +00:00
Richard Roberts 4e8fe533c8 Revert "With Richard: changing from "unsafe_erase" to "erase""
This reverts commit 562bee77cc046234b19fd230c165b5e5f51a8ba3.
2013-08-15 17:23:52 +00:00
Richard Roberts bd89c5fd45 Using FastVector (with tbb allocator) instead of vector 2013-08-15 17:21:20 +00:00
Alex Cunningham f01883b08b With Richard: changing from "unsafe_erase" to "erase" 2013-08-15 14:40:01 +00:00
Richard Roberts 5b4f61171f Changed back to fastmap to fix serialization 2013-08-15 14:24:21 +00:00
Richard Roberts 174c2da7d9 Switched a couple of data structures - ISAM2::Nodes and Scatter, to tbb versions for better performance 2013-08-14 22:54:00 +00:00
Richard Roberts b0659da607 Enabled multithreaded elimination by default 2013-08-14 19:47:29 +00:00
Chris Beall 5c37845c75 minor fix for Mac/Clang 2013-08-13 04:01:23 +00:00
Richard Roberts dc062430d6 Fixed c++11 dependency by replacing with boost 2013-08-13 03:57:01 +00:00
Richard Roberts 7ee1c48ce5 Fixed some compile errors with older boost 2013-08-13 03:13:14 +00:00
Richard Roberts 15bd617a0c Added missing non-ordered eliminatePartialMultifrontal 2013-08-12 18:21:31 +00:00
Richard Roberts f73db8847b Fixed bottleneck in reelimination with orphans 2013-08-12 03:57:17 +00:00
Richard Roberts 84261b38ff Fixed parentheses bug in JunctionTree constructor 2013-08-11 19:00:47 +00:00
Richard Roberts 094fffeea7 Fixed compile errors on Linux 2013-08-11 00:56:50 +00:00
Richard Roberts 789f2bee97 ISAM2 compiling and fixed several issues but still some unit tests failing 2013-08-09 21:35:47 +00:00
Richard Roberts 9a10242e96 Fixed warnings 2013-08-09 21:35:42 +00:00
Richard Roberts 356351db75 Removed unused addClique function 2013-08-09 21:35:39 +00:00
Richard Roberts 957afb4835 Merge branch 'svn/branches/unordered'
Conflicts:
	gtsam/inference/JunctionTree-inst.h
2013-08-08 17:36:43 +00:00
Richard Roberts 41a1b3c30e Fixed comment wording 2013-08-08 17:35:33 +00:00
Frank Dellaert 7175d588e1 Fixed comment wording 2013-08-08 17:26:45 +00:00
Richard Roberts b572ad8131 Use functor structs instead of pointer-to-template-function 2013-08-08 16:30:10 +00:00
Richard Roberts 0726a5ffbc Instantiating template base classes in derived class .cpp files 2013-08-08 16:30:02 +00:00
Richard Roberts 3528173781 Fixed compile problem on linux using boost::join with boost::cref_list_of 2013-08-08 16:29:55 +00:00
Richard Roberts 2388f5df45 Revert "Fixing issues with boost::assign"
This reverts commit d820732adc34a6622aae5d2bc0eb4a88e133beaf.
2013-08-08 16:29:48 +00:00
Richard Roberts 6556fb5b1e Fixed a couple errors and warnings 2013-08-07 21:57:25 +00:00
Alex Cunningham 2b1a533477 Fixing issues with boost::assign 2013-08-07 13:29:35 +00:00
Richard Roberts c0ccec4656 Working on ISAM2 2013-08-07 02:56:39 +00:00
Alex Cunningham b2b7b0b3f3 Fixing more compile problems: Switched BayesTree-inst.h function to use a functor struct rather than an address of a template function - seems to compile. Small include fixes elsewhere 2013-08-06 20:21:43 +00:00
Richard Roberts 375f7c16e6 Working on fixing ISAM 2013-08-06 19:56:48 +00:00
Richard Roberts b823354e44 Exclude null factors from remaining factors when building elimination tree 2013-08-06 18:21:54 +00:00
Alex Cunningham cee0a234ac Fixing compile problems 2013-08-06 17:50:50 +00:00
Alex Cunningham dde245ef3b Merging 2013-08-06 17:50:49 +00:00
Alex Cunningham db287b0d73 Fixing compile problems 2013-08-06 17:50:47 +00:00
Richard Roberts 1424c01fa9 Renamed all typedefs of specific EliminationTraits to EliminationTraitsType to avoid name problem on GCC 2013-08-06 17:09:20 +00:00
Richard Roberts b6c404ff79 Fix in BayesTree shortcuts 2013-08-06 16:10:12 +00:00
Richard Roberts 61fe49ab7e Added EliminateableFactorGraph::marginal and eliminatePartialSequential with vector of keys instead of ordering 2013-08-06 16:10:11 +00:00
Richard Roberts 8bd19e5ef8 Added Ordering::COLAMDConstrainedFirst function 2013-08-06 16:10:08 +00:00
Richard Roberts e39d100b6a Made most global unit tests compile, includes dogleg, iterative, kalman filter, etc 2013-08-06 13:44:22 +00:00
Richard Roberts 09643929fd Making some tests compile 2013-08-05 22:31:26 +00:00
Richard Roberts 0e80fe6418 Moved ordering tests, fixed serialization and constructors, to make all inference, symbolic, and linear tests pass 2013-08-05 22:31:09 +00:00
Richard Roberts 5eb7613f5c Started to fix errors resulting from removing Ordered classes 2013-08-02 22:09:49 +00:00
Richard Roberts be0b27a003 Removed obsolete Ordered classes and unit tests that have already been converted 2013-08-02 22:09:40 +00:00
Richard Roberts 1f6ca330ee Cleanups 2013-08-02 22:09:30 +00:00
Richard Roberts afb8a9aa1b Using 1 thread for now for profiling 2013-08-01 21:57:59 +00:00
Richard Roberts 12de12f045 Added Ordering::COLAMDConstrained and more detailed comments on other COLAMD functions 2013-08-01 21:57:22 +00:00
Richard Roberts 4ea83e8939 Added FactorGraph += for plain const ref to shared_ptr of same type 2013-08-01 21:57:21 +00:00
Richard Roberts 79a3b8dd30 Derive BayesTreeOrphanWrapper from conditional instead of factor 2013-08-01 21:57:18 +00:00
Richard Roberts 60d5feb5cf Working on ISAM 2013-07-29 23:56:04 +00:00
Richard Roberts 3ade190128 Renamed old classes to "Ordered" and removed "Unordered" name from new classes 2013-07-29 23:55:40 +00:00
Richard Roberts 5746dedacb Enabled and made GaussianBayesTree unit tests pass 2013-07-29 23:54:38 +00:00
Richard Roberts a7540a7305 Removed unused code 2013-07-27 18:35:31 +00:00
Richard Roberts 619c772a80 Updated and made removeTop unit tests pass 2013-07-27 18:33:43 +00:00
Richard Roberts 594c0412cb Adjusted parameters 2013-07-27 18:33:42 +00:00
Richard Roberts 1ee51fb6f5 A couple cleanups 2013-07-26 21:03:10 +00:00
Richard Roberts d3afcf9770 Changed parameter 2013-07-26 18:00:36 +00:00
Richard Roberts 3118f6bb9f JunctionTree keeps track of "problem size" at each node 2013-07-26 01:10:16 +00:00
Richard Roberts 0b13c437fe Updated print functions 2013-07-26 01:10:12 +00:00
Richard Roberts c788c525ea Added timing statements in new code 2013-07-23 18:34:23 +00:00
Richard Roberts 65657916ab SymbolicBayesTreeUnordered shortcut and marginal unit tests pass 2013-07-23 16:14:56 +00:00
Richard Roberts aef3ba5e56 Fixed bug in COLAMD ordering (unordered branch) 2013-07-23 03:53:00 +00:00
Richard Roberts a28b9152e6 Fixed BayedTreeUnordered copying, a few small bugs 2013-07-23 02:17:11 +00:00
Richard Roberts 472f246b97 Combined changes - fixed up push_back and += functions in FactorGraphUnordered, enabled BayesTree marginals/shortcut code and unit tests, and cleaned up other template arguments, etc. 2013-07-23 02:17:09 +00:00
Richard Roberts 25de39c481 Added typedef 2013-07-23 02:17:04 +00:00
Richard Roberts b0f0c71d01 Added constrained COLAMD functions 2013-07-23 02:17:03 +00:00
Richard Roberts 38c1066750 Readded BayesTree operator[] 2013-07-23 02:17:01 +00:00
Richard Roberts 6842f4a13b Made argument order in elimination functions consistent 2013-07-17 03:13:26 +00:00
Richard Roberts b857dab6a9 Renamed unit tests already converted to 'Obsolete' 2013-07-17 03:13:00 +00:00
Richard Roberts dae249be2e Tweak with push_back 2013-07-16 20:22:04 +00:00
Richard Roberts 3f73d7801c Fixed eliminating empty graph 2013-07-16 20:22:02 +00:00
Richard Roberts 132cc2ea72 Fixes in EliminateableFactorGraph header 2013-07-16 20:22:01 +00:00
Richard Roberts 333903c4aa Fixed factor graph construction and push_back from iterators and containers over plain and shared_ptr objects 2013-07-16 17:37:08 +00:00
Richard Roberts e9f30660b3 Fixing constructors and unit tests 2013-07-16 03:57:32 +00:00
Richard Roberts c954b87441 Interface tweaks 2013-07-16 00:33:25 +00:00
Richard Roberts 82df8193b6 Changed back to single-threaded elimination for now, until the code is optimized 2013-07-12 22:27:52 +00:00
Richard Roberts 3d62299789 Fixed bugs and compile errors for elimination and back-sub 2013-07-09 17:50:51 +00:00
Richard Roberts db8fcfaa4f Switched to parallel elimination 2013-07-09 17:50:49 +00:00
Richard Roberts 74c503faaa Formatting 2013-07-09 17:50:42 +00:00
Richard Roberts 40bf395856 Serialization fix 2013-07-09 17:50:40 +00:00
Richard Roberts 9bdc5f1113 Small cleanups and fixes in included header files, functions in header file vs cpp/inst file, formatting, private/public, and inheritance. 2013-07-09 17:50:38 +00:00
Richard Roberts b0836ac57c Commented out Hessian, cholesky, and gradient code so that library compiles 2013-07-09 17:50:32 +00:00
Richard Roberts 21f8079924 Standardizing interfaces 2013-07-08 01:33:43 +00:00
Richard Roberts ed6a077e9e Made FactorGraph equals protected since it should be overridden 2013-07-05 20:45:56 +00:00
Richard Roberts 79ce96dceb Cleanups in BayesTree and SymbolicBayesTree 2013-07-02 14:54:20 +00:00
Richard Roberts 4fa8332c77 Fixed errors and warnings in new unordered code 2013-07-01 20:19:41 +00:00
Richard Roberts 67f3109e75 Fixed warnings in preexisting code 2013-07-01 20:19:36 +00:00
Richard Roberts 5cc13abbf1 Fixed size_t/Key/Index types 2013-07-01 20:19:31 +00:00
Richard Roberts 878f87fd25 Added invert to OrderingUnordered 2013-07-01 20:19:29 +00:00
Richard Roberts 115768abc6 Comment formatting 2013-06-28 18:14:04 +00:00
Richard Roberts 317ce7ada5 Finished elimination traits class 2013-06-28 18:14:03 +00:00
Richard Roberts 7b3ef381c1 Starting to add elimination traits class 2013-06-27 23:03:38 +00:00
Richard Roberts b9016adbd6 Tweaks to factor constructors and other small cleanups 2013-06-27 23:03:36 +00:00
Richard Roberts 99b1ab4754 Added FactorGraph constructor from BayesTree in unordered code. Made FactorGraph += operator templated so can += any type that works with push_back. 2013-06-24 19:30:18 +00:00
Richard Roberts 9882d8b34e public addClique function 2013-06-24 19:30:15 +00:00
Richard Roberts 9e373437a7 Removed unused BayesTreeCliqueDefault 2013-06-24 19:30:12 +00:00
Richard Roberts 123657e3d0 Merged from branch 'trunk' 2013-06-24 15:28:16 +00:00
Alex Cunningham 12d083e476 Added serialize() 2013-06-20 17:08:31 +00:00