Skip to content
Snippets Groups Projects
Commit 1086229e authored by markr's avatar markr
Browse files

Update simulate.py

parent 890428aa
No related branches found
No related tags found
No related merge requests found
...@@ -285,8 +285,8 @@ def update_couzin(agent, agents, maxV, winWidth, winHeight, window, maxTurn, rad ...@@ -285,8 +285,8 @@ def update_couzin(agent, agents, maxV, winWidth, winHeight, window, maxTurn, rad
agent[3].draw(window) agent[3].draw(window)
return agents return agents
def update_vicsek(agent, agents, maxV, winWidth, winHeight, window, maxTurn, radTurn, negRadTurn, zoo_r, blind,speed): def update_vicsek(agent, agents, maxV, winWidth, winHeight, window, zoo_r,speed):
return update_couzin(agent, agents, maxV, winWidth, winHeight, window, maxTurn, radTurn, negRadTurn, 0, zoo_r, 0, blind,speed, True) return update_couzin(agent, agents, maxV, winWidth, winHeight, window, 180, math.radians(180), -math.radians(180), 0, zoo_r, 0, 0,speed, True)
# -----------------plot stuff # -----------------plot stuff
...@@ -365,7 +365,7 @@ def main(): ...@@ -365,7 +365,7 @@ def main():
numpycount = np.append(numpycount,i) numpycount = np.append(numpycount,i)
#agents = update_simplest(agent, agents, maxV, winWidth, winHeight, window) #agents = update_simplest(agent, agents, maxV, winWidth, winHeight, window)
agents = update_couzin(agent, agents, maxV, winWidth, winHeight, window, maxTurn, radTurn, negRadTurn, zor_r, zoo_r, zoa_r, blind,speed, False) agents = update_couzin(agent, agents, maxV, winWidth, winHeight, window, maxTurn, radTurn, negRadTurn, zor_r, zoo_r, zoa_r, blind,speed, False)
#agents = update_vicsek(agent, agents, maxV, winWidth, winHeight, window, maxTurn, radTurn, negRadTurn, zoo_r, blind, speed) #agents = update_vicsek(agent, agents, maxV, winWidth, winHeight, window, zoo_r, speed)
time.sleep(0.01) time.sleep(0.01)
plt.errorbar(numpycount,distancedata,yerr=distancestd) plt.errorbar(numpycount,distancedata,yerr=distancestd)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment