[Aptitude-devel] r2979 - branches/aptitude-0.3/aptitude/src/generic

[Daniel Burrows]

Author: dburrows
Date: Sun Apr 10 00:48:17 2005
New Revision: 2979

Modified:
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.cc
   branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h
Log:
Fix the aptitude_resolver stuff.

Modified: branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.cc	Sun Apr 10 00:48:17 2005
@@ -19,6 +19,13 @@
 
 #include "aptitude_resolver.h"
 
+aptitude_resolver::aptitude_resolver(int step_penalty,
+				     int broken_penalty)
+  :generic_problem_resolver<aptitude_universe>(step_penalty, broken_penalty, universe),
+   universe()
+{
+}
+
 void aptitude_resolver::add_scores(int preserve_score, int auto_score,
 				   int remove_score, int keep_score,
 				   int install_score, int upgrade_score,

Modified: branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/aptitude_resolver.h	Sun Apr 10 00:48:17 2005
@@ -995,13 +995,18 @@
   {
     return (*apt_cache_file)->PkgBegin();
   }
+
+  unsigned long get_version_count() const
+  {
+    return (*apt_cache_file)->Head().VersionCount;
+  }
 };
 
 class aptitude_resolver:generic_problem_resolver<aptitude_universe>
 {
+  const aptitude_universe universe;
 public:
-  aptitude_resolver(int step_penalty, int broken_penalty,
-		    const aptitude_universe &universe);
+  aptitude_resolver(int step_penalty, int broken_penalty);
 
   /** Assign scores to all packages and all package versions according
    *  to its arguments.  All scores are assigned with add_score, so