local-search 0.0.1 → 0.0.2

raw patch · 7 files changed

+8/−15 lines, 7 files

Files

Control/Search/Local.hs +2/−5
Control/Search/Local/Example.hs +2/−2
Control/Search/Local/Navigator.hs +0/−1
Control/Search/Local/Neighbourhood.hs +1/−2
Control/Search/Local/Transformation.hs +0/−2
Control/Search/Local/Tree.hs +1/−1
local-search.cabal +2/−2

Control/Search/Local.hs view

@@ -42,16 +42,13 @@   sImprovement,    -- The internal tree, and accessor functions-  LSTree(LSTree),-  treeNodeName,-  treeNodeChildren, +  LSTree(LSTree,treeNodeName,treeNodeChildren),    mkTree,    -- Neighbourhoods and problem specific stuff   exchange,   basicExchange,-  priceSolution,-  NumericallyPriced+  NumericallyPriced(priceSolution) )where  import Control.Search.Local.Tree

Control/Search/Local/Example.hs view

@@ -13,7 +13,7 @@ -----------------------------------------------------------------------------   module Control.Search.Local.Example (-  main+  main,TSPTour ) where  import Control.Search.Local @@ -131,7 +131,7 @@      mapM_ print $ take 50 $ trans tree  {- | Finally a main function, to allow users to just run it and see what it does -}-+main :: IO() main = do g <- getStdGen           let tspmap = makeSymmetricTSPMap 10 10 g           let tourN = tourNeighbourhood basicExchange tspmap

Control/Search/Local/Navigator.hs view

@@ -28,7 +28,6 @@               | otherwise = treeNodeName t : (firstChoice (head (treeNodeChildren t)))       -- | Types left out of the next two parts because of compilation problems with type inference if included.- manualNavigator t =    do displayLSSpace t      putStr ": "

Control/Search/Local/Neighbourhood.hs view

@@ -18,8 +18,7 @@ module Control.Search.Local.Neighbourhood (   exchange,   basicExchange,-  priceSolution,-  NumericallyPriced+  NumericallyPriced(priceSolution) ) where  import Data.List

Control/Search/Local/Transformation.hs view

@@ -23,8 +23,6 @@   sImprovement ) where --- | Transformations for the trees, to capture specific characteristics of different local search algorithms.- import Control.Search.Local.Tree import Control.Search.Local.Neighbourhood import Data.List

Control/Search/Local/Tree.hs view

@@ -12,7 +12,7 @@ -----------------------------------------------------------------------------   module Control.Search.Local.Tree(-   LSTree(LSTree),treeNodeName,treeNodeChildren,mkTree+   LSTree(treeNodeName,treeNodeChildren,LSTree),mkTree )where  {- | A rose tree, but not currently using an optimised data structure, just this little

local-search.cabal view

@@ -1,6 +1,6 @@ Name:              local-search -Version:           0.0.1-Synopsis:          AA first attempt at generalised local search within Haskell, for applications in combinatorial optimisation. +Version:           0.0.2+Synopsis:          A first attempt at generalised local search within Haskell, for applications in combinatorial optimisation.  Description:       This library represents a first attempt at creating a generalised library for                    local (non-exhaustive) search in Haskell.  It is based on work presented to                    IFL2010, a draft of which is currently available on the homepage. The library