aivika-experiment 1.0 → 1.1
raw patch · 3 files changed
+8/−10 lines, 3 filesdep ~aivika
Dependency ranges changed: aivika
Files
Simulation/Aivika/Experiment/Types.hs view
@@ -201,7 +201,7 @@ -- | Prepare data for the simulation experiment in start time from the series -- with the specified labels. experimentDataInStartTime :: [(String, SeriesEntity)] -> Simulation ExperimentData-experimentDataInStartTime m = runEventInStartTime IncludingEarlierEvents d where+experimentDataInStartTime m = runDynamicsInStartTime $ runEventWith EarlierEvents d where d = do signalInIntegTimes <- newSignalInIntegTimes signalInStartTime <- newSignalInStartTime signalInStopTime <- newSignalInStopTime@@ -315,10 +315,11 @@ let simulate :: Simulation () simulate = do d <- simulation- fs <- runEventInStartTime IncludingEarlierEvents $+ fs <- runDynamicsInStartTime $+ runEventWith EarlierEvents $ forM reporters $ \reporter -> reporterSimulate reporter d- runEventInStopTime IncludingCurrentEvents $+ runEventInStopTime $ sequence_ fs executor $ runSimulations simulate specs runCount forM_ reporters reporterFinalise
aivika-experiment.cabal view
@@ -1,5 +1,5 @@ name: aivika-experiment-version: 1.0+version: 1.1 synopsis: Simulation experiments for the Aivika library description: This package allows defining simulation experiments for the Aivika@@ -54,7 +54,7 @@ split >= 0.2.2, network >= 2.3.0.13, parallel-io >= 0.3.2.1,- aivika >= 1.0+ aivika >= 1.1 extensions: FlexibleInstances
examples/MachRep3.hs view
@@ -13,9 +13,6 @@ -- until both machines are down. We find the proportion of up time. It -- should come out to about 0.45. --- module MachRep3Model (model) where--import System.Random import Control.Monad import Control.Monad.Trans @@ -101,10 +98,10 @@ machine pid - runProcessInStartTimeUsingId IncludingCurrentEvents+ runProcessInStartTimeUsingId pid1 (machine pid2) - runProcessInStartTimeUsingId IncludingCurrentEvents+ runProcessInStartTimeUsingId pid2 (machine pid1) let result =