Commit Graph

288 Commits

Author SHA1 Message Date
Tiago Gomes 1d54a78601 BayesBall: improve encapsulation 2013-02-20 14:13:37 +00:00
Tiago Gomes 9a68d95c18 Turn EGNode to be a nested class inside ElimGraph 2013-02-20 13:49:01 +00:00
Tiago Gomes 8ca379c74a Move ElimHeuristic enum to inside of ElimGraph class 2013-02-20 12:52:55 +00:00
Tiago Gomes 8de22f4f0b Counting Bp: move internal classes to source file 2013-02-20 12:42:05 +00:00
Tiago Gomes 8c2468c28b Improve encapsulation in HorusYap and perform other small refactorings 2013-02-20 11:52:42 +00:00
Tiago Gomes 77dfe50acb LiftedVe: move internal classes to source file 2013-02-20 00:21:01 +00:00
Tiago Gomes 7edfe44576 WeightedBp: remove unnecessary include 2013-02-20 00:13:15 +00:00
Tiago Gomes 74a9eda09d HorusCli: put internal functions in an anonymous namespace 2013-02-20 00:05:45 +00:00
Tiago Gomes e3439af0a0 LiftedKc: improve header include 2013-02-19 23:59:05 +00:00
Tiago Gomes e434e87cc8 LiftedKc: remove unnecessary data members 2013-02-19 23:57:22 +00:00
Tiago Gomes c9543514c5 LiftedKc: move some internal classes to source file 2013-02-19 23:47:46 +00:00
Tiago Gomes b6ee7b4460 Don't extend explicity the life time of returned temporaries.
That sort of optimization is compiler's work.
2013-02-16 18:58:22 +00:00
Tiago Gomes ea49b517e8 Some renamings in ElimGraph 2013-02-16 17:03:12 +00:00
Tiago Gomes ba79d2e422 Add a source file for Indexer class
- Move some non-performance critical methods to the source file
- Fix some implicit declarions of members in iomanip
- Fix declaration order in Makefile.in
2013-02-16 16:42:08 +00:00
Tiago Gomes 0852c4fe22 Clean ups 2013-02-16 16:17:14 +00:00
Tiago Gomes d0f5d0f9ab Change LiftedOperations to be a namespace instead of class with static member functions 2013-02-16 16:00:53 +00:00
Tiago Gomes be24ff5160 Fix typos 2013-02-16 15:30:44 +00:00
Tiago Gomes acb4bf610f Clean HorusYap a bit 2013-02-16 01:54:11 +00:00
Tiago Gomes bf1ba17855 Fix typos detected by cppcheck 2013-02-13 23:47:00 +00:00
Tiago Gomes 57f46e7c0d Fix printed string showed when file opening fails 2013-02-13 19:18:55 +00:00
Tiago Gomes ab7f4c8113 Fix namespace name 2013-02-13 19:09:11 +00:00
Tiago Gomes ef4ebb4d7f Use camel case for constants and enumerators.
All capitals case should be reserved for macros and besides there is no big need to emphasize constness in general.
2013-02-13 18:54:15 +00:00
Tiago Gomes afd26ed9b4 Trivial 2013-02-13 15:25:55 +00:00
Tiago Gomes bd70033c06 Disallow copy and assign for Var too 2013-02-13 14:42:24 +00:00
Tiago Gomes 2bc123d72c Update class, struct and enum bracket style 2013-02-13 14:26:47 +00:00
Tiago Gomes e178c1af04 Change namespace name to be in Pascal case 2013-02-08 21:12:46 +00:00
Tiago Gomes 6a1a209ee3 Revert "Improve namespace names"
This reverts commit 973df43fe0.

On a second thought, namespaces are close to classes in the sense that both encapsulate data, so they should both use Pascal case notation.
2013-02-08 21:01:53 +00:00
Tiago Gomes 264ef7a067 Clean a bit LiftedWCNF class 2013-02-08 12:12:45 +00:00
Tiago Gomes bff56c75ca Trivial 2013-02-08 01:11:18 +00:00
Tiago Gomes 98842dca74 Trivial 2013-02-08 00:56:42 +00:00
Tiago Gomes c41b6d80b6 Trivial 2013-02-08 00:28:32 +00:00
Tiago Gomes cd8a25162e Trivial 2013-02-08 00:22:51 +00:00
Tiago Gomes 206cf0a9c7 Trivial 2013-02-08 00:20:01 +00:00
Tiago Gomes 973df43fe0 Improve namespace names 2013-02-08 00:15:41 +00:00
Tiago Gomes 6f83ceb6f5 Put the code inside a horus namespace 2013-02-07 23:53:13 +00:00
Tiago Gomes 4267465f53 Trivial 2013-02-07 22:41:04 +00:00
Tiago Gomes 3738d0b2c6 Move some things around. No functional changes 2013-02-07 22:37:45 +00:00
Tiago Gomes 2992f9e3cf Trivial 2013-02-07 20:54:59 +00:00
Tiago Gomes 5c84a2f532 Improve includes 2013-02-07 20:09:10 +00:00
Tiago Gomes 544d0aa39e Improve header guards (again) 2013-02-07 17:50:33 +00:00
Tiago Gomes bb7a530da3 Avoid importing the std namespace 2013-02-07 13:37:15 +00:00
Tiago Gomes 7b60e88545 Improve Header guards 2013-02-06 22:58:42 +00:00
Tiago Gomes 80452bf75d Small improvements 2013-02-06 00:29:29 +00:00
Tiago Gomes 42a5bc493a Move methods with more than two lines to outside of class definition 2013-02-06 00:29:03 +00:00
Tiago Gomes 0d9d59f5fe Trivial 2013-01-25 13:58:30 +00:00
Tiago Gomes bef65dac57 Fix a compilation error with older versions of GCC 2013-01-25 13:47:20 +00:00
Tiago Gomes f3bd8ad414 Use the word option instead of key. Key reminds me of hashes 2013-01-10 22:59:12 +00:00
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 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 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 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 ba32ebc5f5 Add support for bayesian networks defined in an UAI file format 2013-01-07 22:17:05 +00:00
Tiago Gomes ec2d9e0967 Trivial 2013-01-05 12:04:43 +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
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 01d8f8e178 More whitespace cleanups 2012-12-20 23:19:10 +00:00
Tiago Gomes 421d6f72ee Place the constructor on the right place 2012-12-20 21:32:40 +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
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
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
Tiago Gomes 3eb6b76ddd Whitespace clean 2012-12-17 18:39:42 +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 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 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
Tiago Gomes 73b3594c97 lifted kc: when not debuging don't keep track of the origin clauses 2012-12-07 11:47:50 +00:00
Tiago Gomes ee1b7dcd21 abort when compilation failed 2012-11-27 16:54:02 +00:00