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

[Daniel Burrows]

Author: dburrows
Date: Sat Apr 30 17:07:52 2005
New Revision: 3198

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptcache.cc
   branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
Log:
Only spew debug messages when debugging is enabled.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Apr 30 17:07:52 2005
@@ -2,6 +2,10 @@
 
 	* src/generic/problemresolver/problemresolver.h:
 
+	  Right, only spew if debug is enabled.
+
+	* src/generic/problemresolver/problemresolver.h:
+
 	  When generating the successors of a solution, detect "forced"
 	  installs (i.e., installs which must be in any successor
 	  solution, such as deps that have only one solver) and perform

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 30 17:07:52 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", 50000),
+				 aptcfg->FindI(PACKAGE "::ProblemResolver::BrokenScore", -100),
+				 aptcfg->FindI(PACKAGE "::ProblemResolver::Infinity", 150000),
 				 aptcfg->FindI(PACKAGE "::ProblemResolver::Max-Successors", 50),
 				 aptcfg->FindI(PACKAGE "::ProblemResolver::ResolutionScore", 50),
 				 this);
@@ -1461,7 +1461,7 @@
     {
       try
 	{
-	  solutions.push_back(new aptitude_resolver::solution(resolver->find_next_solution(aptcfg->FindI(PACKAGE "::ProblemResolver::StepLimit", 1000))));
+	  solutions.push_back(new aptitude_resolver::solution(resolver->find_next_solution(aptcfg->FindI(PACKAGE "::ProblemResolver::StepLimit", 100))));
 	  selected_solution=0;
 	  out_of_time=false;
 	  selected_solution_changed();

Modified: branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h	Sat Apr 30 17:07:52 2005
@@ -1261,7 +1261,8 @@
 	else
 	  process_solution(s);
 
-	std::cout << "Done generating successors." << std::endl;
+	if(debug)
+	  std::cout << "Done generating successors." << std::endl;
 
 	--max_steps;
       }