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
fdeca2852a
Use only one interface for options.
...
set_pfl_flag/2 now can be called for setting options for solvers written in Prolog and for solvers in Horus.
2013-01-10 22:10:22 +00:00
Tiago Gomes
e5e224d89b
Fix typo
2013-01-10 21:51:45 +00:00
Tiago Gomes
bd84949f09
Trivial
2013-01-10 17:23:09 +00:00
Tiago Gomes
1bb1138b3a
Fix EM typos
2013-01-10 13:45:24 +00:00
Vitor Santos Costa
b7ef6576a6
add keys within learning
2013-01-09 18:34:19 +00:00
Vitor Santos Costa
6cee85bd60
fix cases where you get repeated keys or a(X,X) keys in PFL.
2013-01-09 18:22:01 +00:00
Vitor Santos Costa
46fbc539bf
handle repeated query vars with evidence
2013-01-09 17:49:07 +00:00
Vitor Santos Costa
ff953eb20a
Merge branch 'master' of https://github.com/tacgomes/yap6.3
2013-01-09 16:48:16 +00:00
tacgomes
2feac46e54
PFL manual: several improvements
2013-01-09 16:45:01 +00:00
tacgomes
7f452d2397
Refactor the benchmarks
2013-01-09 15:25:14 +00:00
tagomes@fc.up.pt
7fabfcf4c9
Trivial
2013-01-09 11:43:40 +00:00
Tiago Gomes
24271157ce
Clean unecessary latex documents
2013-01-08 22:55:27 +00:00
Tiago Gomes
59ae52623c
PFL manual: several improvements
2013-01-08 22:51:44 +00:00
Tiago Gomes
6755e50525
PFL manual: small improvements
2013-01-08 22:00:31 +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
dbd35a20a2
PFL manual: improve introduction section
2013-01-08 19:40:20 +00:00
Tiago Gomes
9c8fd804df
PFL manual: add a further information section
2013-01-08 19:39:39 +00:00
Tiago Gomes
f94032d06c
PFL manual: add an installation section
2013-01-08 19:39:03 +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
4220069d90
PFL manual: use the Unix end-of-line marker
2013-01-08 15:34:56 +00:00
Tiago Gomes
75b652b0c9
PFL manual: improve title page and reword a sentence
2013-01-08 15:33:55 +00:00
Tiago Gomes
6375d05a93
PFL manual: add section for horus cli
2013-01-08 15:31:52 +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
f598881cc5
Explain better the potential value order
2013-01-07 22:21:52 +00:00
Tiago Gomes
9bb43360a2
Rearrange the probabilities to do a clean diff against the exported model
2013-01-07 22:18:50 +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
82a4cc508b
Change burglary-alarm.uai to be bayes instead of markov
2013-01-07 22:01:49 +00:00
Tiago Gomes
bafd7320a5
Rework a bit the examples
2013-01-07 14:59:51 +00:00
Tiago Gomes
91dbd60ad4
Allow calling set_horus_flag/2 without loading clpbn_horus
2013-01-07 14:05:56 +00:00
Tiago Gomes
96f4e7ea1b
Fix typo
2013-01-07 14:04:44 +00:00
David Vaz
cdc15e8cd8
merge with yap-6.3
2013-01-06 20:09:48 +00:00
Tiago Gomes
ec2d9e0967
Trivial
2013-01-05 12:04:43 +00:00
Tiago Gomes
f0768e76f2
Improve Makefile
2013-01-05 01:02:19 +00:00
Tiago Gomes
f55ccdef33
Add a manual for PFL written in Latex
2013-01-05 00:49:39 +00:00
Tiago Gomes
c5a390460d
Chanse use_logarithms default to true.
...
Reasoning:
- In small networks, the use of logarithms is not noticed in terms of performance.
- In large networks, the chance to have a division by 0 is too high when not using logarithms.
2013-01-04 19:48:31 +00:00
Tiago Gomes
f2682374fb
Forgot to update the Makefile in the previous commit
2013-01-04 15:42:03 +00:00
Tiago Gomes
3347f0e676
Rename two examples
2013-01-03 23:44:30 +00:00
Tiago Gomes
d4d11cd4b4
Fix sprinkler probability order
2013-01-03 18:48:15 +00:00
Tiago Gomes
ea5dbe2bca
Trivial
2013-01-03 18:26:12 +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
David Vaz
e6c2fa30ee
Added uthash to store indexed predicates info
2012-12-27 12:11:14 +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
d8c5725b2e
This shouldn't be on the repository
2012-12-21 15:20:28 +00:00
Tiago Gomes
4b901d26d7
Improve error messages
2012-12-20 23:34:53 +00:00
Tiago Gomes
01d8f8e178
More whitespace cleanups
2012-12-20 23:19:10 +00:00
Vítor Santos Costa
3565a01f1e
upstream
2012-12-20 21:41:06 +00:00
Tiago Gomes
421d6f72ee
Place the constructor on the right place
2012-12-20 21:32:40 +00:00
Vitor Santos Costa
4098b9b964
fix compilation MT in win32
2012-12-20 21:15:01 +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
David Vaz
4efa594f0a
UDI: more work
2012-12-20 17:13:30 +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
David Vaz
a655c0bb51
Rtree working as a plugin in UDI
2012-12-20 10:21:55 +00:00
Tiago Gomes
046af409ba
Change the default solver to be hve
2012-12-19 18:25:47 +00:00
Tiago Gomes
c407594146
Whitespace clean
2012-12-19 18:22:47 +00:00
Tiago Gomes
60ff9daafd
Remove old example
2012-12-19 18:13:47 +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
David Vaz
43e459b8f8
Changes Rtree so almost working
2012-12-18 18:26:59 +00:00
Tiago Gomes
4b0acbf8c1
Cleanups
2012-12-18 12:11:45 +00:00
Tiago Gomes
c7a4adcefb
Fix finalizing horus ground solvers on EM
2012-12-17 23:59:52 +00:00
Tiago Gomes
5fa5dda579
Remove BP from clpbn interface to EM
2012-12-17 23:29:21 +00:00
Tiago Gomes
e1c862ebbe
Refactor the way we set the inference solver
2012-12-17 23:14:54 +00:00
Tiago Gomes
f1499f99f3
Introduce set_em_solver and use it
2012-12-17 21:19:47 +00:00
Tiago Gomes
40a72a0a63
Improve error handling for choosing EM solver
2012-12-17 21:03:13 +00:00
David Vaz
8511e87e32
packages udi as module
2012-12-17 20:29:59 +00:00
David Vaz
bd25c61fbf
New work on UDI
2012-12-17 20:23:03 +00:00
Tiago Gomes
9861f4aadb
Is the EM solver that we want
2012-12-17 18:50:36 +00:00
Tiago Gomes
3eb6b76ddd
Whitespace clean
2012-12-17 18:39:42 +00:00
Tiago Gomes
2f2f88e571
Several whitespace fixes
2012-12-17 17:57:00 +00:00
Tiago Gomes
409a230826
Use the same convetion for module import and export
2012-12-17 14:50:12 +00:00
Tiago Gomes
2738c0fb56
Use tabs instead of spaces for consistency
2012-12-17 12:13:08 +00:00
Tiago Gomes
d03ea1509e
Trivial
2012-12-17 11:56:15 +00:00
Tiago Gomes
e35cf51476
Reorders and some reindentation
2012-12-17 11:53:57 +00:00
Tiago Gomes
9ff9be2f49
Don't pass around the Solver for EM
2012-12-15 16:11:03 +00:00
Tiago Gomes
81ac6f1913
Don't pass around the Solver in run_horus_ground_solver
2012-12-15 15:56:05 +00:00
Tiago Gomes
ea931f2f93
Comment
2012-12-15 00:41:00 +00:00
Tiago Gomes
55292ab745
Clean ups and don't forget cbp
2012-12-15 00:29:03 +00:00
Tiago Gomes
1174486576
VE???
2012-12-15 00:16:06 +00:00
Tiago Gomes
2996a0b8b3
Comment does not apply
2012-12-15 00:14:45 +00:00
Tiago Gomes
e5479ff17c
CLPBNs first, PFLs next
2012-12-15 00:13:53 +00:00
Tiago Gomes
6c95c50eb4
Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3
2012-12-14 14:05:22 +00:00
Vitor Santos Costa
84b0529060
improve prism compatibility (fix asia).
2012-12-14 08:26:56 +00:00
Tiago Gomes
971b8b7487
Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3
2012-12-13 23:48:16 +00:00
Tiago Gomes
eea7ce2885
Fix file names
2012-12-13 19:02:04 +00:00
Tiago Gomes
0594d43539
Cosmetic fixes
2012-12-13 17:51:43 +00:00
Tiago Gomes
05e53eaf37
Merge sch32 and school32_data and rename to school_32
2012-12-13 17:08:54 +00:00
Tiago Gomes
6b8301d9c4
CLP(BN) is dead. Long live the PFL
2012-12-13 17:04:14 +00:00
Tiago Gomes
d78baa48a1
Don't special case the tables in city.pfl
...
Its hard to make them work in lifted networks
:
2012-12-13 16:50:39 +00:00
Vitor Santos Costa
c4448d066a
allow backtracking over possible values of constraints.a
2012-12-13 15:53:01 +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
48413deae7
Ops: deleted this by accident in the previous commit
2012-12-13 14:08:16 +00:00
Tiago Gomes
dd8a92aaf3
Merge with upstream code
2012-12-13 12:55:55 +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
c7588c9361
Trivial
2012-12-12 17:03:11 +00:00
Tiago Gomes
4683d30d8e
Trivial
2012-12-12 17:01:30 +00:00
Tiago Gomes
39bf95fe2b
trivial
2012-12-12 16:28:18 +00:00
Tiago Gomes
8eb657aec2
Change extension of school parschema to pfl
2012-12-12 16:00:21 +00:00
Tiago Gomes
0f46c97481
Trivial
2012-12-12 15:47:09 +00:00
Tiago Gomes
e66ff6777c
Be consistent: constraint is always on top
2012-12-12 15:41:41 +00:00
Tiago Gomes
66cd58655b
Place the debug_school predicate into a different file
2012-12-12 15:36:38 +00:00
Tiago Gomes
01dfc5e2be
Change extension of school_params
...
school_params does not define any pfl network, so it shouldn't have pfl as the extension
2012-12-12 15:26:49 +00:00
Tiago Gomes
108e310a0f
Rework the learning examples
2012-12-12 15:16:30 +00:00
Tiago Gomes
f128b6de7a
school_32 should use clp(bn)
2012-12-12 00:27:32 +00:00
Tiago Gomes
27a235f65b
Remove text explaning pfl.
...
The text is badly written and explanaing pfl shouldn't be in *.pfl files, but rather in paper or README file
2012-12-11 23:36:10 +00:00
Tiago Gomes
4310e42562
rework examples
2012-12-11 23:06:09 +00:00
Tiago Gomes
ccba2d4177
update Makefile to reflect the change of extension to .pfl
2012-12-11 21:02:26 +00:00
Tiago Gomes
1641d1fa30
Remove files that souldn't be in the repository
2012-12-11 16:22:38 +00:00
Tiago Gomes
47bc8f22fc
Examples: sprinker was converted from clpbn to pfl
2012-12-11 16:20:55 +00:00
Tiago Gomes
d8a7b7aad6
Examples: change extension to pfl
2012-12-11 16:19:59 +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
Vítor Santos Costa
354dbbf802
follow pldoc
2012-12-08 10:52:39 +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
Vitor Santos Costa
b98b09e7de
improve utf-8
2012-12-07 08:10:21 +00:00
Vitor Santos Costa
a813a13412
mysqldb interface vs Prolog
2012-12-04 14:49:29 +00:00
Vitor Santos Costa
36ae500118
fixes
2012-12-03 12:39:25 +00:00
Vítor Santos Costa
d9d954abe1
fix handling of methods and classes with named objects: just use PyObject_Call()
2012-12-02 13:19:10 +00:00
Vitor Santos Costa
3c0e16030c
imprive python interface
2012-12-01 14:28:25 +00:00
Tiago Gomes
ee1b7dcd21
abort when compilation failed
2012-11-27 16:54:02 +00:00
Vitor Santos Costa
683032432c
more examples
2012-11-27 13:50:18 +00:00
Vítor Santos Costa
e529e79582
more progress
2012-11-27 12:10:41 +00:00
Vitor Santos Costa
f1874ecec0
inprove python interface.
2012-11-27 00:16:34 +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
Vítor Santos Costa
57ac65c83b
new swi version.
2012-11-25 23:48:41 +00:00
Vítor Santos Costa
e470dfcdc7
more python stuff.
2012-11-25 23:37:28 +00:00
Vitor Santos Costa
d5b97ac15e
quoting.
2012-11-24 12:23:00 +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
4afe6c8161
refactor horus_ground and horus_lifted
2012-11-22 16:33:22 +00:00
Tiago Gomes
992d06656d
refactor horus_ground.yap
2012-11-22 15:54:30 +00:00
Vitor Santos Costa
027632456a
Merge branch 'master' of https://github.com/tacgomes/yap6.3
2012-11-22 12:29:37 +00:00
Vitor Santos Costa
bb4d75f428
avoid messing up lifted solvers
2012-11-22 12:27:33 +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
c2791748d2
Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3
2012-11-16 00:57:41 +00:00
Vitor Santos Costa
114a6732f0
add_factor should succeed if Constraints are satisfied
2012-11-15 17:28:57 +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
b673dfd462
fix type in an example
2012-11-14 23:12:03 +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
Vitor Santos Costa
416b407faa
fixes i r..eal
2012-11-14 16:00:35 +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
c53220aa61
Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3
2012-11-09 16:29:24 +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
Vítor Santos Costa
06b915d568
more functionality
2012-11-05 13:49:15 +00:00
Tiago Gomes
4518a3db5d
support smoothing on atom counting nodes (beta)
2012-11-04 18:02:40 +00:00
Vítor Santos Costa
eb63f30ab2
update version
2012-11-03 13:58:20 +00:00
Vítor Santos Costa
bf956ca639
python interface as a separate package
2012-11-02 22:37:27 +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
Vitor Santos Costa
afc0c4c5a2
new version
2012-11-01 08:31:58 +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
Vitor Santos Costa
eb79049bdb
more improvements to interface
2012-10-28 18:22:09 +00:00
Tiago Gomes
d074ca9a8f
add initial independent partial grounding support
2012-10-27 00:13:11 +01:00
Vitor Santos Costa
f33fe61ada
more support.
2012-10-26 00:24:07 +01:00
Tiago Gomes
68ef63207f
initial support for weighted model countign
2012-10-25 12:22:52 +01:00
Vítor Santos Costa
ea3f2f13e9
improve python interface
2012-10-25 00:33:02 +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
Vítor Santos Costa
d2da55463f
more python fixes.
2012-10-23 10:18:24 +01:00
Vítor Santos Costa
0caac30c11
support lists
2012-10-23 10:16:32 +01:00
Vitor Santos Costa
84a5f518bf
fix Makefile trouble
2012-10-23 09:06:38 +01:00
Vítor Santos Costa
b272205707
odbc and archive
2012-10-23 00:45:13 +01:00
Tiago Gomes
a8926fe38b
inital code for lifted knowledge compilation
2012-10-22 23:01:13 +01:00
Vitor Santos Costa
f189784510
Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3
2012-10-22 22:04:38 +01:00
Vítor Santos Costa
6bfd5bbe54
new version.
2012-10-22 21:39:45 +01:00
Vitor Santos Costa
32a01a5bf6
:new SWI modules.
2012-10-22 18:16:52 +01:00
Vitor Santos Costa
2de3917e4a
socket testing
2012-10-17 17:30:51 +01:00
Vítor Santos Costa
fb2a17addf
improve interface
2012-10-17 10:56:44 +01:00
Vítor Santos Costa
d6b3fc4325
new version.
2012-10-09 20:10:02 +01:00
Vitor Santos Costa
965b48f017
inew version.
2012-10-09 17:29:15 +01:00
Vitor Santos Costa
7c178d2644
newer version
2012-10-09 16:31:09 +01:00
Vítor Santos Costa
ecf5ac655f
fun with python
2012-10-08 23:58:22 +01:00
Vitor Santos Costa
c4da6a9c68
update to newer version
2012-10-08 18:27:05 +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
76088ca8b3
support binaries.
2012-09-26 23:10:22 +01:00
Vítor Santos Costa
74fd98832a
upgrade compilation flags.
2012-09-26 22:59:22 +01:00
Vitor Santos Costa
7424a7376c
fix reverse linking with yap from target library.
2012-09-26 14:49:21 +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
Vítor Santos Costa
709843717f
latest swi repo
2012-09-21 13:11:46 +01:00
Vítor Santos Costa
2673c56982
new version.
2012-09-21 13:08:25 +01:00
Vítor Santos Costa
a3435f5a7b
SWI compatibility additions
2012-09-21 13:07:10 +01:00
Vítor Santos Costa
ceb5785120
new commits.
2012-09-18 23:13:07 +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
Costa Vitor
652073caa4
Merge branch 'master' of git://yap.git.sourceforge.net/gitroot/yap/yap-6.3
2012-08-08 11:17:50 -05:00
Vitor Santos Costa
ad609e39da
Merge branch 'master' of git.dcc.fc.up.pt:yap-6.3
2012-08-08 04:00:06 +01:00
Vitor Santos Costa
d5ed379068
recognise weird trie.
2012-08-08 03:59:37 +01:00
Vitor Santos Costa
15bcaf97fc
speedup.
2012-08-08 03:59:06 +01:00
Vítor Santos Costa
2b2cedc2b6
remove some comments and improve em interface.
2012-08-07 21:53:10 -05:00
Vítor Santos Costa
c159894c29
Merge branch 'master' of ssh://git.dcc.fc.up.pt/yap-6.3
2012-08-07 18:37:02 -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
a4ae6acbb6
check for Rinterface.h
2012-08-02 19:53:43 -05:00
Vitor Santos Costa
7458d8ee74
update to newer releases.
2012-08-01 19:48:29 +01:00
Costa Vitor
8ba1de7250
fixes for external CUDD compatibility.
2012-07-16 11:58:21 -05:00
Vitor Santos Costa
d78a55ca83
fix cudd support.
2012-07-08 07:45:16 -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
Vítor Santos Costa
d9decfe003
fix example path in meld.
2012-07-06 18:58:35 -05:00
Vítor Santos Costa
8a22258fdf
use standard paths for installing examples.
2012-07-06 18:56:05 -05:00
Vitor Santos Costa
c67edd877a
learning is debugging
2012-07-03 19:48:13 +01:00
Vitor Santos Costa
b4b1e68c35
Merge branch 'master' of https://github.com/tacgomes/yap6.3
2012-07-03 16:03:27 +01:00
Tiago Gomes
4af5a90b8b
re-enable all elimination heuristics
2012-07-02 22:53:44 +01:00
Vitor Santos Costa
79b4c6cb25
new version.
2012-07-02 20:04:02 +01:00
Denys Duchier
97163fa150
place INLINE_ONLY at front of extern inline declarations AND definitions. gcc and clang then behave the same.
2012-06-30 20:42:14 +02:00
Tiago Gomes
7a3d39551b
improve the way we compute hashs for counting bp
2012-06-30 19:25:29 +01:00
Vítor Santos Costa
70bde4d38f
inline extern patch by Denys Duchier
2012-06-29 22:44:08 +01:00
Vítor Santos Costa
20b60649e5
new updates to jpl.
2012-06-29 22:42:08 +01:00
Vítor Santos Costa
e938c17748
fix clang compilation (Denys Duchier).
2012-06-29 22:24:12 +01:00
Tiago Gomes
5e2d9acc4f
update comment
2012-06-26 19:44:27 +01:00
Vitor Santos Costa
fe2f99e49d
update package version.
2012-06-22 19:00:45 +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
Vitor Santos Costa
31b8cb6440
windows support.
2012-06-08 06:54:03 -05: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
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