Fix flocking behaviour (#73)

JuliaDynamics · Sep 21, 2023 · fb7cd74 · fb7cd74
1 parent 2134b79
commit fb7cd74
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/Flocking/Agents/Flocking.jl b/Flocking/Agents/Flocking.jl
@@ -37,7 +37,7 @@ function flocking_agent_step!(bird, model)
     match = separate = cohere = (0.0, 0.0)
     for neighbor in neighbor_agents
         N += 1
-        heading = neighbor.pos .- bird.pos
+        heading = get_direction(bird.pos, neighbor.pos, model)
         cohere = cohere .+ heading
         match = match .+ neighbor.vel
         if sum(heading.^2) < bird.separation^2
@@ -48,7 +48,7 @@ function flocking_agent_step!(bird, model)
     cohere = cohere .* bird.cohere_factor
     separate = separate .* bird.separate_factor
     match = match .* bird.match_factor
-    bird.vel = bird.vel .+ (cohere .+ separate .+ match) ./ N 
+    bird.vel = bird.vel .+ (cohere .+ separate .+ match) ./ N
     bird.vel = bird.vel ./ norm(bird.vel)
     move_agent!(bird, model, bird.speed)
 end
diff --git a/Flocking/Mesa/boid.py b/Flocking/Mesa/boid.py
@@ -72,11 +72,10 @@ def step(self):
                 separation_vector -= heading
             match_vector += neighbor.velocity
         N = max(N, 1)
-        cohere = cohere / N * self.cohere_factor
+        cohere = cohere * self.cohere_factor
         separation_vector = separation_vector * self.separate_factor
-        match_vector = match_vector / N * self.match_factor
-        #self.velocity = (self.velocity + cohere + separation_vector + match_vector) / 2
-        self.velocity += (cohere + separation_vector + match_vector) / 2
+        match_vector = match_vector * self.match_factor
+        self.velocity += (cohere + separation_vector + match_vector) / N
         self.velocity /= np.linalg.norm(self.velocity)
         new_pos = self.pos + self.velocity * self.speed
         self.model.space.move_agent(self, new_pos)
diff --git a/README.md b/README.md
@@ -22,8 +22,8 @@ These are the results of the latest comparison:
 |:------------------:|:---------------:|:------------:|:------------:|:---------------:|
  | WolfSheep-small  |       1        |    66.8x    |     12.2x      |    40.8x    |
 | WolfSheep-large  |       1        |    21.3x    |      8.3x      |    28.5x    |
- |  Flocking-small  |       1        |    18.3x    |     16.9x      |   134.2x    |
-|  Flocking-large  |       1        |    3.2x     |     18.5x      |   108.1x    |
+ |  Flocking-small  |       1       |    18.7x   |     17.4x     |   183.3x    |
+|  Flocking-large  |       1       |    3.1x   |     19.8x    |   209.7x    |
  | Schelling-small  |       1        |    77.5x    |     23.7x      |    59.4x    |
 | Schelling-large  |       1        |    6.9x     |     32.8x      |    68.4x    |