From 5ee02912c4aa4c599aa4196f768cb38b8b139af4 Mon Sep 17 00:00:00 2001 From: Adriano Meligrana <68152031+Tortar@users.noreply.github.com> Date: Mon, 5 May 2025 16:39:03 +0200 Subject: [PATCH 1/6] Use StructVector container in Schelling and Flocking benchmarks --- Schelling/Agents/Schelling.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Schelling/Agents/Schelling.jl b/Schelling/Agents/Schelling.jl index ea0f2aed..56f94f2a 100755 --- a/Schelling/Agents/Schelling.jl +++ b/Schelling/Agents/Schelling.jl @@ -9,7 +9,7 @@ function schelling_model(rng, numagents, griddims, min_to_be_happy, radius) space = GridSpaceSingle(griddims, periodic = false) properties = (min_to_be_happy = min_to_be_happy, radius = radius) model = StandardABM(SchellingAgent, space; agent_step!, properties, rng, - container = Vector, scheduler = Schedulers.Randomly()) + container = StructVector, scheduler = Schedulers.Randomly()) for n in 1:numagents add_agent_single!(model, false, n < numagents / 2 ? 1 : 2) end From 3308ef9fc8309dc4d8e68520c2ea30d9760b7fc3 Mon Sep 17 00:00:00 2001 From: Adriano Meligrana <68152031+Tortar@users.noreply.github.com> Date: Mon, 5 May 2025 16:40:43 +0200 Subject: [PATCH 2/6] Update Flocking.jl --- Flocking/Agents/Flocking.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Flocking/Agents/Flocking.jl b/Flocking/Agents/Flocking.jl index 5a66d1a4..95035d06 100755 --- a/Flocking/Agents/Flocking.jl +++ b/Flocking/Agents/Flocking.jl @@ -13,7 +13,7 @@ function flocking_model(rng, extent, n_birds, visual_distance; speed = 1.0, cohere_factor = 0.03, separation = 1.0, separate_factor = 0.015, match_factor = 0.05, spacing = visual_distance / 1.5,) space2d = ContinuousSpace(extent; spacing) - model = StandardABM(Bird, space2d; agent_step!, rng, container = Vector, + model = StandardABM(Bird, space2d; agent_step!, rng, container = StructVector, scheduler = Schedulers.Randomly()) for n in 1:n_birds vel = SVector{2}(rand(abmrng(model)) * 2 - 1 for _ in 1:2) From 055391c75ac221a6703d453a41cb14cea9010d70 Mon Sep 17 00:00:00 2001 From: Adriano Meligrana <68152031+Tortar@users.noreply.github.com> Date: Mon, 5 May 2025 17:00:49 +0200 Subject: [PATCH 3/6] Update Schelling.jl --- Schelling/Agents/Schelling.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Schelling/Agents/Schelling.jl b/Schelling/Agents/Schelling.jl index 56f94f2a..ea0f2aed 100755 --- a/Schelling/Agents/Schelling.jl +++ b/Schelling/Agents/Schelling.jl @@ -9,7 +9,7 @@ function schelling_model(rng, numagents, griddims, min_to_be_happy, radius) space = GridSpaceSingle(griddims, periodic = false) properties = (min_to_be_happy = min_to_be_happy, radius = radius) model = StandardABM(SchellingAgent, space; agent_step!, properties, rng, - container = StructVector, scheduler = Schedulers.Randomly()) + container = Vector, scheduler = Schedulers.Randomly()) for n in 1:numagents add_agent_single!(model, false, n < numagents / 2 ? 1 : 2) end From ac282ee8219d7fbb91c94dec55c5476971e5b625 Mon Sep 17 00:00:00 2001 From: Adriano Meligrana <68152031+Tortar@users.noreply.github.com> Date: Mon, 5 May 2025 17:20:11 +0200 Subject: [PATCH 4/6] Update Schelling.jl --- Schelling/Agents/Schelling.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Schelling/Agents/Schelling.jl b/Schelling/Agents/Schelling.jl index ea0f2aed..56f94f2a 100755 --- a/Schelling/Agents/Schelling.jl +++ b/Schelling/Agents/Schelling.jl @@ -9,7 +9,7 @@ function schelling_model(rng, numagents, griddims, min_to_be_happy, radius) space = GridSpaceSingle(griddims, periodic = false) properties = (min_to_be_happy = min_to_be_happy, radius = radius) model = StandardABM(SchellingAgent, space; agent_step!, properties, rng, - container = Vector, scheduler = Schedulers.Randomly()) + container = StructVector, scheduler = Schedulers.Randomly()) for n in 1:numagents add_agent_single!(model, false, n < numagents / 2 ? 1 : 2) end From 588bd29a3a369839c56a77128ce365ade58e14cd Mon Sep 17 00:00:00 2001 From: Adriano Meligrana <68152031+Tortar@users.noreply.github.com> Date: Fri, 19 Dec 2025 18:33:05 +0100 Subject: [PATCH 5/6] Update Flocking.jl --- Flocking/Agents/Flocking.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Flocking/Agents/Flocking.jl b/Flocking/Agents/Flocking.jl index 95035d06..a8cedeef 100755 --- a/Flocking/Agents/Flocking.jl +++ b/Flocking/Agents/Flocking.jl @@ -13,7 +13,7 @@ function flocking_model(rng, extent, n_birds, visual_distance; speed = 1.0, cohere_factor = 0.03, separation = 1.0, separate_factor = 0.015, match_factor = 0.05, spacing = visual_distance / 1.5,) space2d = ContinuousSpace(extent; spacing) - model = StandardABM(Bird, space2d; agent_step!, rng, container = StructVector, + model = StandardABM(Bird, space2d; agent_step!, rng, container = StructVector , scheduler = Schedulers.Randomly()) for n in 1:n_birds vel = SVector{2}(rand(abmrng(model)) * 2 - 1 for _ in 1:2) From 81765636e55c7e9ab73b9b7dd428bfa7a35d51da Mon Sep 17 00:00:00 2001 From: Adriano Meligrana <68152031+Tortar@users.noreply.github.com> Date: Fri, 19 Dec 2025 18:33:15 +0100 Subject: [PATCH 6/6] Update Flocking.jl --- Flocking/Agents/Flocking.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Flocking/Agents/Flocking.jl b/Flocking/Agents/Flocking.jl index a8cedeef..95035d06 100755 --- a/Flocking/Agents/Flocking.jl +++ b/Flocking/Agents/Flocking.jl @@ -13,7 +13,7 @@ function flocking_model(rng, extent, n_birds, visual_distance; speed = 1.0, cohere_factor = 0.03, separation = 1.0, separate_factor = 0.015, match_factor = 0.05, spacing = visual_distance / 1.5,) space2d = ContinuousSpace(extent; spacing) - model = StandardABM(Bird, space2d; agent_step!, rng, container = StructVector , + model = StandardABM(Bird, space2d; agent_step!, rng, container = StructVector, scheduler = Schedulers.Randomly()) for n in 1:n_birds vel = SVector{2}(rand(abmrng(model)) * 2 - 1 for _ in 1:2)