diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,477 Commits 2 Branches 6 Tags 146 MiB
264ef7a067
Commit Graph

1211 Commits

Author SHA1 Message Date
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