OW2 Consortium

CVS log for sat4j/core/src/org/sat4j/minisat/SolverFactory.java

(logo)

Help

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

Request diff between arbitrary revisions / Display revisions graphically


Default branch: MAIN
Bookmark a link to: HEAD / (download)

Revision 1.67 / (view) - annotate - [select for diffs] , Fri Jan 25 17:30:23 2008 UTC (4 years, 3 months ago) by leberre
Branch: MAIN
CVS Tags: PASCAL_SNAPSHOT_TWO, HEAD
Changes since 1.66: +19 -27 lines
Diff to previous 1.66
Updated EPL headers (Pascal) + ref to Minisat paper.

Revision 1.66 / (view) - annotate - [select for diffs] , Sat Dec 15 21:27:08 2007 UTC (4 years, 5 months ago) by leberre
Branch: MAIN
CVS Tags: RELEASE_2_0_RC2, BEFORE_EPL_HEADERS
Changes since 1.65: +9 -1 lines
Diff to previous 1.65
Allow the use of optimisation solvers in SolverFactory thanks to the OptToSat adapter.

Revision 1.65 / (view) - annotate - [select for diffs] , Fri Dec 14 10:00:19 2007 UTC (4 years, 5 months ago) by leberre
Branch: MAIN
Changes since 1.64: +3 -2 lines
Diff to previous 1.64
Added phase selection strategy.

Revision 1.64 / (view) - annotate - [select for diffs] , Wed Dec 12 11:04:25 2007 UTC (4 years, 5 months ago) by leberre
Branch: MAIN
Changes since 1.63: +2 -3 lines
Diff to previous 1.63
The solver now displays the kind of benchmarks it works on.
Added a way to easily change the phase selection strategy in the main heuristics (VarOrderHeap).

Revision 1.63 / (view) - annotate - [select for diffs] , Wed Nov 28 21:48:42 2007 UTC (4 years, 5 months ago) by leberre
Branch: MAIN
Changes since 1.62: +93 -93 lines
Diff to previous 1.62
Going Back to normal, stable code, hopefully.

Revision 1.62 / (view) - annotate - [select for diffs] , Wed Nov 28 16:53:16 2007 UTC (4 years, 5 months ago) by leberre
Branch: MAIN
Changes since 1.61: +93 -93 lines
Diff to previous 1.61
Huge refactoring to allow a finer control of the type of constraints managed by the Solver.

Beware: the code is not stable at all. I will fix this tonight. Do not update until further notice.

Revision 1.61 / (view) - annotate - [select for diffs] , Tue Nov 27 20:17:15 2007 UTC (4 years, 5 months ago) by leberre
Branch: MAIN
CVS Tags: STABLE_CODE
Changes since 1.60: +0 -17 lines
Diff to previous 1.60
Removed newMiniMaxSAT solver for the core SolverFactory.

Revision 1.60 / (view) - annotate - [select for diffs] , Sat Nov 17 16:43:18 2007 UTC (4 years, 5 months ago) by leberre
Branch: MAIN
CVS Tags: RELEASE_2_0_RC_1
Changes since 1.59: +1 -1 lines
Diff to previous 1.59
Added a generic type to the solver decorator in order to avoid downcasting in PB code.

Revision 1.59 / (view) - annotate - [select for diffs] , Thu Sep 13 15:12:03 2007 UTC (4 years, 8 months ago) by leberre
Branch: MAIN
Changes since 1.58: +17 -0 lines
Diff to previous 1.58
Added back newMiniMaxSAT in the solver factory.

Revision 1.58 / (view) - annotate - [select for diffs] , Thu Sep 13 14:47:11 2007 UTC (4 years, 8 months ago) by leberre
Branch: MAIN
Changes since 1.57: +74 -74 lines
Diff to previous 1.57
Added a new generic parameter to Solver. Should not affect black box users.

Revision 1.57 / (view) - annotate - [select for diffs] , Thu Sep 13 12:23:22 2007 UTC (4 years, 8 months ago) by leberre
Branch: MAIN
Changes since 1.56: +0 -1 lines
Diff to previous 1.56
Fixed many warnings.

Revision 1.56 / (view) - annotate - [select for diffs] , Thu Sep 13 09:57:55 2007 UTC (4 years, 8 months ago) by leberre
Branch: MAIN
Changes since 1.55: +0 -16 lines
Diff to previous 1.55
Removed MaxSat solver.

Revision 1.55 / (view) - annotate - [select for diffs] , Thu Sep 13 08:06:45 2007 UTC (4 years, 8 months ago) by leberre
Branch: MAIN
Changes since 1.54: +1 -350 lines
Diff to previous 1.54
Removed CSP and PB related code for the 2.0 release.

Revision 1.54 / (view) - annotate - [select for diffs] , Tue Aug 28 14:24:53 2007 UTC (4 years, 8 months ago) by leberre
Branch: MAIN
CVS Tags: RELEASE_1_7
Changes since 1.53: +86 -60 lines
Diff to previous 1.53
Removed dependency to MiniSATRestarts in Solver to break a last cycle in package dependencies.

Revision 1.53 / (view) - annotate - [select for diffs] , Tue Aug 28 10:36:07 2007 UTC (4 years, 8 months ago) by leberre
Branch: MAIN
Changes since 1.52: +71 -70 lines
Diff to previous 1.52
The solvers returned by the factory methods are now fully typed (from a generics point of view).

Revision 1.52 / (view) - annotate - [select for diffs] , Wed Jul 4 14:04:00 2007 UTC (4 years, 10 months ago) by leberre
Branch: MAIN
Changes since 1.51: +7 -6 lines
Diff to previous 1.51
Fixed learning scheme. Refactored existing classes.

Revision 1.51 / (view) - annotate - [select for diffs] , Wed Jul 4 12:01:55 2007 UTC (4 years, 10 months ago) by leberre
Branch: MAIN
Changes since 1.50: +18 -0 lines
Diff to previous 1.50
Added PB solver with clause only learning.

Revision 1.50 / (view) - annotate - [select for diffs] , Tue Jun 19 12:23:00 2007 UTC (4 years, 10 months ago) by leberre
Branch: MAIN
Changes since 1.49: +2 -4 lines
Diff to previous 1.49
Removed Rapid Restart Strategy.

Revision 1.49 / (view) - annotate - [select for diffs] , Tue Jun 19 10:39:45 2007 UTC (4 years, 10 months ago) by leberre
Branch: MAIN
Changes since 1.48: +4 -1 lines
Diff to previous 1.48
Using Rapid restarts strategy.

Revision 1.48 / (view) - annotate - [select for diffs] , Tue Jun 19 10:27:24 2007 UTC (4 years, 10 months ago) by leberre
Branch: MAIN
Changes since 1.47: +1 -1 lines
Diff to previous 1.47
Fix: use a full PB solver, not one using a reduction to clause.

Revision 1.47 / (view) - annotate - [select for diffs] , Tue Jun 19 10:26:26 2007 UTC (4 years, 10 months ago) by leberre
Branch: MAIN
Changes since 1.46: +17 -0 lines
Diff to previous 1.46
Added a PB solver without learning.

Revision 1.46 / (view) - annotate - [select for diffs] , Mon Jun 11 07:00:47 2007 UTC (4 years, 11 months ago) by leberre
Branch: MAIN
Changes since 1.45: +1 -1 lines
Diff to previous 1.45
Made the solver with Armin Biere rapid restart strategy the default solver.

Revision 1.45 / (view) - annotate - [select for diffs] , Sun Jun 10 14:20:02 2007 UTC (4 years, 11 months ago) by leberre
Branch: MAIN
Changes since 1.44: +1 -0 lines
Diff to previous 1.44
Set parameters the same as the ones in picosat.

Revision 1.44 / (view) - annotate - [select for diffs] , Sun Jun 10 14:12:05 2007 UTC (4 years, 11 months ago) by leberre
Branch: MAIN
Changes since 1.43: +14 -0 lines
Diff to previous 1.43
Added two new solvers: one with Armin Biere restarts strategy, one with a luby style strategy.

Revision 1.43 / (view) - annotate - [select for diffs] , Fri Jun 8 13:39:37 2007 UTC (4 years, 11 months ago) by parrain
Branch: MAIN
Changes since 1.42: +22 -0 lines
Diff to previous 1.42
add a new pb-solver using merging rule

Revision 1.42 / (view) - annotate - [select for diffs] , Fri Mar 23 14:57:10 2007 UTC (5 years, 1 month ago) by leberre
Branch: MAIN
Changes since 1.41: +104 -102 lines
Diff to previous 1.41
Used Generics to prevent the use of downcasting in the code.
See http://www.javaspecialists.eu/archive/newsletter.do?issue=123&print=yes&locale=en_US for details.

Revision 1.41 / (view) - annotate - [select for diffs] , Fri Mar 23 13:55:12 2007 UTC (5 years, 1 month ago) by parrain
Branch: MAIN
Changes since 1.40: +18 -0 lines
Diff to previous 1.40
new solver added which uses PBSolverClause.
PBSolverClause : pb-constraints can be reduced to clause during resolution

Revision 1.40.4.1 / (view) - annotate - [select for diffs] , Mon Mar 12 13:19:06 2007 UTC (5 years, 2 months ago) by parrain
Branch: complete-smallint
Changes since 1.40: +21 -0 lines
Diff to previous 1.40 to next main 1.41
replacing BigInteger by long

Revision 1.40.2.2 / (view) - annotate - [select for diffs] , Fri Mar 9 09:05:08 2007 UTC (5 years, 2 months ago) by leberre
Branch: MEMORY_EFFICIENT
Changes since 1.40.2.1: +10 -10 lines
Diff to previous 1.40.2.1 to branch point 1.40 to next main 1.41
Changed the implementation (the reference is now shared using a static field).

Revision 1.40.2.1 / (view) - annotate - [select for diffs] , Thu Mar 8 11:43:24 2007 UTC (5 years, 2 months ago) by leberre
Branch: MEMORY_EFFICIENT
Changes since 1.40: +19 -19 lines
Diff to previous 1.40
Made access to vocabulary through static method in Solver: should save a lot of memory (4 bytes per constraint).

Revision 1.39.2.1 / (view) - annotate - [select for diffs] , Sat Mar 3 16:22:18 2007 UTC (5 years, 2 months ago) by leberre
Branch: nonlinear
Changes since 1.39: +22 -1 lines
Diff to previous 1.39 to next main 1.40
Added latest files from Anne's email.

Revision 1.40 / (view) - annotate - [select for diffs] , Tue Feb 20 19:36:20 2007 UTC (5 years, 2 months ago) by leberre
Branch: MAIN
CVS Tags: Root_complete-smallint, Root_MEMORY_EFFICIENT
Branch point for: complete-smallint, MEMORY_EFFICIENT
Changes since 1.39: +1 -1 lines
Diff to previous 1.39
Added Rsat like heuristics in default solver.

Revision 1.39 / (view) - annotate - [select for diffs] , Mon Feb 19 13:32:57 2007 UTC (5 years, 2 months ago) by leberre
Branch: MAIN
CVS Tags: Root_nonlinear
Branch point for: nonlinear
Changes since 1.38: +14 -4 lines
Diff to previous 1.38
Added Rsat like heuristics in VarOrderHeapRsat

Revision 1.38 / (view) - annotate - [select for diffs] , Sat Feb 17 15:06:33 2007 UTC (5 years, 2 months ago) by leberre
Branch: MAIN
Changes since 1.37: +2 -2 lines
Diff to previous 1.37
Changed MAX SAT solver paprameter: restarts starts at 100 000 conficts now.

Revision 1.37 / (view) - annotate - [select for diffs] , Sat Feb 17 13:49:04 2007 UTC (5 years, 2 months ago) by leberre
Branch: MAIN
Changes since 1.36: +0 -2 lines
Diff to previous 1.36
Removed unused import.

Revision 1.36 / (view) - annotate - [select for diffs] , Sat Feb 17 13:47:52 2007 UTC (5 years, 2 months ago) by leberre
Branch: MAIN
Changes since 1.35: +17 -0 lines
Diff to previous 1.35
Changed default solver for MAXSAT solving.

Revision 1.35 / (view) - annotate - [select for diffs] , Thu Nov 30 20:17:31 2006 UTC (5 years, 5 months ago) by leberre
Branch: MAIN
CVS Tags: SAT_COMPETITION_2007, Root_NICE, RELEASE_1_7_RC_2, NICE, CSP_COMPETITION_2006_BUGFIXES_HEAD, CSP_COMPETITION_2006_BUGFIXES
Changes since 1.34: +644 -646 lines
Diff to previous 1.34
Fixed copyright headers and indentation/format (asked by Dieter).

Revision 1.34 / (view) - annotate - [select for diffs] , Sun Nov 12 13:20:26 2006 UTC (5 years, 6 months ago) by parrain
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_112, OBJECTWEB_1_0_111, OBJECTWEB_1_0_110
Changes since 1.33: +0 -1 lines
Diff to previous 1.33
warning suppressed

Revision 1.33 / (view) - annotate - [select for diffs] , Sun Nov 12 13:17:41 2006 UTC (5 years, 6 months ago) by parrain
Branch: MAIN
Changes since 1.32: +8 -108 lines
Diff to previous 1.32
Useless ConflictArray* classes and subsequent classes have been deleted

Revision 1.32 / (view) - annotate - [select for diffs] , Sat Nov 11 22:02:49 2006 UTC (5 years, 6 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_109
Changes since 1.31: +2 -4 lines
Diff to previous 1.31
Added missing getter and setters for command line configuration.

Revision 1.31 / (view) - annotate - [select for diffs] , Sat Nov 11 17:17:48 2006 UTC (5 years, 6 months ago) by leberre
Branch: MAIN
Changes since 1.30: +1 -1 lines
Diff to previous 1.30
Fixed Javadoc comments.

Revision 1.30 / (view) - annotate - [select for diffs] , Fri Sep 29 15:48:47 2006 UTC (5 years, 7 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_108, OBJECTWEB_1_0_103, OBJECTWEB_1_0_102, OBJECTWEB_1_0_101, OBJECTWEB_1_0_100
Changes since 1.29: +3 -1 lines
Diff to previous 1.29
Added back learning to PB solver.

Revision 1.29 / (view) - annotate - [select for diffs] , Fri Sep 29 13:17:05 2006 UTC (5 years, 7 months ago) by leberre
Branch: MAIN
Changes since 1.28: +0 -28 lines
Diff to previous 1.28
Removed expensive simplification for PB solvers with resolution.

Revision 1.28 / (view) - annotate - [select for diffs] , Thu Sep 28 18:12:24 2006 UTC (5 years, 7 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_99
Changes since 1.27: +27 -0 lines
Diff to previous 1.27
Added Expensive Simplification to all PB solvers.

Revision 1.27 / (view) - annotate - [select for diffs] , Thu Sep 14 07:15:09 2006 UTC (5 years, 8 months ago) by parrain
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_97
Changes since 1.26: +14 -0 lines
Diff to previous 1.26
ajout d'un solveur
newMiniLearningOPBClauseCardConstrMaxSpecificOrderIncremental

Revision 1.26 / (view) - annotate - [select for diffs] , Thu Sep 7 13:57:46 2006 UTC (5 years, 8 months ago) by parrain
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_96
Changes since 1.25: +1 -1 lines
Diff to previous 1.25
newMiniLearningOPBClauseCardConstrMaxSpecificOrder appelle PBSolverMapInitial par d?faut

Revision 1.25 / (view) - annotate - [select for diffs] , Thu Aug 31 14:54:54 2006 UTC (5 years, 8 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_91, OBJECTWEB_1_0_90
Changes since 1.24: +16 -0 lines
Diff to previous 1.24
Fixed memory problem.
Decoding the model directly in a PrintWriter.

Revision 1.24 / (view) - annotate - [select for diffs] , Thu Aug 31 07:09:10 2006 UTC (5 years, 8 months ago) by parrain
Branch: MAIN
Changes since 1.23: +87 -0 lines
Diff to previous 1.23
nouveaux solveurs crŽŽs pour utiliser les diffŽrentes versions d'isAssertive()

Revision 1.23 / (view) - annotate - [select for diffs] , Wed Aug 23 16:16:14 2006 UTC (5 years, 8 months ago) by leberre
Branch: MAIN
Changes since 1.22: +11 -0 lines
Diff to previous 1.22
Added a resolution based solver.

Revision 1.22 / (view) - annotate - [select for diffs] , Sat Jul 29 15:13:28 2006 UTC (5 years, 9 months ago) by leberre
Branch: MAIN
CVS Tags: CSP_COMPETITION_2006
Changes since 1.21: +1 -1 lines
Diff to previous 1.21
Moved DimacsOutput solver to org.sat4j.tools.

Revision 1.21 / (view) - annotate - [select for diffs] , Thu Jun 29 03:50:58 2006 UTC (5 years, 10 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_89, OBJECTWEB_1_0_88, OBJECTWEB_1_0_87, OBJECTWEB_1_0_86
Changes since 1.20: +1 -1 lines
Diff to previous 1.20
Made MiniLearningHeapEZSimp the default solver.

Revision 1.20 / (view) - annotate - [select for diffs] , Tue Jun 27 11:50:50 2006 UTC (5 years, 10 months ago) by leberre
Branch: MAIN
Changes since 1.19: +5 -0 lines
Diff to previous 1.19
Added text output solver.

Revision 1.19.2.9 / (view) - annotate - [select for diffs] , Mon Jun 5 09:59:08 2006 UTC (5 years, 11 months ago) by leberre
Branch: RELEASE_1_6
CVS Tags: RELEASE_1_6_0_0_9, RELEASE_1_6_0_0_8, RELEASE_1_6_0_0_7, RELEASE_1_6_0_0_10
Changes since 1.19.2.8: +7 -2 lines
Diff to previous 1.19.2.8 to branch point 1.19 to next main 1.20
Made MiniLearningHeapEZSimp solver as default SAT solver.

Revision 1.19.2.8 / (view) - annotate - [select for diffs] , Fri Jun 2 08:02:25 2006 UTC (5 years, 11 months ago) by leberre
Branch: RELEASE_1_6
Changes since 1.19.2.7: +1 -1 lines
Diff to previous 1.19.2.7 to branch point 1.19
Made SATRace2006 the default solver.

Revision 1.19.2.7 / (view) - annotate - [select for diffs] , Fri Jun 2 08:01:44 2006 UTC (5 years, 11 months ago) by leberre
Branch: RELEASE_1_6
Changes since 1.19.2.6: +4 -0 lines
Diff to previous 1.19.2.6 to branch point 1.19
Added a new solver for the SAT race.

Revision 1.19.2.6 / (view) - annotate - [select for diffs] , Thu Jun 1 19:51:43 2006 UTC (5 years, 11 months ago) by leberre
Branch: RELEASE_1_6
CVS Tags: RELEASE_1_6_0_0_4
Changes since 1.19.2.5: +1 -3 lines
Diff to previous 1.19.2.5 to branch point 1.19
Fixed (again) singleton design pattern.

Revision 1.19.2.5 / (view) - annotate - [select for diffs] , Thu Jun 1 18:22:02 2006 UTC (5 years, 11 months ago) by leberre
Branch: RELEASE_1_6
Changes since 1.19.2.4: +81 -90 lines
Diff to previous 1.19.2.4 to branch point 1.19
Fixed Singleton design pattern.

Revision 1.19.2.4 / (view) - annotate - [select for diffs] , Thu Jun 1 15:28:10 2006 UTC (5 years, 11 months ago) by leberre
Branch: RELEASE_1_6
Changes since 1.19.2.3: +1 -1 lines
Diff to previous 1.19.2.3 to branch point 1.19
Removed SATRace decorator as default solver.

Revision 1.19.2.3 / (view) - annotate - [select for diffs] , Thu Jun 1 13:28:53 2006 UTC (5 years, 11 months ago) by leberre
Branch: RELEASE_1_6
Changes since 1.19.2.2: +2 -1 lines
Diff to previous 1.19.2.2 to branch point 1.19
Added SATRaceDecorator.
Fixed launcher: usage displayed when no arguments are given.

Revision 1.19.2.2 / (view) - annotate - [select for diffs] , Wed May 31 07:53:17 2006 UTC (5 years, 11 months ago) by leberre
Branch: RELEASE_1_6
CVS Tags: RELEASE_1_6_0_0_2
Changes since 1.19.2.1: +1 -1 lines
Diff to previous 1.19.2.1 to branch point 1.19
Fixed JavaDoc comment.

Revision 1.19.2.1 / (view) - annotate - [select for diffs] , Wed May 31 07:38:36 2006 UTC (5 years, 11 months ago) by leberre
Branch: RELEASE_1_6
Changes since 1.19: +0 -10 lines
Diff to previous 1.19
Removed Expensive simplification code.

Revision 1.19 / (view) - annotate - [select for diffs] , Sun May 28 06:08:46 2006 UTC (5 years, 11 months ago) by leberre
Branch: MAIN
CVS Tags: Root_RELEASE_1_6, OBJECTWEB_1_0_85, OBJECTWEB_1_0_83, OBJECTWEB_1_0_82, OBJECTWEB_1_0_81
Branch point for: RELEASE_1_6
Changes since 1.18: +16 -0 lines
Diff to previous 1.18
Ajout d'une heuristique prenant en compte la fonction objectif.

Revision 1.18 / (view) - annotate - [select for diffs] , Wed May 24 18:18:39 2006 UTC (5 years, 11 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_80, OBJECTWEB_1_0_79, OBJECTWEB_1_0_78, OBJECTWEB_1_0_77
Changes since 1.17: +10 -3 lines
Diff to previous 1.17
Fixed some Findbugs warnings.

Revision 1.17 / (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_76
Changes since 1.16: +6 -0 lines
Diff to previous 1.16
Fixed many pmd warnings.

Revision 1.16 / (view) - annotate - [select for diffs] , Mon May 22 13:58:24 2006 UTC (5 years, 11 months ago) by parrain
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_75
Changes since 1.15: +16 -0 lines
Diff to previous 1.15
new solver added to use the new datastructure factory (with MinWatchPB, MinWatchCard and WLClause)

Revision 1.15 / (view) - annotate - [select for diffs] , Sat May 13 08:52:05 2006 UTC (6 years ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_74, OBJECTWEB_1_0_73, OBJECTWEB_1_0_72, OBJECTWEB_1_0_71, OBJECTWEB_1_0_69, OBJECTWEB_1_0_68
Changes since 1.14: +3 -3 lines
Diff to previous 1.14
Made MiniLearningHeapEZSimp the default solver.

Revision 1.14 / (view) - annotate - [select for diffs] , Wed May 3 10:45:00 2006 UTC (6 years ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_67, OBJECTWEB_1_0_66, OBJECTWEB_1_0_65
Changes since 1.13: +13 -0 lines
Diff to previous 1.13
*** empty log message ***

Revision 1.13 / (view) - annotate - [select for diffs] , Tue May 2 05:05:34 2006 UTC (6 years ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_64
Changes since 1.12: +3 -2 lines
Diff to previous 1.12
Using the best version of MiniLearning for the No Restarts solver.

Revision 1.12 / (view) - annotate - [select for diffs] , Thu Apr 27 15:53:41 2006 UTC (6 years ago) by parrain
Branch: MAIN
Changes since 1.11: +9 -3 lines
Diff to previous 1.11
more precise comments are added.

Revision 1.11 / (view) - annotate - [select for diffs] , Thu Apr 27 15:28:35 2006 UTC (6 years ago) by parrain
Branch: MAIN
Changes since 1.10: +124 -4 lines
Diff to previous 1.10
merged with PBCONSTR

Revision 1.7.2.6 / (view) - annotate - [select for diffs] , Tue Apr 25 13:18:49 2006 UTC (6 years ago) by parrain
Branch: PBCONSTR
Changes since 1.7.2.5: +49 -2 lines
Diff to previous 1.7.2.5 to branch point 1.7 to next main 1.8
merge with HEAD branches is done

Revision 1.7.2.5 / (view) - annotate - [select for diffs] , Tue Apr 25 10:25:29 2006 UTC (6 years ago) by parrain
Branch: PBCONSTR
Changes since 1.7.2.4: +30 -0 lines
Diff to previous 1.7.2.4 to branch point 1.7
added 2 new solvers.

Revision 1.7.2.4 / (view) - annotate - [select for diffs] , Mon Apr 24 04:23:04 2006 UTC (6 years ago) by parrain
Branch: PBCONSTR
Changes since 1.7.2.3: +17 -2 lines
Diff to previous 1.7.2.3 to branch point 1.7
new solver to use the new datastructure

Revision 1.7.2.3 / (view) - annotate - [select for diffs] , Fri Apr 21 06:37:28 2006 UTC (6 years ago) by parrain
Branch: PBCONSTR
CVS Tags: PBCONSTR_1_0_13
Changes since 1.7.2.2: +26 -7 lines
Diff to previous 1.7.2.2 to branch point 1.7
AP :
added a new solver 
- whith the pseudo-boolean solver with implied clauses
- with counter pb-constraints, watched cards and watched clauses

Revision 1.7.2.2 / (view) - annotate - [select for diffs] , Thu Apr 13 19:37:57 2006 UTC (6 years, 1 month ago) by parrain
Branch: PBCONSTR
CVS Tags: PBCONSTR_1_0_9, PBCONSTR_1_0_11, PBCONSTR_1_0_10
Changes since 1.7.2.1: +42 -0 lines
Diff to previous 1.7.2.1 to branch point 1.7
AP : new solvers have been added to use the new data structure factories.

Revision 1.10 / (view) - annotate - [select for diffs] , Sun Apr 9 06:39:00 2006 UTC (6 years, 1 month ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_62, OBJECTWEB_1_0_61, OBJECTWEB_1_0_60, OBJECTWEB_1_0_59, OBJECTWEB_1_0_58
Changes since 1.9: +2 -2 lines
Diff to previous 1.9
Forgot to make the new methods static.

Revision 1.9 / (view) - annotate - [select for diffs] , Sat Apr 8 18:48:27 2006 UTC (6 years, 1 month ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_57
Changes since 1.8: +24 -2 lines
Diff to previous 1.8
Added two static methods to easily access both default and light solver:
SolverFactory.newDefault()
SolverFactory.newLight()

Revision 1.8 / (view) - annotate - [select for diffs] , Thu Mar 23 17:09:08 2006 UTC (6 years, 1 month ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_56, OBJECTWEB_1_0_55, OBJECTWEB_1_0_54, OBJECTWEB_1_0_53, OBJECTWEB_1_0_52, OBJECTWEB_1_0_51, OBJECTWEB_1_0_50, OBJECTWEB_1_0_48, OBJECTWEB_1_0_47, OBJECTWEB_1_0_46
Changes since 1.7: +25 -0 lines
Diff to previous 1.7
Using SolverFactory as a singleton.

Revision 1.7.2.1 / (view) - annotate - [select for diffs] , Sun Mar 19 22:10:53 2006 UTC (6 years, 1 month ago) by parrain
Branch: PBCONSTR
CVS Tags: PBCONSTR_1_0_8, PBCONSTR_1_0_7, PBCONSTR_1_0_6, PBCONSTR_1_0_5, PBCONSTR_1_0_4, PBCONSTR_1_0_3
Changes since 1.7: +14 -0 lines
Diff to previous 1.7
AP :
- attention : code temporaire, encore boguŽ! 
- crŽation d'une DataStructureFactory qui crŽŽ des PBconstr qui sont des clauses, des cardinalitŽs ou des PB-contraintes, suivant le cas;
- crŽation d'un solveur spŽcifique et des tests correspondants;
- spŽcial FrŽdŽric : lŽgres modifs dans MapPb (mŽthode cuttingPlane peut tre appelŽe avec le paramtre reducedCoefs null, suppression de l'introspection

Revision 1.7 / (view) - annotate - [select for diffs] , Tue Mar 7 21:03:18 2006 UTC (6 years, 2 months ago) by leberre
Branch: MAIN
CVS Tags: Root_PBCONSTR, OBJECTWEB_1_0_45, OBJECTWEB_1_0_44, OBJECTWEB_1_0_42, OBJECTWEB_1_0_41, OBJECTWEB_1_0_40, OBJECTWEB_1_0_37, OBJECTWEB_1_0_36, OBJECTWEB_1_0_35, OBJECTWEB_1_0_32
Branch point for: PBCONSTR
Changes since 1.6: +13 -4 lines
Diff to previous 1.6
Changed delay for memory checking.
Added solvers with full simplification.

Revision 1.6 / (view) - annotate - [select for diffs] , Sat Feb 25 11:36:37 2006 UTC (6 years, 2 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_31, OBJECTWEB_1_0_30, OBJECTWEB_1_0_26, OBJECTWEB_1_0_25, OBJECTWEB_1_0_24, OBJECTWEB_1_0_23
Changes since 1.5: +445 -432 lines
Diff to previous 1.5
Added new prebuilt solver: MiniSATHeapEZSimp

Revision 1.5 / (view) - annotate - [select for diffs] , Thu Feb 23 10:35:07 2006 UTC (6 years, 2 months ago) by parrain
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_20
Changes since 1.4: +27 -0 lines
Diff to previous 1.4
AP : modification du calcul des watched literals : proposition de Pueblo

Revision 1.4 / (view) - annotate - [select for diffs] , Mon Jan 2 13:56:38 2006 UTC (6 years, 4 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_19, OBJECTWEB_1_0_18, OBJECTWEB_1_0_17, OBJECTWEB_1_0_15, OBJECTWEB_1_0_14, OBJECTWEB_1_0_13
Changes since 1.3: +8 -8 lines
Diff to previous 1.3
Use Heap based heuristics in PB solvers. The solvers are almost twice as fast now.

Revision 1.3 / (view) - annotate - [select for diffs] , Wed Dec 28 08:33:14 2005 UTC (6 years, 4 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_9, OBJECTWEB_1_0_11, OBJECTWEB_1_0_10
Changes since 1.2: +1 -1 lines
Diff to previous 1.2
Added new SAT to CSP translator.
Moved all CSP stuffs in a separate package.

Revision 1.2 / (view) - annotate - [select for diffs] , Fri Dec 2 19:33:04 2005 UTC (6 years, 5 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_8, OBJECTWEB_1_0_7, OBJECTWEB_1_0_6, OBJECTWEB_1_0_5, OBJECTWEB_1_0_4, OBJECTWEB_1_0_3, OBJECTWEB_1_0_0
Changes since 1.1: +1 -1 lines
Diff to previous 1.1
Fixed code to mimic exactly RELEASE 1.5

Revision 1.1 / (view) - annotate - [select for diffs] , Wed Nov 30 09:19:52 2005 UTC (6 years, 5 months ago) by leberre
Branch: MAIN
Java 1.5 code base including some code from ubcsat port.

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