[Aptitude-svn-commit] r3865 - in branches/aptitude-0.3/aptitude: . src/generic

[Daniel Burrows]

Author: dburrows
Date: Tue Aug 16 18:30:24 2005
New Revision: 3865

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptcache.cc
Log:
Slightly reward longer solutions rather than slightly penalizing them.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Aug 16 18:30:24 2005
@@ -1,5 +1,13 @@
 2005-08-16  Daniel Burrows  <dburrows at debian.org>
 
+	* src/generic/aptcache.cc:
+
+	  Slightly *reward* longer solutions, rather than slightly
+	  penalizing them.  Although this might produce lower-quality
+	  solutions, it has the effect of encouraging the resolver to
+	  focus on more "mature" lines of reasoning, rather than backing
+	  up and looking at alternatives first.
+
 	* src/cmdline/cmdline_resolver.cc, src/solution_fragment.cc, src/solution_fragment.h:
 
 	  Move some code for formatting information relevant to solutions

Modified: branches/aptitude-0.3/aptitude/src/generic/aptcache.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/aptcache.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/aptcache.cc	Tue Aug 16 18:30:24 2005
@@ -1350,7 +1350,7 @@
 {
   assert(resolver==NULL);
 
-  resolver=new aptitude_resolver(aptcfg->FindI(PACKAGE "::ProblemResolver::StepScore", -10),
+  resolver=new aptitude_resolver(aptcfg->FindI(PACKAGE "::ProblemResolver::StepScore", 10),
 				 aptcfg->FindI(PACKAGE "::ProblemResolver::BrokenScore", -100),
 				 aptcfg->FindI(PACKAGE "::ProblemResolver::UnfixedSoftScore", -10000),
 				 aptcfg->FindI(PACKAGE "::ProblemResolver::Infinity", 1000000),