OW2 Consortium

CVS log for sat4j/core/src/org/sat4j/minisat/constraints/pb/Attic/MapPb.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.17 , 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.16: +0 -0 lines
FILE REMOVED
Removed CSP and PB related code for the 2.0 release.

Revision 1.16 / (view) - annotate - [select for diffs] , Tue Aug 28 12:48:26 2007 UTC (4 years, 8 months ago) by leberre
Branch: MAIN
CVS Tags: RELEASE_1_7
Changes since 1.15: +2 -3 lines
Diff to previous 1.15
Removed unused import.

Revision 1.15 / (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.14: +0 -4 lines
Diff to previous 1.14
Fixed PMD warnings.

Revision 1.14.6.1 / (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.14: +7 -0 lines
Diff to previous 1.14 to next main 1.15
Changed the implementation (the reference is now shared using a static field).

Revision 1.14 / (view) - annotate - [select for diffs] , Thu Nov 30 20:17:29 2006 UTC (5 years, 5 months ago) by leberre
Branch: MAIN
CVS Tags: nonlinear, complete-smallint, SAT_COMPETITION_2007, Root_nonlinear, Root_complete-smallint, Root_NICE, Root_MEMORY_EFFICIENT, RELEASE_1_7_RC_2, NICE, CSP_COMPETITION_2006_BUGFIXES_HEAD, CSP_COMPETITION_2006_BUGFIXES
Branch point for: MEMORY_EFFICIENT
Changes since 1.13: +22 -3 lines
Diff to previous 1.13
Fixed copyright headers and indentation/format (asked by Dieter).

Revision 1.13 / (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_112, OBJECTWEB_1_0_111, OBJECTWEB_1_0_110, OBJECTWEB_1_0_109, OBJECTWEB_1_0_108, OBJECTWEB_1_0_103, OBJECTWEB_1_0_102, OBJECTWEB_1_0_101, OBJECTWEB_1_0_100
Changes since 1.12: +203 -206 lines
Diff to previous 1.12
Fixed some findbugs warnings.

Revision 1.12 / (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_99, OBJECTWEB_1_0_97, OBJECTWEB_1_0_96, OBJECTWEB_1_0_91, OBJECTWEB_1_0_90
Changes since 1.11: +50 -20 lines
Diff to previous 1.11
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.11 / (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.10: +14 -9 lines
Diff to previous 1.10
Added heuristics incrementation as in the SAT solver.

Revision 1.10 / (view) - annotate - [select for diffs] , Wed Aug 23 15:16:43 2006 UTC (5 years, 8 months ago) by leberre
Branch: MAIN
Changes since 1.9: +5 -0 lines
Diff to previous 1.9
Made MapPb and MapConflict the default implementation in PBSolver.

Revision 1.9 / (view) - annotate - [select for diffs] , Mon Jul 10 09:11:07 2006 UTC (5 years, 10 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_89, OBJECTWEB_1_0_88, CSP_COMPETITION_2006
Changes since 1.8: +18 -16 lines
Diff to previous 1.8
Fixed problems reported by Dieter von Holten.

Revision 1.8 / (view) - annotate - [select for diffs] , Thu Apr 27 15:28:35 2006 UTC (6 years ago) by parrain
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_87, OBJECTWEB_1_0_86, 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, 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.7: +168 -133 lines
Diff to previous 1.7
merged with PBCONSTR

Revision 1.7 / (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_62, OBJECTWEB_1_0_61
Changes since 1.6: +2 -2 lines
Diff to previous 1.6
Fixed NLS problems.
Added Emina new methods in IProblem and ISolver interfaces.
Removed displayResults() in Launcher.

Revision 1.5.2.7 / (view) - annotate - [select for diffs] , Thu Apr 13 19:26:29 2006 UTC (6 years, 1 month ago) by parrain
Branch: PBCONSTR
CVS Tags: PBCONSTR_1_0_9, PBCONSTR_1_0_13, PBCONSTR_1_0_11, PBCONSTR_1_0_10
Changes since 1.5.2.6: +10 -25 lines
Diff to previous 1.5.2.6 to branch point 1.5 to next main 1.6
AP : 
- code cleaning in IDataStructurePB hierarchy
- AtLeastPB extends AtLeast and implements PBConstr. Can be learned

Revision 1.5.2.6 / (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_8, PBCONSTR_1_0_7, PBCONSTR_1_0_6
Changes since 1.5.2.5: +11 -29 lines
Diff to previous 1.5.2.5 to branch point 1.5
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.5.2.5 / (view) - annotate - [select for diffs] , Mon Mar 20 15:26:47 2006 UTC (6 years, 1 month ago) by ffontaine
Branch: PBCONSTR
CVS Tags: PBCONSTR_1_0_5, PBCONSTR_1_0_4, PBCONSTR_1_0_3
Changes since 1.5.2.4: +0 -4 lines
Diff to previous 1.5.2.4 to branch point 1.5
Suppresion des warnings (imports inutiles).

Revision 1.5.2.4 / (view) - annotate - [select for diffs] , Sun Mar 19 22:10:53 2006 UTC (6 years, 1 month ago) by parrain
Branch: PBCONSTR
Changes since 1.5.2.3: +47 -24 lines
Diff to previous 1.5.2.3 to branch point 1.5
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.5.2.3 / (view) - annotate - [select for diffs] , Fri Mar 17 13:24:35 2006 UTC (6 years, 2 months ago) by ffontaine
Branch: PBCONSTR
Changes since 1.5.2.2: +45 -55 lines
Diff to previous 1.5.2.2 to branch point 1.5
Modification des différentes methodes cuttingPlane().

[Plus besoin de passer un null en parametre pour la
methode privee cuttingPlane()]

A voir si cette methode est plus propre, et si elle
n'entraine pas des baisses de performance.

Revision 1.5.2.2 / (view) - annotate - [select for diffs] , Tue Mar 14 22:20:44 2006 UTC (6 years, 2 months ago) by parrain
Branch: PBCONSTR
Changes since 1.5.2.1: +173 -141 lines
Diff to previous 1.5.2.1 to branch point 1.5
AP : suite remarques FrŽdŽric

Revision 1.6 / (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_60, OBJECTWEB_1_0_59, OBJECTWEB_1_0_58, OBJECTWEB_1_0_57, 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, 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
Changes since 1.5: +32 -29 lines
Diff to previous 1.5
Fixed a few PMD warnings.

Revision 1.5.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.5: +38 -8 lines
Diff to previous 1.5
AP : version de travail vendredi 10 mars...

Revision 1.5 / (view) - annotate - [select for diffs] , Mon Feb 27 11:57:20 2006 UTC (6 years, 2 months ago) by parrain
Branch: MAIN
CVS Tags: Root_PBCONSTR, OBJECTWEB_1_0_32, OBJECTWEB_1_0_31, OBJECTWEB_1_0_30
Branch point for: PBCONSTR
Changes since 1.4: +5 -5 lines
Diff to previous 1.4
AP : ... on revient ˆ la case prŽcŽdente : il n'y a pas de mŽthode final dans MapPb ...

Revision 1.4 / (view) - annotate - [select for diffs] , Mon Feb 27 11:51:02 2006 UTC (6 years, 2 months ago) by parrain
Branch: MAIN
Changes since 1.3: +5 -5 lines
Diff to previous 1.3
AP : certaines mŽthodes deviennent final

Revision 1.3 / (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_26, OBJECTWEB_1_0_25, OBJECTWEB_1_0_24, OBJECTWEB_1_0_23, OBJECTWEB_1_0_20
Changes since 1.2: +4 -0 lines
Diff to previous 1.2
AP : modification du calcul des watched literals : proposition de Pueblo

Revision 1.2 / (view) - annotate - [select for diffs] , Sun Feb 5 09:12:02 2006 UTC (6 years, 3 months ago) by leberre
Branch: MAIN
CVS Tags: OBJECTWEB_1_0_19, OBJECTWEB_1_0_18, OBJECTWEB_1_0_17
Changes since 1.1: +16 -0 lines
Diff to previous 1.1
Added a toString() method

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
CVS Tags: OBJECTWEB_1_0_9, 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_15, OBJECTWEB_1_0_14, OBJECTWEB_1_0_13, OBJECTWEB_1_0_11, OBJECTWEB_1_0_10, OBJECTWEB_1_0_0
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