Commit Graph

85 Commits (8acc331663eab6cdc2c9026936153b3690e21663)

Author SHA1 Message Date
Abe fbe9aac41c squash local changes on top of gtsam upstream pull from 6/14/2016 2016-06-18 23:13:59 -07:00
dellaert 128bac616c Globally replaced FastSet<Key> with KeySet. 2015-06-20 18:38:25 -07:00
Thomas Schneider ebf5746987 Fix some serialization warnings. 2015-03-06 16:12:09 +01:00
Richard Roberts a9ea1f4033 Made Roots typedef in BayesTree 2014-02-22 16:28:37 -05:00
Richard Roberts 686051c032 Convert DOS line endings to UNIX 2014-01-09 16:39:27 -05:00
Richard Roberts ec78d54f37 Removed old Index typedef and IndexFormatter 2013-11-08 16:35:28 +00:00
Richard Roberts 69c7f6d137 Restored ClusterTree base class of JunctionTree 2013-10-09 17:39:19 +00:00
Alex Cunningham 90ddac8fac Added a print function to the BayesTreeCliqueWrapper that also prints out contents 2013-09-10 19:26:02 +00:00
Richard Roberts e2733d9899 Fixed serialization problems with tbb data structures 2013-08-16 04:10:29 +00:00
Richard Roberts bd89c5fd45 Using FastVector (with tbb allocator) instead of vector 2013-08-15 17:21:20 +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 f73db8847b Fixed bottleneck in reelimination with orphans 2013-08-12 03:57:17 +00:00
Richard Roberts 356351db75 Removed unused addClique function 2013-08-09 21:35:39 +00:00
Richard Roberts 375f7c16e6 Working on fixing ISAM 2013-08-06 19:56:48 +00:00
Alex Cunningham dde245ef3b Merging 2013-08-06 17:50:49 +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 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 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
Alex Cunningham 228a26947f Removed checkConsistency() from BayesTree 2013-05-22 17:27:44 +00:00
Alex Cunningham 41b0b90376 Added nrNodes() and checkConsistency() to BayesTree 2013-05-22 17:27:42 +00:00
Richard Roberts eeef9eab32 Generating config.h file in CMake with quaternion mode flag, dataset paths. Also added CMake option to use system-installed Eigen, which works by generating a global eigen include file containing the corresponding include paths. 2013-04-25 15:57:15 +00:00
Richard Roberts 67e36febf2 Added DLL export annotations on new code 2013-04-01 19:29:53 +00:00
Richard Roberts 229e2d9195 Added BayesTree::removeSubtree 2013-03-18 19:27:59 +00:00
Richard Roberts d88ed78bb3 Made BayesTree::Cliques a FastList instead of an std::list 2013-03-18 19:27:56 +00:00
Alex Cunningham eed9cf1e5c Fixed permutation function in BayesTree to properly update the nodes listing. Added assertion to removeClique() to fail under malformed bayes trees. 2013-02-18 18:26:36 +00:00
Richard Roberts 9a23c2936a Merge remote-tracking branch 'refs/remotes/svn/trunk' into isam2-chain-optimization
Conflicts:
	gtsam/linear/VectorValues.h
2013-02-04 22:53:02 +00:00
Alex Cunningham 059a2c1b97 Added matlab interface to access cliques by index from BayesTree 2013-02-04 17:55:55 +00:00
Alex Cunningham d1246bfe98 Added empty() to BayesTree 2013-01-27 20:12:22 +00:00
Richard Roberts 06f836c0a7 Using vector instead of deque in VariableIndex, BayesTree::Nodes, and GaussianISAM::Dims. In practice it appears to be faster due to smart reallocation strategies (still need to investigate whether we should use reserve, resize, or neither). 2012-11-23 23:22:46 +00:00
Richard Roberts 4d4e17c2a7 Joint marginals using lowest-common-ancestor shortcuts. As part of this commit, caching of shortcuts is removed, the BayesTreeCliqueBase::marginal function computing single-variable shortcut marginals is removed, and the factor/frontal size checks in symbolic and discrete elimination are modified to permit eliminating empty factors or zero frontal variables. 2012-10-28 06:21:21 +00:00
Richard Roberts df9a86d340 Fixed typo/spelling (hopefully for the last time) 2012-10-09 00:14:42 +00:00
Richard Roberts e52b6efb68 Fixed typo/spelling 2012-10-08 23:27:39 +00:00
Alex Cunningham 82593a2432 Added conversion functions from Fast* classes to stl containers. Added permuteWithInverse() to BayesTree 2012-10-08 20:30:59 +00:00
Chris Beall 4297d24c96 changed tabs to spaces for consistent indentation in all of GTSAM 2012-10-02 14:40:07 +00:00
Alex Cunningham df2a6bfdee Added reporting functions for counting number of cached shortcuts/separatorMarginals in BayesTree 2012-09-21 20:57:30 +00:00
Frank Dellaert 7fcd06bb4f BayesTree::marginalFactor now calls Clique::marginal2, which in turn calles the new function Clique::separatorMarginal. This calculates marginals with a much simpler recursion, using the parent separator marginal. This could be faster than the shortcut way, especially if separator sizes are small and the root clique is large. The cached marginals have to be discarded when the bayes tree is updated, but this is no different from shortcuts to the root. 2012-09-17 14:03:54 +00:00
Frank Dellaert 1f0cc0aaa4 2-variable joint marginals computed with shortcuts are buggy: they only work if the cliques are disjoint or one of them is the root. They now throw an exception if that is the case. 2012-09-17 03:31:24 +00:00
Alex Cunningham 684af98249 Added function to manually clear shortcut caches in a bayes tree 2012-09-10 20:07:59 +00:00
Alex Cunningham 2657f04bec Added clone() to BayesTree to allow for full inheritance, wrapped GaussianBayesTree and made GaussianISAM inherit from GaussianBayesTree 2012-09-10 17:00:02 +00:00
Frank Dellaert 3e8544880a Fixed confusing variable naming, e.g. Index key -> Index j 2012-09-08 04:21:21 +00:00
Alex Cunningham d7f6a79967 Refactor in GaussianISAM to make solver easier to use/modify. Added non-const interface to nodes in Bayes Tree. Added separate eclipse make target for check (with default -j params) and "check j1" to force -j params. 2012-08-12 19:52:20 +00:00
Richard Roberts 1565833c2c More consistent order of private/protected/public - typedefs, private/protected variables, public interface, private/protected functions 2012-08-06 21:42:26 +00:00
Stephen Williams 98aa3b0627 In BayesTree, return a const reference to the 'nodes' structure, instead of a copy 2012-08-01 21:07:50 +00:00
Richard Roberts 947e5fe5ee Made typedefs / constants for IndexFormatter to simplify code 2012-06-28 01:52:48 +00:00
Yong-Dian Jian 7a9dd715e7 print statistics for bayesnet and bayestree 2012-06-27 16:33:19 +00:00
Alex Cunningham c7734db4fa Added formatting objects to linear and inference objects to allow for printing meaningful keys 2012-06-25 21:19:38 +00:00
Chris Beall aae88032ea fixed compiler error for gcc 4.2 on Mac OS 2012-06-25 16:12:32 +00:00