Commit Graph

864 Commits

Author SHA1 Message Date
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
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
Vítor Santos Costa
40ce9feb76 bdd experiments 2012-04-16 23:47:36 +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
Vítor Santos Costa
c385dc13a8 fix syntax 2012-04-15 00:02:37 +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
Vítor Santos Costa
3d216cf9db iextend bdd support. 2012-04-03 15:00:22 +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
Vítor Santos Costa
3563dcbf03 control for very large bdds. 2012-03-30 09:50:18 +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
9ff1399482 new versions of packages. 2012-03-27 14:59:22 +01:00
Vítor Santos Costa
295cf24f5c extend functionality. 2012-03-27 14:57:43 +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