minView and maxView

Author: matthewleon

src/Data/Map.purs

@@ -18,6 +18,8 @@ module Data.Map
   , findMax
   , deleteMin
   , deleteMax
+  , minView
+  , maxView
   , foldSubmap
   , submap
   , fromFoldable
@@ -299,27 +301,75 @@ findMin = go Nothing
 -- |
 -- | Return an empty map if the map is empty.
 deleteMin :: forall k v. Ord k => Map k v -> Map k v
-deleteMin Leaf = Leaf
-deleteMin n = down Nil n
+deleteMin = maybe Leaf _.strippedMap <<< minView
+
+-- | Delete the pair with the greatest key. O(logn).
+-- |
+-- | Return an empty map if the map is empty.
+deleteMax :: forall k v. Ord k => Map k v -> Map k v
+deleteMax = maybe Leaf _.strippedMap <<< maxView
+
+-- | Retrieves the least key and the value corresponding to that key,
+-- | and the map stripped of that element. O(logn)
+-- |
+-- | Returns Nothing if the map is empty.
+minView
+  :: forall k v
+    . Ord k
+   => Map k v
+   -> Maybe { key :: k, value :: v, strippedMap :: Map k v}
+minView Leaf = Nothing
+minView n = Just $ down Nil n
   where
-  down :: List (TreeContext k v) -> Map k v -> Map k v
+  down
+    :: List (TreeContext k v)
+    -> Map k v
+    -> { key :: k, value :: v, strippedMap :: Map k v}
   down = unsafePartial \ctx -> case _ of
     Two left k v right ->
       case left, right of
-           Leaf, Leaf -> deleteUp ctx Leaf
+           Leaf, Leaf -> { key: k, value: v, strippedMap: deleteUp ctx Leaf }
            _   , _    -> down (Cons (TwoLeft k v right) ctx) left
     Three left k1 v1 mid k2 v2 right ->
       case left, mid, right of
-           Leaf, Leaf, Leaf -> fromZipper ctx (Two Leaf k2 v2 Leaf)
+           Leaf, Leaf, Leaf ->
+             { key: k1
+             , value: v1
+             , strippedMap: fromZipper ctx (Two Leaf k2 v2 Leaf)
+             }
            _   , _   , _    ->
               down (Cons (ThreeLeft k1 v1 mid k2 v2 right) ctx) left
 
--- | Delete the pair with the greatest key. O(logn).
+-- | Retrieves the greatest key and the value corresponding to that key,
+-- | and the map stripped of that element. O(logn)
 -- |
--- | Return an empty map if the map is empty.
-deleteMax :: forall k v. Ord k => Map k v -> Map k v
-deleteMax Leaf = Leaf
-deleteMax n = removeMaxNode Nil n
+-- | Returns Nothing if the map is empty.
+maxView
+  :: forall k v
+    . Ord k
+   => Map k v
+   -> Maybe { key :: k, value :: v, strippedMap :: Map k v}
+maxView Leaf = Nothing
+maxView n = Just $ down Nil n
+  where
+  down
+    :: List (TreeContext k v)
+    -> Map k v
+    -> { key :: k, value :: v, strippedMap :: Map k v}
+  down = unsafePartial \ctx -> case _ of
+    Two left k v right ->
+      case left, right of
+           Leaf, Leaf -> { key: k, value: v, strippedMap: deleteUp ctx Leaf }
+           _   , _    -> down (Cons (TwoRight left k v) ctx) right
+    Three left k1 v1 mid k2 v2 right ->
+      case left, mid, right of
+           Leaf, Leaf, Leaf ->
+             { key: k2
+             , value: v2
+             , strippedMap: fromZipper ctx (Two Leaf k1 v1 Leaf)
+             }
+           _   , _   , _    ->
+              down (Cons (ThreeRight left k1 v1 mid k2 v2) ctx) right
 
 -- | Fold over the entries of a given map where the key is between a lower and
 -- | an upper bound. Passing `Nothing` as either the lower or upper bound
@@ -526,13 +576,13 @@ pop k = down Nil
     Three _ _ _ _ k' v Leaf -> { key: k', value: v }
     Three _ _ _ _ _ _ right -> maxNode right
 
-
-removeMaxNode :: forall k v. Ord k => List (TreeContext k v) -> Map k v -> Map k v
-removeMaxNode = unsafePartial \ctx -> case _ of
-  Two Leaf _ _ Leaf -> deleteUp ctx Leaf
-  Two left k' v right -> removeMaxNode (Cons (TwoRight left k' v) ctx) right
-  Three Leaf k1 v1 Leaf _ _ Leaf -> deleteUp (Cons (TwoRight Leaf k1 v1) ctx) Leaf
-  Three left k1 v1 mid k2 v2 right -> removeMaxNode (Cons (ThreeRight left k1 v1 mid k2 v2) ctx) right
+  removeMaxNode :: List (TreeContext k v) -> Map k v -> Map k v
+  removeMaxNode = unsafePartial \ctx m ->
+    case m of
+      Two Leaf _ _ Leaf -> deleteUp ctx Leaf
+      Two left k' v right -> removeMaxNode (Cons (TwoRight left k' v) ctx) right
+      Three Leaf k1 v1 Leaf _ _ Leaf -> deleteUp (Cons (TwoRight Leaf k1 v1) ctx) Leaf
+      Three left k1 v1 mid k2 v2 right -> removeMaxNode (Cons (ThreeRight left k1 v1 mid k2 v2) ctx) right
 
 deleteUp :: forall k v. Ord k => List (TreeContext k v) -> Map k v -> Map k v
 deleteUp = unsafePartial \ctxs tree ->

test/Test/Data/Map.purs

@@ -9,11 +9,11 @@ import Control.Monad.Eff.Random (RANDOM)
 import Data.Array as A
 import Data.Foldable (foldl, for_, all)
 import Data.Function (on)
-import Data.List (List(Cons), groupBy, length, nubBy, singleton, sort, sortBy, tail, init)
+import Data.List (List(Cons), groupBy, length, nubBy, singleton, sort, sortBy, tail, init, uncons, unsnoc)
 import Data.List.NonEmpty as NEL
 import Data.Map as M
 import Data.Map.Gen (genMap)
-import Data.Maybe (Maybe(..), fromMaybe, maybe)
+import Data.Maybe (Maybe(..), fromMaybe, maybe, isNothing)
 import Data.NonEmpty ((:|))
 import Data.Tuple (Tuple(..), fst, uncurry)
 import Partial.Unsafe (unsafePartial)
@@ -277,6 +277,22 @@ mapTests = do
   quickCheck $ \(TestMap m :: TestMap String Int) ->
     M.deleteMax m == maybe m M.fromFoldable (init $ M.toAscUnfoldable m)
 
+  log "minView result is correct"
+  quickCheck $ \(TestMap m :: TestMap String Int) ->
+      case uncons (M.toAscUnfoldable m) of
+           Nothing -> isNothing $ M.minView m
+           Just {head: (Tuple k v), tail} -> unsafePartial
+             let Just {key: minK, value: minV, strippedMap: sM} = M.minView m
+             in minK == k && minV == v && sM == (M.fromFoldable tail)
+
+  log "maxView result is correct"
+  quickCheck $ \(TestMap m :: TestMap String Int) ->
+      case unsnoc (M.toAscUnfoldable m) of
+           Nothing -> isNothing $ M.minView m
+           Just {last: (Tuple k v), init} -> unsafePartial
+             let Just {key: maxK, value: maxV, strippedMap: sM} = M.maxView m
+             in maxK == k && maxV == v && sM == (M.fromFoldable init)
+
   log "mapWithKey is correct"
   quickCheck $ \(TestMap m :: TestMap String Int) -> let
     f k v = k <> show v