OW2 Consortium

CVS log for sat4j/core/src/org/sat4j/minisat/constraints/pb/Attic/ConflictMap.java

 (logo)

Help
(back) Up to [OW2-CVS] / sat4j / core / src / org / sat4j / minisat / constraints / pb

Request diff between arbitrary revisions / Display revisions graphically

Default branch: MAIN
Bookmark a link to: HEAD / (download)
Revision 1.29 , Thu Sep 13 08:06:43 2007 UTC (4 years, 8 months ago) by leberre
Branch: MAIN
CVS Tags: RELEASE_2_0_RC2, PASCAL_SNAPSHOT_TWO, INTEGRATION_P2, HEAD, BEFORE_EPL_HEADERS
Changes since 1.28: +0 -0 lines
FILE REMOVED 
Removed CSP and PB related code for the 2.0 release.
Revision 1.28 / (view) - annotate - [select for diffs] , Tue Aug 28 09:41:03 2007 UTC (4 years, 8 months ago) by leberre
Branch: MAIN
CVS Tags: RELEASE_1_7
Changes since 1.27: +2 -2 lines
Diff to previous 1.27 
Fixed findbugs warnings when necessary.
Added a comment DLB findbugs ok is the code is ok and the warning can be safely ignored.
Revision 1.27 / (view) - annotate - [select for diffs] , Mon Jun 25 20:10:46 2007 UTC (4 years, 10 months ago) by parrain
Branch: MAIN
Changes since 1.26: +43 -28 lines
Diff to previous 1.26 
bug correction in isImplyingLiteralOrdered()
Revision 1.26 / (view) - annotate - [select for diffs] , Mon Jun 18 21:30:08 2007 UTC (4 years, 10 months ago) by parrain
Branch: MAIN
Changes since 1.25: +473 -461 lines
Diff to previous 1.25 
improved isImplyingLiteral
Revision 1.25 / (view) - annotate - [select for diffs] , Fri Jun 15 11:37:58 2007 UTC (4 years, 11 months ago) by parrain
Branch: MAIN
Changes since 1.24: +2 -2 lines
Diff to previous 1.24 
correction of an assert
Revision 1.24 / (view) - annotate - [select for diffs] , Mon Jun 11 10:35:21 2007 UTC (4 years, 11 months ago) by parrain
Branch: MAIN
Changes since 1.23: +2 -2 lines
Diff to previous 1.23 
correction of a bug in the merging pb-solver version
Revision 1.23 / (view) - annotate - [select for diffs] , Fri Jun 8 13:38:48 2007 UTC (4 years, 11 months ago) by parrain
Branch: MAIN
Changes since 1.22: +20 -41 lines
Diff to previous 1.22 
add a new pb-solver using merging rule
Revision 1.22.4.2 / (view) - annotate - [select for diffs] , Fri Mar 9 09:05:07 2007 UTC (5 years, 2 months ago) by leberre
Branch: MEMORY_EFFICIENT
Changes since 1.22.4.1: +1 -16 lines
Diff to previous 1.22.4.1 to branch point 1.22 to next main 1.23 
Changed the implementation (the reference is now shared using a static field).
Revision 1.22.4.1 / (view) - annotate - [select for diffs] , Thu Mar 8 11:43:23 2007 UTC (5 years, 2 months ago) by leberre
Branch: MEMORY_EFFICIENT
Changes since 1.22: +17 -4 lines
Diff to previous 1.22 
Made access to vocabulary through static method in Solver: should save a lot of memory (4 bytes per constraint).
Revision 1.22 / (view) - annotate - [select for diffs] , Wed Dec 27 14:13:46 2006 UTC (5 years, 4 months ago) by parrain
Branch: MAIN
CVS Tags: nonlinear, complete-smallint, SAT_COMPETITION_2007, Root_nonlinear, Root_complete-smallint, Root_MEMORY_EFFICIENT
Branch point for: MEMORY_EFFICIENT
Changes since 1.21: +119 -92 lines
Diff to previous 1.21 
Bug in PB-code fixed.
Revision 1.21 / (view) - annotate - [select for diffs] , Sat Dec 9 21:10:56 2006 UTC (5 years, 5 months ago) by parrain
Branch: MAIN
CVS Tags: RELEASE_1_7_RC_2, CSP_COMPETITION_2006_BUGFIXES_HEAD
Changes since 1.20: +51 -27 lines
Diff to previous 1.20 
one bug fixed.
Revision 1.20 / (view) - annotate - [select for diffs] , Thu Nov 30 20:17:29 2006 UTC (5 years, 5 months ago) by leberre
Branch: MAIN
CVS Tags: Root_NICE, NICE, CSP_COMPETITION_2006_BUGFIXES
Changes since 1.19: +577 -545 lines
Diff to previous 1.19 
Fixed copyright headers and indentation/format (asked by Dieter).
Revision 1.19 / (view) - annotate - [select for diffs] , Tue Nov 28 11:51:17 2006 UTC (5 years, 5 months ago) by parrain
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_112
Changes since 1.18: +23 -9 lines
Diff to previous 1.18 
some tests in removeCoef are replaced by asserts
Revision 1.18 / (view) - annotate - [select for diffs] , Sun Nov 12 19:53:05 2006 UTC (5 years, 6 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_111, OBJECTWEB_1_0_110
Changes since 1.17: +1 -1 lines
Diff to previous 1.17 
Fixed javadoc comment.
Revision 1.17 / (view) - annotate - [select for diffs] , Sun Nov 12 13:18:27 2006 UTC (5 years, 6 months ago) by parrain
Branch: MAIN
Changes since 1.16: +1 -1 lines
Diff to previous 1.16 
Useless ConflictArray* classes and subsequent classes have been deleted
Revision 1.16 / (view) - annotate - [select for diffs] , Sat Nov 11 21:30:00 2006 UTC (5 years, 6 months ago) by parrain
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_109
Changes since 1.15: +32 -27 lines
Diff to previous 1.15 
getBacktrackLevel() returns the highest decision level for the backtrack.
Revision 1.15 / (view) - annotate - [select for diffs] , Sat Nov 11 20:34:45 2006 UTC (5 years, 6 months ago) by parrain
Branch: MAIN
Changes since 1.14: +149 -117 lines
Diff to previous 1.14 
ConflictMap : byLevel is now an array of VecInt (instead of a Map of <Integer,List>Integer>> )
(almost) comments in french have been  translated in english

PBSolverClause uses the new ConflictMapClause (instead of ConflictArrayClause)
Revision 1.14 / (view) - annotate - [select for diffs] , Tue Oct 31 11:12:09 2006 UTC (5 years, 6 months ago) by parrain
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_108
Changes since 1.13: +11 -11 lines
Diff to previous 1.13 
removed some asserts in order to time comparisons
Revision 1.13 / (view) - annotate - [select for diffs] , Fri Oct 27 14:54:28 2006 UTC (5 years, 6 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_103, OBJECTWEB_1_0_102, OBJECTWEB_1_0_101
Changes since 1.12: +1 -2 lines
Diff to previous 1.12 
Fixed PMD warnings.
Revision 1.12 / (view) - annotate - [select for diffs] , Tue Oct 3 11:15:20 2006 UTC (5 years, 7 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_100
Changes since 1.11: +18 -13 lines
Diff to previous 1.11 
Fixed some findbugs warnings.
Revision 1.11 / (view) - annotate - [select for diffs] , Mon Sep 25 05:47:58 2006 UTC (5 years, 7 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_99
Changes since 1.10: +3 -3 lines
Diff to previous 1.10 
Fixed problems reporteed by Dieter von Holten.
Revision 1.10 / (view) - annotate - [select for diffs] , Wed Sep 20 17:53:21 2006 UTC (5 years, 7 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_97
Changes since 1.9: +4 -4 lines
Diff to previous 1.9 
Inlined methods get and size in hotspot.
Revision 1.9 / (view) - annotate - [select for diffs] , Mon Sep 4 18:05:04 2006 UTC (5 years, 8 months ago) by parrain
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_96, OBJECTWEB_1_0_91
Changes since 1.8: +56 -20 lines
Diff to previous 1.8 
mise à jour de toutes les méthodes getBacktrackLevel
Revision 1.8 / (view) - annotate - [select for diffs] , Wed Aug 30 18:58:35 2006 UTC (5 years, 8 months ago) by parrain
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_90
Changes since 1.7: +223 -64 lines
Diff to previous 1.7 
3 versions de isAssertive() et getBacktrackLevel().

PŠr dŽfaut, PBSolver appelle ConflictMap, qiu est une version completement incrŽmentale de isAssertive() et getBacktrackLevel()
Revision 1.7 / (view) - annotate - [select for diffs] , Mon Aug 28 11:55:53 2006 UTC (5 years, 8 months ago) by parrain
Branch: MAIN
Changes since 1.6: +1 -0 lines
Diff to previous 1.6 
pour faire des tests sur les diffŽrentes propositions pour isAssertive(), quatre nouvelles classes :
- ArrayPBInitial et ConflictArrayInitial : 
proposent les versions classiques (non incrŽmentales) pour isAssertive() et getBacktracklevel()
- ArrayPbIncrementEtParcours et ConflictArrayIncrementEtParcours :
proposent une version incrŽmentale pour isAssertive() et non incrŽmentale pour getBacktrackLevel().

c'est ConflictArrayIncrementEtParcours qui est choisi par dŽfaut dans PBSolver
Revision 1.6 / (view) - annotate - [select for diffs] , Wed Aug 23 16:18:14 2006 UTC (5 years, 8 months ago) by leberre
Branch: MAIN
Changes since 1.5: +3 -2 lines
Diff to previous 1.5 
Added heuristics incrementation as in the SAT solver.
Revision 1.5 / (view) - annotate - [select for diffs] , Wed May 31 07:34:59 2006 UTC (5 years, 11 months ago) by leberre
Branch: MAIN
CVS Tags: Root_RELEASE_1_6, RELEASE_1_6_0_0_9, RELEASE_1_6_0_0_8, RELEASE_1_6_0_0_7, RELEASE_1_6_0_0_4, RELEASE_1_6_0_0_2, RELEASE_1_6_0_0_10, RELEASE_1_6, OBJECTWEB_1_0_89, OBJECTWEB_1_0_88, OBJECTWEB_1_0_87, OBJECTWEB_1_0_86, OBJECTWEB_1_0_85, OBJECTWEB_1_0_83, CSP_COMPETITION_2006
Changes since 1.4: +1 -3 lines
Diff to previous 1.4 
Fixed javadoc problems.
Revision 1.4 / (view) - annotate - [select for diffs] , Thu May 25 06:14:30 2006 UTC (5 years, 11 months ago) by parrain
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_82, OBJECTWEB_1_0_81, OBJECTWEB_1_0_80, OBJECTWEB_1_0_79
Changes since 1.3: +3 -3 lines
Diff to previous 1.3 
PMD correction
Revision 1.3 / (view) - annotate - [select for diffs] , Wed May 24 05:45:11 2006 UTC (5 years, 11 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_78, OBJECTWEB_1_0_77, OBJECTWEB_1_0_76
Changes since 1.2: +1 -5 lines
Diff to previous 1.2 
Fixed many pmd warnings.
Revision 1.2 / (view) - annotate - [select for diffs] , Thu Apr 27 15:28:35 2006 UTC (6 years ago) by parrain
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_75, OBJECTWEB_1_0_74, OBJECTWEB_1_0_73, OBJECTWEB_1_0_72, OBJECTWEB_1_0_71, OBJECTWEB_1_0_69, OBJECTWEB_1_0_68, OBJECTWEB_1_0_67, OBJECTWEB_1_0_66, OBJECTWEB_1_0_65, OBJECTWEB_1_0_64
Changes since 1.1: +330 -0 lines
Diff to previous 1.1 
merged with PBCONSTR
Revision 1.1.2.1 / (view) - annotate - [select for diffs] , Sat Apr 1 19:25:29 2006 UTC (6 years, 1 month ago) by parrain
Branch: PBCONSTR
CVS Tags: PBCONSTR_1_0_9, PBCONSTR_1_0_8, PBCONSTR_1_0_7, PBCONSTR_1_0_6, PBCONSTR_1_0_13, PBCONSTR_1_0_11, PBCONSTR_1_0_10
Changes since 1.1: +330 -0 lines
Diff to previous 1.1 to next main 1.2 
AP :
- Il y a maintenant une interface et deux classes d'implementation pour MapPb et Conflict : l'une basŽe sur un tableau, l'autre sur un HashMap
Revision 1.1 , Sat Apr 1 19:25:29 2006 UTC (6 years, 1 month ago) by parrain
Branch: MAIN
Branch point for: PBCONSTR
FILE REMOVED 
file ConflictMap.java was initially added on branch PBCONSTR.
This form allows you to request diffs between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.

Diffs between and
Type of Diff should be a
View only Branch:
Sort log by:
webmaster@ow2.org
 Powered by
ViewCVS 0.9.4

Back to OW2 Forge