maximize rather than minimize the rating.

darcs-hash:20070601183240-72aca-496237c05e03b76ae05495afb22b36ced21d7b60.gz

2 files changed, 6 insertions, 2 deletions

diff --git a/Anneal.hs b/Anneal.hs
index 52f7048..e35a90b 100644
--- a/Anneal.hs
+++ b/Anneal.hs
@@ -1,4 +1,5 @@
-module XMonadContrib.Anneal ( Rated(Rated), the_value, the_rating, anneal ) where
+module XMonadContrib.Anneal ( Rated(Rated), the_value, the_rating
+                            , anneal, annealMax ) where
 
 import System.Random ( StdGen, Random, mkStdGen, randomR )
 import Control.Monad.State ( State, runState, put, get, gets, modify )
@@ -21,6 +22,9 @@ instance Ord a => Ord (Rated a b) where
 anneal :: a -> (a -> Double) -> (a -> [a]) -> Rated Double a
 anneal st r sel = runAnneal st r (do_anneal sel)
 
+annealMax :: a -> (a -> Double) -> (a -> [a]) -> Rated Double a
+annealMax st r sel = runAnneal st (negate . r) (do_anneal sel)
+
 do_anneal :: (a -> [a]) -> State (Anneal a) (Rated Double a)
 do_anneal sel = do sequence_ $ replicate 100 da
                    gets best
diff --git a/Mosaic.hs b/Mosaic.hs
index 2b1e96b..1f1eda5 100644
--- a/Mosaic.hs
+++ b/Mosaic.hs
@@ -153,7 +153,7 @@ mosaicL f hints origRect origws
           mc_mosaic :: [NamedWindow] -> CutDirection
                          -> Rated Double (Mosaic (NamedWindow,Rectangle))
           mc_mosaic ws d = fmap (rect_mosaic origRect d) $
-                           anneal (zipML (example_mosaic ws) (map findarea ws))
+                           annealMax (zipML (example_mosaic ws) (map findarea ws))
                            (the_rating . rate_mosaic ratew . rect_mosaic origRect d )
                            changeMosaic