diff --git a/hw-balancedparens.cabal b/hw-balancedparens.cabal --- a/hw-balancedparens.cabal +++ b/hw-balancedparens.cabal @@ -1,5 +1,5 @@ name: hw-balancedparens -version: 0.1.0.2 +version: 0.2.0.0 synopsis: Balanced parentheses description: Please see README.md homepage: http://github.com/haskell-works/hw-balancedparens#readme @@ -32,7 +32,7 @@ , HaskellWorks.Data.BalancedParens.Simple build-depends: base >= 4 && < 5 , hw-bits >= 0.4.0.0 - , hw-excess >= 0.1.0.0 + , hw-excess >= 0.2.0.0 , hw-prim >= 0.4.0.0 , hw-rankselect-base >= 0.2.0.0 , storable-tuple diff --git a/src/HaskellWorks/Data/BalancedParens/RangeMinMax.hs b/src/HaskellWorks/Data/BalancedParens/RangeMinMax.hs --- a/src/HaskellWorks/Data/BalancedParens/RangeMinMax.hs +++ b/src/HaskellWorks/Data/BalancedParens/RangeMinMax.hs @@ -25,6 +25,7 @@ import HaskellWorks.Data.Bits.BitLength import HaskellWorks.Data.Bits.BitWise import HaskellWorks.Data.Excess.MinMaxExcess1 +import HaskellWorks.Data.Excess.Triplet import HaskellWorks.Data.Positioning import HaskellWorks.Data.RankSelect.Base.Rank0 import HaskellWorks.Data.RankSelect.Base.Rank1 @@ -88,18 +89,18 @@ lenL0 = lenBP lenL1 = (DVS.length rmmL0Min `div` pageSizeL1) + 1 :: Int lenL2 = (DVS.length rmmL0Min `div` pageSizeL2) + 1 :: Int - allMinMaxL0 = dvsConstructNI lenL0 (\i -> if i == lenBP then (-64, -64, 0) else minMaxExcess1 (bpv !!! fromIntegral i)) + allMinMaxL0 = dvsConstructNI lenL0 (\i -> if i == lenBP then Triplet (-64) (-64) 0 else minMaxExcess1 (bpv !!! fromIntegral i)) allMinMaxL1 = dvsConstructNI lenL1 (\i -> minMaxExcess1 (dropTake (i * pageSizeL1) pageSizeL1 bpv)) allMinMaxL2 = dvsConstructNI lenL2 (\i -> minMaxExcess1 (dropTake (i * pageSizeL2) pageSizeL2 bpv)) rmmL0Excess = dvsConstructNI lenL0 (\i -> fromIntegral (allExcess1 (pageFill i pageSizeL0 (-64) bpv))) :: DVS.Vector Int16 rmmL1Excess = dvsConstructNI lenL1 (\i -> fromIntegral (allExcess1 (pageFill i pageSizeL1 (-64) bpv))) :: DVS.Vector Int16 rmmL2Excess = dvsConstructNI lenL2 (\i -> fromIntegral (allExcess1 (pageFill i pageSizeL2 (-64) bpv))) :: DVS.Vector Int16 - rmmL0Min = dvsConstructNI lenL0 (\i -> let (minE, _, _) = allMinMaxL0 DVS.! i in fromIntegral minE) - rmmL1Min = dvsConstructNI lenL1 (\i -> let (minE, _, _) = allMinMaxL1 DVS.! i in fromIntegral minE) - rmmL2Min = dvsConstructNI lenL2 (\i -> let (minE, _, _) = allMinMaxL2 DVS.! i in fromIntegral minE) - rmmL0Max = dvsConstructNI lenL0 (\i -> let (_, _, maxE) = allMinMaxL0 DVS.! i in fromIntegral maxE) - rmmL1Max = dvsConstructNI lenL1 (\i -> let (_, _, maxE) = allMinMaxL1 DVS.! i in fromIntegral maxE) - rmmL2Max = dvsConstructNI lenL2 (\i -> let (_, _, maxE) = allMinMaxL2 DVS.! i in fromIntegral maxE) + rmmL0Min = dvsConstructNI lenL0 (\i -> let Triplet minE _ _ = allMinMaxL0 DVS.! i in fromIntegral minE) + rmmL1Min = dvsConstructNI lenL1 (\i -> let Triplet minE _ _ = allMinMaxL1 DVS.! i in fromIntegral minE) + rmmL2Min = dvsConstructNI lenL2 (\i -> let Triplet minE _ _ = allMinMaxL2 DVS.! i in fromIntegral minE) + rmmL0Max = dvsConstructNI lenL0 (\i -> let Triplet _ _ maxE = allMinMaxL0 DVS.! i in fromIntegral maxE) + rmmL1Max = dvsConstructNI lenL1 (\i -> let Triplet _ _ maxE = allMinMaxL1 DVS.! i in fromIntegral maxE) + rmmL2Max = dvsConstructNI lenL2 (\i -> let Triplet _ _ maxE = allMinMaxL2 DVS.! i in fromIntegral maxE) dropTake :: DVS.Storable a => Int -> Int -> DVS.Vector a -> DVS.Vector a dropTake n o = DVS.take o . DVS.drop n diff --git a/src/HaskellWorks/Data/BalancedParens/RangeMinMax2.hs b/src/HaskellWorks/Data/BalancedParens/RangeMinMax2.hs --- a/src/HaskellWorks/Data/BalancedParens/RangeMinMax2.hs +++ b/src/HaskellWorks/Data/BalancedParens/RangeMinMax2.hs @@ -11,28 +11,30 @@ , genMax ) where -import Data.Int +import Data.Int +import HaskellWorks.Data.AtIndex +import HaskellWorks.Data.BalancedParens.BalancedParens +import HaskellWorks.Data.BalancedParens.CloseAt +import HaskellWorks.Data.BalancedParens.Enclose +import HaskellWorks.Data.BalancedParens.FindClose +import HaskellWorks.Data.BalancedParens.FindCloseN +import HaskellWorks.Data.BalancedParens.FindOpen +import HaskellWorks.Data.BalancedParens.FindOpenN +import HaskellWorks.Data.BalancedParens.OpenAt +import HaskellWorks.Data.BalancedParens.NewCloseAt +import HaskellWorks.Data.Bits.AllExcess.AllExcess1 +import HaskellWorks.Data.Bits.BitLength +import HaskellWorks.Data.Bits.BitWise +import HaskellWorks.Data.Excess.MinMaxExcess1 +import HaskellWorks.Data.Excess.Triplet +import HaskellWorks.Data.Positioning +import HaskellWorks.Data.RankSelect.Base.Rank0 +import HaskellWorks.Data.RankSelect.Base.Rank1 +import HaskellWorks.Data.Vector.AsVector64 +import Prelude hiding (length) + import qualified Data.Vector as DV import qualified Data.Vector.Storable as DVS -import HaskellWorks.Data.AtIndex -import HaskellWorks.Data.BalancedParens.BalancedParens -import HaskellWorks.Data.BalancedParens.CloseAt -import HaskellWorks.Data.BalancedParens.Enclose -import HaskellWorks.Data.BalancedParens.FindClose -import HaskellWorks.Data.BalancedParens.FindCloseN -import HaskellWorks.Data.BalancedParens.FindOpen -import HaskellWorks.Data.BalancedParens.FindOpenN -import HaskellWorks.Data.BalancedParens.OpenAt -import HaskellWorks.Data.BalancedParens.NewCloseAt -import HaskellWorks.Data.Bits.AllExcess.AllExcess1 -import HaskellWorks.Data.Bits.BitLength -import HaskellWorks.Data.Bits.BitWise -import HaskellWorks.Data.Excess.MinMaxExcess1 -import HaskellWorks.Data.Positioning -import HaskellWorks.Data.RankSelect.Base.Rank0 -import HaskellWorks.Data.RankSelect.Base.Rank1 -import HaskellWorks.Data.Vector.AsVector64 -import Prelude hiding (length) data RangeMinMax2 a = RangeMinMax2 { rangeMinMax2BP :: !a @@ -119,18 +121,18 @@ lenL2 = (DVS.length rmmL0Min `div` pageSizeL2) + 1 :: Int lenL3 = (DVS.length rmmL0Min `div` pageSizeL3) + 1 :: Int lenL4 = (DVS.length rmmL0Min `div` pageSizeL4) + 1 :: Int - allMinMaxL0 = dvConstructNI lenL0 (\i -> if i == lenBP then (-64, -64, 0) else minMaxExcess1 (bpv !!! fromIntegral i)) + allMinMaxL0 = dvConstructNI lenL0 (\i -> if i == lenBP then Triplet (-64) (-64) 0 else minMaxExcess1 (bpv !!! fromIntegral i)) rmmL0Excess = dvsConstructNI lenL0 (\i -> fromIntegral (allExcess1 (pageFill i pageSizeL0 (-64) bpv))) :: DVS.Vector Int16 rmmL1Excess = dvsConstructNI lenL1 (\i -> fromIntegral (allExcess1 (pageFill i pageSizeL1 (-64) bpv))) :: DVS.Vector Int16 rmmL2Excess = dvsConstructNI lenL2 (\i -> fromIntegral (allExcess1 (pageFill i pageSizeL2 (-64) bpv))) :: DVS.Vector Int16 rmmL3Excess = dvsConstructNI lenL3 (\i -> fromIntegral (allExcess1 (pageFill i pageSizeL3 (-64) bpv))) :: DVS.Vector Int16 rmmL4Excess = dvsConstructNI lenL4 (\i -> fromIntegral (allExcess1 (pageFill i pageSizeL4 (-64) bpv))) :: DVS.Vector Int16 - rmmL0Min = dvsConstructNI lenL0 (\i -> let (minE, _, _) = allMinMaxL0 DV.! i in fromIntegral minE) :: DVS.Vector Int16 + rmmL0Min = dvsConstructNI lenL0 (\i -> let Triplet minE _ _ = allMinMaxL0 DV.! i in fromIntegral minE) :: DVS.Vector Int16 rmmL1Min = dvsConstructNI lenL1 (\i -> genMin 0 (pageFill i factorL1 0 rmmL0Min) (pageFill i factorL1 0 rmmL0Excess)) rmmL2Min = dvsConstructNI lenL2 (\i -> genMin 0 (pageFill i factorL2 0 rmmL1Min) (pageFill i factorL2 0 rmmL1Excess)) rmmL3Min = dvsConstructNI lenL3 (\i -> genMin 0 (pageFill i factorL3 0 rmmL2Min) (pageFill i factorL3 0 rmmL2Excess)) rmmL4Min = dvsConstructNI lenL4 (\i -> genMin 0 (pageFill i factorL4 0 rmmL3Min) (pageFill i factorL4 0 rmmL3Excess)) - rmmL0Max = dvsConstructNI lenL0 (\i -> let (_, _, maxE) = allMinMaxL0 DV.! i in fromIntegral maxE) :: DVS.Vector Int16 + rmmL0Max = dvsConstructNI lenL0 (\i -> let Triplet _ _ maxE = allMinMaxL0 DV.! i in fromIntegral maxE) :: DVS.Vector Int16 rmmL1Max = dvsConstructNI lenL1 (\i -> genMax 0 (pageFill i factorL1 0 rmmL0Max) (pageFill i factorL1 0 rmmL0Excess)) rmmL2Max = dvsConstructNI lenL2 (\i -> genMax 0 (pageFill i factorL2 0 rmmL1Max) (pageFill i factorL2 0 rmmL1Excess)) rmmL3Max = dvsConstructNI lenL3 (\i -> genMax 0 (pageFill i factorL3 0 rmmL2Max) (pageFill i factorL3 0 rmmL2Excess))