diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,13 @@ +Version 5.1 +----- + +* Changed the default chart settings. + +* Using the result source titles instead of coding names. + +* The Deviation chart does not depend on the integration time step anymore. + Version 5.0 ----- diff --git a/Simulation/Aivika/Experiment/Chart/DeviationChartView.hs b/Simulation/Aivika/Experiment/Chart/DeviationChartView.hs --- a/Simulation/Aivika/Experiment/Chart/DeviationChartView.hs +++ b/Simulation/Aivika/Experiment/Chart/DeviationChartView.hs @@ -42,7 +42,7 @@ import Simulation.Aivika.Experiment.Chart.Types import Simulation.Aivika.Experiment.Chart.Utils (colourisePlotLines, colourisePlotFillBetween) --- | Defines the 'View' that plots the deviation chart. +-- | Defines the 'View' that plots the deviation chart in time points by the specified grid. data DeviationChartView = DeviationChartView { deviationChartTitle :: String, -- ^ This is a title used in HTML. @@ -52,6 +52,8 @@ -- ^ The width of the chart. deviationChartHeight :: Int, -- ^ The height of the chart. + deviationChartGridSize :: Int, + -- ^ The size of the grid, where the series data are collected. deviationChartFileName :: ExperimentFilePath, -- ^ It defines the file name with optional extension for each image to be saved. -- It may include special variable @$TITLE@. @@ -111,6 +113,7 @@ deviationChartDescription = "It shows the Deviation chart by rule 3-sigma.", deviationChartWidth = 640, deviationChartHeight = 480, + deviationChartGridSize = 2 * 640, deviationChartFileName = UniqueFilePath "DeviationChart", deviationChartTransform = id, deviationChartLeftYSeries = mempty, @@ -176,11 +179,15 @@ deviationChartResults = r } -- | Create new chart results. -newDeviationChartResults :: [Either String String] -> Experiment -> IO DeviationChartResults -newDeviationChartResults names exp = - do let specs = experimentSpecs exp - bnds = integIterationBnds specs - times <- liftIO $ newListArray bnds (integTimes specs) +newDeviationChartResults :: DeviationChartViewState r -> [Either String String] -> IO DeviationChartResults +newDeviationChartResults st names = + do let exp = deviationChartExperiment st + view = deviationChartView st + size = deviationChartGridSize view + specs = experimentSpecs exp + grid = timeGrid specs size + bnds = (0, 1 + length grid) + times <- liftIO $ newListArray bnds $ map snd grid stats <- forM names $ \_ -> liftIO $ newArray bnds emptySamplingStats >>= newMVar return DeviationChartResults { deviationChartTimes = times, @@ -191,7 +198,7 @@ requireDeviationChartResults :: DeviationChartViewState r -> [Either String String] -> IO DeviationChartResults requireDeviationChartResults st names = maybePutMVar (deviationChartResults st) - (newDeviationChartResults names (deviationChartExperiment st)) $ \results -> + (newDeviationChartResults st names) $ \results -> if (names /= deviationChartNames results) then error "Series with different names are returned for different runs: requireDeviationChartResults" else return results @@ -200,6 +207,9 @@ simulateDeviationChart :: DeviationChartViewState r -> ExperimentData -> Composite () simulateDeviationChart st expdata = do let view = deviationChartView st + loc = localisePathResultTitle $ + experimentLocalisation $ + deviationChartExperiment st rs1 = deviationChartLeftYSeries view $ deviationChartTransform view $ experimentResults expdata @@ -209,14 +219,15 @@ exts1 = resultsToDoubleStatsEitherValues rs1 exts2 = resultsToDoubleStatsEitherValues rs2 exts = exts1 ++ exts2 - names1 = map resultValueName exts1 - names2 = map resultValueName exts2 + names1 = map (loc . resultValueIdPath) exts1 + names2 = map (loc . resultValueIdPath) exts2 names = map Left names1 ++ map Right names2 - signals = experimentPredefinedSignals expdata - signal = resultSignalInIntegTimes signals + signal <- liftEvent $ + newSignalInTimeGrid $ + deviationChartGridSize view hs <- forM exts $ \ext -> newSignalHistory $ - flip mapSignalM signal $ \t -> + flip mapSignalM signal $ \i -> resultValueData ext disposableComposite $ DisposableEvent $ @@ -303,7 +314,9 @@ if null $ rights ps then layoutlr_right_axis_visibility .~ AxisVisibility False False False else id - chart = plotLayout . updateLeftAxis . updateRightAxis $ + chart = plotLayout . + renderingLayoutLR renderer . + updateLeftAxis . updateRightAxis $ layoutlr_x_axis .~ axis $ layoutlr_title .~ plotTitle' $ layoutlr_plots .~ ps $ diff --git a/Simulation/Aivika/Experiment/Chart/FinalHistogramView.hs b/Simulation/Aivika/Experiment/Chart/FinalHistogramView.hs --- a/Simulation/Aivika/Experiment/Chart/FinalHistogramView.hs +++ b/Simulation/Aivika/Experiment/Chart/FinalHistogramView.hs @@ -186,11 +186,14 @@ simulateFinalHistogram :: FinalHistogramViewState r -> ExperimentData -> Composite () simulateFinalHistogram st expdata = do let view = finalHistogramView st + loc = localisePathResultTitle $ + experimentLocalisation $ + finalHistogramExperiment st rs = finalHistogramSeries view $ finalHistogramTransform view $ experimentResults expdata exts = resultsToDoubleListValues rs - names = map resultValueName exts + names = map (loc . resultValueIdPath) exts signals = experimentPredefinedSignals expdata signal = filterSignalM (const predicate) $ resultSignalInStopTime signals @@ -246,7 +249,9 @@ layout_right_axis_visibility .~ v $ l else id - chart = layout . updateAxes $ + chart = layout . + renderingLayout renderer . + updateAxes $ layout_title .~ plotTitle' $ layout_plots .~ [p] $ def diff --git a/Simulation/Aivika/Experiment/Chart/FinalXYChartView.hs b/Simulation/Aivika/Experiment/Chart/FinalXYChartView.hs --- a/Simulation/Aivika/Experiment/Chart/FinalXYChartView.hs +++ b/Simulation/Aivika/Experiment/Chart/FinalXYChartView.hs @@ -210,6 +210,9 @@ simulateFinalXYChart :: FinalXYChartViewState r -> ExperimentData -> Composite () simulateFinalXYChart st expdata = do let view = finalXYChartView st + loc = localisePathResultTitle $ + experimentLocalisation $ + finalXYChartExperiment st rs0 = finalXYChartXSeries view $ finalXYChartTransform view $ experimentResults expdata @@ -226,9 +229,9 @@ exts1 = resultsToDoubleValues rs1 exts2 = resultsToDoubleValues rs2 exts = exts1 ++ exts2 - name0 = resultValueName ext0 - names1 = map resultValueName exts1 - names2 = map resultValueName exts2 + name0 = loc $ resultValueIdPath ext0 + names1 = map (loc . resultValueIdPath) exts1 + names2 = map (loc . resultValueIdPath) exts2 names = map Left names1 ++ map Right names2 signals = experimentPredefinedSignals expdata signal = filterSignalM (const predicate) $ @@ -296,7 +299,9 @@ if null $ rights ps then layoutlr_right_axis_visibility .~ AxisVisibility False False False else id - chart = plotLayout . updateLeftAxis . updateRightAxis $ + chart = plotLayout . + renderingLayoutLR renderer . + updateLeftAxis . updateRightAxis $ layoutlr_x_axis .~ axis $ layoutlr_title .~ plotTitle' $ layoutlr_plots .~ ps $ diff --git a/Simulation/Aivika/Experiment/Chart/HistogramView.hs b/Simulation/Aivika/Experiment/Chart/HistogramView.hs --- a/Simulation/Aivika/Experiment/Chart/HistogramView.hs +++ b/Simulation/Aivika/Experiment/Chart/HistogramView.hs @@ -180,11 +180,14 @@ simulateHistogram :: ChartRendering r => HistogramViewState r -> ExperimentData -> Composite () simulateHistogram st expdata = do let view = histogramView st + loc = localisePathResultTitle $ + experimentLocalisation $ + histogramExperiment st rs = histogramSeries view $ histogramTransform view $ experimentResults expdata exts = resultsToDoubleListValues rs - names = map resultValueName exts + names = map (loc . resultValueIdPath) exts signals = experimentPredefinedSignals expdata n = experimentRunCount $ histogramExperiment st build = histogramBuild view @@ -233,7 +236,9 @@ layout_right_axis_visibility .~ v $ l else id - chart = layout . updateAxes $ + chart = layout . + renderingLayout renderer . + updateAxes $ layout_title .~ runPlotTitle' $ layout_plots .~ [p] $ def diff --git a/Simulation/Aivika/Experiment/Chart/TimeSeriesView.hs b/Simulation/Aivika/Experiment/Chart/TimeSeriesView.hs --- a/Simulation/Aivika/Experiment/Chart/TimeSeriesView.hs +++ b/Simulation/Aivika/Experiment/Chart/TimeSeriesView.hs @@ -185,6 +185,9 @@ simulateTimeSeries :: ChartRendering r => TimeSeriesViewState r -> ExperimentData -> Composite () simulateTimeSeries st expdata = do let view = timeSeriesView st + loc = localisePathResultTitle $ + experimentLocalisation $ + timeSeriesExperiment st rs1 = timeSeriesLeftYSeries view $ timeSeriesTransform view $ experimentResults expdata @@ -241,7 +244,7 @@ toPlot $ plotLines $ plot_lines_values .~ filterPlotLinesValues (zip (elems ts) (elems xs)) $ - plot_lines_title .~ resultValueName ext $ + plot_lines_title .~ (loc $ resultValueIdPath ext) $ def return (ps, drop (length hs) plotLineTails) (ps1, plotLineTails) <- plots hs1 exts1 (tails plotLines) @@ -260,7 +263,9 @@ if null ps2 then layoutlr_right_axis_visibility .~ AxisVisibility False False False else id - chart = plotLayout . updateLeftAxis . updateRightAxis $ + chart = plotLayout . + renderingLayoutLR renderer . + updateLeftAxis . updateRightAxis $ layoutlr_x_axis .~ axis $ layoutlr_title .~ runPlotTitle' $ layoutlr_plots .~ ps' $ diff --git a/Simulation/Aivika/Experiment/Chart/Types.hs b/Simulation/Aivika/Experiment/Chart/Types.hs --- a/Simulation/Aivika/Experiment/Chart/Types.hs +++ b/Simulation/Aivika/Experiment/Chart/Types.hs @@ -26,3 +26,9 @@ -- | Generate an image file with the specified path for the given chart. -- The width and height are passed in the second argument to the function. renderChart :: r -> (Int, Int) -> FilePath -> Renderable c -> IO (PickFn c) + + -- | Return the rendering layout. + renderingLayoutLR :: r -> LayoutLR Double Double Double -> LayoutLR Double Double Double + + -- | Return the rendering layout. + renderingLayout :: r -> Layout Double Double -> Layout Double Double diff --git a/Simulation/Aivika/Experiment/Chart/XYChartView.hs b/Simulation/Aivika/Experiment/Chart/XYChartView.hs --- a/Simulation/Aivika/Experiment/Chart/XYChartView.hs +++ b/Simulation/Aivika/Experiment/Chart/XYChartView.hs @@ -194,6 +194,9 @@ simulateXYChart :: ChartRendering r => XYChartViewState r -> ExperimentData -> Composite () simulateXYChart st expdata = do let view = xyChartView st + loc = localisePathResultTitle $ + experimentLocalisation $ + xyChartExperiment st rs0 = xyChartXSeries view $ xyChartTransform view $ experimentResults expdata @@ -261,7 +264,7 @@ toPlot $ plotLines $ plot_lines_values .~ filterPlotLinesValues (elems zs) $ - plot_lines_title .~ resultValueName ext $ + plot_lines_title .~ (loc $ resultValueIdPath ext) $ def return (ps, drop (length hs) plotLineTails) (ps1, plotLineTails) <- plots hs1 exts1 (tails plotLines) @@ -270,7 +273,7 @@ ps2' = map Right ps2 ps' = ps1' ++ ps2' axis = plotBottomAxis $ - laxis_title .~ resultValueName ext0 $ + laxis_title .~ (loc $ resultValueIdPath ext0) $ def updateLeftAxis = if null ps1 @@ -280,7 +283,9 @@ if null ps2 then layoutlr_right_axis_visibility .~ AxisVisibility False False False else id - chart = plotLayout . updateLeftAxis . updateRightAxis $ + chart = plotLayout . + renderingLayoutLR renderer . + updateLeftAxis . updateRightAxis $ layoutlr_x_axis .~ axis $ layoutlr_title .~ runPlotTitle' $ layoutlr_plots .~ ps' $ diff --git a/aivika-experiment-chart.cabal b/aivika-experiment-chart.cabal --- a/aivika-experiment-chart.cabal +++ b/aivika-experiment-chart.cabal @@ -1,12 +1,12 @@ name: aivika-experiment-chart -version: 5.0 +version: 5.1 synopsis: Simulation experiments with charting for the Aivika library description: This package complements the aivika [1] and aivika-experiment [2] packages with charting capabilites. Now the simulation results can be represented as charts. . - Nevertheless, to plot the charts, you hould use one of the rendering backends + Nevertheless, to plot the charts, you should use one of the rendering backends provided by packages aivika-experiment-cairo [3] or aivika-experiment-diagrams [4]. While the Cairo-based backend suits mostly to Linux and partially OS X, the Diagrams-based backend is mainly destined for MS Windows, although it should work on Linux @@ -145,8 +145,8 @@ lens >= 3.9, data-default-class >= 0.0.1, colour >= 2.3.3, - aivika >= 5.1, - aivika-experiment >= 5.0 + aivika >= 5.3, + aivika-experiment >= 5.1 extensions: MultiParamTypeClasses diff --git a/examples/BassDiffusion/MainUsingCairo.hs b/examples/BassDiffusion/MainUsingCairo.hs --- a/examples/BassDiffusion/MainUsingCairo.hs +++ b/examples/BassDiffusion/MainUsingCairo.hs @@ -10,4 +10,4 @@ import Model import Experiment -main = runExperiment experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model +main = runExperimentParallel experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model diff --git a/examples/BassDiffusion/MainUsingDiagrams.hs b/examples/BassDiffusion/MainUsingDiagrams.hs --- a/examples/BassDiffusion/MainUsingDiagrams.hs +++ b/examples/BassDiffusion/MainUsingDiagrams.hs @@ -13,4 +13,4 @@ main = do fonts <- loadCommonFonts let renderer = DiagramsRenderer SVG (return fonts) - runExperiment experiment generators (WebPageRenderer renderer experimentFilePath) model + runExperimentParallel experiment generators (WebPageRenderer renderer experimentFilePath) model diff --git a/examples/BassDiffusion/Model.hs b/examples/BassDiffusion/Model.hs --- a/examples/BassDiffusion/Model.hs +++ b/examples/BassDiffusion/Model.hs @@ -101,6 +101,6 @@ return $ results [resultSource - "potentialAdopters" "potential adopters" potentialAdopters, + "potentialAdopters" "potential adopters of the product" potentialAdopters, resultSource - "adopters" "adopters" adopters] + "adopters" "adopters of the product" adopters] diff --git a/examples/Furnace/MainUsingCairo.hs b/examples/Furnace/MainUsingCairo.hs --- a/examples/Furnace/MainUsingCairo.hs +++ b/examples/Furnace/MainUsingCairo.hs @@ -10,4 +10,4 @@ import Model import Experiment -main = runExperiment experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model +main = runExperimentParallel experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model diff --git a/examples/Furnace/MainUsingDiagrams.hs b/examples/Furnace/MainUsingDiagrams.hs --- a/examples/Furnace/MainUsingDiagrams.hs +++ b/examples/Furnace/MainUsingDiagrams.hs @@ -13,4 +13,4 @@ main = do fonts <- loadCommonFonts let renderer = DiagramsRenderer SVG (return fonts) - runExperiment experiment generators (WebPageRenderer renderer experimentFilePath) model + runExperimentParallel experiment generators (WebPageRenderer renderer experimentFilePath) model diff --git a/examples/GPSSExample7-26/MainUsingCairo.hs b/examples/GPSSExample7-26/MainUsingCairo.hs --- a/examples/GPSSExample7-26/MainUsingCairo.hs +++ b/examples/GPSSExample7-26/MainUsingCairo.hs @@ -10,4 +10,4 @@ import Model import Experiment -main = runExperiment experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model +main = runExperimentParallel experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model diff --git a/examples/GPSSExample7-26/MainUsingDiagrams.hs b/examples/GPSSExample7-26/MainUsingDiagrams.hs --- a/examples/GPSSExample7-26/MainUsingDiagrams.hs +++ b/examples/GPSSExample7-26/MainUsingDiagrams.hs @@ -13,4 +13,4 @@ main = do fonts <- loadCommonFonts let renderer = DiagramsRenderer SVG (return fonts) - runExperiment experiment generators (WebPageRenderer renderer experimentFilePath) model + runExperimentParallel experiment generators (WebPageRenderer renderer experimentFilePath) model diff --git a/examples/GPSSExample7-31/MainUsingCairo.hs b/examples/GPSSExample7-31/MainUsingCairo.hs --- a/examples/GPSSExample7-31/MainUsingCairo.hs +++ b/examples/GPSSExample7-31/MainUsingCairo.hs @@ -10,4 +10,4 @@ import Model import Experiment -main = runExperiment experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model +main = runExperimentParallel experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model diff --git a/examples/GPSSExample7-31/MainUsingDiagrams.hs b/examples/GPSSExample7-31/MainUsingDiagrams.hs --- a/examples/GPSSExample7-31/MainUsingDiagrams.hs +++ b/examples/GPSSExample7-31/MainUsingDiagrams.hs @@ -13,4 +13,4 @@ main = do fonts <- loadCommonFonts let renderer = DiagramsRenderer SVG (return fonts) - runExperiment experiment generators (WebPageRenderer renderer experimentFilePath) model + runExperimentParallel experiment generators (WebPageRenderer renderer experimentFilePath) model diff --git a/examples/InspectionAdjustmentStations/MainUsingCairo.hs b/examples/InspectionAdjustmentStations/MainUsingCairo.hs --- a/examples/InspectionAdjustmentStations/MainUsingCairo.hs +++ b/examples/InspectionAdjustmentStations/MainUsingCairo.hs @@ -10,4 +10,4 @@ import Model import Experiment -main = runExperiment experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model +main = runExperimentParallel experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model diff --git a/examples/InspectionAdjustmentStations/MainUsingDiagrams.hs b/examples/InspectionAdjustmentStations/MainUsingDiagrams.hs --- a/examples/InspectionAdjustmentStations/MainUsingDiagrams.hs +++ b/examples/InspectionAdjustmentStations/MainUsingDiagrams.hs @@ -13,4 +13,4 @@ main = do fonts <- loadCommonFonts let renderer = DiagramsRenderer SVG (return fonts) - runExperiment experiment generators (WebPageRenderer renderer experimentFilePath) model + runExperimentParallel experiment generators (WebPageRenderer renderer experimentFilePath) model diff --git a/examples/InventorySystem/MainUsingCairo.hs b/examples/InventorySystem/MainUsingCairo.hs --- a/examples/InventorySystem/MainUsingCairo.hs +++ b/examples/InventorySystem/MainUsingCairo.hs @@ -10,4 +10,4 @@ import Model import Experiment -main = runExperiment experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model +main = runExperimentParallel experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model diff --git a/examples/InventorySystem/MainUsingDiagrams.hs b/examples/InventorySystem/MainUsingDiagrams.hs --- a/examples/InventorySystem/MainUsingDiagrams.hs +++ b/examples/InventorySystem/MainUsingDiagrams.hs @@ -13,4 +13,4 @@ main = do fonts <- loadCommonFonts let renderer = DiagramsRenderer SVG (return fonts) - runExperiment experiment generators (WebPageRenderer renderer experimentFilePath) model + runExperimentParallel experiment generators (WebPageRenderer renderer experimentFilePath) model diff --git a/examples/MachRep3/MainUsingCairo.hs b/examples/MachRep3/MainUsingCairo.hs --- a/examples/MachRep3/MainUsingCairo.hs +++ b/examples/MachRep3/MainUsingCairo.hs @@ -10,4 +10,4 @@ import Model import Experiment -main = runExperiment experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model +main = runExperimentParallel experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model diff --git a/examples/MachRep3/MainUsingDiagrams.hs b/examples/MachRep3/MainUsingDiagrams.hs --- a/examples/MachRep3/MainUsingDiagrams.hs +++ b/examples/MachRep3/MainUsingDiagrams.hs @@ -13,4 +13,4 @@ main = do fonts <- loadCommonFonts let renderer = DiagramsRenderer SVG (return fonts) - runExperiment experiment generators (WebPageRenderer renderer experimentFilePath) model + runExperimentParallel experiment generators (WebPageRenderer renderer experimentFilePath) model diff --git a/examples/MachineBreakdowns/MainUsingDiagrams.hs b/examples/MachineBreakdowns/MainUsingDiagrams.hs --- a/examples/MachineBreakdowns/MainUsingDiagrams.hs +++ b/examples/MachineBreakdowns/MainUsingDiagrams.hs @@ -13,4 +13,4 @@ main = do fonts <- loadCommonFonts let renderer = DiagramsRenderer SVG (return fonts) - runExperiment experiment generators (WebPageRenderer renderer experimentFilePath) model + runExperimentParallel experiment generators (WebPageRenderer renderer experimentFilePath) model diff --git a/examples/PERT/MainUsingCairo.hs b/examples/PERT/MainUsingCairo.hs --- a/examples/PERT/MainUsingCairo.hs +++ b/examples/PERT/MainUsingCairo.hs @@ -10,4 +10,4 @@ import Model import Experiment -main = runExperiment experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model +main = runExperimentParallel experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model diff --git a/examples/PERT/MainUsingDiagrams.hs b/examples/PERT/MainUsingDiagrams.hs --- a/examples/PERT/MainUsingDiagrams.hs +++ b/examples/PERT/MainUsingDiagrams.hs @@ -13,4 +13,4 @@ main = do fonts <- loadCommonFonts let renderer = DiagramsRenderer SVG (return fonts) - runExperiment experiment generators (WebPageRenderer renderer experimentFilePath) model + runExperimentParallel experiment generators (WebPageRenderer renderer experimentFilePath) model diff --git a/examples/PortOperations/MainUsingCairo.hs b/examples/PortOperations/MainUsingCairo.hs --- a/examples/PortOperations/MainUsingCairo.hs +++ b/examples/PortOperations/MainUsingCairo.hs @@ -10,4 +10,4 @@ import Model import Experiment -main = runExperiment experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model +main = runExperimentParallel experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model diff --git a/examples/PortOperations/MainUsingDiagrams.hs b/examples/PortOperations/MainUsingDiagrams.hs --- a/examples/PortOperations/MainUsingDiagrams.hs +++ b/examples/PortOperations/MainUsingDiagrams.hs @@ -13,4 +13,4 @@ main = do fonts <- loadCommonFonts let renderer = DiagramsRenderer SVG (return fonts) - runExperiment experiment generators (WebPageRenderer renderer experimentFilePath) model + runExperimentParallel experiment generators (WebPageRenderer renderer experimentFilePath) model diff --git a/examples/QuarryOperations/MainUsingCairo.hs b/examples/QuarryOperations/MainUsingCairo.hs --- a/examples/QuarryOperations/MainUsingCairo.hs +++ b/examples/QuarryOperations/MainUsingCairo.hs @@ -10,4 +10,4 @@ import Model import Experiment -main = runExperiment experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model +main = runExperimentParallel experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model diff --git a/examples/QuarryOperations/MainUsingDiagrams.hs b/examples/QuarryOperations/MainUsingDiagrams.hs --- a/examples/QuarryOperations/MainUsingDiagrams.hs +++ b/examples/QuarryOperations/MainUsingDiagrams.hs @@ -13,4 +13,4 @@ main = do fonts <- loadCommonFonts let renderer = DiagramsRenderer SVG (return fonts) - runExperiment experiment generators (WebPageRenderer renderer experimentFilePath) model + runExperimentParallel experiment generators (WebPageRenderer renderer experimentFilePath) model diff --git a/examples/SingleLaneTraffic/MainUsingCairo.hs b/examples/SingleLaneTraffic/MainUsingCairo.hs --- a/examples/SingleLaneTraffic/MainUsingCairo.hs +++ b/examples/SingleLaneTraffic/MainUsingCairo.hs @@ -11,6 +11,6 @@ import Experiment main = do - runExperiment experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model1 - runExperiment experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model2 - runExperiment experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model3 + runExperimentParallel experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model1 + runExperimentParallel experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model2 + runExperimentParallel experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model3 diff --git a/examples/SingleLaneTraffic/MainUsingDiagrams.hs b/examples/SingleLaneTraffic/MainUsingDiagrams.hs --- a/examples/SingleLaneTraffic/MainUsingDiagrams.hs +++ b/examples/SingleLaneTraffic/MainUsingDiagrams.hs @@ -13,6 +13,6 @@ main = do fonts <- loadCommonFonts let renderer = DiagramsRenderer SVG (return fonts) - runExperiment experiment generators (WebPageRenderer renderer experimentFilePath) model1 - runExperiment experiment generators (WebPageRenderer renderer experimentFilePath) model2 - runExperiment experiment generators (WebPageRenderer renderer experimentFilePath) model3 + runExperimentParallel experiment generators (WebPageRenderer renderer experimentFilePath) model1 + runExperimentParallel experiment generators (WebPageRenderer renderer experimentFilePath) model2 + runExperimentParallel experiment generators (WebPageRenderer renderer experimentFilePath) model3 diff --git a/examples/TruckHaulingSituation/MainUsingCairo.hs b/examples/TruckHaulingSituation/MainUsingCairo.hs --- a/examples/TruckHaulingSituation/MainUsingCairo.hs +++ b/examples/TruckHaulingSituation/MainUsingCairo.hs @@ -10,4 +10,4 @@ import Model import Experiment -main = runExperiment experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model +main = runExperimentParallel experiment generators (WebPageRenderer (CairoRenderer PNG) experimentFilePath) model diff --git a/examples/TruckHaulingSituation/MainUsingDiagrams.hs b/examples/TruckHaulingSituation/MainUsingDiagrams.hs --- a/examples/TruckHaulingSituation/MainUsingDiagrams.hs +++ b/examples/TruckHaulingSituation/MainUsingDiagrams.hs @@ -13,4 +13,4 @@ main = do fonts <- loadCommonFonts let renderer = DiagramsRenderer SVG (return fonts) - runExperiment experiment generators (WebPageRenderer renderer experimentFilePath) model + runExperimentParallel experiment generators (WebPageRenderer renderer experimentFilePath) model