diogo
/
yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,965 Commits 2 Branches 6 Tags 145 MiB
Commit Graph

673 Commits

Author SHA1 Message Date
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
Vítor Santos Costa b24922fd38 fix bdd with em 2012-10-04 00:15:18 +01:00
Vitor Santos Costa 4e43aff605 Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3 2012-10-03 17:17:24 +01:00
Vitor Santos Costa 93f13c9c8d Merge branch 'master' of https://github.com/tacgomes/yap6.3 2012-10-03 17:15:49 +01:00
Vítor Santos Costa ab14365a30 try to make bdds work with EM. 2012-10-03 10:23:27 +01:00
Vitor Santos Costa 01e1a14160 improve indirect evidence handling in PFL queries (obs from Andrea) 2012-10-03 09:50:50 +01:00
Vítor Santos Costa e6fb32d9ca fix problem with conditional_probability/3 and evidence (obs from Andrea Sterbini). 2012-10-02 14:26:42 +01:00
Vítor Santos Costa 85e9da1332 hve with em works now. 2012-10-02 08:49:16 +01:00
Tiago Gomes 559b3e3b54 watch out for division by 0 in message calculation for BP 2012-09-30 22:04:44 +01:00
Vítor Santos Costa 793907f710 more EM stuff 2012-09-29 11:50:00 +01:00
Tiago Gomes fec0bd44b4 Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3 2012-09-28 22:42:08 +01:00
Vítor Santos Costa 83c5c7e7af more PFL support. 2012-09-26 00:04:58 +01:00
Tiago Gomes 265766277f Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3 2012-09-24 22:23:48 +01:00
Vítor Santos Costa 83418f8f27 bdd and pfl integration work (partial patch). 2012-09-24 14:36:30 +01:00
Vítor Santos Costa ac863833ff PFL machinery 2012-09-23 13:25:15 +01:00
Vítor Santos Costa 309dfaa813 aggregates in PFL: exa,ple 2012-09-23 13:24:49 +01:00
Vítor Santos Costa 34dc03d43b new version of ve 2012-09-23 13:23:53 +01:00
Vítor Santos Costa 2603f18a10 support factors 2012-09-23 13:23:37 +01:00
Vítor Santos Costa d73b2ac673 convert keys to numbers. 2012-09-23 13:23:05 +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
Costa Vitor f4e965c02f more small fixes. 2012-08-29 16:36:46 -05:00
Costa Vitor 62ab5b3dcb new ve 2012-08-28 20:21:14 -05:00
Vítor Santos Costa 05d3266671 fix lib64 issues 2012-08-22 10:07:33 -05:00
Costa Vitor a76f4f34d5 make EM work with PFL and BP. 2012-08-15 16:01:45 -05:00
Vítor Santos Costa 7e8cac9fb1 a step forward. 2012-08-13 09:23:36 -05:00
Costa Vitor 4756948967 fix processing of pfl ground networks. 2012-08-08 22:16:37 -05:00
Vítor Santos Costa 2b2cedc2b6 remove some comments and improve em interface. 2012-08-07 21:53:10 -05:00
Costa Vitor 98f68edd34 PFL files should have the PFL suffiv 2012-08-07 18:35:44 -05:00
Costa Vitor e2fa3a3b8a fix call to ground solvers, both using clpbn style and horus style. 2012-08-07 18:33:51 -05:00
Vítor Santos Costa bc8c9a423a Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3 
Conflicts:
	packages/jpl
 2012-07-07 09:54:27 -05:00
Vítor Santos Costa 1e1d49e112 allow installing examples by defult. 2012-07-07 09:43:07 -05:00
Vitor Santos Costa c67edd877a learning is debugging 2012-07-03 19:48:13 +01: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 5e2d9acc4f update comment 2012-06-26 19:44:27 +01:00
Vitor Santos Costa 87e0b67e76 start with pfl learning. 2012-06-22 19:00:12 +01:00
Vitor Santos Costa 5fe052a3ef Merge branch 'master' of https://github.com/tacgomes/yap6.3 2012-06-22 14:51:58 +01:00
Tiago Gomes 3e56cf5e42 update burglary-alarm 2012-06-19 21:19:02 +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 942bc8041e update burglary-alarm 2012-06-18 23:10:18 +01:00
Tiago Gomes 63739c6e31 minor updates 2012-06-18 23:08:37 +01:00
Tiago Gomes b16b0b6a3f add a README file 2012-06-18 21:38:40 +01:00
Tiago Gomes b4d2e7af20 remove unecessary call 2012-06-18 14:40:44 +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
Vitor Santos Costa f6de18cb09 6.2 fix to load_foreign atom. 2012-06-11 22:11:30 +01:00
Tiago Gomes 919116763f add a run all tests script 2012-06-08 14:11:54 +01:00
Tiago Gomes 4cc869a164 update scripts 2012-06-08 14:11:11 +01:00
Tiago Gomes f8e714dcc3 add social domain benchmark with evidence 2012-06-08 14:08:14 +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 568bb27a66 forgot this 2012-06-05 15:33:24 +01:00
Tiago Gomes 2cf6a2a33d add benchmark tests for lbp 2012-06-05 15:23:41 +01:00
Vitor Santos Costa 3669cb894f Merge branch 'master' of https://github.com/tacgomes/yap6.3 
Conflicts:
	packages/CLPBN/clpbn/horus.yap
 2012-06-04 16:29:56 +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
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
Tiago Gomes 16cb48fea4 decrease the time required to find an elimination order 2012-05-17 17:29:31 +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
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
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
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
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 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 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
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
Tiago Gomes d22b5a97fd add missing scripts 2012-04-18 02:52:31 +01:00
Tiago Gomes b7e9245f26 refactor and add more benchmarks scripts 2012-04-18 02:49:33 +01:00
Tiago Gomes d8e757f9ab improvements in the way factorials are computed 2012-04-18 02:46:38 +01:00
Tiago Gomes cd8714460e add a way of calculate factorials of large numbers 2012-04-17 20:24:40 +01:00
Tiago Gomes f02d0fb798 add more api to sorted vector implementation 2012-04-17 19:02:56 +01:00
Tiago Gomes 5e88510a7d use convenience function 2012-04-16 21:48:13 +01:00
Tiago Gomes 6ab5a4668b change align of some functions 2012-04-16 21:47:06 +01:00
Tiago Gomes dd0ae564ef adapt to changes in CFactorGraph 2012-04-16 21:45:52 +01:00
Tiago Gomes 779f4ea2ce fix debuging information and s/ds/range 2012-04-16 21:44:04 +01:00
Tiago Gomes 66353e67ec some refactorings 2012-04-16 21:42:14 +01:00
Tiago Gomes 0d5888e238 assign evidence to the pruned factor graph 2012-04-16 21:40:28 +01:00
Tiago Gomes b27500e93f add nrVarNodes and nrFacNodes 2012-04-16 19:29:55 +01:00
Tiago Gomes 6f7d2af718 add another sorted vector implementation 2012-04-15 21:51:12 +01:00
Tiago Gomes c32ad3de0a use a sorted vector to store the node childs 2012-04-15 21:44:27 +01:00
Tiago Gomes 5e7b660f44 use iterators instead off indices 2012-04-15 03:19:15 +01:00
Tiago Gomes 62fedf014b workaround garbage collector error 2012-04-14 18:00:12 +01:00
Tiago Gomes f1d2889eaa fix warning about uninitialized var 2012-04-14 17:59:04 +01:00
Tiago Gomes 401ad145a5 improve the way the factor graph is constructed from a set from factors 2012-04-14 17:57:24 +01:00
Tiago Gomes f6e3bb4481 don't assert when suming numbers with negative infinity 2012-04-13 23:12:12 +01:00
Tiago Gomes 24a5fe9c23 add typedef 2012-04-13 15:56:37 +01:00
Tiago Gomes 05ef8610f4 fix warning 2012-04-13 15:47:41 +01:00
Tiago Gomes 00faccd940 implement a printSolverParameters in ground solvers 2012-04-13 15:22:24 +01:00
Tiago Gomes f3be68a552 add a way to print bool vars 2012-04-13 15:21:11 +01:00
Tiago Gomes 15c8f3abc6 ops 2012-04-12 18:46:21 +01:00
Tiago Gomes 5348c4a989 comment debug information in some prolog files 2012-04-12 18:35:29 +01:00
Vítor Santos Costa 5a8cc421d2 small pfl fixes. 2012-04-12 18:11:29 +01:00
Vítor Santos Costa c5f42cd7eb more pfl changes. 2012-04-12 17:24:39 +01:00
Vítor Santos Costa 8c2dd1f847 fix bad call for parameters. 2012-04-12 17:17:21 +01:00
Vítor Santos Costa 28ce2da3dc Merge branch 'master' of https://github.com/tacgomes/yap6.3 2012-04-12 17:07:19 +01:00
Tiago Gomes 9def6c2b15 tempary hack to fix cbp and clean in benchs.sh 2012-04-12 00:42:55 +01:00
Tiago Gomes 564958ef8d improvements on benchmarkings 2012-04-11 23:48:59 +01:00
Tiago Gomes 03013960d3 refactor the city benchmarks and introduce set_solver/1 2012-04-11 19:15:52 +01:00
Tiago Gomes f2fbbf29d8 rework the examples and erase the city network in the old format 2012-04-11 15:36:50 +01:00
Tiago Gomes 8697fcd2b4 refactorings 2012-04-10 20:43:08 +01:00
Tiago Gomes 78e86a6330 refactor ground solver interface 2012-04-10 15:00:18 +01:00
Tiago Gomes 46e6a10625 convert city dataset to new format 2012-04-10 12:56:14 +01:00
Tiago Gomes b52dc99914 refactorings 2012-04-10 12:53:52 +01:00
Tiago Gomes aa1b2e40ea some renamings 2012-04-10 11:51:56 +01:00
Tiago Gomes 6986e8c0d7 Improvements 
Factor nodes now contain a factor object instead of a pointer. Refactor the way .fg and .uai formats are readed.
 2012-04-09 15:40:51 +01:00
Tiago Gomes f1d52c0389 add missing files 2012-04-05 23:04:27 +01:00
Tiago Gomes d1b25f0864 renamings and delete bn_bp stuff 2012-04-05 23:00:48 +01:00
Tiago Gomes b28ee8fb3a drop bayesian network representation 2012-04-05 20:08:54 +01:00
Tiago Gomes abb0410d07 drop suport for Pearl belief propagation 2012-04-05 19:34:37 +01:00
Tiago Gomes 0d23591058 Add support to markov networks 2012-04-05 18:38:56 +01:00
Vítor Santos Costa bc2364c5dc small fixes 2012-04-04 08:29:20 +01:00
Tiago Gomes 6c3add2ebd first steps in adapting horus ground solvers to pfl 2012-04-03 19:53:27 +01:00
Vítor Santos Costa 2bdec8f725 more PFL fixes. 2012-04-03 17:12:58 +01:00
Vítor Santos Costa 14d142aa10 new example. 2012-04-03 16:23:26 +01:00
Vítor Santos Costa 65e0c3b2a2 more PFL changes. 2012-04-03 16:22:40 +01:00
Vítor Santos Costa 6ccd458ea5 Merge branch 'master' of https://github.com/tacgomes/yap6.3 
Conflicts:
	packages/CLPBN/clpbn/bp.yap
	packages/CLPBN/clpbn/fove.yap
	packages/CLPBN/clpbn/horus.yap
 2012-04-03 15:07:22 +01:00
Vítor Santos Costa 44cb6abcb6 PFL support. 2012-04-03 15:01:35 +01:00
Vítor Santos Costa e130c26c6d improve bdd support. 2012-04-03 15:01:14 +01:00
Tiago Gomes 911b241ad6 fix align of logical variables 2012-04-03 11:58:21 +01:00
Tiago Gomes fd8980642b another test 2012-04-01 00:23:03 +01:00
tgomes c6128c51e8 this is a test 2012-03-31 23:59:05 +01:00
Tiago Gomes e9cc1a8be2 remove unnecessary files 2012-03-31 23:44:08 +01:00
Tiago Gomes 313f9a036a yay, my first commit 2012-03-31 23:27:37 +01:00
tgomes 24b466db4e new version. 2012-03-29 12:24:29 +01:00
Vítor Santos Costa 0a9076bf4a bdd 2012-03-28 10:59:26 +01:00
Vítor Santos Costa cd45c64dcc allow optimisation and preserve ordering. 2012-03-27 14:57:12 +01:00
Vítor Santos Costa 52e5fdb6aa fix typo and export extra 2012-03-25 21:42:49 +01:00
Vítor Santos Costa 7d6b2435e0 fix typo and export extra 2012-03-25 21:42:39 +01:00
Vítor Santos Costa a38177207d use safer method 2012-03-25 21:41:03 +01:00
Vítor Santos Costa b6d5b79789 force parent unification when binding two variables with same key 2012-03-25 21:40:29 +01:00
Vítor Santos Costa 7d6461a527 fix order. 2012-03-23 22:26:31 +00:00
Vítor Santos Costa 07335ce047 clp(bn) support 2012-03-22 23:24:09 +00:00
Vítor Santos Costa 6b1574757e fix dist usage. 2012-03-22 22:32:50 +00:00
Vítor Santos Costa f5f13541c6 old new syntax 2012-03-22 22:23:20 +00:00
Vítor Santos Costa 4c1602b74b old syntax example. 2012-03-22 22:22:16 +00:00
Vítor Santos Costa a338b95d3f add more support for FOVE. 2012-03-22 19:10:15 +00:00
Vítor Santos Costa 7d4f83ca40 improve examples. 2012-03-22 19:09:31 +00:00
Vítor Santos Costa 172f59cee5 ifix interface to clp(bn) machinery. 2012-03-22 19:08:36 +00:00
Vitor Santos Costa c85e76f20f new fove version. 2012-03-22 11:40:24 +00:00
Vitor Santos Costa 6191dd210b new version 2012-03-22 11:35:54 +00:00
Vitor Santos Costa 21d317b223 new version of bp 2012-03-22 11:33:24 +00:00
Vitor Santos Costa 6e36498cac new version. 2012-03-22 11:29:46 +00:00
Vítor Santos Costa a25c97c295 fove initial skeleton.w 2012-01-10 17:01:06 +00:00
Vítor Santos Costa bf12f320fe fix CPT handling in aggregates. 2011-12-27 22:08:21 +00:00
Vítor Santos Costa 8f3eabef1d support parfactors, first step. 2011-12-27 22:07:42 +00:00
Vítor Santos Costa 7df0fd90f5 Changes by Tiago 2011-12-12 15:30:24 +00:00
Vítor Santos Costa 33bf0bc0f5 new release from Tiago 2011-12-12 15:29:51 +00:00
Vítor Santos Costa 03391e3feb New Version From Tiago 2011-12-10 23:12:10 +00:00
Vítor Santos Costa dbcb6e530c New Version From Tiago 2011-12-10 22:58:43 +00:00
Vítor Santos Costa 2f6ec5ff59 improve learning for CLP(BN). 2011-11-30 13:04:13 +00:00
Vitor Santos Costa e56e1cbacb small fixes 2011-09-24 21:39:37 +01:00
Vitor Santos Costa b2dcc47f9c fix evidence problems. 2011-09-24 21:38:59 +01:00
Vitor Santos Costa dd9aa08eec fix aleph-params install 2011-09-24 21:37:50 +01:00
Vítor Santos Costa 5baf42320b recompute tables when commit. 2011-09-20 09:55:09 +01:00
Vítor Santos Costa bfc1def1d5 imake sure mutable is available. 2011-09-20 09:54:30 +01:00
Vítor Santos Costa 4855c3460a improve memory usage when storing piointers to evidence facts. 2011-09-15 15:49:57 +01:00
U-WIN-U2045GN0RNQ\Vítor Santos Costa 4fe1833ece Merge branch 'master' of /cygdrive/z/vitor/Yap/yap-6.3 2011-07-25 17:09:43 +01:00
U-WIN-U2045GN0RNQ\Vítor Santos Costa 840e287cda mode changes 2011-07-25 17:09:28 +01:00
Vitor Santos Costa 69e5fed10f new version of belief propagation solver. 2011-07-22 21:33:30 +01:00
Vitor Santos Costa 45e5e3b983 work if ipackages are missing and some cleanups. 2011-07-13 15:31:22 +01:00
Vitor Santos Costa 9727f3c71c fix warning messages. 2011-07-04 22:36:34 +01:00
Vitor Santos Costa 21050891ee city example. 2011-07-02 09:49:12 +01:00
Vítor Santos Costa 866d2130af disable make_index for now. 2011-06-14 09:39:19 +01:00
Vitor Santos Costa f04a153e42 flag unavailable before gcc-4.2 2011-06-11 23:07:02 +01:00
U-WIN-ENP104VVO3U\Vítor Santos Costa d685b8891f fix compilation flag. 2011-06-06 12:29:28 +01:00
Vítor Santos Costa b1a3b925ae handle variable destroyed by garbage collector. 2011-06-03 12:54:09 +01:00
Vítor Santos Costa 56d71e55b4 remove unecesary files. 2011-06-03 12:26:10 +01:00
Vitor Santos Costa e9171547b9 implementation of bayes ball. 2011-05-27 21:34:55 +01:00
Vitor Santos Costa b3bd547f55 vel -> ve 2011-05-21 00:27:25 +01:00
Vitor Santos Costa 27dbe24b9e just link if variables have evidence, we can discard other unused variables. 2011-05-21 00:19:53 +01:00
Vitor Santos Costa adcc2797e1 make sure query variables are accessible from top-level. 2011-05-21 00:15:20 +01:00
Vitor Santos Costa 55e2e6fe3a small fixes 2011-05-20 23:56:12 +01:00
Vitor Santos Costa 6d4d2b5830 fix Makefile for bp 2011-05-19 09:23:32 +01:00
Vitor Santos Costa b7379a67cc Update CLP(BN) with Tiago's latest version of BP solver. 2011-05-17 12:00:33 +01:00