OW2 Consortium

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

(logo)

Help

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

Request diff between arbitrary revisions / Display revisions graphically


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

Revision 1.107 / (view) - annotate - [select for diffs] , Fri Feb 1 21:40:39 2008 UTC (4 years, 3 months ago) by parrain
Branch: MAIN
CVS Tags: PASCAL_SNAPSHOT_TWO, HEAD
Changes since 1.106: +4 -2 lines
Diff to previous 1.106
added explanation at root level

Revision 1.106 / (view) - annotate - [select for diffs] , Thu Jan 31 16:30:22 2008 UTC (4 years, 3 months ago) by parrain
Branch: MAIN
Changes since 1.105: +0 -11 lines
Diff to previous 1.105
back to preceeding version for ISolver interface.
explanations concern only pb-part now

Revision 1.105 / (view) - annotate - [select for diffs] , Thu Jan 31 00:25:20 2008 UTC (4 years, 3 months ago) by parrain
Branch: MAIN
Changes since 1.104: +11 -0 lines
Diff to previous 1.104
added simple explanation for unsatisfiability

Revision 1.104 / (view) - annotate - [select for diffs] , Wed Jan 30 22:26:10 2008 UTC (4 years, 3 months ago) by leberre
Branch: MAIN
Changes since 1.103: +1 -1 lines
Diff to previous 1.103
Fixed NPE.

Revision 1.103 / (view) - annotate - [select for diffs] , Wed Jan 30 22:19:42 2008 UTC (4 years, 3 months ago) by leberre
Branch: MAIN
Changes since 1.102: +147 -88 lines
Diff to previous 1.102
Added a deterministic timeout based on the number of conflicts.

Revision 1.102 / (view) - annotate - [select for diffs] , Fri Jan 25 17:30:23 2008 UTC (4 years, 3 months ago) by leberre
Branch: MAIN
Changes since 1.101: +73 -26 lines
Diff to previous 1.101
Updated EPL headers (Pascal) + ref to Minisat paper.

Revision 1.101 / (view) - annotate - [select for diffs] , Wed Jan 2 10:37:39 2008 UTC (4 years, 4 months ago) by leberre
Branch: MAIN
CVS Tags: RELEASE_2_0_RC2, BEFORE_EPL_HEADERS
Changes since 1.100: +9 -5 lines
Diff to previous 1.100
Added a new method in IProblem to allow the solver to return informations specific to a given problem.

Revision 1.100 / (view) - annotate - [select for diffs] , Sat Dec 22 10:53:57 2007 UTC (4 years, 4 months ago) by leberre
Branch: MAIN
Changes since 1.99: +17 -13 lines
Diff to previous 1.99
Removed dependencies to Iterable.

Revision 1.99 / (view) - annotate - [select for diffs] , Sat Dec 22 10:06:57 2007 UTC (4 years, 4 months ago) by leberre
Branch: MAIN
Changes since 1.98: +1 -1 lines
Diff to previous 1.98
Replaced StringBuilder by StringBuffer.

Revision 1.98 / (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.97: +2 -2 lines
Diff to previous 1.97
Added phase selection strategy.

Revision 1.97 / (view) - annotate - [select for diffs] , Wed Dec 12 11:04:24 2007 UTC (4 years, 5 months ago) by leberre
Branch: MAIN
Changes since 1.96: +15 -0 lines
Diff to previous 1.96
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.96 / (view) - annotate - [select for diffs] , Wed Nov 28 21:48:41 2007 UTC (4 years, 5 months ago) by leberre
Branch: MAIN
Changes since 1.95: +27 -27 lines
Diff to previous 1.95
Going Back to normal, stable code, hopefully.

Revision 1.95 / (view) - annotate - [select for diffs] , Wed Nov 28 16:53:15 2007 UTC (4 years, 5 months ago) by leberre
Branch: MAIN
Changes since 1.94: +27 -27 lines
Diff to previous 1.94
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.94 / (view) - annotate - [select for diffs] , Tue Nov 27 20:01:47 2007 UTC (4 years, 5 months ago) by leberre
Branch: MAIN
CVS Tags: STABLE_CODE
Changes since 1.93: +89 -65 lines
Diff to previous 1.93
Allow the isSatisfiable method to be called within a global timeout.

Revision 1.93 / (view) - annotate - [select for diffs] , Wed Nov 21 12:11:07 2007 UTC (4 years, 5 months ago) by fuhs
Branch: MAIN
Changes since 1.92: +6 -2 lines
Diff to previous 1.92
* new method expireTimeout for ISolver
* made Solver.underTimeout volatile in order to allow for
  modification from other Threads

Revision 1.92 / (view) - annotate - [select for diffs] , Wed Oct 24 19:30:27 2007 UTC (4 years, 6 months ago) by leberre
Branch: MAIN
CVS Tags: RELEASE_2_0_RC_1
Changes since 1.91: +5 -2 lines
Diff to previous 1.91
Improved message for the timeout setting.

Revision 1.91 / (view) - annotate - [select for diffs] , Wed Oct 24 19:23:58 2007 UTC (4 years, 6 months ago) by leberre
Branch: MAIN
Changes since 1.90: +1 -1 lines
Diff to previous 1.90
The solver nows display its internal timeout.

Revision 1.90 / (view) - annotate - [select for diffs] , Thu Sep 13 15:30:46 2007 UTC (4 years, 8 months ago) by leberre
Branch: MAIN
Changes since 1.89: +0 -1 lines
Diff to previous 1.89
Fixed a few warnings.

Revision 1.89 / (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.88: +8 -17 lines
Diff to previous 1.88
Added a new generic parameter to Solver. Should not affect black box users.

Revision 1.88 / (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.87: +1 -0 lines
Diff to previous 1.87
Fixed many warnings.

Revision 1.87 / (view) - annotate - [select for diffs] , Thu Aug 30 07:27:59 2007 UTC (4 years, 8 months ago) by leberre
Branch: MAIN
CVS Tags: RELEASE_1_7
Changes since 1.86: +1 -1 lines
Diff to previous 1.86
Fixed typos in the javadoc comments (thanks Eclipse Europa :)).

Revision 1.86 / (view) - annotate - [select for diffs] , Thu Aug 30 07:24:00 2007 UTC (4 years, 8 months ago) by leberre
Branch: MAIN
Changes since 1.85: +1 -1 lines
Diff to previous 1.85
Removed remaining restart framework debug display.

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

Revision 1.84 / (view) - annotate - [select for diffs] , Tue Aug 28 13:15:01 2007 UTC (4 years, 8 months ago) by leberre
Branch: MAIN
Changes since 1.83: +0 -3 lines
Diff to previous 1.83
Removed assertion in Solver that was adding a dependency to constraints.cnf

Revision 1.83 / (view) - annotate - [select for diffs] , Tue Aug 28 12:07:14 2007 UTC (4 years, 8 months ago) by leberre
Branch: MAIN
Changes since 1.82: +0 -2 lines
Diff to previous 1.82
Fixed PMD warnings.

Revision 1.82 / (view) - annotate - [select for diffs] , Tue Aug 28 09:41:03 2007 UTC (4 years, 8 months ago) by leberre
Branch: MAIN
Changes since 1.81: +5 -2 lines
Diff to previous 1.81
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.81 / (view) - annotate - [select for diffs] , Sun Jun 10 08:46:57 2007 UTC (4 years, 11 months ago) by leberre
Branch: MAIN
Changes since 1.80: +14 -5 lines
Diff to previous 1.80
Allows command line configuration of the restarts strategy.

Revision 1.80 / (view) - annotate - [select for diffs] , Sat Jun 9 13:25:41 2007 UTC (4 years, 11 months ago) by leberre
Branch: MAIN
Changes since 1.79: +3 -3 lines
Diff to previous 1.79
Using luby style restarts by default.

Revision 1.79 / (view) - annotate - [select for diffs] , Sat Jun 9 12:58:27 2007 UTC (4 years, 11 months ago) by leberre
Branch: MAIN
Changes since 1.78: +3 -2 lines
Diff to previous 1.78
Uses Armin Biere restart strategy.

Revision 1.78 / (view) - annotate - [select for diffs] , Fri Jun 8 13:05:21 2007 UTC (4 years, 11 months ago) by leberre
Branch: MAIN
Changes since 1.77: +1 -1 lines
Diff to previous 1.77
Fixed number of decision stats.

Revision 1.77 / (view) - annotate - [select for diffs] , Fri Jun 8 12:58:02 2007 UTC (4 years, 11 months ago) by leberre
Branch: MAIN
Changes since 1.76: +11 -4 lines
Diff to previous 1.76
Added a Restart strategy to test Armin Biere and Luby style restart strategies.

Revision 1.76 / (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.75: +15 -15 lines
Diff to previous 1.75
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.75.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.75.2.1: +2 -4 lines
Diff to previous 1.75.2.1 to branch point 1.75 to next main 1.76
Changed the implementation (the reference is now shared using a static field).

Revision 1.75.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.75: +19 -2 lines
Diff to previous 1.75
Made access to vocabulary through static method in Solver: should save a lot of memory (4 bytes per constraint).

Revision 1.75 / (view) - annotate - [select for diffs] , Tue Feb 20 19:34:51 2007 UTC (5 years, 2 months ago) by leberre
Branch: MAIN
CVS Tags: complete-smallint, Root_complete-smallint, Root_MEMORY_EFFICIENT
Branch point for: MEMORY_EFFICIENT
Changes since 1.74: +1 -1 lines
Diff to previous 1.74
Fixed NPE in regression tests.

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

Revision 1.73 / (view) - annotate - [select for diffs] , Mon Feb 19 08:19:36 2007 UTC (5 years, 2 months ago) by leberre
Branch: MAIN
Changes since 1.72: +2 -2 lines
Diff to previous 1.72
Fixed assertions in Exp and Easy simplifications.

Revision 1.72 / (view) - annotate - [select for diffs] , Sat Feb 17 14:23:18 2007 UTC (5 years, 2 months ago) by leberre
Branch: MAIN
Changes since 1.71: +0 -11 lines
Diff to previous 1.71
Removed commented lines.

Revision 1.71 / (view) - annotate - [select for diffs] , Sat Feb 17 12:14:23 2007 UTC (5 years, 2 months ago) by leberre
Branch: MAIN
Changes since 1.70: +2 -0 lines
Diff to previous 1.70
Fixed FB warnings.

Revision 1.70 / (view) - annotate - [select for diffs] , Fri Jan 26 10:02:08 2007 UTC (5 years, 3 months ago) by leberre
Branch: MAIN
CVS Tags: SAT_COMPETITION_2007
Changes since 1.69: +23 -0 lines
Diff to previous 1.69
Made clear that reason simplification cannot because used with anything else than WL clauses.

Revision 1.69 / (view) - annotate - [select for diffs] , Thu Dec 21 20:43:26 2006 UTC (5 years, 4 months ago) by leberre
Branch: MAIN
CVS Tags: RELEASE_1_7_RC_2, CSP_COMPETITION_2006_BUGFIXES_HEAD
Changes since 1.68: +1 -1 lines
Diff to previous 1.68
Fixed PMD warnings.

Revision 1.68 / (view) - annotate - [select for diffs] , Wed Dec 20 08:43:53 2006 UTC (5 years, 4 months ago) by leberre
Branch: MAIN
Changes since 1.67: +12 -14 lines
Diff to previous 1.67
Added back conflict based timer. Removed explicit call to GC.

Revision 1.67 / (view) - annotate - [select for diffs] , Tue Dec 19 12:37:53 2006 UTC (5 years, 4 months ago) by leberre
Branch: MAIN
Changes since 1.66: +13 -11 lines
Diff to previous 1.66
Removed Conflict-based Timer.

Revision 1.66 / (view) - annotate - [select for diffs] , Mon Dec 18 16:30:13 2006 UTC (5 years, 4 months ago) by leberre
Branch: MAIN
Changes since 1.65: +1 -1 lines
Diff to previous 1.65
Do memory checks every 500 conflicts.

Revision 1.65 / (view) - annotate - [select for diffs] , Mon Dec 11 22:38:04 2006 UTC (5 years, 5 months ago) by leberre
Branch: MAIN
Changes since 1.64: +1 -1 lines
Diff to previous 1.64
Replace integer operation by a long operation in setTimeout(int)

Revision 1.64 / (view) - annotate - [select for diffs] , Mon Dec 11 22:28:37 2006 UTC (5 years, 5 months ago) by leberre
Branch: MAIN
Changes since 1.63: +1 -1 lines
Diff to previous 1.63
Made ConflictTimer serializable.

Revision 1.63.2.1 / (view) - annotate - [select for diffs] , Wed Dec 6 16:24:20 2006 UTC (5 years, 5 months ago) by leberre
Branch: NICE
CVS Tags: CSP_COMPETITION_2006_BUGFIXES
Changes since 1.63: +5 -1 lines
Diff to previous 1.63 to next main 1.64
Preliminary support for external reasons for backtracking.

Revision 1.63 / (view) - annotate - [select for diffs] , Wed Dec 6 13:42:43 2006 UTC (5 years, 5 months ago) by leberre
Branch: MAIN
CVS Tags: Root_NICE
Branch point for: NICE
Changes since 1.62: +2 -2 lines
Diff to previous 1.62
Do memory checkup every 100 conflicts.

Revision 1.62 / (view) - annotate - [select for diffs] , Wed Dec 6 13:13:43 2006 UTC (5 years, 5 months ago) by leberre
Branch: MAIN
Changes since 1.61: +38 -13 lines
Diff to previous 1.61
added time-independant memory management. The solver should be 100% deterministic now.

Revision 1.61 / (view) - annotate - [select for diffs] , Tue Dec 5 15:06:29 2006 UTC (5 years, 5 months ago) by leberre
Branch: MAIN
Changes since 1.60: +8 -4 lines
Diff to previous 1.60
Added possibility to assign timeout in ms.

Revision 1.60 / (view) - annotate - [select for diffs] , Thu Nov 30 20:17:29 2006 UTC (5 years, 5 months ago) by leberre
Branch: MAIN
Changes since 1.59: +2 -2 lines
Diff to previous 1.59
Fixed copyright headers and indentation/format (asked by Dieter).

Revision 1.59 / (view) - annotate - [select for diffs] , Sun Nov 12 19:50:53 2006 UTC (5 years, 6 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_112, OBJECTWEB_1_0_111, OBJECTWEB_1_0_110
Changes since 1.58: +15 -16 lines
Diff to previous 1.58
Added even more comments (classes + enum).

Revision 1.58 / (view) - annotate - [select for diffs] , Thu Nov 9 10:27:55 2006 UTC (5 years, 6 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_109
Changes since 1.57: +1 -1 lines
Diff to previous 1.57
Fixed notification for wrong component property name.

Revision 1.57 / (view) - annotate - [select for diffs] , Wed Nov 8 21:15:27 2006 UTC (5 years, 6 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_108
Changes since 1.56: +9 -10 lines
Diff to previous 1.56
Added support for modifying searchparams on the command line.

Revision 1.56 / (view) - annotate - [select for diffs] , Wed Nov 8 17:48:28 2006 UTC (5 years, 6 months ago) by leberre
Branch: MAIN
Changes since 1.55: +1 -1 lines
Diff to previous 1.55
Fixed setSimplification method.

Revision 1.55 / (view) - annotate - [select for diffs] , Wed Nov 8 17:45:53 2006 UTC (5 years, 6 months ago) by leberre
Branch: MAIN
Changes since 1.54: +12 -0 lines
Diff to previous 1.54
Added support for simplification.

Revision 1.54 / (view) - annotate - [select for diffs] , Tue Oct 31 11:19:03 2006 UTC (5 years, 6 months ago) by leberre
Branch: MAIN
Changes since 1.53: +1 -1 lines
Diff to previous 1.53
Fixed problem with DimacsOutput.

Revision 1.53 / (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.52: +1 -1 lines
Diff to previous 1.52
Fixed PMD warnings.

Revision 1.52 / (view) - annotate - [select for diffs] , Fri Oct 27 14:38:27 2006 UTC (5 years, 6 months ago) by leberre
Branch: MAIN
Changes since 1.51: +2 -2 lines
Diff to previous 1.51
Fixed findbugs warnings.

Revision 1.51 / (view) - annotate - [select for diffs] , Wed Oct 4 10:38:45 2006 UTC (5 years, 7 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_100
Changes since 1.50: +2 -3 lines
Diff to previous 1.50
Fixed Class Cast exeption (Java generics limitation).

Revision 1.50 / (view) - annotate - [select for diffs] , Wed Oct 4 10:15:08 2006 UTC (5 years, 7 months ago) by leberre
Branch: MAIN
Changes since 1.49: +6 -5 lines
Diff to previous 1.49
Tried to improve further the SAT solver (propagate, analyze,etc).

Revision 1.49 / (view) - annotate - [select for diffs] , Wed Oct 4 10:13:05 2006 UTC (5 years, 7 months ago) by leberre
Branch: MAIN
Changes since 1.48: +15 -11 lines
Diff to previous 1.48
Tried to improve further the SAT solver (propagate, analyze,etc).

Revision 1.48 / (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_99, OBJECTWEB_1_0_97, OBJECTWEB_1_0_96, OBJECTWEB_1_0_91, OBJECTWEB_1_0_90
Changes since 1.47: +3 -2 lines
Diff to previous 1.47
Fixed memory problem.
Decoding the model directly in a PrintWriter.

Revision 1.47 / (view) - annotate - [select for diffs] , Tue Jul 11 13:24:22 2006 UTC (5 years, 10 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_89, CSP_COMPETITION_2006
Changes since 1.46: +3 -1 lines
Diff to previous 1.46
Ready for the internal evaluation.

Revision 1.46 / (view) - annotate - [select for diffs] , Tue Jul 11 08:56:23 2006 UTC (5 years, 10 months ago) by leberre
Branch: MAIN
Changes since 1.45: +1 -1 lines
Diff to previous 1.45
Fixed Findbugs problems.
Changed a few things in Predicate.

Revision 1.45 / (view) - annotate - [select for diffs] , Thu Jun 29 14:13:08 2006 UTC (5 years, 10 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_88, OBJECTWEB_1_0_87
Changes since 1.44: +1 -0 lines
Diff to previous 1.44
Added back one call to c.setLearnt()

Revision 1.44 / (view) - annotate - [select for diffs] , Wed Jun 28 19:01:47 2006 UTC (5 years, 10 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_86
Changes since 1.43: +4 -7 lines
Diff to previous 1.43
Removed minlevel in Expensive Simplification.

Revision 1.43 / (view) - annotate - [select for diffs] , Wed Jun 28 18:40:01 2006 UTC (5 years, 10 months ago) by leberre
Branch: MAIN
Changes since 1.42: +0 -3 lines
Diff to previous 1.42
Added new WLClause subclasses in order to save memory when using large clauses.

Revision 1.42 / (view) - annotate - [select for diffs] , Wed Jun 28 17:29:32 2006 UTC (5 years, 10 months ago) by leberre
Branch: MAIN
Changes since 1.41: +5 -6 lines
Diff to previous 1.41
The simplification is now exactly the one in MiniSAT 1.14.

Revision 1.41 / (view) - annotate - [select for diffs] , Wed Jun 28 15:29:24 2006 UTC (5 years, 10 months ago) by leberre
Branch: MAIN
Changes since 1.40: +7 -6 lines
Diff to previous 1.40
Fixed ExpensiveSimplification.

Revision 1.40 / (view) - annotate - [select for diffs] , Wed Jun 28 13:07:42 2006 UTC (5 years, 10 months ago) by leberre
Branch: MAIN
Changes since 1.39: +1094 -1093 lines
Diff to previous 1.39
Removed level abstraction in expensive simplification.

Revision 1.39 / (view) - annotate - [select for diffs] , Sun Jun 25 06:37:08 2006 UTC (5 years, 10 months ago) by leberre
Branch: MAIN
Changes since 1.38: +4 -2 lines
Diff to previous 1.38
Added a method to clear learnt clauses.

Revision 1.38 / (view) - annotate - [select for diffs] , Sat Jun 17 11:58:06 2006 UTC (5 years, 11 months ago) by leberre
Branch: MAIN
Changes since 1.37: +34 -20 lines
Diff to previous 1.37
Added a new method in IProblem, feature request from Chris Tucker.

Revision 1.37 / (view) - annotate - [select for diffs] , Tue Jun 13 07:55:48 2006 UTC (5 years, 11 months ago) by leberre
Branch: MAIN
Changes since 1.36: +28 -14 lines
Diff to previous 1.36
Merged fixes from 1.6 branch.

Revision 1.36.2.4 / (view) - annotate - [select for diffs] , Tue Jun 13 07:45:53 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_10
Changes since 1.36.2.3: +5 -3 lines
Diff to previous 1.36.2.3 to branch point 1.36 to next main 1.37
Fixed properly the AtMost problem.

Revision 1.36.2.3 / (view) - annotate - [select for diffs] , Thu Jun 1 13:57:41 2006 UTC (5 years, 11 months ago) by leberre
Branch: RELEASE_1_6
CVS Tags: RELEASE_1_6_0_0_8, RELEASE_1_6_0_0_7, RELEASE_1_6_0_0_4
Changes since 1.36.2.2: +1 -0 lines
Diff to previous 1.36.2.2 to branch point 1.36
The solver now takes into account the expected number of clauses to fix constrs initial size.

Revision 1.36.2.2 / (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.36.2.1: +22 -11 lines
Diff to previous 1.36.2.1 to branch point 1.36
Added SATRaceDecorator.
Fixed launcher: usage displayed when no arguments are given.

Revision 1.36.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
CVS Tags: RELEASE_1_6_0_0_2
Changes since 1.36: +0 -73 lines
Diff to previous 1.36
Removed Expensive simplification code.

Revision 1.36 / (view) - annotate - [select for diffs] , Wed May 24 05:45:11 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, OBJECTWEB_1_0_80, OBJECTWEB_1_0_79, OBJECTWEB_1_0_78, OBJECTWEB_1_0_77, OBJECTWEB_1_0_76
Branch point for: RELEASE_1_6
Changes since 1.35: +1014 -1015 lines
Diff to previous 1.35
Fixed many pmd warnings.

Revision 1.35 / (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_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.34: +11 -11 lines
Diff to previous 1.34
Using the best version of MiniLearning for the No Restarts solver.

Revision 1.34 / (view) - annotate - [select for diffs] , Thu Apr 27 16:12:41 2006 UTC (6 years ago) by parrain
Branch: MAIN
Changes since 1.33: +1 -1 lines
Diff to previous 1.33
a "protected" forgotten on addConstr() method

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

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

Revision 1.17.2.4 / (view) - annotate - [select for diffs] , Fri Apr 21 13:30:57 2006 UTC (6 years ago) by parrain
Branch: PBCONSTR
CVS Tags: PBCONSTR_1_0_13
Changes since 1.17.2.3: +1034 -1035 lines
Diff to previous 1.17.2.3 to branch point 1.17
AP : some methods are now protected

Revision 1.32 / (view) - annotate - [select for diffs] , Wed Apr 19 05:01:44 2006 UTC (6 years ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_62
Changes since 1.31: +12 -3 lines
Diff to previous 1.31
Fiwed assertion in ExpSimplification.
Added guard verifications in model.

Revision 1.31 / (view) - annotate - [select for diffs] , Tue Apr 18 20:46:01 2006 UTC (6 years ago) by leberre
Branch: MAIN
Changes since 1.30: +3 -3 lines
Diff to previous 1.30
Fixed the way the clauses were cleaned.

Revision 1.30 / (view) - annotate - [select for diffs] , Tue Apr 18 20:27:41 2006 UTC (6 years ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_61
Changes since 1.29: +30 -16 lines
Diff to previous 1.29
Fixed NLS problems.
Added Emina new methods in IProblem and ISolver interfaces.
Removed displayResults() in Launcher.

Revision 1.29 / (view) - annotate - [select for diffs] , Fri Apr 14 13:46:12 2006 UTC (6 years, 1 month ago) by salhaji
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_60
Changes since 1.28: +7 -3 lines
Diff to previous 1.28
Add a start and an end method in the SearchListener interface.
The Solver class is changed in concequence. (call the start and the end method)

Revision 1.28 / (view) - annotate - [select for diffs] , Wed Apr 12 09:43:25 2006 UTC (6 years, 1 month ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_59
Changes since 1.27: +8 -27 lines
Diff to previous 1.27
Removed some warnings and commented code.

Revision 1.27 / (view) - annotate - [select for diffs] , Sun Apr 9 06:37:01 2006 UTC (6 years, 1 month ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_58
Changes since 1.26: +3 -3 lines
Diff to previous 1.26
ExpSimp related modifications (but still incorrect)..

Revision 1.26 / (view) - annotate - [select for diffs] , Sat Apr 1 19:06:11 2006 UTC (6 years, 1 month ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_57, OBJECTWEB_1_0_56, OBJECTWEB_1_0_55, OBJECTWEB_1_0_54
Changes since 1.25: +2 -1 lines
Diff to previous 1.25
Maybe a fix for expensiveSimplification?

Revision 1.25 / (view) - annotate - [select for diffs] , Sat Apr 1 16:14:52 2006 UTC (6 years, 1 month ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_53
Changes since 1.24: +9 -9 lines
Diff to previous 1.24
Simplified reduceDB.

Revision 1.24 / (view) - annotate - [select for diffs] , Sat Apr 1 05:50:04 2006 UTC (6 years, 1 month ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_52
Changes since 1.23: +9 -7 lines
Diff to previous 1.23
Removed call to simplifyDB() in solver, because it breaks the single solution test.

Revision 1.23 / (view) - annotate - [select for diffs] , Wed Mar 29 10:15:29 2006 UTC (6 years, 1 month ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_51, OBJECTWEB_1_0_50
Changes since 1.22: +19 -19 lines
Diff to previous 1.22
Fixed stats display.

Revision 1.22 / (view) - annotate - [select for diffs] , Tue Mar 28 06:19:37 2006 UTC (6 years, 1 month ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_48
Changes since 1.21: +0 -1 lines
Diff to previous 1.21
Removed @SuppressWarning("serial")

Revision 1.21 / (view) - annotate - [select for diffs] , Mon Mar 27 12:51:47 2006 UTC (6 years, 1 month ago) by salhaji
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_47
Changes since 1.20: +1 -0 lines
Diff to previous 1.20
The interface LearningStrategy is currently Serializable

Revision 1.20 / (view) - annotate - [select for diffs] , Thu Mar 23 17:10:27 2006 UTC (6 years, 1 month ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_46
Changes since 1.19: +3 -0 lines
Diff to previous 1.19
Added a new feature: Max satisfiability!

Revision 1.17.2.3 / (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_9, PBCONSTR_1_0_8, PBCONSTR_1_0_7, PBCONSTR_1_0_6, PBCONSTR_1_0_5, PBCONSTR_1_0_4, PBCONSTR_1_0_3, PBCONSTR_1_0_11, PBCONSTR_1_0_10
Changes since 1.17.2.2: +2 -9 lines
Diff to previous 1.17.2.2 to branch point 1.17
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.19 / (view) - annotate - [select for diffs] , Thu Mar 16 10:37:13 2006 UTC (6 years, 2 months ago) by salhaji
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_45, OBJECTWEB_1_0_44, OBJECTWEB_1_0_42, OBJECTWEB_1_0_41, OBJECTWEB_1_0_40, OBJECTWEB_1_0_37
Changes since 1.18: +11 -5 lines
Diff to previous 1.18
Changed PrintStream by PrintWriter in abstract launcher.
The ISolver.printStat(PrintStream,prefix) is now deprecated.
One should use ISolver.printStat(PrintWriter,prefix) instead.

Revision 1.17.2.2 / (view) - annotate - [select for diffs] , Tue Mar 14 22:21:29 2006 UTC (6 years, 2 months ago) by parrain
Branch: PBCONSTR
Changes since 1.17.2.1: +9 -23 lines
Diff to previous 1.17.2.1 to branch point 1.17
AP : suite remarques FrŽdŽric

Revision 1.18 / (view) - annotate - [select for diffs] , Mon Mar 13 13:14:27 2006 UTC (6 years, 2 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_36, OBJECTWEB_1_0_35
Changes since 1.17: +2 -2 lines
Diff to previous 1.17
Fixed a few PMD warnings.

Revision 1.17.2.1 / (view) - annotate - [select for diffs] , Fri Mar 10 21:42:44 2006 UTC (6 years, 2 months ago) by parrain
Branch: PBCONSTR
Changes since 1.17: +13 -0 lines
Diff to previous 1.17
AP : version de travail vendredi 10 mars...

Revision 1.17 / (view) - annotate - [select for diffs] , Thu Mar 9 20:52:32 2006 UTC (6 years, 2 months ago) by leberre
Branch: MAIN
CVS Tags: Root_PBCONSTR
Branch point for: PBCONSTR
Changes since 1.16: +4 -3 lines
Diff to previous 1.16
Fixed maybe a problem in Expensive Simplification.

Revision 1.16 / (view) - annotate - [select for diffs] , Thu Mar 9 20:28:51 2006 UTC (6 years, 2 months ago) by leberre
Branch: MAIN
Changes since 1.15: +9 -2 lines
Diff to previous 1.15
Fix problem of reduceDB is another thread!!!

Revision 1.15 / (view) - annotate - [select for diffs] , Thu Mar 9 10:35:26 2006 UTC (6 years, 2 months ago) by leberre
Branch: MAIN
Changes since 1.14: +1 -1 lines
Diff to previous 1.14
Fixed a problem in Expensive simplification.

Revision 1.14 / (view) - annotate - [select for diffs] , Tue Mar 7 21:10:56 2006 UTC (6 years, 2 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_32
Changes since 1.13: +5 -3 lines
Diff to previous 1.13
Added stats on removed literals.

Revision 1.13 / (view) - annotate - [select for diffs] , Tue Mar 7 21:03:18 2006 UTC (6 years, 2 months ago) by leberre
Branch: MAIN
Changes since 1.12: +2 -2 lines
Diff to previous 1.12
Changed delay for memory checking.
Added solvers with full simplification.

Revision 1.12 / (view) - annotate - [select for diffs] , Tue Mar 7 08:50:18 2006 UTC (6 years, 2 months ago) by leberre
Branch: MAIN
Changes since 1.11: +1050 -1026 lines
Diff to previous 1.11
Added log message to be sure that memory management is done correctly.

Revision 1.11 / (view) - annotate - [select for diffs] , Mon Mar 6 08:38:40 2006 UTC (6 years, 2 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_31
Changes since 1.10: +2 -2 lines
Diff to previous 1.10
Fixed the causes cleanup: the test was only done once. Now it is really done every 30s.

Revision 1.10 / (view) - annotate - [select for diffs] , Sun Mar 5 20:05:55 2006 UTC (6 years, 2 months ago) by leberre
Branch: MAIN
Changes since 1.9: +2 -2 lines
Diff to previous 1.9
Fixed cleanup timer to really 30s (and not 300s!!!).

Revision 1.9 / (view) - annotate - [select for diffs] , Tue Feb 28 17:53:24 2006 UTC (6 years, 2 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_30
Changes since 1.8: +17 -9 lines
Diff to previous 1.8
New clause cleanup policy.

Revision 1.8 / (view) - annotate - [select for diffs] , Sun Feb 26 20:46:15 2006 UTC (6 years, 2 months ago) by leberre
Branch: MAIN
Changes since 1.7: +3 -1 lines
Diff to previous 1.7
The solver now cleanup the clauses each time it restarts. The problem is that cleanup and restarts are currently tight together. They should be independent.

Revision 1.7 / (view) - annotate - [select for diffs] , Sat Feb 25 16:55:55 2006 UTC (6 years, 2 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_26, OBJECTWEB_1_0_25, OBJECTWEB_1_0_24, OBJECTWEB_1_0_23
Changes since 1.6: +1003 -999 lines
Diff to previous 1.6
Corrected bug in Solver.modelFound() discovered thanks to the changes in Lits.

Revision 1.6 / (view) - annotate - [select for diffs] , Thu Dec 29 22:34:50 2005 UTC (6 years, 4 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_20, OBJECTWEB_1_0_19, OBJECTWEB_1_0_18, OBJECTWEB_1_0_17, OBJECTWEB_1_0_15, OBJECTWEB_1_0_14, OBJECTWEB_1_0_13, OBJECTWEB_1_0_11, OBJECTWEB_1_0_10
Changes since 1.5: +0 -1 lines
Diff to previous 1.5
Fixed CSP3 encoding. Unfortunately, now the encoding is really slow.
Some improvements is needed (avoiding creating too many objects for instance).

Revision 1.5 / (view) - annotate - [select for diffs] , Thu Dec 29 20:59:27 2005 UTC (6 years, 4 months ago) by leberre
Branch: MAIN
Changes since 1.4: +1 -0 lines
Diff to previous 1.4
Fixed a bug in BinarySupportACEncoding. There is still one in GeneralizedSupportACEncoding.

Revision 1.4 / (view) - annotate - [select for diffs] , Sun Dec 11 18:39:37 2005 UTC (6 years, 5 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_9, OBJECTWEB_1_0_8, OBJECTWEB_1_0_7
Changes since 1.3: +10 -6 lines
Diff to previous 1.3
Added a decorator to detect a single solution.

Revision 1.3 / (view) - annotate - [select for diffs] , Tue Dec 6 10:21:42 2005 UTC (6 years, 5 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_6
Changes since 1.2: +0 -4 lines
Diff to previous 1.2
Fixed some problems detected by PMD.

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_5, OBJECTWEB_1_0_4, OBJECTWEB_1_0_3, OBJECTWEB_1_0_0
Changes since 1.1: +2 -2 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:51 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