~ Merge selection module to bitfield.

4 files changed, 87 insertions, 98 deletions

diff --git a/bittorrent.cabal b/bittorrent.cabal
index b4da98a4..fdcfc6d9 100644
--- a/bittorrent.cabal
+++ b/bittorrent.cabal
@@ -44,7 +44,6 @@ library
                      , Network.BitTorrent.Tracker.Scrape
 
                      , Network.BitTorrent.Exchange
-                     , Network.BitTorrent.Exchange.Selection
 
   other-modules:       Network.BitTorrent.Internal
 
diff --git a/src/Data/Bitfield.hs b/src/Data/Bitfield.hs
index 1ceaf78b..3c278691 100644
--- a/src/Data/Bitfield.hs
+++ b/src/Data/Bitfield.hs
@@ -9,6 +9,21 @@
 --   bitfields. Bitfields are used to keep track indices of complete
 --   pieces either peer have or client have.
 --
+--   There are also commonly used piece seletion algorithms
+--   which used to find out which one next piece to download.
+--   Selectors considered to be used in the following order:
+--
+--     * Random first - at the start.
+--
+--     * Rarest first selection - performed to avoid situation when
+--     rarest piece is unaccessible.
+--
+--     * _End game_ seletion - performed after a peer has requested all
+--     the subpieces of the content.
+--
+--   Note that BitTorrent applies the strict priority policy for
+--   /subpiece/ or /blocks/ selection.
+--
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE RecordWildCards #-}
@@ -34,6 +49,13 @@ module Data.Bitfield
          -- * Serialization
        , fromBitmap, toBitmap
 
+         -- * Selection
+       , Selector
+       , selector, strategyClass
+
+       , strictFirst, strictLast
+       , rarestFirst, randomFirst, endGame
+
 #if  defined (TESTING)
          -- * Debug
        , mkBitfield
@@ -239,4 +261,67 @@ mkBitfield :: PieceCount -> [PieceIx] -> Bitfield
 mkBitfield s ixs = Bitfield {
     bfSize = s
   , bfSet  = S.splitGT (-1) $ S.splitLT s $ S.fromList ixs
-  }
\ No newline at end of file
+  }
+
+{-----------------------------------------------------------------------
+    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 have
+      |          have < threshold     = SCBeginning
+      | have + 1 % numerator have < 1 = SCReady
+    -- FIXME numerator have is not total count
+      |           otherwise           = SCEnd
+
+
+-- | Select the first available piece.
+strictFirst :: Selector
+strictFirst h a _ = findMin (difference a h)
+
+-- | Select the last available piece.
+strictLast :: Selector
+strictLast h a _ = 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
diff --git a/src/Network/BitTorrent/Exchange.hs b/src/Network/BitTorrent/Exchange.hs
index b23ca667..dd1f9d0b 100644
--- a/src/Network/BitTorrent/Exchange.hs
+++ b/src/Network/BitTorrent/Exchange.hs
@@ -33,12 +33,11 @@ import Data.Serialize as S
 
 import Network
 
-import Network.BitTorrent.Exchange.Selection
-import Network.BitTorrent.Exchange.Protocol
 
 import Network.BitTorrent.Internal
 import Network.BitTorrent.Extension
 import Network.BitTorrent.Peer
+import Network.BitTorrent.Exchange.Protocol
 import Data.Bitfield as BF
 import Data.Torrent
 
diff --git a/src/Network/BitTorrent/Exchange/Selection.hs b/src/Network/BitTorrent/Exchange/Selection.hs
deleted file mode 100644
index ef47876a..00000000
--- a/src/Network/BitTorrent/Exchange/Selection.hs
+++ /dev/null
@@ -1,94 +0,0 @@
--- TODO tests
--- |
---   Copyright   :  (c) Sam T. 2013
---   License     :  MIT
---   Maintainer  :  pxqr.sta@gmail.com
---   Stability   :  experimental
---   Portability :  portable
---
---   This module provides commonly used piece seletion algorithms
---   which used to find out which one next piece to download.
---   Selectors considered to be used in the following order:
---
---     * Random first - at the start.
---
---     * Rarest first selection - performed to avoid situation when
---     rarest piece is unaccessible.
---
---     * _End game_ seletion - performed after a peer has requested all
---     the subpieces of the content.
---
---   Note that BitTorrent applies the strict priority policy for
---   /subpiece/ or /blocks/ selection.
---
-module Network.BitTorrent.Exchange.Selection
-       ( Selector
-
-       -- * Construction
-       , selector, strategyClass
-
-       -- * Strategies
-       , strictFirst, strictLast
-       , rarestFirst, randomFirst, endGame
-       ) where
-
-import Data.Bitfield
-import Data.Ratio
-import Network.BitTorrent.Exchange.Protocol
-
-
-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 have
-      |          have < threshold     = SCBeginning
-      | have + 1 % numerator have < 1 = SCReady -- FIXME numerator have is not total count
-      |           otherwise           = SCEnd
-
-
--- | Select the first available piece.
-strictFirst :: Selector
-strictFirst h a _ = findMin (difference a h)
-
--- | Select the last available piece.
-strictLast :: Selector
-strictLast h a _ = 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