packages feed

combinatorial-problems (empty) → 0.0.1

raw patch · 15 files changed

+2056/−0 lines, 15 filesdep +arraydep +basedep +containerssetup-changed

Dependencies added: array, base, containers, random

Files

+ CombinatorialOptimisation/SAT.hs view
@@ -0,0 +1,186 @@+-----------------------------------------------------------------------------+-- |+-- Module      :  CombinatorialOptimisation.SAT+-- Copyright   :  (c) Richard Senington 2011+-- License     :  GPL-style+-- +-- Maintainer  :  Richard Senington <sc06r2s@leeds.ac.uk>+-- Stability   :  provisional+-- Portability :  portable+-- +-- A library for the representation and manipulation of satisfiability problems.+-- Currently this is expected to only be 3-SAT however I do not think the +-- code is particularly limited to 3-SAT. The approach taken is that there+-- is a complex data structure called SATProblem, which contains both the +-- problem and the solution (settings of variables). In addition it contains +-- a number additional fields that allow for making changes quickly, such +-- as a table of clause positions. This is a Map from clause index to the +-- number of variable terms that are currently set to true. +--+-- Currently the only function for quickly changing a problem is the flipping +-- of a single variable. I think some other low level operations for finding +-- clauses not currently evaluating to true and so on would be useful.+----------------------------------------------------------------------------- ++{-# LANGUAGE ScopedTypeVariables #-}++module CombinatorialOptimisation.SAT(+  SATProblem(SATProblem,numClauses,numSATEDClauses,numVariables,variableLookUp,variablePosition,clausePosition,clauseLookUp),+  numUnSATEDClauses,getTrueFalseCount,summariseSAT,makeRandomSATProblem,flipVariable,satproblem,setAllVars,randomiseVariables+)where++import qualified Data.Map as M+import qualified Data.Array as A+import Data.List+import System.Random+import System.IO.Unsafe+import Data.Char++data SATProblem = SATProblem { numClauses :: Int,+                               numSATEDClauses :: Int,+                               numVariables :: Int,+                               variableLookUp :: Int->([Int],[Int]),+                               clauseLookUp :: Int->([Int],[Int]),+                               variablePosition :: M.Map Int Bool,+                               clausePosition :: M.Map Int Int}++instance Eq SATProblem where+  (==) s1 s2 = (numSATEDClauses s1) == (numSATEDClauses s2) && (variablePosition s1) == (variablePosition s2)++instance Ord SATProblem where+  compare s1 s2 = compare (numSATEDClauses s2) (numSATEDClauses s1)++instance Show SATProblem where+  show s = showSATLogic s ++"\n"++ showVARPosition s ++"\n"++ summariseSAT s++"\n"++(show $ getTrueFalseCount s)++{- |  For the purposes of getting a general impression of the state of the system, +      it returns the number of variables in the True, and False positions. -}++getTrueFalseCount :: SATProblem->(Int,Int)+getTrueFalseCount s = let ls = M.elems $ variablePosition s+                      in (length (filter (==True) ls),length (filter (==False) ls))++{- |  The number of unsatisfied clauses in the problem, the inverse of @numSATEDClauses@ -}++numUnSATEDClauses :: SATProblem->Int+numUnSATEDClauses s = numClauses s - numSATEDClauses s++{- |  Partial display function, for usage in show, this displays the logic of the problem. -}++showSATLogic :: SATProblem->String+showSATLogic s = concat (intersperse " /\\\n" (map writeClause [0 .. numClauses s -1])) ++ "\n"+  where+    writeClause c = let (as,bs) = clauseLookUp s c +                        (as',bs') = (map (\a->(a,' ')) as,map (\a->(a,'!')) bs)+                        cs = sortBy (\a b->compare (fst a) (fst b)) $ as' ++ bs'+                    in '(' : (concat $ intersperse " \\/ " $ [ d :'x':show c  | (c,d)<-cs]) ++ ")"++{- |  Partial display function, for usage in show, displays some general statistics about +      the solution status. -}++summariseSAT :: SATProblem->String+summariseSAT s = concat ["number of clauses : ",show (numClauses s),"\n",+                         "number of variables : ",show (numVariables s),"\n",+                         "satisfied clauses : ",show (numSATEDClauses s),"\n", +                         satMessage,"\n"]+  where+    sat = (numSATEDClauses s) == (numClauses s)+    satMessage = if sat then "SATisfied" else "unSATisfied"++{- |  Partial display function, for usage in show, displays the setting of each variable. -}++showVARPosition :: SATProblem->String+showVARPosition s = concat [concat ["  x",show v," = ",show t,"\n" ]   |(v,t)<- M.assocs (variablePosition s)]++{- |  Alternative constructor for the data structure. Takes only those elements that can +      not be derived and correctly initialises the other components, such as calculating +      how many clauses are currently evaluating to true. Requires the number of clauses,+      the number of variables, the lookup function for variables (variable index +      returning two lists, the first is the indexes of clauses in which this variable +      is present, the second list the indexes of clauses in which the inverse of this variable +      is present), the lookup table for clauses (clause index to lists of variable indexes) +      and the current settings of each variable. -}++satproblem :: Int->Int->(Int->([Int],[Int]))->(Int->([Int],[Int]))->M.Map Int Bool->SATProblem+satproblem nClauses nVars varLookup claLookup varPosition+  = SATProblem nClauses satClause nVars varLookup claLookup varPosition finalClausePosition+  where+    varList = [0 .. nVars -1]+    initialClausePositions = M.fromList $ zip [0 .. nClauses -1] $ repeat 0 +    finalClausePosition = foldl f M.empty [0 .. nVars -1]+    f m v = let (ords,negs) = varLookup v+                varPos = varPosition M.! v+            in if varPos then foldl (\m' c->M.adjust (+1) c m') m ords else foldl (\m' c->M.adjust (+1) c m') m negs+    satClause = sum $ map (\x->if x ==0 then 0 else 1) (M.elems finalClausePosition)++{- |  For rapid initialisation of problem instances. This fixes the setting of +      all variables to either true or false. The effect this has on the number +      of clauses that evaluate to true is unknown until it is carried out. -}++setAllVars :: Bool->SATProblem->SATProblem+setAllVars b s = satproblem (numClauses s) (numVariables s) (variableLookUp s) (clauseLookUp s) initialVarPosition+  where+    initialVarPosition = M.fromList $ zip [0 .. numVariables s -1] $ repeat b++{- |  For rapid initialisation of problem instances for usage in stochastic algorithms. +      Specifically expected to be used for genetic algorithms and other forms of +      stochastic meta-heuristic. -}++randomiseVariables :: RandomGen g=>g->SATProblem->SATProblem+randomiseVariables g s = satproblem (numClauses s) (numVariables s) (variableLookUp s) (clauseLookUp s) varpos  +  where+    varpos = M.fromList $ zip [0 .. (numVariables s) -1] $ (randoms g :: [Bool])++{- |  I am not sure how often this will be used in practice, as randomly created problems+      often seem to be quite easy to solve. Requires a source of random numbers, the number+      of variables and the number of clauses to create, in that order. It is assumed +      that 3-SAT problems are the type wanted. -} ++makeRandomSATProblem :: RandomGen g=>g->Int->Int->SATProblem+makeRandomSATProblem gen numVariables numClauses +  = satproblem numClauses numVariables varLookup claLookup initialVarPosition +  where+    initialVarPosition = M.fromList $ zip [0 .. numVariables -1] $ repeat False+    clauses = take numClauses $ nub (unfoldr generateRandomClause gen)+    generateRandomClause g = let f (ms,ns) gen'+                                   | length ms + length ns == 3 = (ms,ns,gen')+                                   | otherwise = let (l :: Int,gen'') = randomR (0,1) gen' +                                                     (n :: Int,gen''') = randomR (0,numVariables -1) gen''+                                                     already = elem n ms || elem n ns+                                                 in if already then f (ms,ns) gen'''+                                                               else if l ==0 then f (n:ms,ns) gen'''+                                                                             else f (ms,n:ns) gen'''+                                 (ords,negs,g') = f ([],[]) g+                             in Just ((sort ords,sort negs),g')+    emptyClauseData = M.fromList $ zip [0 .. numVariables -1] (repeat ([],[]))+    basicClauseLookup = foldl constructClauseLookup emptyClauseData $ zip [0..] clauses+    varLookup = ((A.listArray (0,numVariables-1) (M.elems basicClauseLookup)) A.!)+    constructClauseLookup m (clauseIndex,(ords,negs)) = let addNeg m' x = M.adjust (\(as,bs)->(as,clauseIndex:bs)) x m'+                                                            addOrd m' x = M.adjust (\(as,bs)->(clauseIndex:as,bs)) x m'+                                                        in foldl addNeg (foldl addOrd  m  ords) negs+    claLookup = ((A.listArray (0,numVariables-1) clauses) A.!)++{- |  The first low level operation. Takes a problem and changes the +      setting of the indexed variable from true to false. This is +      expected to be used in conjunction with other program logic+      to select which index to flip. -}+                                                        +flipVariable :: Int->SATProblem->(SATProblem,Int)+flipVariable v s +  = let modifiedVarPos = M.insert v changedVar (variablePosition s)+    in (s{numSATEDClauses=numSATEDClauses s + overAllChange,variablePosition=modifiedVarPos,clausePosition=modifiedClausePos},overAllChange)+  where+    overAllChange = ordChange + negChange+    changedVar  = not $ (variablePosition s) M.! v+    (ords,negs) = (variableLookUp s) v+    cp = clausePosition s+    (cp',ordChange) = if changedVar then foldl countInc (cp,0) ords else foldl countDec (cp,0) ords+    (modifiedClausePos,negChange) = if changedVar then foldl countDec (cp',0) negs else foldl countInc (cp',0) negs+    countInc (positions,counter) i = let current =  positions M.! i+                                         counter' = if current == 0 then counter+1 else counter+                                     in (M.insert i (current+1) positions,counter')+    countDec (positions,counter) i = let current =  positions M.! i+                                         counter' = if current == 1 then counter-1 else counter+                                     in (M.insert i (current-1) positions,counter')++
+ CombinatorialOptimisation/SAT.hs~ view
@@ -0,0 +1,186 @@+-----------------------------------------------------------------------------+-- |+-- Module      :  CombinatorialOptimisation.SAT+-- Copyright   :  (c) Richard Senington 2011+-- License     :  GPL-style+-- +-- Maintainer  :  Richard Senington <sc06r2s@leeds.ac.uk>+-- Stability   :  provisional+-- Portability :  portable+-- +-- A library for the representation and manipulation of satisfiability problems.+-- Currently this is expected to only be 3-SAT however I do not think the +-- code is particularly limited to 3-SAT. The approach taken is that there+-- is a complex data structure called SATProblem, which contains both the +-- problem and the solution (settings of variables). In addition it contains +-- a number additional fields that allow for making changes quickly, such +-- as a table of clause positions. This is a Map from clause index to the +-- number of variable terms that are currently set to true. +--+-- Currently the only function for quickly changing a problem is the flipping +-- of a single variable. I think some other low level operations for finding +-- clauses not currently evaluating to true and so on would be useful.+----------------------------------------------------------------------------- ++{-# LANGUAGE ScopedTypeVariables #-}++module CombinatorialOptimisation.SAT(+  SATProblem(SATProblem,numClauses,numSATEDClauses,numVariables,variableLookUp,variablePosition,clausePosition,clauseLookUp),+  numUnSATEDClauses,getTrueFalseCount,summariseSAT,makeRandomSATProblem,flipVariable,satproblem,setAllVars,randomiseVariables+)where++import qualified Data.Map as M+import qualified Data.Array as A+import Data.List+import System.Random+import System.IO.Unsafe+import Data.Char++data SATProblem = SATProblem { numClauses :: Int,+                               numSATEDClauses :: Int,+                               numVariables :: Int,+                               variableLookUp :: Int->([Int],[Int]),+                               clauseLookUp :: Int->([Int],[Int]),+                               variablePosition :: M.Map Int Bool,+                               clausePosition :: M.Map Int Int}++instance Eq SATProblem where+  (==) s1 s2 = (numSATEDClauses s1) == (numSATEDClauses s2) && (variablePosition s1) == (variablePosition s2)++instance Ord SATProblem where+  compare s1 s2 = compare (numSATEDClauses s2) (numSATEDClauses s1)++instance Show SATProblem where+  show s = showSATLogic s ++"\n"++ showVARPosition s ++"\n"++ summariseSAT s++"\n"++(show $ getTrueFalseCount s)++{- |  For the purposes of getting a general impression of the state of the system, +      it returns the number of variables in the True, and False positions. -}++getTrueFalseCount :: SATProblem->(Int,Int)+getTrueFalseCount s = let ls = M.elems $ variablePosition s+                      in (length (filter (==True) ls),length (filter (==False) ls))++{- |  The number of unsatisfied clauses in the problem, the inverse of numSATEDClauses -}++numUnSATEDClauses :: SATProblem->Int+numUnSATEDClauses s = numClauses s - numSATEDClauses s++{- |  Partial display function, for usage in show, this displays the logic of the problem. -}++showSATLogic :: SATProblem->String+showSATLogic s = concat (intersperse " /\\\n" (map writeClause [0 .. numClauses s -1])) ++ "\n"+  where+    writeClause c = let (as,bs) = clauseLookUp s c +                        (as',bs') = (map (\a->(a,' ')) as,map (\a->(a,'!')) bs)+                        cs = sortBy (\a b->compare (fst a) (fst b)) $ as' ++ bs'+                    in '(' : (concat $ intersperse " \\/ " $ [ d :'x':show c  | (c,d)<-cs]) ++ ")"++{- |  Partial display function, for usage in show, displays some general statistics about +      the solution status. -}++summariseSAT :: SATProblem->String+summariseSAT s = concat ["number of clauses : ",show (numClauses s),"\n",+                         "number of variables : ",show (numVariables s),"\n",+                         "satisfied clauses : ",show (numSATEDClauses s),"\n", +                         satMessage,"\n"]+  where+    sat = (numSATEDClauses s) == (numClauses s)+    satMessage = if sat then "SATisfied" else "unSATisfied"++{- |  Partial display function, for usage in show, displays the setting of each variable. -}++showVARPosition :: SATProblem->String+showVARPosition s = concat [concat ["  x",show v," = ",show t,"\n" ]   |(v,t)<- M.assocs (variablePosition s)]++{- |  Alternative constructor for the data structure. Takes only those elements that can +      not be derived and correctly initialises the other components, such as calculating +      how many clauses are currently evaluating to true. Requires the number of clauses,+      the number of variables, the lookup function for variables (variable index +      returning two lists, the first is the indexes of clauses in which this variable +      is present, the second list the indexes of clauses in which the inverse of this variable +      is present), the lookup table for clauses (clause index to lists of variable indexes) +      and the current settings of each variable. -}++satproblem :: Int->Int->(Int->([Int],[Int]))->(Int->([Int],[Int]))->M.Map Int Bool->SATProblem+satproblem nClauses nVars varLookup claLookup varPosition+  = SATProblem nClauses satClause nVars varLookup claLookup varPosition finalClausePosition+  where+    varList = [0 .. nVars -1]+    initialClausePositions = M.fromList $ zip [0 .. nClauses -1] $ repeat 0 +    finalClausePosition = foldl f M.empty [0 .. nVars -1]+    f m v = let (ords,negs) = varLookup v+                varPos = varPosition M.! v+            in if varPos then foldl (\m' c->M.adjust (+1) c m') m ords else foldl (\m' c->M.adjust (+1) c m') m negs+    satClause = sum $ map (\x->if x ==0 then 0 else 1) (M.elems finalClausePosition)++{- |  For rapid initialisation of problem instances. This fixes the setting of +      all variables to either true or false. The effect this has on the number +      of clauses that evaluate to true is unknown until it is carried out. -}++setAllVars :: Bool->SATProblem->SATProblem+setAllVars b s = satproblem (numClauses s) (numVariables s) (variableLookUp s) (clauseLookUp s) initialVarPosition+  where+    initialVarPosition = M.fromList $ zip [0 .. numVariables s -1] $ repeat b++{- |  For rapid initialisation of problem instances for usage in stochastic algorithms. +      Specifically expected to be used for genetic algorithms and other forms of +      stochastic meta-heuristic. -}++randomiseVariables :: RandomGen g=>g->SATProblem->SATProblem+randomiseVariables g s = satproblem (numClauses s) (numVariables s) (variableLookUp s) (clauseLookUp s) varpos  +  where+    varpos = M.fromList $ zip [0 .. (numVariables s) -1] $ (randoms g :: [Bool])++{- |  I am not sure how often this will be used in practice, as randomly created problems+      often seem to be quite easy to solve. Requires a source of random numbers, the number+      of variables and the number of clauses to create, in that order. It is assumed +      that 3-SAT problems are the type wanted. -} ++makeRandomSATProblem :: RandomGen g=>g->Int->Int->SATProblem+makeRandomSATProblem gen numVariables numClauses +  = satproblem numClauses numVariables varLookup claLookup initialVarPosition +  where+    initialVarPosition = M.fromList $ zip [0 .. numVariables -1] $ repeat False+    clauses = take numClauses $ nub (unfoldr generateRandomClause gen)+    generateRandomClause g = let f (ms,ns) gen'+                                   | length ms + length ns == 3 = (ms,ns,gen')+                                   | otherwise = let (l :: Int,gen'') = randomR (0,1) gen' +                                                     (n :: Int,gen''') = randomR (0,numVariables -1) gen''+                                                     already = elem n ms || elem n ns+                                                 in if already then f (ms,ns) gen'''+                                                               else if l ==0 then f (n:ms,ns) gen'''+                                                                             else f (ms,n:ns) gen'''+                                 (ords,negs,g') = f ([],[]) g+                             in Just ((sort ords,sort negs),g')+    emptyClauseData = M.fromList $ zip [0 .. numVariables -1] (repeat ([],[]))+    basicClauseLookup = foldl constructClauseLookup emptyClauseData $ zip [0..] clauses+    varLookup = ((A.listArray (0,numVariables-1) (M.elems basicClauseLookup)) A.!)+    constructClauseLookup m (clauseIndex,(ords,negs)) = let addNeg m' x = M.adjust (\(as,bs)->(as,clauseIndex:bs)) x m'+                                                            addOrd m' x = M.adjust (\(as,bs)->(clauseIndex:as,bs)) x m'+                                                        in foldl addNeg (foldl addOrd  m  ords) negs+    claLookup = ((A.listArray (0,numVariables-1) clauses) A.!)++{- |  The first low level operation. Takes a problem and changes the +      setting of the indexed variable from true to false. This is +      expected to be used in conjunction with other program logic+      to select which index to flip. -}+                                                        +flipVariable :: Int->SATProblem->(SATProblem,Int)+flipVariable v s +  = let modifiedVarPos = M.insert v changedVar (variablePosition s)+    in (s{numSATEDClauses=numSATEDClauses s + overAllChange,variablePosition=modifiedVarPos,clausePosition=modifiedClausePos},overAllChange)+  where+    overAllChange = ordChange + negChange+    changedVar  = not $ (variablePosition s) M.! v+    (ords,negs) = (variableLookUp s) v+    cp = clausePosition s+    (cp',ordChange) = if changedVar then foldl countInc (cp,0) ords else foldl countDec (cp,0) ords+    (modifiedClausePos,negChange) = if changedVar then foldl countDec (cp',0) negs else foldl countInc (cp',0) negs+    countInc (positions,counter) i = let current =  positions M.! i+                                         counter' = if current == 0 then counter+1 else counter+                                     in (M.insert i (current+1) positions,counter')+    countDec (positions,counter) i = let current =  positions M.! i+                                         counter' = if current == 1 then counter-1 else counter+                                     in (M.insert i (current-1) positions,counter')++
+ CombinatorialOptimisation/TSP.hs view
@@ -0,0 +1,262 @@+-----------------------------------------------------------------------------+-- |+-- Module      :  CombinatorialOptimisation.TSP+-- Copyright   :  (c) Richard Senington 2011+-- License     :  GPL-style+-- +-- Maintainer  :  Richard Senington <sc06r2s@leeds.ac.uk>+-- Stability   :  provisional+-- Portability :  portable+-- +-- A library for the representation and manipulation of travelling salesperson+-- problems.+-- The approach taken is the creation of a complex data structure called +-- TSPProblem which contains both the problem, the current solution and +-- the current value of the route.+-- The route is stored as a dictionary (@Data.Map@) of vertex indexes+-- to a pair of values, the previous vertex and the next vertex in the+-- sequence. This is to facilitate changing the route quickly, and+-- avoid searching for data in lists.+--+-- The data structure also contains two additional fields, the +-- @routeElementToIndex@ and @indexToRouteElement@ components.+-- These exist to allow manipulation either by the vertex number+-- or the position in the current solution. +-- Solutions are hamiltonian cycles.+-- For ease of reasoning it is recommended that users do not +-- attempt to move vertex 0, or index 0, so that solutions+-- are cycles from 0 to 0. I may change this in the future to +-- lock this down a bit. In the meantime, there is no+-- actual problem with making these changes, however +-- later manipulations may not match up clearly with +-- the way the show routines work.+--+-- Currently only two functions are provided for manipulating routes,+-- either by position in the sequence (@exchangeCitiesOnIndex@) or +-- by vertex name (@exchangeCities@).+--+-- I am not sure how this will clearly support meta-heuristics that+-- work by deleting edges and recombining subsequences. However +-- since I am storing association lists I think it should be possible +-- to make this work, I will worry about it later.+----------------------------------------------------------------------------- ++module CombinatorialOptimisation.TSP(+  TSPProblem(TSPProblem,currentPrice,routeMap,edgePrices,numCities,routeElementToIndex,indexToRouteElement),+  InternalStorage(ExplicitMatrix,TriangularMatrix,Recomputation),+  showEdgeWeights,+  exchangeCities,+  exchangeCitiesOnIndex,+  evaluateRouteNaive,+  randomiseRoute,+  setRoute,+  makeASymmetricTSPMap,+  makeSymmetricTSPMap,+  makeEuclideanTSPMap+)where++import qualified Data.Map as M+import qualified Data.Array as A+import System.Random+import Data.List++{- |  The data type for carrying the combination problem and solution to +      the TSP. The route is stored as a dictionary of associations +      from vertex name to a pair of values, the name of the preceding +      vertex and the next vertex. This forms an infinite loop, so +      use carefully.++      The @routeElementToIndex@\/@indexToRouteElement@ pair store +      fixed indexes to the cities. This is intended to allow +      a dumb heuristic to decide to switch elements 0 and 2, +      knowing they must be separated by 1 element, rather than+      vertices 0 and 2, which may be next to each other, or +      very different parts of the cycle.+-}++data TSPProblem = TSPProblem { currentPrice :: Float,+                               routeMap :: M.Map Int (Int,Int),+                               edgePrices :: (Int->Int->Float),+                               numCities :: Int,+                               routeElementToIndex :: M.Map Int Int,+                               indexToRouteElement :: M.Map Int Int+                             }++{- |  There are three possible internal storage forms. A full explicit matrix, an upper triangular matrix or recomputation +      from data points. The advantage of full explicit is speed, but it takes more memory. It is also the only option for +      asymmetric TSP problems. The triangular matrix is also fast, but can only be used in symmetric problems, and also +      still requires quite a bit of memory. Recomputation is the last option, it is slow because it is no longer a lookup+      table, but will take much less room. Can only be used with problems where the distance between two points can be+      calculated. Currently I am only supporting symmetric TSPs for this.+-}++data InternalStorage = ExplicitMatrix | TriangularMatrix | Recomputation deriving (Show,Eq) -- just in case I need these++instance Show TSPProblem where+  show t = concat ["TSPProblem of ",show . numCities $ t,+                   " cities\n    Current Solution ",show r,+                   "\n    Costing ",show . currentPrice $ t,"\n"]+    where+      rm = snd . ((M.!) (routeMap t))+      r = 0:(takeWhile (\x->x/=0) $ iterate rm (rm 0))++[0]++{- |  Converts the lookup table of a problem into a comma and newline delimited+      string. This should facilitate copying into spreadsheets for checking the +      problem being used and validating solutions by hand. -}++showEdgeWeights :: TSPProblem->String+showEdgeWeights t = headerRow ++ concatMap makeRow nc+  where+    ep = edgePrices t+    nc = [0 .. numCities t-1]+    headerRow = ',': concat (intersperse "," $ map show [0..numCities t-1]) ++ "\n"+    makeRow i = show i ++ "," ++ concat (intersperse "," [ show (ep i' i) |  i'<-nc]) ++"\n"++{- |  Will perform a switch of 2 cities in the path. This is by city name, not current index+      in the path. It looks up the current indexes by city name and passes the work off to +      @exchangeCitiesOnIndex@.  -}++exchangeCities :: Int->Int->TSPProblem->TSPProblem+exchangeCities a b t = exchangeCitiesOnIndex (min i1 i2) (max i1 i2) t +  where+    i1 = routeElementToIndex t M.! a+    i2 = routeElementToIndex t M.! b+ +{- |  Performs the bulk of the work for exchanging elements of the cycle.+      It assumes that the order of the indexes is increasing (e.g. 0 2 not 2 0).+      While changing the order it will also calculate the change in value of the +      route and update this. This is performed fairly efficiently by finding the +      edges being removed, and the edges being created and adding the difference +      between the two to the current price. -}++exchangeCitiesOnIndex :: Int->Int->TSPProblem->TSPProblem+exchangeCitiesOnIndex i1 i2 t +  | d == 0 = t+  | d == 1 = t{routeMap=rAdj,currentPrice=currentPrice t + priceChangeAdj,routeElementToIndex=t2',indexToRouteElement=t1'}+  | otherwise = t{routeMap=r',currentPrice=currentPrice t + priceChange,routeElementToIndex=t2',indexToRouteElement=t1'}+  where +    d = abs (i1 - i2)++    -- basic setup+    r = (routeMap t)+    a = indexToRouteElement t M.! i1+    b = indexToRouteElement t M.! i2+    p = edgePrices t+    ((a1,a2),(b1,b2)) = (r M.! a,r M.! b)++    -- usual code+    priceChange = sum [p a1 b,p b a2,p b1 a,p a b2] - sum [p a a2,p b b2,p a1 a,p b1 b]+    r' = foldl' (\m (k,f) -> M.adjust f k m) r [(a,\_->(b1,b2)),(b,\_->(a1,a2)),(a1,\(x,y)->(x,b)),(a2,\(x,y)->(b,y)),(b1,\(x,y)->(x,a)),(b2,\(x,y)->(a,y))]++    -- index exchange+    t1 = indexToRouteElement t+    t2 = routeElementToIndex t+    t2' = M.insert b i1 (M.insert a i2 t2) +    t1' = M.insert i1 b (M.insert i2 a t1) +    +    -- adjacent exchange, special case+    priceChangeAdj = sum [p a1 b,p b a,p a b2] - sum [p a1 a,p a b,p b b2]+    rAdj = foldl' (\m (k,f) -> M.adjust f k m) r [(a1,\(x,y)->(x,b)),(b2,\(x,y)->(a,y)),(a,\_->(b,b2)),(b,\_->(a1,a))]++{- |  A brute force recalculation of the current length of the path. Use sparingly.-}++evaluateRouteNaive :: TSPProblem->TSPProblem+evaluateRouteNaive t = t{currentPrice=evalRoute 0}+  where+    ep = edgePrices t+    rm = snd . ((M.!) (routeMap t))+    evalRoute x = let n = rm x+                  in if n==0 then ep x n +                             else ep x n + evalRoute n++{- |  Take a path through the system and a problem, insert the path into the system, +      calculating distances and setting up appropriate look up tables. It does not+      validate the list in terms of going through all the cities, or going through +      a city more than once (though this is likely to break other parts of the system +      very very fast). It does organise the list so that the starting node is vertex 0. ++      Uses the @evaluateRouteNaive@ to calculate the length of the path via a brute+      force method. This is not expected to be used frequently. -}++setRoute :: [Int]->TSPProblem->TSPProblem+setRoute path t = evaluateRouteNaive t{routeMap=newRoute,indexToRouteElement=in1,routeElementToIndex=in2} +  where+    l = dropWhile (/=0) $ cycle path +    l' = tail l+    l'' = tail l'+    (k,k':_) = span (\(_,x,_)->x/=0) $ zip3 l l' l''+    newRoute = foldl' (\m (a,b,c) -> M.insert b (a,c) m) M.empty (k':k)+    in1 = M.fromList $ zip [0..] (take (numCities t) l)+    in2 = M.fromList . (map swap) . M.assocs $ in1+    swap (a,b)  = (b,a)++{- |  Shuffles a simple list of cities and then passes off the work to setRoute. -}++randomiseRoute :: RandomGen g=>g->TSPProblem->TSPProblem+randomiseRoute g t = setRoute (0:map snd (sort (zip (randoms g :: [Float]) [1 .. numCities t -1]))) t  ++{- |  Construct a TSPProblem instance for an Asymmetric TSP. That is, the distance+      from A-B is the not necessarily the same as B-A. The actual route will +      not be set up initially, the dictionaries will be empty. This could be +      used directly for a global search system (branch and bound), or use in +      conjunction with @setRoute@ or @randomiseRoute@ to initialise for local search. +      Internal data structure is always fully explicit matrix.-}++makeASymmetricTSPMap :: RandomGen g=>(Float,Float)->Int->g->TSPProblem+makeASymmetricTSPMap distanceLimits numCities g +  = let cities = [0 ..(numCities-1)]+        cityCoords = [(a,b) | a<-cities,b<-cities,a/=b]+        matrix = M.fromList $ zip cityCoords (randomRs distanceLimits g)+        -- p' = (\x y->M.findWithDefault 0 (x,y) matrix)+        explicit = A.listArray (0,numCities*numCities-1)  [M.findWithDefault 0 (a,b) matrix | a<-cities,b<-cities]+    in TSPProblem 0 M.empty (\x y->explicit A.! (x * numCities + y)) numCities M.empty M.empty+    -- TSPProblem 0 M.empty p numCities M.empty M.empty++{- |  Construct a TSPProblem instance for a Symmetric TSP. That is, the distance+      from A-B is the same as B-A. The actual route will not be set up initially,+      the dictionaries will be empty. This could be used directly for a global +      search system (branch and bound), or use in conjunction with @setRoute@ or +      @randomiseRoute@ to initialise for local search. Should be noted that this+      does not create locations and calculate distances, but rather randomly +      assigns distances to each edge, making them symmetric. -}++makeSymmetricTSPMap :: RandomGen g=>InternalStorage->(Float,Float)->Int->g->TSPProblem+makeSymmetricTSPMap Recomputation _ _ _ = error "Cannot support recomputation, please use alternative storage, or makeEuclideanTSPMap"+makeSymmetricTSPMap storageType distanceLimits numCities g +  = let cities = [0 ..(numCities-1)]+        cityCoords = [(a,b) | a<-cities,b<-take (a+1) cities,a/=b ]+        f e ((a,b),c) = M.insert (b,a) c (M.insert (a,b) c e)+        matrix = foldl f M.empty (zip cityCoords (randomRs distanceLimits g))+        explicit = A.listArray (0,numCities*numCities-1)  [M.findWithDefault 0 (a,b) matrix | a<-cities,b<-cities]+        triangular = A.listArray (0,sum [0..numCities])  [M.findWithDefault 0 (a,b) matrix | a<-cities,b<-[0..a]]+        p = if storageType == ExplicitMatrix then (\x y->explicit A.! (x * numCities + y))+                                             else (\x y->let x' = min x y; y' = max x y in triangular A.! (div (y'*y'+y') 2 + x'))+    in TSPProblem 0 M.empty p numCities M.empty M.empty++{- |  Construct a TSPProblem instance for a Symmetric TSP. The route will not be+      initially set up, the dictionaries will be empty. This does create the +      vertices of the graph as points in a 2d space, and the lengths of edges +      are calculated, so this supports all internal storage types. +-}++makeEuclideanTSPMap :: RandomGen g=>InternalStorage->(Float,Float)->(Float,Float)->Int->g->TSPProblem+makeEuclideanTSPMap storageType xRange yRange numCities g +  = let cities = [0 ..(numCities-1)]+        (genA,genB) = split g+        positions = take numCities $ zip (randomRs xRange genA) (randomRs yRange genB)+        posArr = A.listArray (0 , numCities-1) positions++        explicit = A.listArray (0,numCities*numCities-1)  [euclidianDistance (posArr A.! a) (posArr A.! b) | a<-cities,b<-cities]+        triangular = A.listArray (0,sum [0..numCities])  [euclidianDistance (posArr A.! a) (posArr A.! b) | a<-cities,b<-[0..a]]++        p = case storageType of+              ExplicitMatrix -> \x y->explicit A.! (x * numCities + y)+              TriangularMatrix -> (\x y->let x' = min x y; y' = max x y in triangular A.! (div (y'*y'+y') 2 + x'))+              Recomputation -> \a b->if a == b then 0 else euclidianDistance (posArr A.! a) (posArr A.! b)+    in TSPProblem 0 M.empty p numCities M.empty M.empty+  where+    euclidianDistance :: (Float,Float)->(Float,Float)->Float+    euclidianDistance (a,b) (c,d) = sqrt ((a-c)*(a-c)+(b-d)*(b-d))+        ++
+ CombinatorialOptimisation/TSP.hs~ view
@@ -0,0 +1,262 @@+-----------------------------------------------------------------------------+-- |+-- Module      :  CombinatorialOptimisation.TSP+-- Copyright   :  (c) Richard Senington 2011+-- License     :  GPL-style+-- +-- Maintainer  :  Richard Senington <sc06r2s@leeds.ac.uk>+-- Stability   :  provisional+-- Portability :  portable+-- +-- A library for the representation and manipulation of traveling salesperson+-- problems.+-- The approach taken is the creation of a complex data structure called +-- TSPProblem which contains both the problem, the current solution and +-- the current value of the route.+-- The route is stored as a dictionary (@Data.Map@) of vertex indexes+-- to a pair of values, the previous vertex and the next vertex in the+-- sequence. This is to facilitate changing the route quickly, and+-- avoid searching for data in lists.+--+-- The data structure also contains two additonal fields, the +-- @routeElementToIndex@ and @indexToRouteElement@ components.+-- These exist to allow manipulation either by the vertex number+-- or the position in the current solution. +-- Solutions are hamiltonian cycles.+-- For ease of reasoning it is recomended that users do not +-- attempt to move vertex 0, or index 0, so that solutions+-- are cycles from 0 to 0. I may change this in the future to +-- lock this down a bit. In the meantime, there is no+-- actual problem with making these changes, however +-- later manipulations may not match up clearly with +-- the way the show routines work.+--+-- Currently only two functions are provided for manipulating routes,+-- either by position in the sequence (@exchangeCitiesOnIndex@) or +-- by vertex name (@exchangeCities@).+--+-- I am not sure how this will clearly support meta-heuristics that+-- work by deleting edges and recombining subsequences. However +-- since I am storing association lists I think it should be possible +-- to make this work, I will worry about it later.+----------------------------------------------------------------------------- ++module CombinatorialOptimisation.TSP(+  TSPProblem(TSPProblem,currentPrice,routeMap,edgePrices,numCities,routeElementToIndex,indexToRouteElement),+  InternalStorage(ExplicitMatrix,TriangularMatrix,Recomputation),+  showEdgeWeights,+  exchangeCities,+  exchangeCitiesOnIndex,+  evaluateRouteNaive,+  randomiseRoute,+  setRoute,+  makeASymmetricTSPMap,+  makeSymmetricTSPMap,+  makeEuclideanTSPMap+)where++import qualified Data.Map as M+import qualified Data.Array as A+import System.Random+import Data.List++{- |  The data type for carrying the combination problem and solution to +      the TSP. The route is stored as a dictionary of associations +      from vertex name to a pair of values, the name of the preceding +      vertex and the next vertex. This forms an infinite loop, so +      use carefully.++      The @routeElementToIndex@\/@indexToRouteElement@ pair store +      fixed indexes to the cities. This is intended to allow +      a dumb heuristic to decide to switch elements 0 and 2, +      knowing they must be separated by 1 element, rather than+      vertices 0 and 2, which may be next to each other, or +      very different parts of the cycle.+-}++data TSPProblem = TSPProblem { currentPrice :: Float,+                               routeMap :: M.Map Int (Int,Int),+                               edgePrices :: (Int->Int->Float),+                               numCities :: Int,+                               routeElementToIndex :: M.Map Int Int,+                               indexToRouteElement :: M.Map Int Int+                             }++{- |  There are three possible internal storage forms. A full explicit matrix, an upper triangular matrix or recomputation +      from data points. The advantage of full explicit is speed, but it takes more memory. It is also the only option for +      asymmetric TSP problems. The triangular matrix is also fast, but can only be used in symmetric problems, and also +      still requires quite a bit of memory. Recomputation is the last option, it is slow because it is no longer a lookup+      table, but will take much less room. Can only be used with problems where the distance between two points can be+      calculated. Currently I am only supporting symmetric TSPs for this.+-}++data InternalStorage = ExplicitMatrix | TriangularMatrix | Recomputation deriving (Show,Eq) -- just in case I need these++instance Show TSPProblem where+  show t = concat ["TSPProblem of ",show . numCities $ t,+                   " cities\n    Current Solution ",show r,+                   "\n    Costing ",show . currentPrice $ t,"\n"]+    where+      rm = snd . ((M.!) (routeMap t))+      r = 0:(takeWhile (\x->x/=0) $ iterate rm (rm 0))++[0]++{- |  Converts the lookup table of a problem into a comma and newline deliminated+      string. This should facilitate copying into spreadsheets for checking the +      problem being used and validating solutions by hand. -}++showEdgeWeights :: TSPProblem->String+showEdgeWeights t = headerRow ++ concatMap makeRow nc+  where+    ep = edgePrices t+    nc = [0 .. numCities t-1]+    headerRow = ',': concat (intersperse "," $ map show [0..numCities t-1]) ++ "\n"+    makeRow i = show i ++ "," ++ concat (intersperse "," [ show (ep i' i) |  i'<-nc]) ++"\n"++{- |  Will perform a switch of 2 cities in the path. This is by city name, not current index+      in the path. It looks up the current indexes by city name and passes the work off to +      @exchangeCitiesOnIndex@.  -}++exchangeCities :: Int->Int->TSPProblem->TSPProblem+exchangeCities a b t = exchangeCitiesOnIndex (min i1 i2) (max i1 i2) t +  where+    i1 = routeElementToIndex t M.! a+    i2 = routeElementToIndex t M.! b+ +{- |  Performs the bulk of the work for exchanging elements of the cycle.+      It assumes that the order of the indexes is increasing (e.g. 0 2 not 2 0).+      While changing the order it will also calculate the change in value of the +      route and update this. This is performed fairly efficiently by finding the +      edges being removed, and the edges being created and adding the difference +      between the two to the current price. -}++exchangeCitiesOnIndex :: Int->Int->TSPProblem->TSPProblem+exchangeCitiesOnIndex i1 i2 t +  | d == 0 = t+  | d == 1 = t{routeMap=rAdj,currentPrice=currentPrice t + priceChangeAdj,routeElementToIndex=t2',indexToRouteElement=t1'}+  | otherwise = t{routeMap=r',currentPrice=currentPrice t + priceChange,routeElementToIndex=t2',indexToRouteElement=t1'}+  where +    d = abs (i1 - i2)++    -- basic setup+    r = (routeMap t)+    a = indexToRouteElement t M.! i1+    b = indexToRouteElement t M.! i2+    p = edgePrices t+    ((a1,a2),(b1,b2)) = (r M.! a,r M.! b)++    -- usual code+    priceChange = sum [p a1 b,p b a2,p b1 a,p a b2] - sum [p a a2,p b b2,p a1 a,p b1 b]+    r' = foldl' (\m (k,f) -> M.adjust f k m) r [(a,\_->(b1,b2)),(b,\_->(a1,a2)),(a1,\(x,y)->(x,b)),(a2,\(x,y)->(b,y)),(b1,\(x,y)->(x,a)),(b2,\(x,y)->(a,y))]++    -- index exchange+    t1 = indexToRouteElement t+    t2 = routeElementToIndex t+    t2' = M.insert b i1 (M.insert a i2 t2) +    t1' = M.insert i1 b (M.insert i2 a t1) +    +    -- adjacent exchange, special case+    priceChangeAdj = sum [p a1 b,p b a,p a b2] - sum [p a1 a,p a b,p b b2]+    rAdj = foldl' (\m (k,f) -> M.adjust f k m) r [(a1,\(x,y)->(x,b)),(b2,\(x,y)->(a,y)),(a,\_->(b,b2)),(b,\_->(a1,a))]++{- |  A brute force recalculation of the current length of the path. Use sparingly.-}++evaluateRouteNaive :: TSPProblem->TSPProblem+evaluateRouteNaive t = t{currentPrice=evalRoute 0}+  where+    ep = edgePrices t+    rm = snd . ((M.!) (routeMap t))+    evalRoute x = let n = rm x+                  in if n==0 then ep x n +                             else ep x n + evalRoute n++{- |  Take a path through the system and a problem, insert the path into the system, +      calculating distances and setting up appropriate look up tables. It does not+      validate the list in terms of going through all the cities, or going through +      a city more than once (though this is likely to break other parts of the system +      very very fast). It does organise the list so that the starting node is vertex 0. ++      Uses the @evaluateRouteNaive@ to calculate the length of the path via a brute+      force method. This is not expected to be used frequently. -}++setRoute :: [Int]->TSPProblem->TSPProblem+setRoute path t = evaluateRouteNaive t{routeMap=newRoute,indexToRouteElement=in1,routeElementToIndex=in2} +  where+    l = dropWhile (/=0) $ cycle path +    l' = tail l+    l'' = tail l'+    (k,k':_) = span (\(_,x,_)->x/=0) $ zip3 l l' l''+    newRoute = foldl' (\m (a,b,c) -> M.insert b (a,c) m) M.empty (k':k)+    in1 = M.fromList $ zip [0..] (take (numCities t) l)+    in2 = M.fromList . (map swap) . M.assocs $ in1+    swap (a,b)  = (b,a)++{- |  Shuffles a simple list of cities and then passes off the work to setRoute. -}++randomiseRoute :: RandomGen g=>g->TSPProblem->TSPProblem+randomiseRoute g t = setRoute (0:map snd (sort (zip (randoms g :: [Float]) [1 .. numCities t -1]))) t  ++{- |  Construct a TSPProblem instance for an Asymmetric TSP. That is, the distance+      from A-B is the not necessarily the same as B-A. The actual route will +      not be set up initially, the dictionaries will be empty. This could be +      used directly for a global search system (branch and bound), or use in +      conjunction with @setRoute@ or @randomiseRoute@ to initialise for local search. +      Internal data structure is always fully explicit matrix.-}++makeASymmetricTSPMap :: RandomGen g=>(Float,Float)->Int->g->TSPProblem+makeASymmetricTSPMap distanceLimits numCities g +  = let cities = [0 ..(numCities-1)]+        cityCoords = [(a,b) | a<-cities,b<-cities,a/=b]+        matrix = M.fromList $ zip cityCoords (randomRs distanceLimits g)+        -- p' = (\x y->M.findWithDefault 0 (x,y) matrix)+        explicit = A.listArray (0,numCities*numCities-1)  [M.findWithDefault 0 (a,b) matrix | a<-cities,b<-cities]+    in TSPProblem 0 M.empty (\x y->explicit A.! (x * numCities + y)) numCities M.empty M.empty+    -- TSPProblem 0 M.empty p numCities M.empty M.empty++{- |  Construct a TSPProblem instance for a Symmetric TSP. That is, the distance+      from A-B is the same as B-A. The actual route will not be set up initially,+      the dictionaries will be empty. This could be used directly for a global +      search system (branch and bound), or use in conjunction with @setRoute@ or +      @randomiseRoute@ to initialise for local search. Should be noted that this+      does not create locations and calculate distances, but rather randomly +      assigns distances to each edge, making them symmetric. -}++makeSymmetricTSPMap :: RandomGen g=>InternalStorage->(Float,Float)->Int->g->TSPProblem+makeSymmetricTSPMap Recomputation _ _ _ = error "Cannot support recomputation, please use alternative storage, or makeEuclideanTSPMap"+makeSymmetricTSPMap storageType distanceLimits numCities g +  = let cities = [0 ..(numCities-1)]+        cityCoords = [(a,b) | a<-cities,b<-take (a+1) cities,a/=b ]+        f e ((a,b),c) = M.insert (b,a) c (M.insert (a,b) c e)+        matrix = foldl f M.empty (zip cityCoords (randomRs distanceLimits g))+        explicit = A.listArray (0,numCities*numCities-1)  [M.findWithDefault 0 (a,b) matrix | a<-cities,b<-cities]+        triangular = A.listArray (0,sum [0..numCities])  [M.findWithDefault 0 (a,b) matrix | a<-cities,b<-[0..a]]+        p = if storageType == ExplicitMatrix then (\x y->explicit A.! (x * numCities + y))+                                             else (\x y->let x' = min x y; y' = max x y in triangular A.! (div (y'*y'+y') 2 + x'))+    in TSPProblem 0 M.empty p numCities M.empty M.empty++{- |  Construct a TSPProblem instance for a Symmetric TSP. The route will not be+      initially set up, the dictionaries will be empty. This does create the +      vertices of the graph as points in a 2d space, and the lengths of edges +      are calculated, so this supports all internal storage types. +-}++makeEuclideanTSPMap :: RandomGen g=>InternalStorage->(Float,Float)->(Float,Float)->Int->g->TSPProblem+makeEuclideanTSPMap storageType xRange yRange numCities g +  = let cities = [0 ..(numCities-1)]+        (genA,genB) = split g+        positions = take numCities $ zip (randomRs xRange genA) (randomRs yRange genB)+        posArr = A.listArray (0 , numCities-1) positions++        explicit = A.listArray (0,numCities*numCities-1)  [euclidianDistance (posArr A.! a) (posArr A.! b) | a<-cities,b<-cities]+        triangular = A.listArray (0,sum [0..numCities])  [euclidianDistance (posArr A.! a) (posArr A.! b) | a<-cities,b<-[0..a]]++        p = case storageType of+              ExplicitMatrix -> \x y->explicit A.! (x * numCities + y)+              TriangularMatrix -> (\x y->let x' = min x y; y' = max x y in triangular A.! (div (y'*y'+y') 2 + x'))+              Recomputation -> \a b->if a == b then 0 else euclidianDistance (posArr A.! a) (posArr A.! b)+    in TSPProblem 0 M.empty p numCities M.empty M.empty+  where+    euclidianDistance :: (Float,Float)->(Float,Float)->Float+    euclidianDistance (a,b) (c,d) = sqrt ((a-c)*(a-c)+(b-d)*(b-d))+        ++
+ FileFormat/SATLIB.hs view
@@ -0,0 +1,67 @@+-----------------------------------------------------------------------------+-- |+-- Module      :  FileFormat.SATLIB+-- Copyright   :  (c) Richard Senington 2011+-- License     :  GPL-style+-- +-- Maintainer  :  Richard Senington <sc06r2s@leeds.ac.uk>+-- Stability   :  provisional+-- Portability :  portable+-- +-- The loading routines for the Conjunctive Normal Form (cnf) styled files+-- that can be found on the SATLIB website. Relies upon the+-- @CombinatorialOptimisation.SAT@ library for the data structures.+----------------------------------------------------------------------------- ++module FileFormat.SATLIB(loadCNFFile,saveAsCNF)where++import CombinatorialOptimisation.SAT++import Data.List+import qualified Data.Map as M+import qualified Data.Array as A++{- | Loading routine that takes the file path and returns a SATProblem. All variables will be set to false in the initial +setup, and the truth values of all clauses set appropriately. -}++loadCNFFile :: FilePath->IO(SATProblem)+loadCNFFile fName +  = do rawContents<-readFile fName+       let ls = (filter (\x->head x /= 'c')) $ lines rawContents+       let problemLine = words $ head $ filter (\x->head x == 'p') ls+       let (varCount,clauseCount) = if  problemLine !! 1 /= "cnf" then error "This is not a CNF file"+                                                                  else (read $ problemLine !! 2,read $ problemLine !! 3) :: (Int,Int)+       let clauseLines =  (map processClause) . (mySplit 0)   .  (map read) .  (concatMap words) . tail $ ls +       let clauseMap = foldl f (M.fromList (zip [0 .. varCount -1] $ repeat ([],[]))) (zip [0..] clauseLines)+       let varLook = ((A.listArray (0,varCount -1) (M.elems clauseMap)) A.!)+       let claLook = ((A.listArray (0,clauseCount -1) clauseLines) A.!)+       return $ satproblem clauseCount varCount varLook claLook (M.fromList $ zip [0 .. varCount -1] $ repeat False)+  where+    mySplit target xs = mySplit' [] xs+      where +        mySplit' [] [] =[]+        mySplit' ns [] = [reverse ns]+        mySplit' ns (x:xs) | x == target = (reverse ns) : mySplit' [] xs+                           | otherwise = mySplit' (x:ns) xs+    processClause cs = let (as,bs) = partition (>0) cs in (map ((+) (-1)) as,map ((+) (-1)) $ map abs bs)+    f m (clauseIndex,(ords,negs)) = let addNeg m' x = M.adjust (\(as,bs)->(as,clauseIndex:bs)) x m'+                                        addOrd m' x = M.adjust (\(as,bs)->(clauseIndex:as,bs)) x m'+                                    in foldl addNeg (foldl addOrd  m  ords) negs ++{- | Save routine for SATProblem, outputs back into SATLIB cnf format. The code @(loadCNFFile f) >>= (saveAsCNF f)@ should +have no effect upon the file. All information such as variable settings and the truth values of clauses is lost.+To save extra information use standard prelude write file function with show. I will try to improve on that +at some point. -}++saveAsCNF :: FilePath->SATProblem->IO ()+saveAsCNF fName s = writeFile fName $ fixedHeader++problemHeader++concatMap prepareClause [0.. (numClauses s)-1]+  where+    fixedHeader = concat ["c\n","c SAT instance in DIMACS CNF input format.\n","c\n"]+    problemHeader = concat ["p cnf ",show . numVariables $ s," ",show . numClauses $ s,"\n"]+    prepareClause c = let (as,bs) = clauseLookUp s c+                          (as',bs') = (map (\a->(a,a+1)) as,map (\a->(a,-(a+1))) bs)+                          cs = map snd (sortBy (\a b->compare (fst a) (fst b)) $ as' ++ bs')+                      in (init . init . concat $ [show k++"  " | k<-cs ++ [0]]) ++ "\n"+                         ++
+ FileFormat/SATLIB.hs~ view
@@ -0,0 +1,67 @@+-----------------------------------------------------------------------------+-- |+-- Module      :  FileFormat.SATLIB+-- Copyright   :  (c) Richard Senington 2011+-- License     :  GPL-style+-- +-- Maintainer  :  Richard Senington <sc06r2s@leeds.ac.uk>+-- Stability   :  provisional+-- Portability :  portable+-- +-- The loading routines for the Conjuntive Normal Form (cnf) styled files+-- that can be found on the SATLIB website. Relies upon the+-- @CombinatorialOptimisation.SAT@ library for the data structures.+----------------------------------------------------------------------------- ++module FileFormat.SATLIB(loadCNFFile,saveAsCNF)where++import CombinatorialOptimisation.SAT++import Data.List+import qualified Data.Map as M+import qualified Data.Array as A++{- | Loading routine that takes the file path and returns a SATProblem. All variables will be set to false in the initial +setup, and the truth values of all clauses set appropriately. -}++loadCNFFile :: FilePath->IO(SATProblem)+loadCNFFile fName +  = do rawContents<-readFile fName+       let ls = (filter (\x->head x /= 'c')) $ lines rawContents+       let problemLine = words $ head $ filter (\x->head x == 'p') ls+       let (varCount,clauseCount) = if  problemLine !! 1 /= "cnf" then error "This is not a CNF file"+                                                                  else (read $ problemLine !! 2,read $ problemLine !! 3) :: (Int,Int)+       let clauseLines =  (map processClause) . (mySplit 0)   .  (map read) .  (concatMap words) . tail $ ls +       let clauseMap = foldl f (M.fromList (zip [0 .. varCount -1] $ repeat ([],[]))) (zip [0..] clauseLines)+       let varLook = ((A.listArray (0,varCount -1) (M.elems clauseMap)) A.!)+       let claLook = ((A.listArray (0,clauseCount -1) clauseLines) A.!)+       return $ satproblem clauseCount varCount varLook claLook (M.fromList $ zip [0 .. varCount -1] $ repeat False)+  where+    mySplit target xs = mySplit' [] xs+      where +        mySplit' [] [] =[]+        mySplit' ns [] = [reverse ns]+        mySplit' ns (x:xs) | x == target = (reverse ns) : mySplit' [] xs+                           | otherwise = mySplit' (x:ns) xs+    processClause cs = let (as,bs) = partition (>0) cs in (map ((+) (-1)) as,map ((+) (-1)) $ map abs bs)+    f m (clauseIndex,(ords,negs)) = let addNeg m' x = M.adjust (\(as,bs)->(as,clauseIndex:bs)) x m'+                                        addOrd m' x = M.adjust (\(as,bs)->(clauseIndex:as,bs)) x m'+                                    in foldl addNeg (foldl addOrd  m  ords) negs ++{- | Save routine for SATProblem, outputs back into SATLIB cnf format. The code @(loadCNFFile f) >>= (saveAsCNF f)@ should +have no effect upon the file. All information such as variable settings and the truth values of clauses is lost.+To save extra information use standard prelude write file function with show. I will try to improve on that +at some point. -}++saveAsCNF :: FilePath->SATProblem->IO ()+saveAsCNF fName s = writeFile fName $ fixedHeader++problemHeader++concatMap prepareClause [0.. (numClauses s)-1]+  where+    fixedHeader = concat ["c\n","c SAT instance in DIMACS CNF input format.\n","c\n"]+    problemHeader = concat ["p cnf ",show . numVariables $ s," ",show . numClauses $ s,"\n"]+    prepareClause c = let (as,bs) = clauseLookUp s c+                          (as',bs') = (map (\a->(a,a+1)) as,map (\a->(a,-(a+1))) bs)+                          cs = map snd (sortBy (\a b->compare (fst a) (fst b)) $ as' ++ bs')+                      in (init . init . concat $ [show k++"  " | k<-cs ++ [0]]) ++ "\n"+                         ++
+ FileFormat/TSPLIB.hs view
@@ -0,0 +1,104 @@+module FileFormat.TSPLIB(+  loadTSPFile+  )where++-- only supports a subset of the TSPLIB format+-- not using real parsing libraries. This is probably a mistake.+-- also, still not using ByteString, also a misake.++import CombinatorialOptimisation.TSP+++-- load save of TSPLIB -- can only resave explicit data, could be cripling for big+-- data sets+++-- for those files where the co-ordinates of nodes are given+euclidianDistance :: (Float,Float)->(Float,Float)->Float+euclidianDistance (a,b) (c,d) = sqrt ((a-c)*(a-c)+(b-d)*(b-d))++geoDistance :: (Float,Float)->(Float,Float)->Float+geoDistance (x1,y1) (x2,y2) = encodeFloat (floor dij) 0+  where+    q1 = cos (lon1  - lon2)+    q2 = cos (lat1 - lat2)+    q3 = cos (lat1 + lat2)+    lon1 = degConvert y1+    lon2 = degConvert y2+    lat1 = degConvert x1+    lat2 = degConvert x2+    +    dij =  6378.388 * (acos( 0.5*((1.0+q1)*q2 - ((1.0-q1)*q3) )) ) + 1.0++    degConvert m = let deg = encodeFloat (floor m) 0+                       miN = m - deg+                   in 3.141592 * (deg + (5.0 * miN/3.0))/180.0+{-+readSpecification :: String->([(String,String)],String)+readSpecification s | name -> print?+                    | type -> TSP or ATSP only+                    | comment -> throw or print+                    | dimension Int+                    | capacity, not interested+                    | edge-weight-type -> Lots+                    | edge-weight-format+                    | edge-data-format+                    | node-coord-type+                    | display-data-type+                    | eof: end do not expect++-}++data Specification = IGNORE String | USEFUL String String | ENDSPEC String | FAIL String deriving Show++isUsefulSpec (USEFUL _ _) = True+isUsefulSpec _ = False++readSpecificationLine :: String->Specification+readSpecificationLine s +  | likeString "NAME" s = IGNORE s+  | likeString "TYPE" s = USEFUL "Type" (trim s)+  | likeString "NODE_COORD_SECTION" s = ENDSPEC "NODE COORD"+  | likeString "EDGE_WEIGHT_SECTION" s = ENDSPEC "EDGE WEIGHT"+  | likeString "COMMENT" s = IGNORE s+  | likeString "DIMENSION" s = USEFUL "Dimension" (trim s)+  | likeString "DISPLAY_DATA_TYPE" s = IGNORE s+  | likeString "EDGE_WEIGHT_TYPE" s = USEFUL "EdgeWeightType" (trim s)+  | otherwise = FAIL $ "unrecognised field in specification : "++s+  where+    likeString q s = take (length q) s == q+    trim s = let s' = (dropWhile (==' ')) . (drop 1) . (dropWhile (/=':')) $ s +             in reverse . (dropWhile (==' ')) . reverse $ s'++readSpecification :: [String]->([Specification],[String])+readSpecification [] = ([FAIL "seem to have run out of data, without ending the specification phase"],[]) +readSpecification (s:ss) = let p = readSpecificationLine s+                               (rs,es) = readSpecification ss+                           in case p of +                             ENDSPEC k  -> ([USEFUL "DATA PART TYPE" k],ss)+                             IGNORE _   -> (p:rs,es)+                             FAIL _     -> (p:rs,es)+                             USEFUL _ _ -> (p:rs,es)+ +loadTSPFile :: String->IO () -- TSPProblem+loadTSPFile fName = do rawContents<-readFile fName+                       let (spec,remainder) = readSpecification $ lines rawContents+                       mapM_ print spec+                       print ""+                       mapM_ print $ filter isUsefulSpec spec++{- +readEdgeWeightSection++FULL_MATRIX ++readEdgeWeightSection :: Num a=>String->Int->String->IO (Int->Int->Float)+readEdgeWeightSection ty dim inputData +  = do ++readNodeCoordSection :: Num a=>String->Int->String->IO (Int->Int->Float)+readNodeCoordSection dim inputData +  = do +                                              ++-}
+ FileFormat/TSPLIB.hs~ view
@@ -0,0 +1,105 @@+module FileFormat.TSPLIB(+  loadTSPFile+  )where++-- only supports a subset of the TSPLIB format+-- not using real parsing libraries. This is probably a mistake.+-- also, still not using ByteString, also a misake.++import CombinatorialOptimisation.TSP+++-- load save of TSPLIB -- can only resave explicit data, could be cripling for big+-- data sets+++-- for those files where the co-ordinates of nodes are given+euclidianDistance :: (Float,Float)->(Float,Float)->Float+euclidianDistance (a,b) (c,d) = sqrt ((a-c)*(a-c)+(b-d)*(b-d))++geoDistance :: (Float,Float)->(Float,Float)->Float+geoDistance (x1,y1) (x2,y2) = encodeFloat (floor dij) 0+  where+    q1 = cos (lon1  - lon2)+    q2 = cos (lat1 - lat2)+    q3 = cos (lat1 + lat2)+    lon1 = degConvert y1+    lon2 = degConvert y2+    lat1 = degConvert x1+    lat2 = degConvert x2+    +    dij =  6378.388 * (acos( 0.5*((1.0+q1)*q2 - ((1.0-q1)*q3) )) ) + 1.0++    degConvert m = let deg = encodeFloat (floor m) 0+                       miN = m - deg+                   in 3.141592 * (deg + (5.0 * miN/3.0))/180.0+{-+readSpecification :: String->([(String,String)],String)+readSpecification s | name -> print?+                    | type -> TSP or ATSP only+                    | comment -> throw or print+                    | dimension Int+                    | capacity, not interested+                    | edge-weight-type -> Lots+                    | edge-weight-format+                    | edge-data-format+                    | node-coord-type+                    | display-data-type+                    | eof: end do not expect++-}++data Specification = IGNORE String | USEFUL String String | ENDSPEC String | FAIL String deriving Show++isUsefulSpec (USEFUL _ _) = True+isUsefulSpec _ = False++readSpecificationLine :: String->Specification+readSpecificationLine s +  | likeString "NAME" s = IGNORE s+  | likeString "TYPE" s = USEFUL "Type" (trim s)+  | likeString "NODE_COORD_SECTION" s = ENDSPEC "NODE COORD"+  | likeString "EDGE_WEIGHT_SECTION" s = ENDSPEC "EDGE WEIGHT"+  | likeString "COMMENT" s = IGNORE s+  | likeString "DIMENSION" s = USEFUL "Dimension" (trim s)+  | likeString "DISPLAY_DATA_TYPE" s = IGNORE s+  | likeString "EDGE_WEIGHT_TYPE" s = USEFUL "EdgeWeightType" (trim s)+  | otherwise = FAIL $ "unrecognised field in specification : "++s+  where+    likeString q s = take (length q) s == q+    trim s = let s' = (dropWhile (==' ')) . (drop 1) . (dropWhile (/=':')) $ s +             in reverse . (dropWhile (==' ')) . reverse $ s'++readSpecification :: [String]->([Specification],[String])+readSpecification [] = ([FAIL "seem to have run out of data, without ending the specification phase"],[]) +readSpecification (s:ss) = let p = readSpecificationLine s+                               (rs,es) = readSpecification ss+                           in case p of +                             ENDSPEC k  -> ([USEFUL "DATA PART TYPE" k],ss)+                             IGNORE _   -> (p:rs,es)+                             FAIL _     -> (p:rs,es)+                             USEFUL _ _ -> (p:rs,es)+ ++loadTSPFile :: String->IO () -- TSPProblem+loadTSPFile fName = do rawContents<-readFile fName+                       let (spec,remainder) = readSpecification $ lines rawContents+                       mapM_ print spec+                       print ""+                       mapM_ print $ filter isUsefulSpec spec++{- +readEdgeWeightSection++FULL_MATRIX ++readEdgeWeightSection :: Num a=>String->Int->String->IO (Int->Int->Float)+readEdgeWeightSection ty dim inputData +  = do ++readNodeCoordSection :: Num a=>String->Int->String->IO (Int->Int->Float)+readNodeCoordSection dim inputData +  = do +                                              ++-}
+ LICENSE view
@@ -0,0 +1,674 @@+                    GNU GENERAL PUBLIC LICENSE+                       Version 3, 29 June 2007++ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>+ Everyone is permitted to copy and distribute verbatim copies+ of this license document, but changing it is not allowed.++                            Preamble++  The GNU General Public License is a free, copyleft license for+software and other kinds of works.++  The licenses for most software and other practical works are designed+to take away your freedom to share and change the works.  By contrast,+the GNU General Public License is intended to guarantee your freedom to+share and change all versions of a program--to make sure it remains free+software for all its users.  We, the Free Software Foundation, use the+GNU General Public License for most of our software; it applies also to+any other work released this way by its authors.  You can apply it to+your programs, too.++  When we speak of free software, we are referring to freedom, not+price.  Our General Public Licenses are designed to make sure that you+have the freedom to distribute copies of free software (and charge for+them if you wish), that you receive source code or can get it if you+want it, that you can change the software or use pieces of it in new+free programs, and that you know you can do these things.++  To protect your rights, we need to prevent others from denying you+these rights or asking you to surrender the rights.  Therefore, you have+certain responsibilities if you distribute copies of the software, or if+you modify it: responsibilities to respect the freedom of others.++  For example, if you distribute copies of such a program, whether+gratis or for a fee, you must pass on to the recipients the same+freedoms that you received.  You must make sure that they, too, receive+or can get the source code.  And you must show them these terms so they+know their rights.++  Developers that use the GNU GPL protect your rights with two steps:+(1) assert copyright on the software, and (2) offer you this License+giving you legal permission to copy, distribute and/or modify it.++  For the developers' and authors' protection, the GPL clearly explains+that there is no warranty for this free software.  For both users' and+authors' sake, the GPL requires that modified versions be marked as+changed, so that their problems will not be attributed erroneously to+authors of previous versions.++  Some devices are designed to deny users access to install or run+modified versions of the software inside them, although the manufacturer+can do so.  This is fundamentally incompatible with the aim of+protecting users' freedom to change the software.  The systematic+pattern of such abuse occurs in the area of products for individuals to+use, which is precisely where it is most unacceptable.  Therefore, we+have designed this version of the GPL to prohibit the practice for those+products.  If such problems arise substantially in other domains, we+stand ready to extend this provision to those domains in future versions+of the GPL, as needed to protect the freedom of users.++  Finally, every program is threatened constantly by software patents.+States should not allow patents to restrict development and use of+software on general-purpose computers, but in those that do, we wish to+avoid the special danger that patents applied to a free program could+make it effectively proprietary.  To prevent this, the GPL assures that+patents cannot be used to render the program non-free.++  The precise terms and conditions for copying, distribution and+modification follow.++                       TERMS AND CONDITIONS++  0. Definitions.++  "This License" refers to version 3 of the GNU General Public License.++  "Copyright" also means copyright-like laws that apply to other kinds of+works, such as semiconductor masks.++  "The Program" refers to any copyrightable work licensed under this+License.  Each licensee is addressed as "you".  "Licensees" and+"recipients" may be individuals or organizations.++  To "modify" a work means to copy from or adapt all or part of the work+in a fashion requiring copyright permission, other than the making of an+exact copy.  The resulting work is called a "modified version" of the+earlier work or a work "based on" the earlier work.++  A "covered work" means either the unmodified Program or a work based+on the Program.++  To "propagate" a work means to do anything with it that, without+permission, would make you directly or secondarily liable for+infringement under applicable copyright law, except executing it on a+computer or modifying a private copy.  Propagation includes copying,+distribution (with or without modification), making available to the+public, and in some countries other activities as well.++  To "convey" a work means any kind of propagation that enables other+parties to make or receive copies.  Mere interaction with a user through+a computer network, with no transfer of a copy, is not conveying.++  An interactive user interface displays "Appropriate Legal Notices"+to the extent that it includes a convenient and prominently visible+feature that (1) displays an appropriate copyright notice, and (2)+tells the user that there is no warranty for the work (except to the+extent that warranties are provided), that licensees may convey the+work under this License, and how to view a copy of this License.  If+the interface presents a list of user commands or options, such as a+menu, a prominent item in the list meets this criterion.++  1. Source Code.++  The "source code" for a work means the preferred form of the work+for making modifications to it.  "Object code" means any non-source+form of a work.++  A "Standard Interface" means an interface that either is an official+standard defined by a recognized standards body, or, in the case of+interfaces specified for a particular programming language, one that+is widely used among developers working in that language.++  The "System Libraries" of an executable work include anything, other+than the work as a whole, that (a) is included in the normal form of+packaging a Major Component, but which is not part of that Major+Component, and (b) serves only to enable use of the work with that+Major Component, or to implement a Standard Interface for which an+implementation is available to the public in source code form.  A+"Major Component", in this context, means a major essential component+(kernel, window system, and so on) of the specific operating system+(if any) on which the executable work runs, or a compiler used to+produce the work, or an object code interpreter used to run it.++  The "Corresponding Source" for a work in object code form means all+the source code needed to generate, install, and (for an executable+work) run the object code and to modify the work, including scripts to+control those activities.  However, it does not include the work's+System Libraries, or general-purpose tools or generally available free+programs which are used unmodified in performing those activities but+which are not part of the work.  For example, Corresponding Source+includes interface definition files associated with source files for+the work, and the source code for shared libraries and dynamically+linked subprograms that the work is specifically designed to require,+such as by intimate data communication or control flow between those+subprograms and other parts of the work.++  The Corresponding Source need not include anything that users+can regenerate automatically from other parts of the Corresponding+Source.++  The Corresponding Source for a work in source code form is that+same work.++  2. Basic Permissions.++  All rights granted under this License are granted for the term of+copyright on the Program, and are irrevocable provided the stated+conditions are met.  This License explicitly affirms your unlimited+permission to run the unmodified Program.  The output from running a+covered work is covered by this License only if the output, given its+content, constitutes a covered work.  This License acknowledges your+rights of fair use or other equivalent, as provided by copyright law.++  You may make, run and propagate covered works that you do not+convey, without conditions so long as your license otherwise remains+in force.  You may convey covered works to others for the sole purpose+of having them make modifications exclusively for you, or provide you+with facilities for running those works, provided that you comply with+the terms of this License in conveying all material for which you do+not control copyright.  Those thus making or running the covered works+for you must do so exclusively on your behalf, under your direction+and control, on terms that prohibit them from making any copies of+your copyrighted material outside their relationship with you.++  Conveying under any other circumstances is permitted solely under+the conditions stated below.  Sublicensing is not allowed; section 10+makes it unnecessary.++  3. Protecting Users' Legal Rights From Anti-Circumvention Law.++  No covered work shall be deemed part of an effective technological+measure under any applicable law fulfilling obligations under article+11 of the WIPO copyright treaty adopted on 20 December 1996, or+similar laws prohibiting or restricting circumvention of such+measures.++  When you convey a covered work, you waive any legal power to forbid+circumvention of technological measures to the extent such circumvention+is effected by exercising rights under this License with respect to+the covered work, and you disclaim any intention to limit operation or+modification of the work as a means of enforcing, against the work's+users, your or third parties' legal rights to forbid circumvention of+technological measures.++  4. Conveying Verbatim Copies.++  You may convey verbatim copies of the Program's source code as you+receive it, in any medium, provided that you conspicuously and+appropriately publish on each copy an appropriate copyright notice;+keep intact all notices stating that this License and any+non-permissive terms added in accord with section 7 apply to the code;+keep intact all notices of the absence of any warranty; and give all+recipients a copy of this License along with the Program.++  You may charge any price or no price for each copy that you convey,+and you may offer support or warranty protection for a fee.++  5. Conveying Modified Source Versions.++  You may convey a work based on the Program, or the modifications to+produce it from the Program, in the form of source code under the+terms of section 4, provided that you also meet all of these conditions:++    a) The work must carry prominent notices stating that you modified+    it, and giving a relevant date.++    b) The work must carry prominent notices stating that it is+    released under this License and any conditions added under section+    7.  This requirement modifies the requirement in section 4 to+    "keep intact all notices".++    c) You must license the entire work, as a whole, under this+    License to anyone who comes into possession of a copy.  This+    License will therefore apply, along with any applicable section 7+    additional terms, to the whole of the work, and all its parts,+    regardless of how they are packaged.  This License gives no+    permission to license the work in any other way, but it does not+    invalidate such permission if you have separately received it.++    d) If the work has interactive user interfaces, each must display+    Appropriate Legal Notices; however, if the Program has interactive+    interfaces that do not display Appropriate Legal Notices, your+    work need not make them do so.++  A compilation of a covered work with other separate and independent+works, which are not by their nature extensions of the covered work,+and which are not combined with it such as to form a larger program,+in or on a volume of a storage or distribution medium, is called an+"aggregate" if the compilation and its resulting copyright are not+used to limit the access or legal rights of the compilation's users+beyond what the individual works permit.  Inclusion of a covered work+in an aggregate does not cause this License to apply to the other+parts of the aggregate.++  6. Conveying Non-Source Forms.++  You may convey a covered work in object code form under the terms+of sections 4 and 5, provided that you also convey the+machine-readable Corresponding Source under the terms of this License,+in one of these ways:++    a) Convey the object code in, or embodied in, a physical product+    (including a physical distribution medium), accompanied by the+    Corresponding Source fixed on a durable physical medium+    customarily used for software interchange.++    b) Convey the object code in, or embodied in, a physical product+    (including a physical distribution medium), accompanied by a+    written offer, valid for at least three years and valid for as+    long as you offer spare parts or customer support for that product+    model, to give anyone who possesses the object code either (1) a+    copy of the Corresponding Source for all the software in the+    product that is covered by this License, on a durable physical+    medium customarily used for software interchange, for a price no+    more than your reasonable cost of physically performing this+    conveying of source, or (2) access to copy the+    Corresponding Source from a network server at no charge.++    c) Convey individual copies of the object code with a copy of the+    written offer to provide the Corresponding Source.  This+    alternative is allowed only occasionally and noncommercially, and+    only if you received the object code with such an offer, in accord+    with subsection 6b.++    d) Convey the object code by offering access from a designated+    place (gratis or for a charge), and offer equivalent access to the+    Corresponding Source in the same way through the same place at no+    further charge.  You need not require recipients to copy the+    Corresponding Source along with the object code.  If the place to+    copy the object code is a network server, the Corresponding Source+    may be on a different server (operated by you or a third party)+    that supports equivalent copying facilities, provided you maintain+    clear directions next to the object code saying where to find the+    Corresponding Source.  Regardless of what server hosts the+    Corresponding Source, you remain obligated to ensure that it is+    available for as long as needed to satisfy these requirements.++    e) Convey the object code using peer-to-peer transmission, provided+    you inform other peers where the object code and Corresponding+    Source of the work are being offered to the general public at no+    charge under subsection 6d.++  A separable portion of the object code, whose source code is excluded+from the Corresponding Source as a System Library, need not be+included in conveying the object code work.++  A "User Product" is either (1) a "consumer product", which means any+tangible personal property which is normally used for personal, family,+or household purposes, or (2) anything designed or sold for incorporation+into a dwelling.  In determining whether a product is a consumer product,+doubtful cases shall be resolved in favor of coverage.  For a particular+product received by a particular user, "normally used" refers to a+typical or common use of that class of product, regardless of the status+of the particular user or of the way in which the particular user+actually uses, or expects or is expected to use, the product.  A product+is a consumer product regardless of whether the product has substantial+commercial, industrial or non-consumer uses, unless such uses represent+the only significant mode of use of the product.++  "Installation Information" for a User Product means any methods,+procedures, authorization keys, or other information required to install+and execute modified versions of a covered work in that User Product from+a modified version of its Corresponding Source.  The information must+suffice to ensure that the continued functioning of the modified object+code is in no case prevented or interfered with solely because+modification has been made.++  If you convey an object code work under this section in, or with, or+specifically for use in, a User Product, and the conveying occurs as+part of a transaction in which the right of possession and use of the+User Product is transferred to the recipient in perpetuity or for a+fixed term (regardless of how the transaction is characterized), the+Corresponding Source conveyed under this section must be accompanied+by the Installation Information.  But this requirement does not apply+if neither you nor any third party retains the ability to install+modified object code on the User Product (for example, the work has+been installed in ROM).++  The requirement to provide Installation Information does not include a+requirement to continue to provide support service, warranty, or updates+for a work that has been modified or installed by the recipient, or for+the User Product in which it has been modified or installed.  Access to a+network may be denied when the modification itself materially and+adversely affects the operation of the network or violates the rules and+protocols for communication across the network.++  Corresponding Source conveyed, and Installation Information provided,+in accord with this section must be in a format that is publicly+documented (and with an implementation available to the public in+source code form), and must require no special password or key for+unpacking, reading or copying.++  7. Additional Terms.++  "Additional permissions" are terms that supplement the terms of this+License by making exceptions from one or more of its conditions.+Additional permissions that are applicable to the entire Program shall+be treated as though they were included in this License, to the extent+that they are valid under applicable law.  If additional permissions+apply only to part of the Program, that part may be used separately+under those permissions, but the entire Program remains governed by+this License without regard to the additional permissions.++  When you convey a copy of a covered work, you may at your option+remove any additional permissions from that copy, or from any part of+it.  (Additional permissions may be written to require their own+removal in certain cases when you modify the work.)  You may place+additional permissions on material, added by you to a covered work,+for which you have or can give appropriate copyright permission.++  Notwithstanding any other provision of this License, for material you+add to a covered work, you may (if authorized by the copyright holders of+that material) supplement the terms of this License with terms:++    a) Disclaiming warranty or limiting liability differently from the+    terms of sections 15 and 16 of this License; or++    b) Requiring preservation of specified reasonable legal notices or+    author attributions in that material or in the Appropriate Legal+    Notices displayed by works containing it; or++    c) Prohibiting misrepresentation of the origin of that material, or+    requiring that modified versions of such material be marked in+    reasonable ways as different from the original version; or++    d) Limiting the use for publicity purposes of names of licensors or+    authors of the material; or++    e) Declining to grant rights under trademark law for use of some+    trade names, trademarks, or service marks; or++    f) Requiring indemnification of licensors and authors of that+    material by anyone who conveys the material (or modified versions of+    it) with contractual assumptions of liability to the recipient, for+    any liability that these contractual assumptions directly impose on+    those licensors and authors.++  All other non-permissive additional terms are considered "further+restrictions" within the meaning of section 10.  If the Program as you+received it, or any part of it, contains a notice stating that it is+governed by this License along with a term that is a further+restriction, you may remove that term.  If a license document contains+a further restriction but permits relicensing or conveying under this+License, you may add to a covered work material governed by the terms+of that license document, provided that the further restriction does+not survive such relicensing or conveying.++  If you add terms to a covered work in accord with this section, you+must place, in the relevant source files, a statement of the+additional terms that apply to those files, or a notice indicating+where to find the applicable terms.++  Additional terms, permissive or non-permissive, may be stated in the+form of a separately written license, or stated as exceptions;+the above requirements apply either way.++  8. Termination.++  You may not propagate or modify a covered work except as expressly+provided under this License.  Any attempt otherwise to propagate or+modify it is void, and will automatically terminate your rights under+this License (including any patent licenses granted under the third+paragraph of section 11).++  However, if you cease all violation of this License, then your+license from a particular copyright holder is reinstated (a)+provisionally, unless and until the copyright holder explicitly and+finally terminates your license, and (b) permanently, if the copyright+holder fails to notify you of the violation by some reasonable means+prior to 60 days after the cessation.++  Moreover, your license from a particular copyright holder is+reinstated permanently if the copyright holder notifies you of the+violation by some reasonable means, this is the first time you have+received notice of violation of this License (for any work) from that+copyright holder, and you cure the violation prior to 30 days after+your receipt of the notice.++  Termination of your rights under this section does not terminate the+licenses of parties who have received copies or rights from you under+this License.  If your rights have been terminated and not permanently+reinstated, you do not qualify to receive new licenses for the same+material under section 10.++  9. Acceptance Not Required for Having Copies.++  You are not required to accept this License in order to receive or+run a copy of the Program.  Ancillary propagation of a covered work+occurring solely as a consequence of using peer-to-peer transmission+to receive a copy likewise does not require acceptance.  However,+nothing other than this License grants you permission to propagate or+modify any covered work.  These actions infringe copyright if you do+not accept this License.  Therefore, by modifying or propagating a+covered work, you indicate your acceptance of this License to do so.++  10. Automatic Licensing of Downstream Recipients.++  Each time you convey a covered work, the recipient automatically+receives a license from the original licensors, to run, modify and+propagate that work, subject to this License.  You are not responsible+for enforcing compliance by third parties with this License.++  An "entity transaction" is a transaction transferring control of an+organization, or substantially all assets of one, or subdividing an+organization, or merging organizations.  If propagation of a covered+work results from an entity transaction, each party to that+transaction who receives a copy of the work also receives whatever+licenses to the work the party's predecessor in interest had or could+give under the previous paragraph, plus a right to possession of the+Corresponding Source of the work from the predecessor in interest, if+the predecessor has it or can get it with reasonable efforts.++  You may not impose any further restrictions on the exercise of the+rights granted or affirmed under this License.  For example, you may+not impose a license fee, royalty, or other charge for exercise of+rights granted under this License, and you may not initiate litigation+(including a cross-claim or counterclaim in a lawsuit) alleging that+any patent claim is infringed by making, using, selling, offering for+sale, or importing the Program or any portion of it.++  11. Patents.++  A "contributor" is a copyright holder who authorizes use under this+License of the Program or a work on which the Program is based.  The+work thus licensed is called the contributor's "contributor version".++  A contributor's "essential patent claims" are all patent claims+owned or controlled by the contributor, whether already acquired or+hereafter acquired, that would be infringed by some manner, permitted+by this License, of making, using, or selling its contributor version,+but do not include claims that would be infringed only as a+consequence of further modification of the contributor version.  For+purposes of this definition, "control" includes the right to grant+patent sublicenses in a manner consistent with the requirements of+this License.++  Each contributor grants you a non-exclusive, worldwide, royalty-free+patent license under the contributor's essential patent claims, to+make, use, sell, offer for sale, import and otherwise run, modify and+propagate the contents of its contributor version.++  In the following three paragraphs, a "patent license" is any express+agreement or commitment, however denominated, not to enforce a patent+(such as an express permission to practice a patent or covenant not to+sue for patent infringement).  To "grant" such a patent license to a+party means to make such an agreement or commitment not to enforce a+patent against the party.++  If you convey a covered work, knowingly relying on a patent license,+and the Corresponding Source of the work is not available for anyone+to copy, free of charge and under the terms of this License, through a+publicly available network server or other readily accessible means,+then you must either (1) cause the Corresponding Source to be so+available, or (2) arrange to deprive yourself of the benefit of the+patent license for this particular work, or (3) arrange, in a manner+consistent with the requirements of this License, to extend the patent+license to downstream recipients.  "Knowingly relying" means you have+actual knowledge that, but for the patent license, your conveying the+covered work in a country, or your recipient's use of the covered work+in a country, would infringe one or more identifiable patents in that+country that you have reason to believe are valid.++  If, pursuant to or in connection with a single transaction or+arrangement, you convey, or propagate by procuring conveyance of, a+covered work, and grant a patent license to some of the parties+receiving the covered work authorizing them to use, propagate, modify+or convey a specific copy of the covered work, then the patent license+you grant is automatically extended to all recipients of the covered+work and works based on it.++  A patent license is "discriminatory" if it does not include within+the scope of its coverage, prohibits the exercise of, or is+conditioned on the non-exercise of one or more of the rights that are+specifically granted under this License.  You may not convey a covered+work if you are a party to an arrangement with a third party that is+in the business of distributing software, under which you make payment+to the third party based on the extent of your activity of conveying+the work, and under which the third party grants, to any of the+parties who would receive the covered work from you, a discriminatory+patent license (a) in connection with copies of the covered work+conveyed by you (or copies made from those copies), or (b) primarily+for and in connection with specific products or compilations that+contain the covered work, unless you entered into that arrangement,+or that patent license was granted, prior to 28 March 2007.++  Nothing in this License shall be construed as excluding or limiting+any implied license or other defenses to infringement that may+otherwise be available to you under applicable patent law.++  12. No Surrender of Others' Freedom.++  If conditions are imposed on you (whether by court order, agreement or+otherwise) that contradict the conditions of this License, they do not+excuse you from the conditions of this License.  If you cannot convey a+covered work so as to satisfy simultaneously your obligations under this+License and any other pertinent obligations, then as a consequence you may+not convey it at all.  For example, if you agree to terms that obligate you+to collect a royalty for further conveying from those to whom you convey+the Program, the only way you could satisfy both those terms and this+License would be to refrain entirely from conveying the Program.++  13. Use with the GNU Affero General Public License.++  Notwithstanding any other provision of this License, you have+permission to link or combine any covered work with a work licensed+under version 3 of the GNU Affero General Public License into a single+combined work, and to convey the resulting work.  The terms of this+License will continue to apply to the part which is the covered work,+but the special requirements of the GNU Affero General Public License,+section 13, concerning interaction through a network will apply to the+combination as such.++  14. Revised Versions of this License.++  The Free Software Foundation may publish revised and/or new versions of+the GNU General Public License from time to time.  Such new versions will+be similar in spirit to the present version, but may differ in detail to+address new problems or concerns.++  Each version is given a distinguishing version number.  If the+Program specifies that a certain numbered version of the GNU General+Public License "or any later version" applies to it, you have the+option of following the terms and conditions either of that numbered+version or of any later version published by the Free Software+Foundation.  If the Program does not specify a version number of the+GNU General Public License, you may choose any version ever published+by the Free Software Foundation.++  If the Program specifies that a proxy can decide which future+versions of the GNU General Public License can be used, that proxy's+public statement of acceptance of a version permanently authorizes you+to choose that version for the Program.++  Later license versions may give you additional or different+permissions.  However, no additional obligations are imposed on any+author or copyright holder as a result of your choosing to follow a+later version.++  15. Disclaimer of Warranty.++  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.++  16. Limitation of Liability.++  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF+SUCH DAMAGES.++  17. Interpretation of Sections 15 and 16.++  If the disclaimer of warranty and limitation of liability provided+above cannot be given local legal effect according to their terms,+reviewing courts shall apply local law that most closely approximates+an absolute waiver of all civil liability in connection with the+Program, unless a warranty or assumption of liability accompanies a+copy of the Program in return for a fee.++                     END OF TERMS AND CONDITIONS++            How to Apply These Terms to Your New Programs++  If you develop a new program, and you want it to be of the greatest+possible use to the public, the best way to achieve this is to make it+free software which everyone can redistribute and change under these terms.++  To do so, attach the following notices to the program.  It is safest+to attach them to the start of each source file to most effectively+state the exclusion of warranty; and each file should have at least+the "copyright" line and a pointer to where the full notice is found.++    <one line to give the program's name and a brief idea of what it does.>+    Copyright (C) <year>  <name of author>++    This program is free software: you can redistribute it and/or modify+    it under the terms of the GNU General Public License as published by+    the Free Software Foundation, either version 3 of the License, or+    (at your option) any later version.++    This program is distributed in the hope that it will be useful,+    but WITHOUT ANY WARRANTY; without even the implied warranty of+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the+    GNU General Public License for more details.++    You should have received a copy of the GNU General Public License+    along with this program.  If not, see <http://www.gnu.org/licenses/>.++Also add information on how to contact you by electronic and paper mail.++  If the program does terminal interaction, make it output a short+notice like this when it starts in an interactive mode:++    <program>  Copyright (C) <year>  <name of author>+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.+    This is free software, and you are welcome to redistribute it+    under certain conditions; type `show c' for details.++The hypothetical commands `show w' and `show c' should show the appropriate+parts of the General Public License.  Of course, your program's commands+might be different; for a GUI interface, you would use an "about box".++  You should also get your employer (if you work as a programmer) or school,+if any, to sign a "copyright disclaimer" for the program, if necessary.+For more information on this, and how to apply and follow the GNU GPL, see+<http://www.gnu.org/licenses/>.++  The GNU General Public License does not permit incorporating your program+into proprietary programs.  If your program is a subroutine library, you+may consider it more useful to permit linking proprietary applications with+the library.  If this is what you want to do, use the GNU Lesser General+Public License instead of this License.  But first, please read+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+ Setup.hs view
@@ -0,0 +1,2 @@+import Distribution.Simple+main=defaultMain
+ Test.hs~ view
@@ -0,0 +1,62 @@+import CombinatorialOptimisation.SAT +import CombinatorialOptimisation.TSP+import FileFormat.SATLIB+import FileFormat.TSPLIB++import System.Random+import qualified Data.Map as M++{- +main :: IO()+main = do s<-loadCNFFile "./CBS_k3_n100_m403_b10_0.cnf"+          print s+          saveAsCNF "test.cnf" s++-}++{- +-- checking basic Symmetric TSP code and mutator algorithms+main :: IO()+main = do gen<-newStdGen+          let meep = makeSymmetricTSPMap (2,5) 5 gen+          -- print meep+          let meep' = randomiseRoute gen meep+          print meep'+          print $ routeElementToIndex meep'+          print $ indexToRouteElement meep'+          print ""+          let meep'' = exchangeCities 1 1 meep'+          print meep''+          print $ routeElementToIndex meep''+          print $ indexToRouteElement meep''+          putStrLn $ showEdgeWeights meep''++-}++{- +-- checking stability of arrays, rather than map+main :: IO()+main = do gen<-newStdGen+          let (meep,meep') = makeASymmetricTSPMap (2,5) 50 gen+          putStrLn $ showEdgeWeights meep+          putStrLn ""+          putStrLn $ showEdgeWeights meep'+          putStrLn $ show $ showEdgeWeights meep == showEdgeWeights meep'+-}++-- checking stability of arrays, rather than map+main :: IO()+main = do let gen = mkStdGen 5+          let gen' = mkStdGen 10+          let meep = makeEuclideanTSPMap ExplicitMatrix (2,8) (2,8) 100 gen+          let meep' = makeEuclideanTSPMap TriangularMatrix (2,8) (2,8) 100 gen+          let meep'' = makeEuclideanTSPMap Recomputation (2,8) (2,8) 100 gen+          putStrLn $ showEdgeWeights meep+          putStrLn ""+          putStrLn $ showEdgeWeights meep'+          putStrLn $ show $ (showEdgeWeights meep == showEdgeWeights meep') && (showEdgeWeights meep == showEdgeWeights meep'')++{- +-- checking loading TSPs+main :: IO()+main = do loadTSPFile "../exampleProblems/ali535.tsp" -}
+ build.sh~ view
@@ -0,0 +1,3 @@+runghc Setup configure+runghc Setup build+runghc Setup hscolour
+ combinatorial-problems.cabal view
@@ -0,0 +1,38 @@+Name:              combinatorial-problems+Version:           0.0.1+Synopsis:          A number of data structures to represent and allow the manipulation of standard combinatorial problems, used as test problems in computer science.+Description:       In computer science there are a number of standard test problems that are used for testing algorithms, +                   especially those related to Artificial Intelligence and Operations Research. Online there are a number +                   of repositories for collections of known interesting problems, for example the TSPLIB at +                   <http://comopt.ifi.uni-heidelberg.de/software/TSPLIB95/> and the SATLIB at +                   <http://www.satlib.org/>. +                   .+                   This library seeks to provide implementations of data structures to store these problems, along with +                   functions for manipulating the problems and routines to load problem files from various sources. +                   .+                   At present it only supports TSP and SAT\/SATLIB (TSPLIB coming soon), however it is hoped that the loading routines +                   can be expanded and the range of problems expanded to cover problems like scheduling and timetabling.+                   The internal data structures make heavy use of the @Data.Map@ library and @Data.Array@. It is not currently+                   using unboxed values. The library does not use the @bytestring@ library for loading and saving data either, +                   which will probably need to be changed later.++Stability:         experimental+Category:          Optimisation+Author:            Richard Senington+License:           GPL+license-file:      LICENSE+Copyright:         Copyright (c) 2011 Richard Senington+Homepage:          http://www.comp.leeds.ac.uk/sc06r2s/Projects/HaskellLocalSearch+Maintainer:        sc06r2s@leeds.ac.uk+Build-Type:        Simple+Cabal-Version:     >= 1.2++library+  Exposed-Modules: FileFormat.SATLIB+                   CombinatorialOptimisation.SAT+                   CombinatorialOptimisation.TSP+  Build-Depends:   base >= 2.0 && <=5, +                   random >= 1.0.0.1,+                   containers >= 0.2.0.1,+                   array >= 0.2.0.0+  extensions: 
+ combinatorial-problems.cabal~ view
@@ -0,0 +1,38 @@+Name:              combinatorial-problems+Version:           0.0.1+Synopsis:          A number of data structures to represent and allow the manipulation of standard combinatorial problems, used as test problems in computer science.+Description:       In computer science there are a number of standard test problems that are used for testing algorithms, +                   especially those related to Artificial Intelligence and Operations Research. Online there are a number +                   of repositories for collections of known interesting problems, for example the TSPLIB at +                   <http://comopt.ifi.uni-heidelberg.de/software/TSPLIB95/> and the SATLIB at +                   <http://www.satlib.org/>. +                   .+                   This library seeks to provide implementations of data structures to store these problems, along with +                   functions for manipulating the problems and routines to load problem files from various sources. +                   .+                   At present it only supports TSP and SAT\/SATLIB (TSPLIB coming soon), however it is hoped that the loading routines +                   can be expanded and the range of problems expanded to cover problems like scheduling and timetabling.+                   The internal data structures make heavy use of the @Data.Map@ library and @Data.Array@. It is not currently+                   using unboxed values. The library does not use the @bytestring@ library for loading and saving data either, +                   which will probably need to be changed later.++Stability:         experimental+Category:          Optimisation+Author:            Richard Senington+License:           GPL+license-file:      LICENSE+Copyright:         Copyright (c) 2011 Richard Senington+Homepage:          http://www.comp.leeds.ac.uk/sc06r2s/Projects/HaskellLocalSearch+Maintainer:        sc06r2s@leeds.ac.uk+Build-Type:        Simple+Cabal-Version:     >= 1.2++library+  Exposed-Modules: FileFormat.SATLIB+                   CombinatorialOptimisation.SAT+                   CombinatorialOptimisation.TSP+  Build-Depends:   base >= 2.0 && <=5, +                   random >= 1.0.0.1,+                   containers >= 0.2.0.1,+                   array >= 0.2.0.0+  extensions: 
+ new file~ view