diff --git a/Project.toml b/Project.toml index 8b3291bea6c4c59dcea828b25aba4ec1a7eff42f..d18b9ff19d36850fbdfe2433dbe20d85a018c793 100644 --- a/Project.toml +++ b/Project.toml @@ -7,7 +7,6 @@ version = "0.4.1" Agents = "46ada45e-f475-11e8-01d0-f70cc89e6671" ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63" CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b" -CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" DataFramesMeta = "1313f7d8-7da2-5740-9ea0-a2ca25f37964" Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" diff --git a/src/Persefone.jl b/src/Persefone.jl index 4291e31bc9b8d4ff59a44a05bdb7040de3416197..9a37a641535a21459d69fd85dbcfd96fde928823 100644 --- a/src/Persefone.jl +++ b/src/Persefone.jl @@ -16,7 +16,6 @@ module Persefone using Agents, ArgParse, - CairoMakie, #XXX this is a very big dependency :-( CSV, Dates, DataFrames, @@ -80,8 +79,6 @@ export createevent!, finalise!, outputdata, - visualisemap, - populationtrends, visualiseoutput, savemodelobject, loadmodelobject @@ -90,7 +87,7 @@ export ## b references something from file a, it must be included later) include("core/input.jl") include("core/output.jl") -include("analysis/makieplots.jl") +#include("analysis/makieplots.jl") include("world/landscape.jl") include("world/weather.jl") diff --git a/src/core/output.jl b/src/core/output.jl index 513b140a3b279a03eeec420c4d97c5b80fdc0e45..e26e84f40e82f03c15bfce8416628cc934fe3c73 100644 --- a/src/core/output.jl +++ b/src/core/output.jl @@ -217,7 +217,7 @@ saving each figure to file. """ function visualiseoutput(model::AgentBasedModel) @debug "Visualising output." - CairoMakie.activate!() # make sure we're using Cairo + #CairoMakie.activate!() # make sure we're using Cairo for output in model.dataoutputs isnothing(output.plotfunction) && continue figure = output.plotfunction(model) diff --git a/src/nature/ecologicaldata.jl b/src/nature/ecologicaldata.jl index 02c646aedb631bf26af86468fbfe8822eb9dfc11..03cad202e790cbb0a79bb73a2ec240ccb924a418 100644 --- a/src/nature/ecologicaldata.jl +++ b/src/nature/ecologicaldata.jl @@ -9,10 +9,10 @@ Create output files for each data group collected by the nature model. """ function initecologicaldata(model::AgentBasedModel) - newdataoutput!(model, "populations", ["Date", "Species", "Abundance"], - savepopulationdata, @param(nature.popoutfreq), populationtrends) - newdataoutput!(model, "individuals", ["Date","ID","X","Y","Species","Sex","Age"], - saveindividualdata, @param(nature.indoutfreq), visualisemap) + # newdataoutput!(model, "populations", ["Date", "Species", "Abundance"], + # savepopulationdata, @param(nature.popoutfreq), populationtrends) + # newdataoutput!(model, "individuals", ["Date","ID","X","Y","Species","Sex","Age"], + # saveindividualdata, @param(nature.indoutfreq), visualisemap) end """ diff --git a/test/io_tests.jl b/test/io_tests.jl index 734ee7844566ddf2eb6cc01cd421204d9d253084..1ba74c2fe10019bbcca43d061dada2439e97493d 100644 --- a/test/io_tests.jl +++ b/test/io_tests.jl @@ -85,13 +85,13 @@ end @param(core.enddate) = originalenddate end -@testset "Output visualisation" begin - model = initialise(TESTPARAMETERS) - stepsimulation!(model) - @test_logs((:debug, "Visualising output."), - min_level=Logging.Debug, match_mode=:any, - visualiseoutput(model)) - @test isfile(joinpath(@param(core.outdir), "individuals.pdf")) - @test isfile(joinpath(@param(core.outdir), "populations.pdf")) - rm(@param(core.outdir), force=true, recursive=true) -end +# @testset "Output visualisation" begin +# model = initialise(TESTPARAMETERS) +# stepsimulation!(model) +# @test_logs((:debug, "Visualising output."), +# min_level=Logging.Debug, match_mode=:any, +# visualiseoutput(model)) +# @test isfile(joinpath(@param(core.outdir), "individuals.pdf")) +# @test isfile(joinpath(@param(core.outdir), "populations.pdf")) +# rm(@param(core.outdir), force=true, recursive=true) +# end