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
|
970efd9e29
|
Fixed missing include of boost.range, fixed signed/unsigned comparison warning
|
2012-09-17 01:26:08 +00:00 |
|
Frank Dellaert
|
75b96d9ed2
|
Removed old indices code
|
2012-09-17 00:50:15 +00:00 |
|
Frank Dellaert
|
cdf45105c2
|
Fixed shortcuts after adding several more problematic testcases
|
2012-09-17 00:29:03 +00:00 |
|
Frank Dellaert
|
34a9000134
|
forceOrder flag respects order of constrained variables passed to conditionalBayesNet
|
2012-09-17 00:28:27 +00:00 |
|
Frank Dellaert
|
bd8f9d0006
|
Went back to eliminate all in conditional because of singularities :-(, added use of forceOrder flag
|
2012-09-17 00:26:07 +00:00 |
|
Frank Dellaert
|
db8264aaae
|
forceOrder flag respects order of constrained variables passed to ccolamd
|
2012-09-17 00:24:49 +00:00 |
|
Frank Dellaert
|
33b772fc21
|
Accept list in constructor
|
2012-09-17 00:23:56 +00:00 |
|
Frank Dellaert
|
54afba0bbc
|
Accept list in constructor
|
2012-09-17 00:23:42 +00:00 |
|
Frank Dellaert
|
d9b639ab97
|
added newlines
|
2012-09-17 00:22:06 +00:00 |
|
Frank Dellaert
|
dcce64ea3a
|
Check in old shortcut way
|
2012-09-16 18:08:47 +00:00 |
|
Frank Dellaert
|
aeb43bc8fc
|
Used technique described in http://gcc.gnu.org/onlinedocs/gcc/Diagnostic-Pragmas.html to turn off excessive warnings generated by boost lambda headers
|
2012-09-16 18:07:50 +00:00 |
|
Frank Dellaert
|
439b724011
|
test new solver functions
|
2012-09-16 17:54:59 +00:00 |
|
Frank Dellaert
|
89cd600165
|
avoid warnings
|
2012-09-16 17:54:43 +00:00 |
|
Frank Dellaert
|
538714fb69
|
avoid lambda.hpp warnings
|
2012-09-16 17:52:49 +00:00 |
|
Frank Dellaert
|
338ea6e920
|
conditionalBayesNet and an internal eliminate - developed for making shortcuts
|
2012-09-16 17:52:14 +00:00 |
|
Frank Dellaert
|
db57f1872a
|
jointBayesNet function avoids conversion to factorgraph (which was converted back to a BayesNet in shortcut calculation)
|
2012-09-16 16:06:28 +00:00 |
|
Frank Dellaert
|
3f194bebff
|
Used technique described in http://gcc.gnu.org/onlinedocs/gcc/Diagnostic-Pragmas.html to turn off excessive warnings generated by boost BFS header
|
2012-09-16 16:04:28 +00:00 |
|
Frank Dellaert
|
de66a5cd4a
|
Added unit test targets
|
2012-09-16 14:35:59 +00:00 |
|
Frank Dellaert
|
1bbbd0ee4a
|
Cleaned up unit test *mess*
|
2012-09-16 14:34:19 +00:00 |
|
Frank Dellaert
|
dfbb02570b
|
Fixed confusing template naming
|
2012-09-16 13:40:31 +00:00 |
|
Frank Dellaert
|
16c8cfb1cf
|
Better set calculations
|
2012-09-16 13:28:50 +00:00 |
|
Frank Dellaert
|
9094fe2744
|
Fully functioning, non-buggy separator shortcuts. Still not as tight as they can be....
|
2012-09-16 04:37:59 +00:00 |
|
Frank Dellaert
|
44c66cb0cb
|
moved stuff to cpp file
|
2012-09-16 04:37:04 +00:00 |
|
Frank Dellaert
|
896d006ddf
|
return all keys (slow)
|
2012-09-16 04:36:35 +00:00 |
|
Frank Dellaert
|
e26ab012de
|
custom clique checks Combine and DiscreteBayesTree construction (testing 32000 configurations :-))
|
2012-09-15 13:21:43 +00:00 |
|
Frank Dellaert
|
1df761d9a0
|
Small formatting
|
2012-09-15 11:49:42 +00:00 |
|
Frank Dellaert
|
4be00da291
|
evaluate operator
|
2012-09-15 11:48:59 +00:00 |
|
Frank Dellaert
|
8b6c1a0b9d
|
evaluate (interesting that this is not even defined in BayesNet, should move there?)
|
2012-09-15 11:48:21 +00:00 |
|
Frank Dellaert
|
b819b7c446
|
implemented Combine to we can create a BayesTree from a DiscreteBayesNet
|
2012-09-15 11:11:57 +00:00 |
|
Frank Dellaert
|
b95210a5f0
|
Plot Bayes tree within matlab ! (dot -> png -> imread -> imshow).
|
2012-09-15 03:05:22 +00:00 |
|
Frank Dellaert
|
107d293ed7
|
Removed debug printing
|
2012-09-15 02:56:19 +00:00 |
|
Frank Dellaert
|
ea6655beba
|
Fixed thin tree indexing, and conditionals
|
2012-09-15 02:54:42 +00:00 |
|
Frank Dellaert
|
a9cae46b10
|
Plot Bayes net within matlab ! (dot -> png -> imread -> imshow).
|
2012-09-15 02:53:54 +00:00 |
|
Frank Dellaert
|
60da4cb2f9
|
Reversed saving of nodes
|
2012-09-15 02:53:06 +00:00 |
jdurand7
|
8d85d679cd
|
Debugged the thinTree. Now works with tree indexing starting at 1 at the root. TODO : make it work with index 0 on a leaf.
|
2012-09-14 23:46:21 +00:00 |
|
jdurand7
|
0357559827
|
Files and test files for the thinTree. To be debugged.
|
2012-09-14 22:14:37 +00:00 |
|
jdurand7
|
ea2c13bca3
|
Added method saveGraph for BayesNet.
|
2012-09-14 22:13:33 +00:00 |
|
jdurand7
|
090133f944
|
Fixed Contents to include new classes and used better ordering.
|
2012-09-14 20:52:58 +00:00 |
|
jdurand7
|
5cdcdaa448
|
Made SymbolicBayesTree and GaussianBayesTree subclasses of templated BayesTree
|
2012-09-14 20:52:22 +00:00 |
|
jdurand7
|
b8ccc78a16
|
Wrapped BayesNet templates and made both SymbolicBayesNet and GaussianBayesNet derived classes.
|
2012-09-14 19:59:10 +00:00 |
|
jdurand7
|
e9e40c733d
|
Made BayesNet argument a reference (and moved printStats to the right place)
|
2012-09-14 19:58:20 +00:00 |
Richard Roberts
|
0554532fcd
|
Disabled timing scripts for now (they are outdated and do not compile)
|
2012-09-11 15:58:41 +00:00 |
|
Richard Roberts
|
a01bad89db
|
Merged from branch 'branches/2.1.0' to trunk
|
2012-09-11 15:51:58 +00:00 |
|
Alex Cunningham
|
684af98249
|
Added function to manually clear shortcut caches in a bayes tree
|
2012-09-10 20:07:59 +00:00 |
|
Frank Dellaert
|
db22753767
|
Checking marginals more thoroughly
|
2012-09-10 20:07:40 +00:00 |
|
Richard Roberts
|
b584db0489
|
Updated toolbox precompiling flags to enable compiling wrapper, changed file permissions
|
2012-09-10 18:55:10 +00:00 |
|
Richard Roberts
|
6fb948e9d2
|
Changed default to not build matlab toolbox
|
2012-09-10 18:16:59 +00:00 |
|
Frank Dellaert
|
446d170f1c
|
Fixed BayesTree test
|
2012-09-10 18:15:02 +00:00 |