aivika-experiment 5.3 → 5.3.3
raw patch · 2 files changed
+12/−10 lines, 2 filesdep ~aivikadep ~aivika-transformersPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependency ranges changed: aivika, aivika-transformers
API changes (from Hackage documentation)
+ Simulation.Aivika.Experiment.Types: -- | Defines the experiment monad type.
+ Simulation.Aivika.Trans.Experiment.Types: -- | Defines the experiment environment.
- Simulation.Aivika.Experiment.Types: class ExperimentRendering r where data ExperimentContext r :: * type ExperimentEnvironment r :: * type ExperimentMonad r :: * -> * where {
+ Simulation.Aivika.Experiment.Types: class ExperimentRendering r where {
- Simulation.Aivika.Trans.Experiment.Types: class ExperimentMonadProviding r (m :: * -> *) where type ExperimentMonad r m :: * -> * where {
+ Simulation.Aivika.Trans.Experiment.Types: class ExperimentMonadProviding r (m :: * -> *) where {
- Simulation.Aivika.Trans.Experiment.Types: class ExperimentMonadProviding r m => ExperimentRendering r m where data ExperimentContext r m :: * type ExperimentEnvironment r m :: * where {
+ Simulation.Aivika.Trans.Experiment.Types: class ExperimentMonadProviding r m => ExperimentRendering r m where {
Files
Simulation/Aivika/Experiment/Histogram.hs view
@@ -122,7 +122,7 @@ -- | It "rounds" every number into the closest number below it -- that is divisible by size. bin :: Double -> [Double] -> [Double]-bin size xs @ [_] = xs+bin size xs@[_] = xs bin size xs = map (\x -> size * fromIntegral (floor (x / size)) + size / 2) xs -- | Combine bins from different histograms (optimized version).@@ -139,11 +139,11 @@ ordering = sortBy $ \(_, t1, _) (_, t2, _) -> compare t1 t2 groupping = groupBy $ \(_, t1, _) (_, t2, _) -> t1 == t2 sorting = sortBy $ \(i1, _, _) (i2, _, _) -> compare i1 i2- merging zs @ ((_, t, _) : _) = merging' zs t 1 []+ merging zs@((_, t, _) : _) = merging' zs t 1 [] merging' [] t k acc | k <= count = merging' [] t (k + 1) (0 : acc) | k > count = (t, reverse acc)- merging' zs @ ((i, _, n) : xs) t k acc+ merging' zs@((i, _, n) : xs) t k acc | i == k = merging' xs t (k + 1) (n : acc) | i > k = merging' zs t (k + 1) (0 : acc) count = length xs
aivika-experiment.cabal view
@@ -1,5 +1,5 @@ name: aivika-experiment-version: 5.3+version: 5.3.3 synopsis: Simulation experiments for the Aivika library description: This package allows defining simulation experiments based on the aivika [1]@@ -21,7 +21,7 @@ author: David Sorokin maintainer: David Sorokin <david.sorokin@gmail.com> homepage: http://www.aivikasoft.com-cabal-version: >= 1.6+cabal-version: >= 1.10 build-type: Simple tested-with: GHC == 7.10.1 @@ -62,14 +62,16 @@ split >= 0.2.2, network-uri >= 2.6, parallel-io >= 0.3.2.1,- aivika >= 5.5,- aivika-transformers >= 5.5+ aivika >= 5.9.1,+ aivika-transformers >= 5.9.1 - extensions: MultiParamTypeClasses,- FlexibleContexts,- TypeFamilies+ other-extensions: MultiParamTypeClasses,+ FlexibleContexts,+ TypeFamilies ghc-options: -O2++ default-language: Haskell2010 source-repository head