merged with mvo branch

[apt.git] / apt-pkg / algorithms.h

diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 0379357c21f631693af793e94cb2aaae215657f3..b72874d8e216687c4edfd0474008f730b71b7b16 100644 (file)
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: algorithms.h,v 1.4 1998/10/02 04:39:43 jgg Exp $
+// $Id: algorithms.h,v 1.10 2001/05/22 04:17:41 jgg Exp $

 /* ######################################################################
 
    Algorithms - A set of misc algorithms
 /* ######################################################################
 
    Algorithms - A set of misc algorithms


@@ -27,34 +27,51 @@
 
    ##################################################################### */
                                                                        /*}}}*/
 
    ##################################################################### */
                                                                        /*}}}*/

-// Header section: pkglib

 #ifndef PKGLIB_ALGORITHMS_H
 #define PKGLIB_ALGORITHMS_H
 
 #ifndef PKGLIB_ALGORITHMS_H
 #define PKGLIB_ALGORITHMS_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/algorithms.h"
-#endif 

 
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/depcache.h>
 
 
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/depcache.h>
 

+#include <iostream>
+
+using std::ostream;
+

 class pkgSimulate : public pkgPackageManager
 {
    protected:
 
 class pkgSimulate : public pkgPackageManager
 {
    protected:
 

+   class Policy : public pkgDepCache::Policy
+   {
+      pkgDepCache *Cache;
+      public:
+      
+      virtual VerIterator GetCandidateVer(PkgIterator Pkg)
+      {
+        return (*Cache)[Pkg].CandidateVerIter(*Cache);
+      }
+      
+      Policy(pkgDepCache *Cache) : Cache(Cache) {};
+   };
+   

    unsigned char *Flags;
    
    unsigned char *Flags;
    

+   Policy iPolicy;

    pkgDepCache Sim;
    
    // The Actuall installation implementation
    virtual bool Install(PkgIterator Pkg,string File);
    virtual bool Configure(PkgIterator Pkg);
    pkgDepCache Sim;
    
    // The Actuall installation implementation
    virtual bool Install(PkgIterator Pkg,string File);
    virtual bool Configure(PkgIterator Pkg);

-   virtual bool Remove(PkgIterator Pkg);
+   virtual bool Remove(PkgIterator Pkg,bool Purge);
+
+private:

    void ShortBreaks();
    void ShortBreaks();

+   void Describe(PkgIterator iPkg,ostream &out,bool Current,bool Candidate);

    
    public:
 
    
    public:
 

-   pkgSimulate(pkgDepCache &Cache);
+   pkgSimulate(pkgDepCache *Cache);

 };
 
 class pkgProblemResolver
 };
 
 class pkgProblemResolver


@@ -68,7 +85,8 @@ class pkgProblemResolver
    typedef pkgCache::Package Package;
    
    enum Flags {Protected = (1 << 0), PreInstalled = (1 << 1),
    typedef pkgCache::Package Package;
    
    enum Flags {Protected = (1 << 0), PreInstalled = (1 << 1),

-               Upgradable = (1 << 2), ReInstateTried = (1 << 3)};
+               Upgradable = (1 << 2), ReInstateTried = (1 << 3),
+               ToRemove = (1 << 4)};

    signed short *Scores;
    unsigned char *Flags;
    bool Debug;
    signed short *Scores;
    unsigned char *Flags;
    bool Debug;


@@ -89,19 +107,28 @@ class pkgProblemResolver
    public:
    
    inline void Protect(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= Protected;};
    public:
    
    inline void Protect(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= Protected;};

-
+   inline void Remove(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= ToRemove;};
+   inline void Clear(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] &= ~(Protected | ToRemove);};
+   

    // Try to intelligently resolve problems by installing and removing packages   
    bool Resolve(bool BrokenFix = false);
    // Try to intelligently resolve problems by installing and removing packages   
    bool Resolve(bool BrokenFix = false);

-
+   

    // Try to resolve problems only by using keep
    bool ResolveByKeep();
    // Try to resolve problems only by using keep
    bool ResolveByKeep();

-      
-   pkgProblemResolver(pkgDepCache &Cache);
+
+   // Install all protected packages   
+   void InstallProtect();   
+   
+   pkgProblemResolver(pkgDepCache *Cache);
+   ~pkgProblemResolver();

 };
 
 bool pkgDistUpgrade(pkgDepCache &Cache);
 bool pkgApplyStatus(pkgDepCache &Cache);
 bool pkgFixBroken(pkgDepCache &Cache);
 bool pkgAllUpgrade(pkgDepCache &Cache);
 };
 
 bool pkgDistUpgrade(pkgDepCache &Cache);
 bool pkgApplyStatus(pkgDepCache &Cache);
 bool pkgFixBroken(pkgDepCache &Cache);
 bool pkgAllUpgrade(pkgDepCache &Cache);

+bool pkgMinimizeUpgrade(pkgDepCache &Cache);

 
 

+void pkgPrioSortList(pkgCache &Cache,pkgCache::Version **List);
+                    

 #endif
 #endif