Hans/haga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up comments and TODOs in GA module

Browse Source
This commit is contained in:
David Pätzel 2019-10-22 07:10:28 +02:00
parent 43071b9b1e
commit db55ec0716
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/GA.hs
View File

@ -8,11 +8,6 @@
module GA where module GA where
-- MAYBE add factory floor optimizer:
-- [2019-07-15] GA that optimizes factory floor
-- - data: graph of workstations with edge weights being the number of walks between them
-- - desired: optimal configuration that reduces crossings
-- - space: 15 workstations that can be positioned in a 20 x 20 space
import Control.Arrow hiding (first) import Control.Arrow hiding (first)
import qualified Data.List as L import qualified Data.List as L
import Data.List.NonEmpty ((<|)) import Data.List.NonEmpty ((<|))
@ -39,12 +34,12 @@ shuffle' xs = do
where where
deleteI i xs = fst (NE.splitAt (i - 1) xs) ++ snd (NE.splitAt i xs) deleteI i xs = fst (NE.splitAt (i - 1) xs) ++ snd (NE.splitAt i xs)
-- TODO Enforce this being > 0 -- TODO enforce this being > 0
type N = Int type N = Int
type R = Double type R = Double
-- alternative could be -- TODO an alternative could be
-- data I a -- data I a
-- = I -- = I
-- { mutate :: m (I a), -- { mutate :: m (I a),
@ -111,12 +106,9 @@ proportionate1 pop =
sequence ((\i -> (,i) <$> fitness i) <$> pop) sequence ((\i -> (,i) <$> fitness i) <$> pop)
>>= sample . fromWeightedList . NE.toList . unPop >>= sample . fromWeightedList . NE.toList . unPop
-- TODO Perhaps use stochastic acceptance for performance?
{-| {-|
Selects @n@ individuals from the population using proportionate selection. Selects @n@ individuals from the population using proportionate selection.
-} -}
-- TODO Perhaps use Data.Vector.Sized for the result?
proportionate proportionate
:: (Individual i, MonadRandom m) :: (Individual i, MonadRandom m)
=> N => N