46fbc539bf
handle repeated query vars with evidence
2013-01-09 17:49:07 +00:00
2feac46e54
PFL manual: several improvements
2013-01-09 16:45:01 +00:00
7f452d2397
Refactor the benchmarks
2013-01-09 15:25:14 +00:00
7fabfcf4c9
Trivial
2013-01-09 11:43:40 +00:00
24271157ce
Clean unecessary latex documents
2013-01-08 22:55:27 +00:00
59ae52623c
PFL manual: several improvements
2013-01-08 22:51:44 +00:00
6755e50525
PFL manual: small improvements
2013-01-08 22:00:31 +00:00
ea054468bc
Improve hcli usage string
2013-01-08 21:17:56 +00:00
dc536fabc2
Beautify setHorusFlag
2013-01-08 21:13:58 +00:00
2738d83302
Remove some alias for hve
2013-01-08 20:48:46 +00:00
dfd7360291
Allow the use of solver as an alias of ground_solver
2013-01-08 20:47:12 +00:00
dbd35a20a2
PFL manual: improve introduction section
2013-01-08 19:40:20 +00:00
9c8fd804df
PFL manual: add a further information section
2013-01-08 19:39:39 +00:00
f94032d06c
PFL manual: add an installation section
2013-01-08 19:39:03 +00:00
1b9c4e96e7
Prefix with bp_ some bp flags
2013-01-08 17:06:40 +00:00
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
4220069d90
PFL manual: use the Unix end-of-line marker
2013-01-08 15:34:56 +00:00
75b652b0c9
PFL manual: improve title page and reword a sentence
2013-01-08 15:33:55 +00:00
6375d05a93
PFL manual: add section for horus cli
2013-01-08 15:31:52 +00:00
182429252e
Update the usage string for hcli
2013-01-08 14:47:21 +00:00
c92b7c3e7e
Install hcli to the bin directory
2013-01-08 00:33:01 +00:00
f598881cc5
Explain better the potential value order
2013-01-07 22:21:52 +00:00
9bb43360a2
Rearrange the probabilities to do a clean diff against the exported model
2013-01-07 22:18:50 +00:00
ba32ebc5f5
Add support for bayesian networks defined in an UAI file format
2013-01-07 22:17:05 +00:00
82a4cc508b
Change burglary-alarm.uai to be bayes instead of markov
2013-01-07 22:01:49 +00:00
bafd7320a5
Rework a bit the examples
2013-01-07 14:59:51 +00:00
91dbd60ad4
Allow calling set_horus_flag/2 without loading clpbn_horus
2013-01-07 14:05:56 +00:00
96f4e7ea1b
Fix typo
2013-01-07 14:04:44 +00:00
ec2d9e0967
Trivial
2013-01-05 12:04:43 +00:00
f0768e76f2
Improve Makefile
2013-01-05 01:02:19 +00:00
f55ccdef33
Add a manual for PFL written in Latex
2013-01-05 00:49:39 +00:00
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
f2682374fb
Forgot to update the Makefile in the previous commit
2013-01-04 15:42:03 +00:00
3347f0e676
Rename two examples
2013-01-03 23:44:30 +00:00
d4d11cd4b4
Fix sprinkler probability order
2013-01-03 18:48:15 +00:00
ea5dbe2bca
Trivial
2013-01-03 18:26:12 +00:00
d293c5e5a9
Trivial
2012-12-28 15:40:32 +00:00
3363019c93
Remove unnecessary methods
2012-12-28 01:35:59 +00:00
7d9af75c35
Improve solver flags
2012-12-27 23:21:32 +00:00
d36b63ece3
Trivial
2012-12-27 22:29:20 +00:00
c96496720b
Trivial
2012-12-27 22:28:19 +00:00
485c3e34b2
Use more DISALLOW_COPY_AND_ASSIGN
2012-12-27 22:25:45 +00:00
7b7f663ac6
Don't use public members for solver flags
2012-12-27 15:44:40 +00:00
b996436b24
Reorganize
2012-12-27 15:05:40 +00:00
de0a118ae5
Move belief propagation stuff out from Horus.h
2012-12-27 15:00:30 +00:00
cbea630fbf
Cosmetic fixes
2012-12-27 12:54:58 +00:00
8bdcb65907
Improve variable elimination
2012-12-26 22:55:48 +00:00
188f359496
Fix a warning about a unitialized var
2012-12-26 21:48:05 +00:00
d8c5725b2e
This shouldn't be on the repository
2012-12-21 15:20:28 +00:00
4b901d26d7
Improve error messages
2012-12-20 23:34:53 +00:00
01d8f8e178
More whitespace cleanups
2012-12-20 23:19:10 +00:00
421d6f72ee
Place the constructor on the right place
2012-12-20 21:32:40 +00:00
57339760b9
Merge LiftedKc and LiftedCircuit in one file
2012-12-20 21:11:51 +00:00
b44ed7db39
Improve the error messages
2012-12-20 18:07:50 +00:00
685f46dc27
Fix
2012-12-20 17:41:52 +00:00
053fa31bb2
Exit is better than abort.
...
Also use a macro instead of integer to indicate failure.
2012-12-20 17:37:59 +00:00
2ca31ca14a
Don't abort if opening a file to export to graphviz fails
2012-12-20 17:11:11 +00:00
af8497af6e
Sort the logical vars of the constraint tree when exporting to graphviz
2012-12-20 16:20:38 +00:00
046af409ba
Change the default solver to be hve
2012-12-19 18:25:47 +00:00
c407594146
Whitespace clean
2012-12-19 18:22:47 +00:00
60ff9daafd
Remove old example
2012-12-19 18:13:47 +00:00
48254ba7d7
Lkc: fix some memory leaks
2012-12-19 17:45:53 +00:00
2d1f5edc91
There is no more to do
2012-12-18 23:52:56 +00:00
691188d5c9
Handle better formulas like f(X,X)
2012-12-18 23:51:51 +00:00
0a661b0462
More cleanups
2012-12-18 22:47:43 +00:00
4b0acbf8c1
Cleanups
2012-12-18 12:11:45 +00:00
c7a4adcefb
Fix finalizing horus ground solvers on EM
2012-12-17 23:59:52 +00:00
5fa5dda579
Remove BP from clpbn interface to EM
2012-12-17 23:29:21 +00:00
e1c862ebbe
Refactor the way we set the inference solver
2012-12-17 23:14:54 +00:00
f1499f99f3
Introduce set_em_solver and use it
2012-12-17 21:19:47 +00:00
40a72a0a63
Improve error handling for choosing EM solver
2012-12-17 21:03:13 +00:00
9861f4aadb
Is the EM solver that we want
2012-12-17 18:50:36 +00:00
3eb6b76ddd
Whitespace clean
2012-12-17 18:39:42 +00:00
2f2f88e571
Several whitespace fixes
2012-12-17 17:57:00 +00:00
409a230826
Use the same convetion for module import and export
2012-12-17 14:50:12 +00:00
2738c0fb56
Use tabs instead of spaces for consistency
2012-12-17 12:13:08 +00:00
d03ea1509e
Trivial
2012-12-17 11:56:15 +00:00
e35cf51476
Reorders and some reindentation
2012-12-17 11:53:57 +00:00
9ff9be2f49
Don't pass around the Solver for EM
2012-12-15 16:11:03 +00:00
81ac6f1913
Don't pass around the Solver in run_horus_ground_solver
2012-12-15 15:56:05 +00:00
ea931f2f93
Comment
2012-12-15 00:41:00 +00:00
55292ab745
Clean ups and don't forget cbp
2012-12-15 00:29:03 +00:00
1174486576
VE???
2012-12-15 00:16:06 +00:00
2996a0b8b3
Comment does not apply
2012-12-15 00:14:45 +00:00
e5479ff17c
CLPBNs first, PFLs next
2012-12-15 00:13:53 +00:00
971b8b7487
Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3
2012-12-13 23:48:16 +00:00
eea7ce2885
Fix file names
2012-12-13 19:02:04 +00:00
0594d43539
Cosmetic fixes
2012-12-13 17:51:43 +00:00
05e53eaf37
Merge sch32 and school32_data and rename to school_32
2012-12-13 17:08:54 +00:00
6b8301d9c4
CLP(BN) is dead. Long live the PFL
2012-12-13 17:04:14 +00:00
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
c4448d066a
allow backtracking over possible values of constraints.a
2012-12-13 15:53:01 +00:00
8b996c5dc9
Lkc: show that we exported the circuit to graphviz when debugging
2012-12-13 14:21:16 +00:00
48413deae7
Ops: deleted this by accident in the previous commit
2012-12-13 14:08:16 +00:00
dd8a92aaf3
Merge with upstream code
2012-12-13 12:55:55 +00:00
11e688ffd7
Lkc: use utility function
2012-12-12 21:19:22 +00:00
f2173d001e
Lkc: fix bug when adding weights
2012-12-12 21:16:36 +00:00
c7588c9361
Trivial
2012-12-12 17:03:11 +00:00
4683d30d8e
Trivial
2012-12-12 17:01:30 +00:00
39bf95fe2b
trivial
2012-12-12 16:28:18 +00:00
8eb657aec2
Change extension of school parschema to pfl
2012-12-12 16:00:21 +00:00
0f46c97481
Trivial
2012-12-12 15:47:09 +00:00
e66ff6777c
Be consistent: constraint is always on top
2012-12-12 15:41:41 +00:00
66cd58655b
Place the debug_school predicate into a different file
2012-12-12 15:36:38 +00:00
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
108e310a0f
Rework the learning examples
2012-12-12 15:16:30 +00:00
f128b6de7a
school_32 should use clp(bn)
2012-12-12 00:27:32 +00:00
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
4310e42562
rework examples
2012-12-11 23:06:09 +00:00
ccba2d4177
update Makefile to reflect the change of extension to .pfl
2012-12-11 21:02:26 +00:00
1641d1fa30
Remove files that souldn't be in the repository
2012-12-11 16:22:38 +00:00
47bc8f22fc
Examples: sprinker was converted from clpbn to pfl
2012-12-11 16:20:55 +00:00
d8a7b7aad6
Examples: change extension to pfl
2012-12-11 16:19:59 +00:00
a59c152962
Lkc: Fix smoothing in atom counting nodes
2012-12-11 16:02:48 +00:00
bb68afe91d
Fix an error caused by a temporary being out of scope
2012-12-11 15:52:20 +00:00
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
8371e395dd
fix typo
2012-12-10 19:37:41 +00:00
a25f4584c8
support printing LitLvTypes objects
2012-12-10 18:48:54 +00:00
9c8827c309
always copy clauses for backup
2012-12-09 22:57:39 +00:00
90736156ae
some clean ups
2012-12-09 22:13:58 +00:00
e46d2177b7
rework a bit the test infrastructure for lkc
2012-12-09 22:04:33 +00:00
907144db32
don't use a stack for atom counting operator
2012-12-09 19:46:14 +00:00
57a31c2c36
fix showing the weights on edge labels when there is a SetOrNode ancestor
2012-12-09 17:33:36 +00:00
59f653aabd
move implementation of copyClauses to another file
2012-12-08 19:32:19 +00:00
4edbcf86b8
Use pointers to refer to clauses for better performance
2012-12-08 19:17:19 +00:00
73b3594c97
lifted kc: when not debuging don't keep track of the origin clauses
2012-12-07 11:47:50 +00:00
ee1b7dcd21
abort when compilation failed
2012-11-27 16:54:02 +00:00
e529e79582
more progress
2012-11-27 12:10:41 +00:00
610e55a4a2
Improve debbuging for lifted knowledge compilation
2012-11-26 14:46:45 +00:00
1f1d194326
remove unnecessary std set
2012-11-26 14:46:00 +00:00
a2429a1eec
Merge branch 'master' of github.com:tacgomes/yap6.3
2012-11-26 11:48:24 +00:00
e09c25bd59
remove grounding stub form lifted knowledge compilation. its hard to implement
2012-11-22 16:34:24 +00:00
4afe6c8161
refactor horus_ground and horus_lifted
2012-11-22 16:33:22 +00:00
992d06656d
refactor horus_ground.yap
2012-11-22 15:54:30 +00:00
027632456a
Merge branch 'master' of https://github.com/tacgomes/yap6.3
2012-11-22 12:29:37 +00:00
bb4d75f428
avoid messing up lifted solvers
2012-11-22 12:27:33 +00:00
85db763d9c
small improvement in HorusYap
2012-11-16 22:38:14 +00:00
51eef45b2d
refactor HorusYap
2012-11-16 17:10:04 +00:00
59fd21bf33
use only 1 lifted solver instance
2012-11-16 16:50:19 +00:00
c2791748d2
Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3
2012-11-16 00:57:41 +00:00
114a6732f0
add_factor should succeed if Constraints are satisfied
2012-11-15 17:28:57 +00:00
51fd48cd46
Ouchgit statusgit status! forgot to add these to index
2012-11-14 23:17:39 +00:00
4522850cd6
one step close to use one solver instatiation to solve several queries
2012-11-14 23:13:46 +00:00
b673dfd462
fix type in an example
2012-11-14 23:12:03 +00:00
64a27847cc
Introduce a lifted solver class
2012-11-14 21:55:51 +00:00
6e7d0d1d0a
remove old TODOs
2012-11-14 21:17:04 +00:00
cad22da9f5
fixes & cleanups
2012-11-14 21:05:55 +00:00
d9e48e6290
log domain calculations fixes for lifted knowledge compilation
2012-11-14 18:40:03 +00:00
9202e286f8
IncExc: check if log vars are count normalized
2012-11-14 14:43:56 +00:00
f5c85ffcc9
shatter agains the query in lifted knowledge compilation
2012-11-12 15:20:42 +00:00
4776817603
move more code around
2012-11-10 00:18:20 +00:00
07bcc89a76
factor out some lifted operations in a new class
2012-11-09 23:52:35 +00:00
8ab622e0aa
more work to support inference with lifted knowledge compilation
2012-11-09 18:42:21 +00:00
6a200760ca
initial code to support calling a lifted knowledge compilation solver
2012-11-08 21:54:47 +00:00
0ed89d3eeb
add flag to lifted knowledge compilation and s/fove/lve
2012-11-08 15:05:48 +00:00
a8c4f4fc52
fix one more TODO
2012-11-08 14:02:18 +00:00
f7db522c6c
InxExc: improve the code
2012-11-07 23:45:43 +00:00
6db4d37684
Independence: consider also counted log vars
2012-11-07 21:21:42 +00:00
d2ae171bb5
Improve Clause constructor
2012-11-07 18:43:13 +00:00
278f8f77f5
Improve independence
2012-11-07 18:42:11 +00:00
07c6509a79
cleanups, refactorings & renamings
2012-11-07 15:28:33 +00:00
83c1e58674
clean ups
2012-11-07 12:37:22 +00:00
b599b45bc6
AC: only allow one counting node per branch
2012-11-06 23:56:52 +00:00
829f2248ee
use utility method
2012-11-06 23:39:18 +00:00
06a59ad659
IPG: verify that the root log vars appear in the same positions
2012-11-06 23:35:14 +00:00
1e38743462
fix ipgCandidates
2012-11-06 16:24:59 +00:00
869d513c1a
remove and add some TODOs
2012-11-06 15:57:54 +00:00
5e1547ba78
add missing method to TinySet
2012-11-06 15:15:55 +00:00
ab334f82b2
fix weighted model counting in atom counting nodes
2012-11-06 14:16:04 +00:00
4518a3db5d
support smoothing on atom counting nodes (beta)
2012-11-04 18:02:40 +00:00
b8cef8798a
fix warning produced by new version of gcc
2012-11-01 22:54:14 +00:00
a1d0deb638
support model counting on atom couting nodes - still untested
2012-11-01 22:34:28 +00:00
d4912ea219
some reorders
2012-11-01 13:56:12 +00:00
bfa9648067
clean up
2012-10-31 23:58:07 +00:00
6877be897e
first stab for atom counting
2012-10-31 23:43:39 +00:00
e762d6be22
tweak colors
2012-10-30 16:00:20 +00:00
77ef7b87cd
support smoothing in inclusion-exclusion nodes
2012-10-30 15:48:19 +00:00
b31a047635
refactor exportToGraphViz
2012-10-30 14:31:52 +00:00
a75799b34f
small improvements
2012-10-30 12:41:00 +00:00
864f764391
support model counting in inc-exc nodes
2012-10-30 01:51:10 +00:00
8b77b93a3b
add support for inclusion-exclusion
2012-10-30 00:21:10 +00:00
b6df8a66b1
add assignement operator to ConstraintTree
2012-10-30 00:15:40 +00:00
d07ea73050
add projectedCopy
2012-10-29 21:37:58 +00:00
324ea1a96c
make independent partial ground suck less
2012-10-29 20:49:21 +00:00
c2b1434969
show weights in dot file and add support for smoothing set-and nodes
2012-10-29 15:39:56 +00:00
fbc44ba17d
improments in exportToGraphViz
2012-10-29 13:49:11 +00:00
d074ca9a8f
add initial independent partial grounding support
2012-10-27 00:13:11 +01:00
68ef63207f
initial support for weighted model countign
2012-10-25 12:22:52 +01:00
eac6b954a8
add inital smoothing of the circuit
2012-10-24 21:22:49 +01:00
0cfc64d068
update TODO
2012-10-24 16:24:49 +01:00
a8926fe38b
inital code for lifted knowledge compilation
2012-10-22 23:01:13 +01:00
b24922fd38
fix bdd with em
2012-10-04 00:15:18 +01:00
4e43aff605
Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3
2012-10-03 17:17:24 +01:00
93f13c9c8d
Merge branch 'master' of https://github.com/tacgomes/yap6.3
2012-10-03 17:15:49 +01:00
ab14365a30
try to make bdds work with EM.
2012-10-03 10:23:27 +01:00
01e1a14160
improve indirect evidence handling in PFL queries (obs from Andrea)
2012-10-03 09:50:50 +01:00
e6fb32d9ca
fix problem with conditional_probability/3 and evidence (obs from Andrea Sterbini).
2012-10-02 14:26:42 +01:00
85e9da1332
hve with em works now.
2012-10-02 08:49:16 +01:00
559b3e3b54
watch out for division by 0 in message calculation for BP
2012-09-30 22:04:44 +01:00
793907f710
more EM stuff
2012-09-29 11:50:00 +01:00
Vitor Santos Costa
tacgomes
tagomes@fc.up.pt