cmaes 0.2.1.1 → 0.2.2

raw patch · 2 files changed

+14/−5 lines, 2 files

Files

• Numeric/Optimization/Algorithms/CMAES.hs +13/−4
• cmaes.cabal +1/−1

@@ -1,4 +1,4 @@-{-# LANGUAGE RankNTypes, RecordWildCards,ScopedTypeVariables #-}+{-# LANGUAGE PackageImports, RankNTypes, RecordWildCards,ScopedTypeVariables #-} {-# OPTIONS -Wall #-}  @@ -107,7 +107,7 @@  import           Control.Applicative ((<|>), (<$>)) import           Control.Monad hiding (forM_, mapM)-import qualified Control.Monad.State as State+import qualified "mtl" Control.Monad.State as State import           Data.Data import           Data.Generics import           Data.List (isPrefixOf)@@ -116,7 +116,7 @@ import           Data.Traversable import           Safe (atDef, headDef) import           System.IO-import qualified System.IO.Strict as Strict+import qualified "strict" System.IO.Strict as Strict import           System.IO.Unsafe(unsafePerformIO) import           System.Process import           Prelude hiding (concat, mapM, sum)@@ -172,6 +172,10 @@   , otherArgs     :: [(String, String)]     -- ^ Interfaces for passing other configuration arguments directly to     -- @cma.py@+  , pythonPath    :: Maybe FilePath+    -- path to python (default: automatic detection)+  , cmaesWrapperPath :: Maybe FilePath+    -- path to wrapper script (default: in the data folder created by cabal)   }  @@ -197,6 +201,8 @@   , tolX          = Just 1e-11   , verbose       = False   , otherArgs     = []+  , pythonPath    = Nothing+  , cmaesWrapperPath = Nothing   }  @@ -278,7 +284,10 @@ -- | Execute the optimizer and get the solution. run :: forall tgt. Config tgt -> IO tgt run Config{..} = do-  (Just hin, Just hout, _, hproc) <- createProcess (proc "python2" [wrapperFnFullPath])+  let pythonPath0 = maybe "python2" id pythonPath+      wrapperPath0 = maybe wrapperFnFullPath id cmaesWrapperPath++  (Just hin, Just hout, _, hproc) <- createProcess (proc pythonPath0 [wrapperPath0])     { std_in = CreatePipe, std_out = CreatePipe }   sendLine hin $ unwords (map show initXs)   sendLine hin $ show sigma0

@@ -1,5 +1,5 @@ name:                cmaes-version:             0.2.1.1+version:             0.2.2 synopsis:            CMA-ES wrapper in Haskell description: