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

[Daniel Burrows]

Author: dburrows
Date: Mon May  2 02:20:44 2005
New Revision: 3256

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptcache.cc
Log:
Bump default StepLimit to 5000

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon May  2 02:20:44 2005
@@ -1,5 +1,15 @@
 2005-05-01  Daniel Burrows  <dburrows@debian.org>
 
+	* src/generic/aptcache.cc:
+
+	Live dangerously: bump the default StepLimit to 5000.  It seems
+	from empirical tests that the various changes to the problem
+	resolver -- especially the 'forbidden' version tests, forced
+	installations, and the reduction of the branching factor -- have
+	made longer searches feasible; also, some interesting test cases
+	(like 'aptitude -s -t experimental dist-upgrade') need more steps
+	to complete.
+
 	* src/cmdline/cmdline_resolver.cc:
 
 	Give up, don't loop forever, if the user asks to terminate a

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	Mon May  2 02:20:44 2005
@@ -1467,7 +1467,7 @@
     {
       try
 	{
-	  solutions.push_back(new aptitude_resolver::solution(resolver->find_next_solution(aptcfg->FindI(PACKAGE "::ProblemResolver::StepLimit", 500))));
+	  solutions.push_back(new aptitude_resolver::solution(resolver->find_next_solution(aptcfg->FindI(PACKAGE "::ProblemResolver::StepLimit", 5000))));
 	  selected_solution=0;
 	  out_of_time=false;
 	  selected_solution_changed();
@@ -1488,7 +1488,7 @@
     {
       // otherwise weirdness is happening.
       assert(!out_of_time);
-      solutions.push_back(new aptitude_resolver::solution(resolver->find_next_solution(aptcfg->FindI(PACKAGE "::ProblemResolver::StepLimit", 500))));
+      solutions.push_back(new aptitude_resolver::solution(resolver->find_next_solution(aptcfg->FindI(PACKAGE "::ProblemResolver::StepLimit", 5000))));
       ++selected_solution;
       selected_solution_changed();
       return *solutions.back();
@@ -1533,7 +1533,7 @@
 
   resolver->dump_scores(out);
 
-  out << "EXPECT ( " << aptcfg->FindI(PACKAGE "::Resolver::StepLimit", 500) << " ANY )" << endl;
+  out << "EXPECT ( " << aptcfg->FindI(PACKAGE "::Resolver::StepLimit", 5000) << " ANY )" << endl;
 }
 
 //////////////////// END PROBLEM RESOLVER INTERFACE ////////////////////