# HG changeset patch
# User Yasutaka Higa <e115763@ie.u-ryukyu.ac.jp>
# Date 1420360321 -32400
# Node ID 8c7bd8bf809214027011300878d29b1b99400d3e
# Parent  6635a513f81a93ecfa1b3fa7026d5e2cc5811000
Define DeltaWithLog

diff -r 6635a513f81a -r 8c7bd8bf8092 delta.hs
--- a/delta.hs	Sun Jan 04 17:20:33 2015 +0900
+++ b/delta.hs	Sun Jan 04 17:32:01 2015 +0900
@@ -51,11 +51,8 @@
 
 -- utils
 
-returnS :: (Show s) => s -> Delta s
-returnS x = Mono x
-
-returnSS :: (Show s) => s -> s -> Delta s
-returnSS x y = (returnS x) `deltaAppend` (returnS y)
+returnDD :: (Show s) => s -> s -> Delta s
+returnDD x y = (return x) `deltaAppend` (return y)
 
 deltaFromList :: [a] -> Delta a
 deltaFromList = (foldl1 deltaAppend) . (fmap return)
@@ -65,23 +62,23 @@
 
 generator :: Int -> Delta [Int]
 generator x = let intList = [1..x] in
-                  returnS intList
+                  return intList
 
 primeFilter :: [Int] -> Delta [Int]
 primeFilter xs = let primeList    = filter isPrime xs
                      refactorList = filter even xs    in
-                 returnSS primeList refactorList
+                 returnDD primeList refactorList
 
 count :: [Int] -> Delta Int
 count xs = let primeCount = length xs in
-           returnS primeCount
+           return primeCount
 
 primeCount :: Int -> Delta Int
 primeCount x = generator x >>= primeFilter >>= count
 
 bubbleSort :: [Int] -> Delta [Int]
-bubbleSort [] = returnS []
-bubbleSort xs = bubbleSort remainValue >>= (\xs -> returnSS (sortedValueL : xs)
+bubbleSort [] = return []
+bubbleSort xs = bubbleSort remainValue >>= (\xs -> returnDD (sortedValueL : xs)
                                                             (sortedValueR ++ xs))
     where
         maximumValue = maximum xs
@@ -136,7 +133,8 @@
 -- DeltaM examples
 
 -- DeltaM example utils
-type DeltaLog = Writer [String]
+type DeltaLog     = Writer [String]
+type DeltaWithLog = DeltaM DeltaLog
 
 returnW :: (Show a) => a -> DeltaLog a
 returnW x = do tell $ [show x]
@@ -151,19 +149,19 @@
 -- usage   : runWriter $ checkOut 0 $ primeCountM 30  -- run specific version
 --         : dmap runWriter $ primeCountM 30          -- run all version
 
-generatorM :: Int -> DeltaM DeltaLog [Int]
+generatorM :: Int -> DeltaWithLog [Int]
 generatorM x = let intList = returnW [1..x] in
                              DeltaM $ deltaFromList $  [intList, intList]
 
-primeFilterM :: [Int] -> DeltaM DeltaLog [Int]
+primeFilterM :: [Int] -> DeltaWithLog [Int]
 primeFilterM xs = let primeList    = filter isPrime xs
                       refactorList = filter even xs    in
                       DeltaM $ deltaFromList $ fmap returnW [primeList, refactorList]
 
 
-countM :: [Int] -> DeltaM DeltaLog Int
+countM :: [Int] -> DeltaWithLog Int
 countM xs = let primeCount = length xs in
                 DeltaM $ deltaFromList $ fmap returnW [primeCount, primeCount]
 
-primeCountM :: Int -> DeltaM DeltaLog Int
+primeCountM :: Int -> DeltaWithLog Int
 primeCountM x = generatorM x >>= primeFilterM >>= countM