[Aptitude-devel] r3150 - in branches/aptitude-0.3/aptitude: . src/generic

[Daniel Burrows]

Author: dburrows
Date: Wed Apr 27 15:34:26 2005
New Revision: 3150

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptcache.cc
Log:
Make infinity smaller; penalize brokenness more.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Apr 27 15:34:26 2005
@@ -1,5 +1,12 @@
 2005-04-27  Daniel Burrows  <dburrows@debian.org>
 
+	* src/generic/aptcache.cc:
+
+	  Make infinity smaller and penalize brokenness more.  Now if
+	  aptitude goes nuts (although I should do more to stop this) it
+	  at least won't eat all your virtual memory before figuring out
+	  that no solutions exist.  This is a bit of a hack, though..
+
 	* src/generic/problemresolver/problemresolver.h:
 
 	  Incrementally calculate the new score, and abort as soon as it

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	Wed Apr 27 15:34:26 2005
@@ -1350,8 +1350,8 @@
   assert(resolver==NULL);
 
   resolver=new aptitude_resolver(aptcfg->FindI(PACKAGE "::ProblemResolver::StepScore", -10),
-				 aptcfg->FindI(PACKAGE "::ProblemResolver::BrokenScore", -50),
-				 aptcfg->FindI(PACKAGE "::ProblemResolver::Infinity", 150000),
+				 aptcfg->FindI(PACKAGE "::ProblemResolver::BrokenScore", -200),
+				 aptcfg->FindI(PACKAGE "::ProblemResolver::Infinity", 50000),
 				 aptcfg->FindI(PACKAGE "::ProblemResolver::ResolutionScore", 50));
 
   resolver->add_action_scores(aptcfg->FindI(PACKAGE "::ProblemResolver::PreserveManualScore", 40),