packages feed

aivika-experiment-chart 0.1.2 → 0.2

raw patch · 10 files changed

+27/−21 lines, 10 filesdep ~aivikadep ~aivika-experimentPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: aivika, aivika-experiment

API changes (from Hackage documentation)

Files

Simulation/Aivika/Experiment/DeviationChartView.hs view
@@ -24,7 +24,7 @@ import Data.Maybe import Data.Either import Data.Array-import Data.Array.IO+import Data.Array.IO.Safe  import Data.Accessor @@ -111,7 +111,7 @@ defaultDeviationChartView :: DeviationChartView defaultDeviationChartView =    DeviationChartView { deviationChartTitle       = "Deviation Chart",-                       deviationChartDescription = [],+                       deviationChartDescription = "It shows the Deviation chart by rule 3-sigma.",                        deviationChartWidth       = 640,                        deviationChartHeight      = 480,                        deviationChartFileName    = UniqueFileName "$TITLE" ".png",
Simulation/Aivika/Experiment/FinalHistogramView.hs view
@@ -25,7 +25,7 @@ import Data.Maybe import Data.Either import Data.Array-import Data.Array.IO+import Data.Array.IO.Safe  import Data.Accessor @@ -105,7 +105,7 @@ defaultFinalHistogramView :: FinalHistogramView defaultFinalHistogramView =    FinalHistogramView { finalHistogramTitle       = "Final Histogram",-                       finalHistogramDescription = [],+                       finalHistogramDescription = "It shows a histogram by data gathered in the final time points.",                        finalHistogramWidth       = 640,                        finalHistogramHeight      = 480,                        finalHistogramFileName    = UniqueFileName "$TITLE" ".png",@@ -162,7 +162,7 @@      return FinalHistogramResults { finalHistogramNames  = names,                                     finalHistogramValues = values }        --- | Simulation the specified series.+-- | Simulation of the specified series. simulateFinalHistogram :: FinalHistogramViewState -> ExperimentData -> Dynamics (Dynamics ()) simulateFinalHistogram st expdata =   do let protolabels = finalHistogramSeries $ finalHistogramView st
Simulation/Aivika/Experiment/FinalXYChartView.hs view
@@ -24,7 +24,7 @@ import Data.Maybe import Data.Either import Data.Array-import Data.Array.IO+import Data.Array.IO.Safe  import Data.Accessor @@ -112,7 +112,7 @@ defaultFinalXYChartView :: FinalXYChartView defaultFinalXYChartView =    FinalXYChartView { finalXYChartTitle       = "Final XY Chart",-                     finalXYChartDescription = [],+                     finalXYChartDescription = "It shows the XY chart for the results in the final time points.",                      finalXYChartWidth       = 640,                      finalXYChartHeight      = 480,                      finalXYChartFileName    = UniqueFileName "$TITLE" ".png",
Simulation/Aivika/Experiment/HistogramView.hs view
@@ -114,7 +114,7 @@ defaultHistogramView :: HistogramView defaultHistogramView =    HistogramView { histogramTitle       = "Histogram",-                  histogramDescription = [],+                  histogramDescription = "It shows the histogram(s) by data gathered in the integration time points.",                   histogramWidth       = 640,                   histogramHeight      = 480,                   histogramFileName    = UniqueFileName "$TITLE - $RUN_INDEX" ".png",
Simulation/Aivika/Experiment/TimeSeriesView.hs view
@@ -116,7 +116,7 @@ defaultTimeSeriesView :: TimeSeriesView defaultTimeSeriesView =    TimeSeriesView { timeSeriesTitle       = "Time Series",-                   timeSeriesDescription = [],+                   timeSeriesDescription = "It shows the Time Series chart(s).",                    timeSeriesWidth       = 640,                    timeSeriesHeight      = 480,                    timeSeriesFileName    = UniqueFileName "$TITLE - $RUN_INDEX" ".png",
Simulation/Aivika/Experiment/XYChartView.hs view
@@ -122,7 +122,7 @@ defaultXYChartView :: XYChartView defaultXYChartView =    XYChartView { xyChartTitle       = "XY Chart",-                xyChartDescription = [],+                xyChartDescription = "It shows the XY chart(s).",                 xyChartWidth       = 640,                 xyChartHeight      = 480,                 xyChartFileName    = UniqueFileName "$TITLE - $RUN_INDEX" ".png",
aivika-experiment-chart.cabal view
@@ -1,5 +1,5 @@ name:            aivika-experiment-chart-version:         0.1.2+version:         0.2 synopsis:        Simulation experiments with charting for the Aivika library description:     This package complements the Aivika and Aivika Experiment packages with@@ -43,7 +43,7 @@                      MissingH >= 1.2.0.0,                      data-accessor >= 0.2.2.3,                      colour >= 2.3.3,-                     aivika >= 0.4.3,-                     aivika-experiment >= 0.1.2+                     aivika >= 0.5.1,+                     aivika-experiment >= 0.2      ghc-options:     -O2
examples/BassDiffusion.hs view
@@ -13,6 +13,7 @@ import Simulation.Aivika.Experiment import Simulation.Aivika.Experiment.DeviationChartView import Simulation.Aivika.Experiment.TimeSeriesView+import Simulation.Aivika.Experiment.ExperimentSpecsView  n = 100    -- the number of agents @@ -32,7 +33,8 @@     experimentRunCount = 20,     experimentDescription = "This is a famous Bass Diffusion model solved with help of the agent-based modelling.",     experimentGenerators =-      [outputView $ defaultDeviationChartView {+      [outputView defaultExperimentSpecsView,+       outputView $ defaultDeviationChartView {          deviationChartSeries = [Left "potentialAdopters",                                   Left "adopters"] },        outputView $ defaultTimeSeriesView {
examples/ChemicalReaction.hs view
@@ -10,6 +10,7 @@ import Simulation.Aivika.Experiment.TableView import Simulation.Aivika.Experiment.TimeSeriesView import Simulation.Aivika.Experiment.XYChartView+import Simulation.Aivika.Experiment.ExperimentSpecsView  specs = Specs { spcStartTime = 0,                  spcStopTime = 13, @@ -21,13 +22,11 @@   defaultExperiment {     experimentSpecs = specs,     experimentRunCount = 1,-    experimentDescription = "Experiment Description",     experimentGenerators =-      [outputView $ defaultLastValueView {-          lastValueDescription = "Last Value description",-          lastValueSeries = ["t", "a", "b", "c"] },+      [outputView defaultExperimentSpecsView,+       outputView $ defaultLastValueView {+         lastValueSeries = ["t", "a", "b", "c"] },        outputView $ defaultTableView {-         tableDescription = "Table description",          tableSeries = ["t", "a", "b", "c"] },         outputView $ defaultTimeSeriesView {          timeSeries = [Left "a", Left "b", Left "c"] },
examples/MachRep3.hs view
@@ -35,6 +35,8 @@ import Simulation.Aivika.Experiment.DeviationChartView import Simulation.Aivika.Experiment.FinalHistogramView import Simulation.Aivika.Experiment.FinalXYChartView+import Simulation.Aivika.Experiment.ExperimentSpecsView+import Simulation.Aivika.Experiment.FinalStatsView  specs = Specs { spcStartTime = 0.0,                 spcStopTime = 1000.0,@@ -48,8 +50,9 @@     experimentRunCount = 200,     experimentDescription = "Experiment Description",     experimentGenerators =-      [outputView $ defaultDeviationChartView {-          deviationChartSeries = [Left "t", Right "x"] },+      [outputView defaultExperimentSpecsView,+       outputView $ defaultDeviationChartView {+         deviationChartSeries = [Left "t", Right "x"] },        outputView $ defaultFinalXYChartView {          finalXYChartPlotTitle = "The proportion up time for simulation runs < 50 and > 100",           finalXYChartXSeries = Just "n",@@ -63,6 +66,8 @@        outputView $ defaultFinalHistogramView {          finalHistogramPlotTitle  = "Final Histogram (Default)",          finalHistogramSeries = ["t", "t"] },+       outputView $ defaultFinalStatsView {+         finalStatsSeries = ["x"] },        outputView $ defaultFinalHistogramView {          finalHistogramPlotTitle  = "Final Histogram (Default)",          finalHistogramSeries = ["x"] },