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

[Daniel Burrows]

Author: dburrows
Date: Fri Apr  8 02:46:59 2005
New Revision: 2946

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
Log:
Add more debugging code.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Fri Apr  8 02:46:59 2005
@@ -2,6 +2,10 @@
 
 	* src/generic/problemresolver/test.cc:
 
+	  Add yet more debugging code.
+
+	* src/generic/problemresolver/test.cc:
+
 	  Add more debugging code; make dump() dump all info by default.
 
 	* src/generic/problemresolver/problemresolver.h, src/generic/problemresolver/test.cc:

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	Fri Apr  8 02:46:59 2005
@@ -550,28 +550,41 @@
     for(typename version::revdep_iterator rd=old_version.revdeps_begin();
 	rd!=old_version.revdeps_end(); ++rd)
       if(dep_broken(s, v, *rd))
-	new_broken.insert(*rd);
+	{
+	  cout << "Inserting broken dep " << *rd << endl;
+	  new_broken.insert(*rd);
+	}
 
     for(typename version::revdep_iterator rd=v.revdeps_begin();
 	rd!=v.revdeps_end(); ++rd)
       if(dep_broken(s, v, *rd))
-	new_broken.insert(*rd);
+	{
+	  cout << "Inserting broken dep " << *rd << endl;
+	  new_broken.insert(*rd);
+	}
 
     const std::set<dep> &old_broken=s.get_broken();
     for(typename std::set<dep>::const_iterator bd=old_broken.begin();
 	bd!=old_broken.end(); ++bd)
       if(dep_broken(s, v, *bd))
-	new_broken.insert(*bd);
+	{
+	  cout << "Inserting broken dep " << *bd << endl;
+	  new_broken.insert(*bd);
+	}
 
     solution s2=solution(action(v), s,
 			 new_broken,
 			 new_action_score+broken_score*new_broken.size(),
 			 new_action_score);
 
+    std::cout << "  There are " << new_broken.size() << " elements in new_broken." << std::endl;
+
     std::cout << "Enqueuing ";
     s2.dump(std::cout);
     std::cout << endl;
 
+    std::cout << "  There are " << new_broken.size() << " elements in new_broken." << std::endl;
+
     open.push(s2);
   }