diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c0261529f1f3b3dab348f74adffff2252e0521f..12a692c70b533865e4208db0b02fec9bef50ad11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,10 +19,13 @@ way the species definition macros work and are used. - `@create` macro defines a special phase function that is called when an individual animal is created (at birth or on model initialisation) -- functions to replace Agents.jl functionality: +- functions (and associated macros) to replace Agents.jl functionality: - `move!()` and `walk!()` - `nearby_ids()`, `nearby_animals()`, `neighbours()` - `directionto()`, `distanceto()`, `randomdirection()` + - `nagents()` + +- `@here` - large logo and model structure diagram @@ -40,6 +43,8 @@ way the species definition macros work and are used. - Skylark, Wolpertinger, and Wyvern updated to match the new macros +- requires Julia 1.10 + ### Deprecated ### Removed diff --git a/Manifest.toml b/Manifest.toml index a7f7ddeae95be084cc996755ed3a769227bf2672..52f95cf2d30c65b319e2d5c66f60c8798a43be86 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.9.3" manifest_format = "2.0" -project_hash = "e311f4201afd13434354fd7c9ee06354de336988" +project_hash = "de5f3c5069068252f2e7d0894f08e62dd473087e" [[deps.ANSIColoredPrinters]] git-tree-sha1 = "574baf8110975760d391c710b6341da1afa48d8c" @@ -40,22 +40,6 @@ weakdeps = ["StaticArrays"] [deps.Adapt.extensions] AdaptStaticArraysExt = "StaticArrays" -[[deps.Agents]] -deps = ["CSV", "CommonSolve", "DataFrames", "DataStructures", "Distributed", "Distributions", "Downloads", "Graphs", "JLD2", "LazyArtifacts", "LightOSM", "LinearAlgebra", "Pkg", "ProgressMeter", "Random", "Rotations", "Scratch", "StaticArrays", "StatsBase"] -git-tree-sha1 = "adb98dc3c06912eb2af18ba80365b9a8a61806c5" -uuid = "46ada45e-f475-11e8-01d0-f70cc89e6671" -version = "5.17.1" - - [deps.Agents.extensions] - AgentsArrow = "Arrow" - AgentsOSMVisualizations = "OSMMakie" - AgentsVisualizations = "Makie" - - [deps.Agents.weakdeps] - Arrow = "69666777-d1a9-59fb-9406-91d4454c9d45" - Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a" - OSMMakie = "76b6901f-8821-46bb-9129-841bc9cfe677" - [[deps.Animations]] deps = ["Colors"] git-tree-sha1 = "e81c509d2c8e49592413bfb0bb3b08150056c79d" @@ -83,12 +67,6 @@ version = "1.1.4" uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" version = "1.1.1" -[[deps.ArnoldiMethod]] -deps = ["LinearAlgebra", "Random", "StaticArrays"] -git-tree-sha1 = "62e51b39331de8911e4a7ff6f5aaf38a5f4cc0ae" -uuid = "ec485272-7323-5ecc-a04f-4719b315124d" -version = "0.2.0" - [[deps.ArrayInterface]] deps = ["Adapt", "LinearAlgebra", "Requires", "SparseArrays", "SuiteSparse"] git-tree-sha1 = "f83ec24f76d4c8f525099b2ac475fc098138ec31" @@ -111,11 +89,6 @@ version = "7.4.11" StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c" Tracker = "9f7883ad-71c0-57eb-9f7f-b5c9e6d3789c" -[[deps.ArrayTools]] -git-tree-sha1 = "ca8c5218f18c5318827fdb1881f370249610f8d2" -uuid = "1dc0ca97-c5ce-4e77-ac6d-c576ac9d7f27" -version = "0.2.7" - [[deps.Arrow_jll]] deps = ["Artifacts", "Bzip2_jll", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Lz4_jll", "Pkg", "Thrift_jll", "Zlib_jll", "boost_jll", "snappy_jll"] git-tree-sha1 = "d64cb60c0e6a138fbe5ea65bcbeea47813a9a700" @@ -170,11 +143,6 @@ git-tree-sha1 = "4435559dc39793d53a9e3d278e185e920b4619ef" uuid = "0e736298-9ec6-45e8-9647-e4fc86a2fe38" version = "0.2.8" -[[deps.BitFlags]] -git-tree-sha1 = "43b1a4a8f797c1cddadf60499a8a077d4af2cd2d" -uuid = "d1d4a3ce-64b1-5f1a-9ba4-7e7e69966f35" -version = "0.1.7" - [[deps.Bzip2_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "19a35467a82e236ff51bc17a3a44b69ef35185a2" @@ -307,11 +275,6 @@ git-tree-sha1 = "08c8b6831dc00bfea825826be0bc8336fc369860" uuid = "861a8166-3701-5b0c-9a16-15d98fcdc6aa" version = "1.0.2" -[[deps.CommonSolve]] -git-tree-sha1 = "0eee5eb66b1cf62cd6ad1b460238e60e4b09400c" -uuid = "38540f10-b2f7-11e9-35d8-d573e4eb0ff2" -version = "0.2.4" - [[deps.CommonSubexpressions]] deps = ["MacroTools", "Test"] git-tree-sha1 = "7b8a93dba8af7e3b42fecabf646260105ac373f7" @@ -344,12 +307,6 @@ version = "0.1.2" [deps.CompositionsBase.weakdeps] InverseFunctions = "3587e190-3f89-42d0-90ee-14403ec27112" -[[deps.ConcurrentUtilities]] -deps = ["Serialization", "Sockets"] -git-tree-sha1 = "5372dbbf8f0bdb8c700db5367132925c0771ef7e" -uuid = "f0e56b4a-5159-44fe-b623-3e5288b988bb" -version = "2.2.1" - [[deps.ConstructionBase]] deps = ["LinearAlgebra"] git-tree-sha1 = "c53fc348ca4d40d7b371e71fd52251839080cbc9" @@ -540,12 +497,6 @@ git-tree-sha1 = "276e83bc8b21589b79303b9985c321024ffdf59c" uuid = "429591f6-91af-11e9-00e2-59fbe8cec110" version = "2.2.5" -[[deps.ExceptionUnwrapping]] -deps = ["Test"] -git-tree-sha1 = "e90caa41f5a86296e014e148ee061bd6c3edec96" -uuid = "460bff9d-24e4-43bc-9d9f-a8973cb893f4" -version = "0.1.9" - [[deps.Expat_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "4558ab818dcceaab612d1bb8c19cee87eda2b83c" @@ -762,12 +713,6 @@ git-tree-sha1 = "344bf40dcab1073aca04aa0df4fb092f920e4011" uuid = "3b182d85-2403-5c21-9c21-1e1f0cc25472" version = "1.3.14+0" -[[deps.Graphs]] -deps = ["ArnoldiMethod", "Compat", "DataStructures", "Distributed", "Inflate", "LinearAlgebra", "Random", "SharedArrays", "SimpleTraits", "SparseArrays", "Statistics"] -git-tree-sha1 = "899050ace26649433ef1af25bc17a815b3db52b7" -uuid = "86223c79-3864-5bf0-83f7-82e725a168b6" -version = "1.9.0" - [[deps.GridLayoutBase]] deps = ["GeometryBasics", "InteractiveUtils", "Observables"] git-tree-sha1 = "f57a64794b336d4990d90f80b147474b869b1bc4" @@ -785,12 +730,6 @@ git-tree-sha1 = "38c8874692d48d5440d5752d6c74b0c6b0b60739" uuid = "0234f1f7-429e-5d53-9886-15a909be8d59" version = "1.14.2+1" -[[deps.HTTP]] -deps = ["Base64", "CodecZlib", "ConcurrentUtilities", "Dates", "ExceptionUnwrapping", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"] -git-tree-sha1 = "5eab648309e2e060198b45820af1a37182de3cce" -uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" -version = "1.10.0" - [[deps.HarfBuzz_jll]] deps = ["Artifacts", "Cairo_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "Graphite2_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Pkg"] git-tree-sha1 = "129acf094d168394e80ee1dc4bc06ec835e510a3" @@ -940,12 +879,6 @@ git-tree-sha1 = "a3f24677c21f5bbe9d2a714f95dcd58337fb2856" uuid = "82899510-4779-5014-852e-03e436cf321d" version = "1.0.0" -[[deps.JLD2]] -deps = ["FileIO", "MacroTools", "Mmap", "OrderedCollections", "Pkg", "Printf", "Reexport", "Requires", "TranscodingStreams", "UUIDs"] -git-tree-sha1 = "c11d691a0dc8e90acfa4740d293ade57f68bfdbb" -uuid = "033835bb-8acc-5ee8-8aae-3f567f8a3819" -version = "0.4.35" - [[deps.JLLWrappers]] deps = ["Artifacts", "Preferences"] git-tree-sha1 = "7e5d6779a1e09a36db2a7b6cff50942a0a7d0fca" @@ -1095,12 +1028,6 @@ git-tree-sha1 = "7f3efec06033682db852f8b3bc3c1d2b0a0ab066" uuid = "38a345b3-de98-5d2b-a5d3-14cd9215e700" version = "2.36.0+0" -[[deps.LightOSM]] -deps = ["DataStructures", "Graphs", "HTTP", "JSON", "LightXML", "MetaGraphs", "NearestNeighbors", "Parameters", "QuickHeaps", "SimpleWeightedGraphs", "SparseArrays", "SpatialIndexing", "StaticArrays", "StaticGraphs", "Statistics"] -git-tree-sha1 = "9a4355c298afb938274d8559128fd22c020d242c" -uuid = "d1922b25-af4e-4ba3-84af-fe9bea896051" -version = "0.2.11" - [[deps.LightXML]] deps = ["Libdl", "XML2_jll"] git-tree-sha1 = "e129d9391168c677cd4800f5c0abb1ed8cb3794f" @@ -1244,12 +1171,6 @@ git-tree-sha1 = "8f52dbaa1351ce4cb847d95568cb29e62a307d93" uuid = "0a4f8689-d25c-4efe-a92b-7142dfc1aa53" version = "0.5.6" -[[deps.MbedTLS]] -deps = ["Dates", "MbedTLS_jll", "MozillaCACerts_jll", "Random", "Sockets"] -git-tree-sha1 = "03a9b9718f5682ecb107ac9f7308991db4ce395b" -uuid = "739be429-bea8-5141-9913-cc70e7f3736d" -version = "1.1.7" - [[deps.MbedTLS_jll]] deps = ["Artifacts", "Libdl"] uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" @@ -1261,12 +1182,6 @@ git-tree-sha1 = "5cd413ae2079f4a98aa8b506add26a1656cb0de5" uuid = "eacbb407-ea5a-433e-ab97-5258b1ca43fa" version = "0.28.1" -[[deps.MetaGraphs]] -deps = ["Graphs", "JLD2", "Random"] -git-tree-sha1 = "1130dbe1d5276cb656f6e1094ce97466ed700e5a" -uuid = "626554b9-1ddb-594c-aa3c-2596fe9399a5" -version = "0.7.2" - [[deps.MicroCollections]] deps = ["BangBang", "InitialValues", "Setfield"] git-tree-sha1 = "629afd7d10dbc6935ec59b32daeb33bc4460a42e" @@ -1398,12 +1313,6 @@ git-tree-sha1 = "e25c1778a98e34219a00455d6e4384e017ea9762" uuid = "fe0851c0-eecd-5654-98d4-656369965a5c" version = "4.1.6+0" -[[deps.OpenSSL]] -deps = ["BitFlags", "Dates", "MozillaCACerts_jll", "OpenSSL_jll", "Sockets"] -git-tree-sha1 = "51901a49222b09e3743c65b8847687ae5fc78eb2" -uuid = "4d8831e6-92b7-49fb-bdf8-b643e874388c" -version = "1.4.1" - [[deps.OpenSSL_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] git-tree-sha1 = "ceeda72c9fd6bbebc4f4f598560789145a8b6c4c" @@ -1596,18 +1505,6 @@ git-tree-sha1 = "9ebcd48c498668c7fa0e97a9cae873fbee7bfee1" uuid = "1fd47b50-473d-5c70-9696-f719f8f3bcdc" version = "2.9.1" -[[deps.Quaternions]] -deps = ["LinearAlgebra", "Random", "RealDot"] -git-tree-sha1 = "da095158bdc8eaccb7890f9884048555ab771019" -uuid = "94ee1d12-ae83-5a48-8b1c-48b8ff168ae0" -version = "0.7.4" - -[[deps.QuickHeaps]] -deps = ["ArrayTools", "DataStructures"] -git-tree-sha1 = "ff720a9c8356004cc9e3d109cdcb327510345edc" -uuid = "30b38841-0f52-47f8-a5f8-18d5d4064379" -version = "0.1.2" - [[deps.REPL]] deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" @@ -1631,12 +1528,6 @@ weakdeps = ["FixedPointNumbers"] [deps.Ratios.extensions] RatiosFixedPointNumbersExt = "FixedPointNumbers" -[[deps.RealDot]] -deps = ["LinearAlgebra"] -git-tree-sha1 = "9f0a1b71baaf7650f4fa8a1d168c7fb6ee41f0c9" -uuid = "c1ae055f-0cd5-4b69-90a6-9a35b1a98df9" -version = "0.1.0" - [[deps.RecipesBase]] deps = ["PrecompileTools"] git-tree-sha1 = "5c3d09cc4f31f5fc6af001c250bf1278733100ff" @@ -1690,12 +1581,6 @@ git-tree-sha1 = "6ed52fdd3382cf21947b15e8870ac0ddbff736da" uuid = "f50d1b31-88e8-58de-be2c-1cc44531875f" version = "0.4.0+0" -[[deps.Rotations]] -deps = ["LinearAlgebra", "Quaternions", "Random", "StaticArrays"] -git-tree-sha1 = "0783924e4a332493f72490253ba4e668aeba1d73" -uuid = "6038ab10-8711-5258-84ad-4b1120ba62dc" -version = "1.6.0" - [[deps.RoundingEmulator]] git-tree-sha1 = "40b9edad2e5287e05bd413a38f61a8ff55b9557b" uuid = "5eaf0fd0-dfba-4ccb-bf02-d820a40db705" @@ -1770,11 +1655,6 @@ git-tree-sha1 = "d263a08ec505853a5ff1c1ebde2070419e3f28e9" uuid = "73760f76-fbc4-59ce-8f25-708e95d2df96" version = "0.4.0" -[[deps.SimpleBufferStream]] -git-tree-sha1 = "874e8867b33a00e784c8a7e4b60afe9e037b74e1" -uuid = "777ac1f9-54b0-4bf8-805c-2214025038e7" -version = "1.1.0" - [[deps.SimpleGraphs]] deps = ["AbstractLattices", "Combinatorics", "DataStructures", "IterTools", "LightXML", "LinearAlgebra", "LinearAlgebraX", "Optim", "Primes", "Random", "RingLists", "SimplePartitions", "SimplePolynomials", "SimpleRandom", "SparseArrays", "Statistics"] git-tree-sha1 = "b608903049d11cc557c45e03b3a53e9260579c19" @@ -1805,12 +1685,6 @@ git-tree-sha1 = "5d7e3f4e11935503d3ecaf7186eac40602e7d231" uuid = "699a6c99-e7fa-54fc-8d76-47d257e15c1d" version = "0.9.4" -[[deps.SimpleWeightedGraphs]] -deps = ["Graphs", "LinearAlgebra", "Markdown", "SparseArrays"] -git-tree-sha1 = "4b33e0e081a825dbfaf314decf58fa47e53d6acb" -uuid = "47aef6b3-ad0c-573a-a1e2-d07658019622" -version = "1.4.0" - [[deps.Sixel]] deps = ["Dates", "FileIO", "ImageCore", "IndirectArrays", "OffsetArrays", "REPL", "libsixel_jll"] git-tree-sha1 = "2da10356e31327c7096832eb9cd86307a50b1eb6" @@ -1830,11 +1704,6 @@ version = "1.1.1" deps = ["Libdl", "LinearAlgebra", "Random", "Serialization", "SuiteSparse_jll"] uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" -[[deps.SpatialIndexing]] -git-tree-sha1 = "bacf5065cd7c0d6449b8bba6fa8e75b3087356b0" -uuid = "d4ead438-fe20-5cc5-a293-4fd39a41b74c" -version = "0.1.5" - [[deps.SpecialFunctions]] deps = ["IrrationalConstants", "LogExpFunctions", "OpenLibm_jll", "OpenSpecFun_jll"] git-tree-sha1 = "e2cfc4012a19088254b3950b85c3c1d8882d864d" @@ -1890,12 +1759,6 @@ git-tree-sha1 = "36b3d696ce6366023a0ea192b4cd442268995a0d" uuid = "1e83bf80-4336-4d27-bf5d-d5a4f845583c" version = "1.4.2" -[[deps.StaticGraphs]] -deps = ["Graphs", "JLD2", "SparseArrays"] -git-tree-sha1 = "855371d8fdfaed46dbb32a7c57a42db4441b9247" -uuid = "4c8beaf5-199b-59a0-a7f2-21d17de635b6" -version = "0.3.0" - [[deps.StatisticalTraits]] deps = ["ScientificTypesBase"] git-tree-sha1 = "30b9236691858e13f167ce829490a68e1a597782" @@ -2057,11 +1920,6 @@ git-tree-sha1 = "d911ae4e642cf7d56b1165d29ef0a96ba3444ca9" uuid = "9d95f2ec-7b3d-5a63-8d20-e2491e220bb9" version = "1.4.3" -[[deps.URIs]] -git-tree-sha1 = "b7a5e99f24892b6824a954199a45e9ffcc1c70f0" -uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4" -version = "1.5.0" - [[deps.UUIDs]] deps = ["Random", "SHA"] uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" diff --git a/Project.toml b/Project.toml index fee76e4fa01d80191fc882153a11981b568fa286..d052e044ff500e8c5e0b4f47c14debcc56dbb942 100644 --- a/Project.toml +++ b/Project.toml @@ -4,7 +4,6 @@ authors = ["Daniel Vedder <daniel.vedder@idiv.de>"] version = "0.4.1" [deps] -Agents = "46ada45e-f475-11e8-01d0-f70cc89e6671" ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63" CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b" CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0" @@ -27,5 +26,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" TiffImages = "731e570b-9d59-4bfa-96dc-6df516fadf69" [compat] -Agents = ">= 5.6" -julia = ">= 1.9" +julia = ">= 1.10"