Commit Graph

932 Commits

Author SHA1 Message Date
Tiago Gomes 4708685ed4 fix bug in Factor::contains 2012-06-01 14:03:39 +01:00
Vitor Santos Costa 71a62307f4 CLP(BN) stuff. 2012-06-01 13:17: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 0ad8f5fb4a remove whitespace 2012-05-28 17:01:07 +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 2b896aecb4 add examples to the Makefile 2012-05-23 19:59:40 +01:00
Tiago Gomes 9f236dccdd rename bp.yap and fove.yap 2012-05-23 19:15:23 +01:00
Tiago Gomes cf929b6f13 Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3 2012-05-23 17:59:26 +01:00
Tiago Gomes c04082dc2e move benchmarks one level up 2012-05-23 17:27:21 +01:00
Tiago Gomes 3890aafc1a update examples 2012-05-23 17:17:50 +01:00
Tiago Gomes bdef49bb20 remove city old example 2012-05-23 15:57:00 +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 5b38891c21 third try ... 2012-05-23 14:58:26 +01:00
Tiago Gomes 6c77afb3ae ok, second try 2012-05-23 14:56:01 +01:00
Tiago Gomes a4d181eb97 update benchmarks 2012-05-23 12:40:34 +01:00
Tiago Gomes 7c3e4ed3ab improve log information 2012-05-23 12:26:14 +01:00
Vitor Santos Costa 9e3d16022a fix YAP_AttOfVar
beautify get atts
2012-05-21 17:24:40 +01:00
Tiago Gomes 16cb48fea4 decrease the time required to find an elimination order 2012-05-17 17:29:31 +01:00
Vítor Santos Costa d68ef3f5a1 fix empty tries. 2012-05-17 09:56:49 +01:00
Tiago Gomes cf9a7f1413 show the maximum memory used in the benchmarks 2012-05-16 12:31:58 +01:00
Tiago Gomes 5934d9efe9 update TODO 2012-05-16 00:44:59 +01:00
Tiago Gomes 23b180b6f0 merge TinySet and SortedVector classes 2012-05-16 00:41:01 +01:00
Tiago Gomes 354071c261 update scripts 2012-05-15 20:14:13 +01:00
Tiago Gomes f7ba86d3ed kill Util::abort, s/vectorIndex/indexOf and s/isCarteesianProduct/isCartesianProduct 2012-05-15 19:41:14 +01:00
Tiago Gomes db0d2c9772 refactor and increase the scope of parfactor multiplication 2012-05-15 19:05:39 +01:00
Tiago Gomes f4bca3ceea factor overflow will not happen with bp 2012-05-15 19:02:40 +01:00
Tiago Gomes 7ec4887e77 refactor printing of a parfactor 2012-05-15 16:57:50 +01:00
Tiago Gomes 346b70145f improvements on shattering 2012-05-15 16:52:21 +01:00
Tiago Gomes 90e139f8f3 refactor ProbFormula comparation operator 2012-05-15 16:49:34 +01:00
Tiago Gomes 03f9df7dc3 fix a bug when checking of a set of log vars form a cartesian product 2012-05-15 16:46:21 +01:00
Tiago Gomes 1380adcfb5 support getting tuples of repeated log vars 2012-05-15 16:45:24 +01:00
Tiago Gomes 2061eefda2 add a way to copy a log var 2012-05-15 16:43:32 +01:00
Vitor Santos Costa 6c36a8ccd3 make it easier for outside packages to link with YAP innards. 2012-05-14 15:06:18 +01:00
Tiago Gomes 4ade4945a0 improve Util::abort 2012-05-07 17:52:47 +01:00
Tiago Gomes aeb07d43a7 add two more utility functions 2012-05-07 17:48:15 +01:00
Tiago Gomes 9d5801ef7f ony summout a group of rand vars if they not appear in another position on the parfactor 2012-05-05 23:11:32 +01:00
Tiago Gomes 8e75ef3073 shatter parfactors also against themselves 2012-05-05 21:06:27 +01:00
Tiago Gomes 660e15e2ac update the overflow check in factors, still needs more work tbd 2012-05-04 14:28:07 +01:00
Tiago Gomes 0e01a51929 remove commented code and fix a warning 2012-05-04 14:10:00 +01:00
Tiago Gomes 35d0804f9a update TODO 2012-05-03 13:15:33 +01:00
Tiago Gomes 10ac7720f7 update smokers examples 2012-05-03 11:38:49 +01:00
Tiago Gomes 2bef3f6866 minor updates 2012-05-03 00:56:19 +01:00
Vítor Santos Costa 9b0b6ec649 fix stop_low_level_trace.
P Moura request for (?).
2012-05-02 10:09:26 +01:00
Tiago Gomes 92d8c7dcbe add more asserts 2012-04-30 17:49:07 +01:00
Tiago Gomes ad50166bd0 fix bug in benchmarks script 2012-04-30 16:26:33 +01:00
Tiago Gomes 9971736a45 kill DEBUG constant, its not used any more 2012-04-30 14:50:14 +01:00
Tiago Gomes 7cf8c68e15 fix error message 2012-04-30 14:12:00 +01:00
Tiago Gomes d6e11ca84d delete order vars flag 2012-04-30 13:02:53 +01:00
Tiago Gomes fa8ff6d5b6 abort if the factor will become to bigger 2012-04-30 12:48:30 +01:00
Tiago Gomes 85fc4ae50a add missing files 2012-04-30 11:59:59 +01:00
Tiago Gomes a90bfb7a86 update benchmarks 2012-04-30 11:24:04 +01:00
Tiago Gomes 2fa06da3c9 disable bayes ball for now 2012-04-30 11:20:02 +01:00
Tiago Gomes 185cbe9c73 update examples 2012-04-30 11:16:11 +01:00
Tiago Gomes 56475cacbc revamp debugging plataform 2012-04-29 20:07:09 +01:00
Tiago Gomes d86e2c8386 don't raise counting log vars before multiplication 2012-04-28 01:10:04 +01:00
Tiago Gomes 1173b4c25b when expanding a counting formula, check if the expanded log vars are still counting log vars 2012-04-28 01:01:23 +01:00
Tiago Gomes 52f4aa0340 sort the parfactors by their parameters when printing 2012-04-27 19:10:22 +01:00
Vítor Santos Costa 067d6d3f4f fix problog experiment. 2012-04-27 16:30:02 +01:00
Vítor Santos Costa 5ee39c6f08 back to original version. 2012-04-27 16:20:40 +01:00
Vítor Santos Costa 6bb4db125d fix names. 2012-04-27 15:33:32 +01:00
Vítor Santos Costa 60184e230d new lbdd stuff. 2012-04-27 15:32:57 +01:00
Vítor Santos Costa ceb0c1f5ac new support file. 2012-04-27 15:32:17 +01:00
Vítor Santos Costa 823066f9da use library for learning. 2012-04-27 15:30:39 +01:00
Vítor Santos Costa fd4bf21ece fix file names. 2012-04-27 15:26:44 +01:00
Tiago Gomes 20fc2c8dd1 add debug information to variable elimination 2012-04-27 14:48:48 +01:00
Tiago Gomes 9e1a649262 raising the paramaters to some power should happen after summing out, not before 2012-04-27 14:47:30 +01:00
Tiago Gomes 7599ccd5a1 don't print the paramaters if they are more than 32 2012-04-27 01:19:28 +01:00
Tiago Gomes af063dcda8 be more precise when calculating the cost of grounding a log var in a formula 2012-04-27 01:18:54 +01:00
Tiago Gomes 995a11be83 improvements in the way we align logical variables 2012-04-26 18:00:06 +01:00
Vítor Santos Costa fd755f0b7e allow ProbLog to use lbdd. 2012-04-26 13:52:09 +01:00
Tiago Gomes cc09e77707 remove unnecessary variable 2012-04-26 00:58:06 +01:00
Tiago Gomes 689244a0d8 improve cbp by supporting factors connected to a single var two or more times 2012-04-26 00:54:06 +01:00
Tiago Gomes ad24a360ce Add a way to summout a dimension given a index instead of a variable id.
This is required for counting belief propagation.
2012-04-25 22:59:01 +01:00
Tiago Gomes fc362fe123 reorder the parameters instead of reordering variables 2012-04-23 22:57:04 +01:00
Tiago Gomes 0ebd6d6e06 improve constructor of VarNode 2012-04-23 22:40:36 +01:00
Tiago Gomes 3397f694fe sort the variable ids when printing all posterioris 2012-04-23 22:12:04 +01:00
Vitor Santos Costa f24bf2e2cd full school 2012-04-23 07:13:58 -05:00
Vitor Santos Costa 32a905bc8b ddnnf support 2012-04-23 07:13:25 -05:00
Vitor Santos Costa 040c1c7fa7 more ddnnf stuff 2012-04-23 07:13:01 -05:00
Tiago Gomes d90fcd532b minor update 2012-04-21 17:21:54 +01:00
Tiago Gomes 8c689665a0 support setting flags in horus cli and fix a bug when ordering the variables 2012-04-21 17:14:19 +01:00
Vitor Santos Costa 22f702f8e4 ddnnfs. 2012-04-20 16:43:30 -05:00
Vitor Santos Costa 220f7e6efc support mtbdds. 2012-04-20 16:42:59 -05:00
Tiago Gomes 085ebe1e96 check for overflows when performing expansion
case the factor size after expansion be bigger than an unsigned integer, abort the program
2012-04-20 17:16:10 +01:00
Tiago Gomes 0ffa409a80 fix a bug when expanding potential 2012-04-20 14:50:14 +01:00
Vitor Santos Costa 178ad27db8 better understanding of ddnnf. 2012-04-20 07:07:19 -05:00
Tiago Gomes 09697b8461 heuristic to improve results with fove 2012-04-19 18:37:15 +01:00
Tiago Gomes 2b7da4bc23 refactor the way we calculate the grounding cost 2012-04-19 17:59:45 +01:00
Tiago Gomes 661ce08961 check if the factor is not zero when choosing the elimination order 2012-04-19 12:08:27 +01:00
Tiago Gomes cd1e157019 sort the colors in the signature receveied from a factor (add std namespace) 2012-04-18 19:29:43 +01:00
Tiago Gomes 7c100c96bc sort the colors in the signature receveied from a factor 2012-04-18 19:29:11 +01:00
Tiago Gomes 862e90a36b fix bug in joining constraint trees 2012-04-18 18:14:15 +01:00
Tiago Gomes 61ee95d92a use logarithms to calculate the cost of each fove operator 2012-04-18 16:40:12 +01:00
Tiago Gomes 406276b62b add missing scripts 2012-04-18 13:53:34 +01:00
Tiago Gomes a7f57bea99 several optimizations on ConstraintTree 2012-04-18 03:05:01 +01:00
Tiago Gomes cd720497f8 update groups when shattering 2012-04-18 03:04:06 +01:00
Tiago Gomes bb5d02dbc0 minor updates 2012-04-18 03:03:29 +01:00
Tiago Gomes dacf6b4e57 update examples 2012-04-18 02:57:24 +01:00