Commit Graph

288 Commits

Author SHA1 Message Date
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
Tiago Gomes ecde9649a8 fix header guard 2012-06-01 12:35:44 +01:00
Tiago Gomes b5369db214 use only solveQuery 2012-05-31 23:06:53 +01:00
Tiago Gomes f91e543d9d workaround c++ bad design: don't allow creating a factor graph from some pointer 2012-05-31 22:42:38 +01:00
Tiago Gomes 3f0f41c8a9 cleanup 2012-05-31 21:24:40 +01:00
Tiago Gomes e11ed1a226 forgot these two 2012-05-31 21:24:15 +01:00
Tiago Gomes 22d8876d33 add support to (real) lifted belief propagation 2012-05-31 21:12:46 +01:00
Tiago Gomes 22780c4559 handle empty vectors in TinySet 2012-05-31 14:57:53 +01:00
Tiago Gomes 7429a39b48 fix a bug on absorving lifted evidence 2012-05-31 14:09:50 +01:00
Tiago Gomes c2297c3f70 add lbp flag 2012-05-31 12:45:09 +01:00
Tiago Gomes d00eb05624 use bind2nd instead of bind1st 2012-05-31 12:19:13 +01:00
Tiago Gomes 6668ee6381 add initial skeleton for lifted bp 2012-05-30 19:23:41 +01:00
Tiago Gomes 8d14593c3e add an enum for lifted solvers and do some renamings 2012-05-30 17:17:39 +01:00
Tiago Gomes ac38e9e6a6 minor improvement 2012-05-29 17:19:49 +01:00
Tiago Gomes 651051484b update TODO 2012-05-29 17:14:29 +01:00
Tiago Gomes 02395daed3 add a sequential elimination heuristic 2012-05-29 17:14:01 +01:00
Tiago Gomes 0315cd51a3 remove repeated elements in TinySet 2012-05-29 17:09:45 +01:00
Tiago Gomes 6feb746412 use STL to calculate L1 distance and max norm 2012-05-29 13:48:08 +01:00
Tiago Gomes 3ac854b2ff use more Util::sizeExpected 2012-05-28 21:27:52 +01:00
Tiago Gomes 54ae29ae02 replace Util::add and Util::multiply by Util::apply_n_times 2012-05-28 21:09:56 +01:00
Tiago Gomes f489a59194 use std::accumulate to calc the msg size 2012-05-28 20:59:39 +01:00
Tiago Gomes 57e32267fe remove unecessary code 2012-05-28 19:47:20 +01:00
Tiago Gomes 62283f353c some renamings 2012-05-28 19:41:24 +01:00
Tiago Gomes 64b53e8180 minor improvements 2012-05-28 19:10:29 +01:00
Tiago Gomes 004e6c0c5f minor improvements 2012-05-28 18:26:15 +01:00
Tiago Gomes 0cee50496e fix compilation in older gcc 2012-05-28 17:57:45 +01:00
Tiago Gomes d5c2e6833d use convenient function 2012-05-28 17:43:48 +01:00
Tiago Gomes 149f3dab26 fix a bug in exporting to uai format 2012-05-28 17:00:46 +01:00
Tiago Gomes 3ee176c65b fix header guard 2012-05-28 16:59:41 +01:00
Tiago Gomes f3ca7b2dfc add elementsToString and move things around a bit 2012-05-28 16:57:45 +01:00
Tiago Gomes 1352a526c3 refactor the way we export to libDAI 2012-05-28 14:42:20 +01:00
Tiago Gomes 250d122fc8 prefix is better than postfix 2012-05-28 14:12:18 +01:00
Tiago Gomes a9c369aac1 size_t invasion, part II 2012-05-28 14:01:05 +01:00
Tiago Gomes 4a02997484 be consistent: s/copy/backup 2012-05-28 12:34:39 +01:00
Tiago Gomes 3986012e56 rename CutIndexer to MapIndexer 2012-05-28 12:32:15 +01:00
Tiago Gomes 3290834dfe be consistent with other functions 2012-05-28 12:24:10 +01:00
Tiago Gomes fb9bb5c8b5 remove unused method 2012-05-28 12:18:39 +01:00
Tiago Gomes 6034f7a264 refactor the function to reorder arguments 2012-05-28 12:17:47 +01:00
Tiago Gomes 1239832c21 refactor the way we calculate the product of two factors 2012-05-26 20:58:56 +01:00
Tiago Gomes bc2da47804 add a new handy constructor to CutIndexer class 2012-05-26 20:56:41 +01:00
Tiago Gomes 918666d7f6 add a randomize function 2012-05-26 20:44:39 +01:00
Tiago Gomes c1bd230e61 small improvement 2012-05-25 21:26:40 +01:00
Tiago Gomes 4b2ffee015 minor renaming 2012-05-25 21:22:48 +01:00
Tiago Gomes 2efca0c85a refactor indexer classes and receive te ranges as a constant reference 2012-05-25 21:16:08 +01:00
Tiago Gomes 5ff161b10f refactor functions for summing out 2012-05-25 20:15:05 +01:00
Tiago Gomes df8a3c5fdc fix a recent bug in StatesIndexer.h 2012-05-25 14:36:52 +01:00
Tiago Gomes a56bccf5e5 delete unused method 2012-05-24 23:39:38 +01:00
Tiago Gomes 18d4777d9a use PrvGroup 2012-05-24 23:38:44 +01:00
Tiago Gomes af6601837c size_t invasion 2012-05-24 22:55:20 +01:00
Tiago Gomes 5124098b6c delete unused code 2012-05-24 16:21:41 +01:00
Tiago Gomes acc5ab056a some refactorings 2012-05-24 16:14:13 +01:00
Tiago Gomes 444eaacc63 add operators to manipulate vectors of parameters 2012-05-24 14:55:30 +01:00
Tiago Gomes 6cb718942a some renamings 2012-05-23 21:23:03 +01:00
Tiago Gomes d91e91b97e prefix calls to c++ functions with cpp_ 2012-05-23 20:34:57 +01:00
Tiago Gomes c04082dc2e move benchmarks one level up 2012-05-23 17:27:21 +01:00
Tiago Gomes efec94adff remove two unnecessary files 2012-05-23 15:55:39 +01:00
Tiago Gomes 584e363aa1 move graphical model examples 2012-05-23 15:48:03 +01:00
Tiago Gomes 6c77afb3ae ok, second try 2012-05-23 14:56:01 +01:00