[Aptitude-svn-commit] r3882 - in branches/aptitude-0.3/aptitude: . src/cmdline src/generic/problemresolver

[Daniel Burrows]

Author: dburrows
Date: Wed Aug 17 01:24:49 2005
New Revision: 3882

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc
   branches/aptitude-0.3/aptitude/src/generic/problemresolver/solution.h
Log:
Move the by-id comparison of actions to the generic solution class.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Aug 17 01:24:49 2005
@@ -1,5 +1,9 @@
 2005-08-16  Daniel Burrows  <dburrows at debian.org>
 
+	* src/cmdline/cmdline_resolver.cc, src/generic/solution.h:
+
+	  Move the by-id comparison functor to the solution class.
+
 	* src/solution_screen.cc:
 
 	  Add a class that describes an action instead of just presenting

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc	Wed Aug 17 01:24:49 2005
@@ -45,16 +45,6 @@
 
 typedef generic_solution<aptitude_universe> aptitude_solution;
 
-struct action_id_compare
-{
-public:
-  bool operator()(const aptitude_solution::action &a1,
-		  const aptitude_solution::action &a2) const
-  {
-    return a1.id < a2.id;
-  }
-};
-
 /** Generate a fragment describing a solution as an ordered sequence
  *  of actions.
  */
@@ -64,7 +54,7 @@
   for(map<aptitude_universe::package, aptitude_solution::action>::const_iterator i
 	= s.get_actions().begin(); i != s.get_actions().end(); ++i)
     actions.push_back(i->second);
-  sort(actions.begin(), actions.end(), action_id_compare());
+  sort(actions.begin(), actions.end(), aptitude_solution::action_id_compare());
 
 
   vector<fragment *> fragments;

Modified: branches/aptitude-0.3/aptitude/src/generic/problemresolver/solution.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/problemresolver/solution.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/problemresolver/solution.h	Wed Aug 17 01:24:49 2005
@@ -523,6 +523,17 @@
 
     out << get_score();
   }
+
+  /** Compare actions by their ID */
+  struct action_id_compare
+  {
+  public:
+    bool operator()(const action &a1,
+		    const action &a2) const
+    {
+      return a1.id < a2.id;
+    }
+  };
 }; // End solution wrapper
 
 #endif // SOLUTION_H