Commit Graph

307 Commits

Author SHA1 Message Date
Tiago Gomes
cd8a25162e Trivial 2013-02-08 00:22:51 +00:00
Tiago Gomes
206cf0a9c7 Trivial 2013-02-08 00:20:01 +00:00
Tiago Gomes
973df43fe0 Improve namespace names 2013-02-08 00:15:41 +00:00
Tiago Gomes
6f83ceb6f5 Put the code inside a horus namespace 2013-02-07 23:53:13 +00:00
Tiago Gomes
4267465f53 Trivial 2013-02-07 22:41:04 +00:00
Tiago Gomes
3738d0b2c6 Move some things around. No functional changes 2013-02-07 22:37:45 +00:00
Tiago Gomes
2992f9e3cf Trivial 2013-02-07 20:54:59 +00:00
Tiago Gomes
5c84a2f532 Improve includes 2013-02-07 20:09:10 +00:00
Tiago Gomes
544d0aa39e Improve header guards (again) 2013-02-07 17:50:33 +00:00
Tiago Gomes
bb7a530da3 Avoid importing the std namespace 2013-02-07 13:37:15 +00:00
Tiago Gomes
7b60e88545 Improve Header guards 2013-02-06 22:58:42 +00:00
Tiago Gomes
80452bf75d Small improvements 2013-02-06 00:29:29 +00:00
Tiago Gomes
42a5bc493a Move methods with more than two lines to outside of class definition 2013-02-06 00:29:03 +00:00
Tiago Gomes
0d9d59f5fe Trivial 2013-01-25 13:58:30 +00:00
Tiago Gomes
bef65dac57 Fix a compilation error with older versions of GCC 2013-01-25 13:47:20 +00:00
Tiago Gomes
f3bd8ad414 Use the word option instead of key. Key reminds me of hashes 2013-01-10 22:59:12 +00:00
Tiago Gomes
d3e2abd677 Don't use the name horus in documentation.
It is just an internal code name.
2013-01-10 22:39:46 +00:00
Tiago Gomes
ea054468bc Improve hcli usage string 2013-01-08 21:17:56 +00:00
Tiago Gomes
dc536fabc2 Beautify setHorusFlag 2013-01-08 21:13:58 +00:00
Tiago Gomes
2738d83302 Remove some alias for hve 2013-01-08 20:48:46 +00:00
Tiago Gomes
dfd7360291 Allow the use of solver as an alias of ground_solver 2013-01-08 20:47:12 +00:00
Tiago Gomes
1b9c4e96e7 Prefix with bp_ some bp flags 2013-01-08 17:06:40 +00:00
Tiago Gomes
da0514a779 Add support for more infernce keys.
Add support for export_libdai, export_uai, export_gv and print_fg.
Document these keys.
2013-01-08 17:01:03 +00:00
Tiago Gomes
182429252e Update the usage string for hcli 2013-01-08 14:47:21 +00:00
Tiago Gomes
c92b7c3e7e Install hcli to the bin directory 2013-01-08 00:33:01 +00:00
Tiago Gomes
ba32ebc5f5 Add support for bayesian networks defined in an UAI file format 2013-01-07 22:17:05 +00:00
Tiago Gomes
ec2d9e0967 Trivial 2013-01-05 12:04:43 +00:00
Tiago Gomes
d293c5e5a9 Trivial 2012-12-28 15:40:32 +00:00
Tiago Gomes
3363019c93 Remove unnecessary methods 2012-12-28 01:35:59 +00:00
Tiago Gomes
7d9af75c35 Improve solver flags 2012-12-27 23:21:32 +00:00
Tiago Gomes
d36b63ece3 Trivial 2012-12-27 22:29:20 +00:00
Tiago Gomes
c96496720b Trivial 2012-12-27 22:28:19 +00:00
Tiago Gomes
485c3e34b2 Use more DISALLOW_COPY_AND_ASSIGN 2012-12-27 22:25:45 +00:00
Tiago Gomes
7b7f663ac6 Don't use public members for solver flags 2012-12-27 15:44:40 +00:00
Tiago Gomes
b996436b24 Reorganize 2012-12-27 15:05:40 +00:00
Tiago Gomes
de0a118ae5 Move belief propagation stuff out from Horus.h 2012-12-27 15:00:30 +00:00
Tiago Gomes
cbea630fbf Cosmetic fixes 2012-12-27 12:54:58 +00:00
Tiago Gomes
8bdcb65907 Improve variable elimination 2012-12-26 22:55:48 +00:00
Tiago Gomes
188f359496 Fix a warning about a unitialized var 2012-12-26 21:48:05 +00:00
Tiago Gomes
01d8f8e178 More whitespace cleanups 2012-12-20 23:19:10 +00:00
Tiago Gomes
421d6f72ee Place the constructor on the right place 2012-12-20 21:32:40 +00:00
Tiago Gomes
57339760b9 Merge LiftedKc and LiftedCircuit in one file 2012-12-20 21:11:51 +00:00
Tiago Gomes
b44ed7db39 Improve the error messages 2012-12-20 18:07:50 +00:00
Tiago Gomes
685f46dc27 Fix 2012-12-20 17:41:52 +00:00
Tiago Gomes
053fa31bb2 Exit is better than abort.
Also use a macro instead of integer to indicate failure.
2012-12-20 17:37:59 +00:00
Tiago Gomes
2ca31ca14a Don't abort if opening a file to export to graphviz fails 2012-12-20 17:11:11 +00:00
Tiago Gomes
af8497af6e Sort the logical vars of the constraint tree when exporting to graphviz 2012-12-20 16:20:38 +00:00
Tiago Gomes
48254ba7d7 Lkc: fix some memory leaks 2012-12-19 17:45:53 +00:00
Tiago Gomes
2d1f5edc91 There is no more to do 2012-12-18 23:52:56 +00:00
Tiago Gomes
691188d5c9 Handle better formulas like f(X,X) 2012-12-18 23:51:51 +00:00
Tiago Gomes
0a661b0462 More cleanups 2012-12-18 22:47:43 +00:00
Tiago Gomes
3eb6b76ddd Whitespace clean 2012-12-17 18:39:42 +00:00
Tiago Gomes
8b996c5dc9 Lkc: show that we exported the circuit to graphviz when debugging 2012-12-13 14:21:16 +00:00
Tiago Gomes
11e688ffd7 Lkc: use utility function 2012-12-12 21:19:22 +00:00
Tiago Gomes
f2173d001e Lkc: fix bug when adding weights 2012-12-12 21:16:36 +00:00
Tiago Gomes
a59c152962 Lkc: Fix smoothing in atom counting nodes 2012-12-11 16:02:48 +00:00
Tiago Gomes
bb68afe91d Fix an error caused by a temporary being out of scope 2012-12-11 15:52:20 +00:00
Tiago Gomes
1d732594e2 smooth circuit
Smooth the circuit independent of the verbosity level, but don't smooth it when the compilation has fail.
2012-12-10 19:39:09 +00:00
Tiago Gomes
8371e395dd fix typo 2012-12-10 19:37:41 +00:00
Tiago Gomes
a25f4584c8 support printing LitLvTypes objects 2012-12-10 18:48:54 +00:00
Tiago Gomes
9c8827c309 always copy clauses for backup 2012-12-09 22:57:39 +00:00
Tiago Gomes
90736156ae some clean ups 2012-12-09 22:13:58 +00:00
Tiago Gomes
e46d2177b7 rework a bit the test infrastructure for lkc 2012-12-09 22:04:33 +00:00
Tiago Gomes
907144db32 don't use a stack for atom counting operator 2012-12-09 19:46:14 +00:00
Tiago Gomes
57a31c2c36 fix showing the weights on edge labels when there is a SetOrNode ancestor 2012-12-09 17:33:36 +00:00
Tiago Gomes
59f653aabd move implementation of copyClauses to another file 2012-12-08 19:32:19 +00:00
Tiago Gomes
4edbcf86b8 Use pointers to refer to clauses for better performance 2012-12-08 19:17:19 +00:00
Tiago Gomes
73b3594c97 lifted kc: when not debuging don't keep track of the origin clauses 2012-12-07 11:47:50 +00:00
Tiago Gomes
ee1b7dcd21 abort when compilation failed 2012-11-27 16:54:02 +00:00
Tiago Gomes
610e55a4a2 Improve debbuging for lifted knowledge compilation 2012-11-26 14:46:45 +00:00
Tiago Gomes
1f1d194326 remove unnecessary std set 2012-11-26 14:46:00 +00:00
Tiago Gomes
a2429a1eec Merge branch 'master' of github.com:tacgomes/yap6.3 2012-11-26 11:48:24 +00:00
Tiago Gomes
e09c25bd59 remove grounding stub form lifted knowledge compilation. its hard to implement 2012-11-22 16:34:24 +00:00
Tiago Gomes
85db763d9c small improvement in HorusYap 2012-11-16 22:38:14 +00:00
Tiago Gomes
51eef45b2d refactor HorusYap 2012-11-16 17:10:04 +00:00
Tiago Gomes
59fd21bf33 use only 1 lifted solver instance 2012-11-16 16:50:19 +00:00
Tiago Gomes
51fd48cd46 Ouchgit statusgit status! forgot to add these to index 2012-11-14 23:17:39 +00:00
Tiago Gomes
4522850cd6 one step close to use one solver instatiation to solve several queries 2012-11-14 23:13:46 +00:00
Tiago Gomes
64a27847cc Introduce a lifted solver class 2012-11-14 21:55:51 +00:00
Tiago Gomes
6e7d0d1d0a remove old TODOs 2012-11-14 21:17:04 +00:00
Tiago Gomes
cad22da9f5 fixes & cleanups 2012-11-14 21:05:55 +00:00
Tiago Gomes
d9e48e6290 log domain calculations fixes for lifted knowledge compilation 2012-11-14 18:40:03 +00:00
Tiago Gomes
9202e286f8 IncExc: check if log vars are count normalized 2012-11-14 14:43:56 +00:00
Tiago Gomes
f5c85ffcc9 shatter agains the query in lifted knowledge compilation 2012-11-12 15:20:42 +00:00
Tiago Gomes
4776817603 move more code around 2012-11-10 00:18:20 +00:00
Tiago Gomes
07bcc89a76 factor out some lifted operations in a new class 2012-11-09 23:52:35 +00:00
Tiago Gomes
8ab622e0aa more work to support inference with lifted knowledge compilation 2012-11-09 18:42:21 +00:00
Tiago Gomes
6a200760ca initial code to support calling a lifted knowledge compilation solver 2012-11-08 21:54:47 +00:00
Tiago Gomes
0ed89d3eeb add flag to lifted knowledge compilation and s/fove/lve 2012-11-08 15:05:48 +00:00
Tiago Gomes
a8c4f4fc52 fix one more TODO 2012-11-08 14:02:18 +00:00
Tiago Gomes
f7db522c6c InxExc: improve the code 2012-11-07 23:45:43 +00:00
Tiago Gomes
6db4d37684 Independence: consider also counted log vars 2012-11-07 21:21:42 +00:00
Tiago Gomes
d2ae171bb5 Improve Clause constructor 2012-11-07 18:43:13 +00:00
Tiago Gomes
278f8f77f5 Improve independence 2012-11-07 18:42:11 +00:00
Tiago Gomes
07c6509a79 cleanups, refactorings & renamings 2012-11-07 15:28:33 +00:00
Tiago Gomes
83c1e58674 clean ups 2012-11-07 12:37:22 +00:00
Tiago Gomes
b599b45bc6 AC: only allow one counting node per branch 2012-11-06 23:56:52 +00:00
Tiago Gomes
829f2248ee use utility method 2012-11-06 23:39:18 +00:00
Tiago Gomes
06a59ad659 IPG: verify that the root log vars appear in the same positions 2012-11-06 23:35:14 +00:00
Tiago Gomes
1e38743462 fix ipgCandidates 2012-11-06 16:24:59 +00:00
Tiago Gomes
869d513c1a remove and add some TODOs 2012-11-06 15:57:54 +00:00
Tiago Gomes
5e1547ba78 add missing method to TinySet 2012-11-06 15:15:55 +00:00
Tiago Gomes
ab334f82b2 fix weighted model counting in atom counting nodes 2012-11-06 14:16:04 +00:00
Tiago Gomes
4518a3db5d support smoothing on atom counting nodes (beta) 2012-11-04 18:02:40 +00:00
Tiago Gomes
b8cef8798a fix warning produced by new version of gcc 2012-11-01 22:54:14 +00:00
Tiago Gomes
a1d0deb638 support model counting on atom couting nodes - still untested 2012-11-01 22:34:28 +00:00
Tiago Gomes
d4912ea219 some reorders 2012-11-01 13:56:12 +00:00
Tiago Gomes
bfa9648067 clean up 2012-10-31 23:58:07 +00:00
Tiago Gomes
6877be897e first stab for atom counting 2012-10-31 23:43:39 +00:00
Tiago Gomes
e762d6be22 tweak colors 2012-10-30 16:00:20 +00:00
Tiago Gomes
77ef7b87cd support smoothing in inclusion-exclusion nodes 2012-10-30 15:48:19 +00:00
Tiago Gomes
b31a047635 refactor exportToGraphViz 2012-10-30 14:31:52 +00:00
Tiago Gomes
a75799b34f small improvements 2012-10-30 12:41:00 +00:00
Tiago Gomes
864f764391 support model counting in inc-exc nodes 2012-10-30 01:51:10 +00:00
Tiago Gomes
8b77b93a3b add support for inclusion-exclusion 2012-10-30 00:21:10 +00:00
Tiago Gomes
b6df8a66b1 add assignement operator to ConstraintTree 2012-10-30 00:15:40 +00:00
Tiago Gomes
d07ea73050 add projectedCopy 2012-10-29 21:37:58 +00:00
Tiago Gomes
324ea1a96c make independent partial ground suck less 2012-10-29 20:49:21 +00:00
Tiago Gomes
c2b1434969 show weights in dot file and add support for smoothing set-and nodes 2012-10-29 15:39:56 +00:00
Tiago Gomes
fbc44ba17d improments in exportToGraphViz 2012-10-29 13:49:11 +00:00
Tiago Gomes
d074ca9a8f add initial independent partial grounding support 2012-10-27 00:13:11 +01:00
Tiago Gomes
68ef63207f initial support for weighted model countign 2012-10-25 12:22:52 +01:00
Tiago Gomes
eac6b954a8 add inital smoothing of the circuit 2012-10-24 21:22:49 +01:00
Tiago Gomes
0cfc64d068 update TODO 2012-10-24 16:24:49 +01:00
Tiago Gomes
a8926fe38b inital code for lifted knowledge compilation 2012-10-22 23:01:13 +01:00
Tiago Gomes
559b3e3b54 watch out for division by 0 in message calculation for BP 2012-09-30 22:04:44 +01:00
Tiago Gomes
10b15f606a fix counting bp calculation of joint distribution 2012-09-18 17:24:22 +01:00
Tiago Gomes
701911ef09 forgot this 2012-09-11 18:48:54 +01:00
Tiago Gomes
febb17d753 fix factor joint 2012-09-11 18:48:16 +01:00
Tiago Gomes
86b57e961e fix memory leak 2012-09-11 18:40:41 +01:00
Vítor Santos Costa
05d3266671 fix lib64 issues 2012-08-22 10:07:33 -05:00
Tiago Gomes
4af5a90b8b re-enable all elimination heuristics 2012-07-02 22:53:44 +01:00
Tiago Gomes
7a3d39551b improve the way we compute hashs for counting bp 2012-06-30 19:25:29 +01:00
Tiago Gomes
25e87a5ddc whitespace fixes 2012-06-19 15:30:55 +01:00
Tiago Gomes
57edd6adb9 minor improvements 2012-06-19 15:29:09 +01:00
Tiago Gomes
ee5b8e693a re-activate bayes ball 2012-06-19 15:10:57 +01:00
Tiago Gomes
9a8464d0f0 some renamings 2012-06-19 14:32:12 +01:00
Tiago Gomes
05b3daf5bb trivial fix 2012-06-14 12:19:51 +01:00
Tiago Gomes
384c108e62 fix joint calculation with lifted bp 2012-06-14 11:57:00 +01:00
Tiago Gomes
0e83a75b60 improve calculation of joint dist in counting bp 2012-06-13 12:47:41 +01:00
Tiago Gomes
b43e3316b3 forgot destructor 2012-06-13 12:17:49 +01:00
Tiago Gomes
89725dffbb rename some enums 2012-06-12 21:27:17 +01:00
Tiago Gomes
af11dbb445 reorder entries in the Makefile and drop some objects not required to build hcli 2012-06-12 16:55:32 +01:00
Tiago Gomes
d4f63b3942 drop Solver suffix and rename some files and classes 2012-06-12 16:29:57 +01:00
Tiago Gomes
51c279d24c increase the cost of the grounding operator 2012-06-08 13:35:00 +01:00
Tiago Gomes
5785260644 fix warning 2012-06-06 15:04:28 +01:00
Tiago Gomes
eec4b1452b print all lifted bp flags 2012-06-01 19:31:07 +01:00
Tiago Gomes
8fa8fff9f1 minor improvements 2012-06-01 19:29:57 +01:00
Tiago Gomes
25ccfa2f54 only allow joint dists on cliques 2012-06-01 19:29:23 +01:00
Tiago Gomes
4708685ed4 fix bug in Factor::contains 2012-06-01 14:03:39 +01:00