aivika-experiment 5.0 → 5.1

raw patch · 7 files changed

+35/−20 lines, 7 filesdep ~aivikadep ~aivika-transformersPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: aivika, aivika-transformers

API changes (from Hackage documentation)

Files

• Simulation/Aivika/Experiment/Base/FinalStatsView.hs +4/−1
• Simulation/Aivika/Experiment/Base/FinalTableView.hs +4/−1
• Simulation/Aivika/Experiment/Base/InfoView.hs +12/−12
• Simulation/Aivika/Experiment/Base/LastValueView.hs +4/−1
• Simulation/Aivika/Experiment/Base/TableView.hs +4/−1
• Simulation/Aivika/Experiment/Base/TimingStatsView.hs +4/−1
• aivika-experiment.cabal +3/−3

@@ -117,11 +117,14 @@          rs      = finalStatsSeries view $                    finalStatsTransform view $                    experimentResults expdata+         loc     = localisePathResultTitle $+                   experimentLocalisation $+                   finalStatsExperiment st          exts    = resultsToDoubleStatsEitherValues rs          signals = experimentPredefinedSignals expdata          signal  = filterSignalM (const predicate) $                    resultSignalInStopTime signals-         names   = map resultValueName exts+         names   = map (loc . resultValueIdPath) exts          predicate = finalStatsPredicate view      results <- liftIO $ requireFinalStatsResults st names      let values = finalStatsValues results 

@@ -170,11 +170,14 @@          rs      = finalTableSeries view $                    finalTableTransform view $                    experimentResults expdata+         loc     = localisePathResultTitle $+                   experimentLocalisation $+                   finalTableExperiment st          exts    = resultsToStringValues rs          signals = experimentPredefinedSignals expdata          signal  = filterSignalM (const predicate) $                    resultSignalInStopTime signals-         names   = map resultValueName exts+         names   = map (loc . resultValueIdPath) exts          predicate = finalTablePredicate view      results <- liftIO $ requireFinalTableResults st names      let values = finalTableValues results 

@@ -39,10 +39,8 @@              -- ^ This is a text description used in HTML.              infoTransform    :: ResultTransform,              -- ^ The transform applied to the results before receiving series.-             infoSeries       :: ResultTransform, +             infoSeries       :: ResultTransform              -- ^ It defines the series for which the description is shown.-             infoLocalisation :: ResultLocalisation-             -- ^ It specifies the localisation.            }    -- | The default description view.  @@ -51,8 +49,7 @@   InfoView { infoTitle        = "Information",              infoDescription  = "It shows the information about simulation entities:",              infoTransform    = id,-             infoSeries       = id,-             infoLocalisation = englishResultLocalisation }+             infoSeries       = id }  instance ExperimentView InfoView (WebPageRenderer a) where   @@ -95,11 +92,14 @@            flip map sources $ \source ->            case source of              ResultItemSource (ResultItem x) ->-               [(resultItemName x, loc $ resultItemId x)]+               [(resultNameToTitle $ resultItemName x,+                 localiseResultDescription loc $ resultItemId x)]              ResultObjectSource x ->-               [(resultObjectName x, loc $ resultObjectId x)]+               [(resultNameToTitle $ resultObjectName x,+                 localiseResultDescription loc $ resultObjectId x)]              ResultVectorSource x ->-               [(resultVectorName x, loc $ resultVectorId x)]+               [(resultNameToTitle $ resultVectorName x,+                 localiseResultDescription loc $ resultVectorId x)]              ResultSeparatorSource x ->                []          (names, values) = unzip $ concat xs@@ -110,19 +110,19 @@ requireInfoResults :: InfoViewState -> [ResultSource] -> IO InfoResults requireInfoResults st sources =   let view = infoView st-      loc  = infoLocalisation view       exp  = infoExperiment st+      loc  = experimentLocalisation exp   in maybePutMVar (infoResults st)      (newInfoResults sources loc exp) $ \results ->   do let xs =            flip map sources $ \source ->            case source of              ResultItemSource (ResultItem x) ->-               [resultItemName x]+               [resultNameToTitle $ resultItemName x]              ResultObjectSource x ->-               [resultObjectName x]+               [resultNameToTitle $ resultObjectName x]              ResultVectorSource x ->-               [resultVectorName x]+               [resultNameToTitle $ resultVectorName x]              ResultSeparatorSource x ->                []      let names = concat xs

@@ -104,6 +104,9 @@          rs      = lastValueSeries view $                    lastValueTransform view $                    experimentResults expdata+         loc     = localisePathResultTitle $+                   experimentLocalisation $+                   lastValueExperiment st          exts    = resultsToStringValues rs          signals = experimentPredefinedSignals expdata          signal  = resultSignalInStopTime signals@@ -112,7 +115,7 @@        do let r = fromJust $ M.lookup (i - 1) (lastValueMap st)           output <- forM exts $ \ext ->             do x <- resultValueData ext-               return (resultValueName ext, x)+               return (loc $ resultValueIdPath ext, x)           liftIO $ writeIORef r output       -- | Get the HTML code.     

@@ -173,6 +173,9 @@          rs      = tableSeries view $                    tableTransform view $                    experimentResults expdata+         loc     = localisePathResultTitle $+                   experimentLocalisation $+                   tableExperiment st          exts    = resultsToStringValues rs          signals = experimentPredefinedSignals expdata          signal  = pureResultSignal signals $@@ -189,7 +192,7 @@        do forM_ (zip [0..] exts) $ \(column, ext) ->             do when (column > 0) $                   hPutStr h separator-               hPutStr h $ show $ resultValueName ext+               hPutStr h $ show $ loc $ resultValueIdPath ext           hPutStrLn h ""      handleSignalComposite signal $ \t ->        do p <- predicate

@@ -109,6 +109,9 @@          rs      = timingStatsSeries view $                    timingStatsTransform view $                    experimentResults expdata+         loc     = localisePathResultTitle $+                   experimentLocalisation $+                   timingStatsExperiment st          exts    = resultsToDoubleValues rs          signals = experimentPredefinedSignals expdata          signal  = filterSignalM (const predicate) $@@ -119,7 +122,7 @@      let r = fromJust $ M.lookup (i - 1) $ timingStatsMap st      forM_ exts $ \ext ->        do stats <- liftIO $ newIORef emptyTimingStats-          let name = resultValueName ext+          let name = loc $ resultValueIdPath ext           liftIO $ modifyIORef r ((:) (name, stats))           handleSignalComposite signal $ \_ ->             do t <- liftDynamics time

@@ -1,5 +1,5 @@ name:            aivika-experiment-version:         5.0+version:         5.1 synopsis:        Simulation experiments for the Aivika library description:     This package allows defining simulation experiments based on the aivika [1]@@ -62,8 +62,8 @@                      split >= 0.2.2,                      network-uri >= 2.6,                      parallel-io >= 0.3.2.1,-                     aivika >= 5.1,-                     aivika-transformers >= 5.1+                     aivika >= 5.3,+                     aivika-transformers >= 5.3      extensions:      MultiParamTypeClasses,                      FlexibleContexts,