[Aptitude-devel] r3068 - in branches/aptitude-0.3/aptitude: . src/generic
Daniel Burrows
dburrows@costa.debian.org
Sat, 23 Apr 2005 02:47:08 +0000
Author: dburrows
Date: Sat Apr 23 02:47:05 2005
New Revision: 3068
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/src/generic/aptcache.cc
Log:
Tweak the default scores to more heavily penalize removing packages and breaking deps.
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Sat Apr 23 02:47:05 2005
@@ -2,6 +2,12 @@
* src/generic/aptcache.cc:
+ Tweak the default scores: be slightly less hostile to changing
+ the user's selections, and greatly increase the penalties for
+ broken deps and for removing packages.
+
+ * src/generic/aptcache.cc:
+
Fix a reversed comparison in solutions_exhausted.
* src/generic/problemresolver/problemresolver.h:
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 Sat Apr 23 02:47:05 2005
@@ -1347,11 +1347,11 @@
assert(resolver==NULL);
resolver=new aptitude_resolver(aptcfg->FindI(PACKAGE "::ProblemResolver::StepPenalty", 10),
- aptcfg->FindI(PACKAGE "::ProblemResolver::BrokenPenalty", 50));
+ aptcfg->FindI(PACKAGE "::ProblemResolver::BrokenPenalty", 200));
- resolver->add_action_scores(aptcfg->FindI(PACKAGE "::ProblemResolver::PreserveManualScore", 50),
- aptcfg->FindI(PACKAGE "::ProblemResolver::PreserveAutoScore", 25),
- aptcfg->FindI(PACKAGE "::ProblemResolver::RemoveScore", -50),
+ resolver->add_action_scores(aptcfg->FindI(PACKAGE "::ProblemResolver::PreserveManualScore", 40),
+ aptcfg->FindI(PACKAGE "::ProblemResolver::PreserveAutoScore", 35),
+ aptcfg->FindI(PACKAGE "::ProblemResolver::RemoveScore", -300),
aptcfg->FindI(PACKAGE "::ProblemResolver::KeepScore", -10),
aptcfg->FindI(PACKAGE "::ProblemResolver::InstallScore", -20),
aptcfg->FindI(PACKAGE "::ProblemResolver::UpgradeScore", -15),