Move piece selection algorithms to separate module

1 files changed, 1 insertions, 71 deletions

diff --git a/src/Data/Torrent/Bitfield.hs b/src/Data/Torrent/Bitfield.hs
index c7ef0998..17278a2c 100644
--- a/src/Data/Torrent/Bitfield.hs
+++ b/src/Data/Torrent/Bitfield.hs
@@ -55,13 +55,6 @@ module Data.Torrent.Bitfield
        , fromBitmap, toBitmap
        , toList
 
-         -- * Selection
-       , Selector
-       , selector, strategyClass
-
-       , strictFirst, strictLast
-       , rarestFirst, randomFirst, endGame
-
 #if  defined (TESTING)
          -- * Debug
        , mkBitfield
@@ -78,7 +71,7 @@ import qualified Data.Vector.Unboxed as V
 import qualified Data.Vector.Unboxed.Mutable as VM
 import           Data.IntervalSet (IntSet)
 import qualified Data.IntervalSet as S
-import qualified  Data.IntervalSet.ByteString as S
+import qualified Data.IntervalSet.ByteString as S
 import           Data.List (foldl')
 import           Data.Monoid
 import           Data.Ratio
@@ -289,66 +282,3 @@ mkBitfield s ixs = Bitfield {
     bfSize = s
   , bfSet  = S.splitGT (-1) $ S.splitLT s $ S.fromList ixs
   }
-
-{-----------------------------------------------------------------------
-    Selection
------------------------------------------------------------------------}
-
-type Selector =  Bitfield      -- ^ Indices of client /have/ pieces.
-             ->  Bitfield      -- ^ Indices of peer /have/ pieces.
-             -> [Bitfield]     -- ^ Indices of other peers /have/ pieces.
-             -> Maybe PieceIx  -- ^ Zero-based index of piece to request
-                               --   to, if any.
-
-selector :: Selector       -- ^ Selector to use at the start.
-         -> Ratio PieceCount
-         -> Selector       -- ^ Selector to use after the client have
-                           -- the C pieces.
-         -> Selector       -- ^ Selector that changes behaviour based
-                           -- on completeness.
-selector start pt ready   h a xs =
-  case strategyClass pt h of
-    SCBeginning -> start h a xs
-    SCReady     -> ready h a xs
-    SCEnd       -> endGame h a xs
-
-data StartegyClass
-  = SCBeginning
-  | SCReady
-  | SCEnd
-    deriving (Show, Eq, Ord, Enum, Bounded)
-
-
-strategyClass :: Ratio PieceCount -> Bitfield -> StartegyClass
-strategyClass threshold = classify . completeness
-  where
-    classify c
-      |        c < threshold       = SCBeginning
-      | c + 1 % numerator c < 1    = SCReady
-    -- FIXME numerator have is not total count
-      |          otherwise         = SCEnd
-
-
--- | Select the first available piece.
-strictFirst :: Selector
-strictFirst h a _ = Just $ findMin (difference a h)
-
--- | Select the last available piece.
-strictLast :: Selector
-strictLast h a _ = Just $ findMax (difference a h)
-
--- |
-rarestFirst :: Selector
-rarestFirst h a xs = rarest (map (intersection want) xs)
-  where
-    want = difference h a
-
--- | In average random first is faster than rarest first strategy but
---    only if all pieces are available.
-randomFirst :: Selector
-randomFirst = do
---  randomIO
-  error "randomFirst"
-
-endGame :: Selector
-endGame = strictLast