Delete file

quanghuyle3 · Aug 19, 2021 · 09f4c05 · 09f4c05
1 parent 161639f
commit 09f4c05
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 338 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/__pycache__/runner.cpython-38.pyc b/__pycache__/runner.cpython-38.pyc
diff --git a/__pycache__/runner_sample.cpython-38.pyc b/__pycache__/runner_sample.cpython-38.pyc
diff --git a/__pycache__/virtual_world.cpython-38.pyc b/__pycache__/virtual_world.cpython-38.pyc
diff --git a/simple_virtual_world/.DS_Store b/simple_virtual_world/.DS_Store
diff --git a/simple_virtual_world/runner.py b/simple_virtual_world/runner.py
@@ -1,3 +1,4 @@
+
 from mesa import Agent, Model
 from mesa.space import MultiGrid
 import math

diff --git a/simple_virtual_world/runner_sample.py b/simple_virtual_world/runner_sample.py
diff --git a/simple_virtual_world/server.py b/simple_virtual_world/server.py
@@ -21,11 +21,13 @@ def cell(agent):
         portrayal['Color'] = '#237308'
     elif agent.type == 'grass':
         portrayal['Color'] = '#4ECA24'
-<<<<<<< Updated upstream
+
+
+<< << << < Updated upstream
     elif agent.type == 'runner':
-=======
+== == == =
     elif agent.type == 'type1':
->>>>>>> Stashed changes
+>>>>>> > Stashed changes
         portrayal['Shape'] = 'circle'
         portrayal['r'] = '0.7'
         portrayal['Layer'] = 1

diff --git a/simple_virtual_world/virtual_world.py b/simple_virtual_world/virtual_world.py
@@ -342,12 +342,14 @@ def __init__(self, N, width, height):
             runner = RunnerAgent(i, self)
             # store the inital position as attribte
             runner.init_position = self.random.choice(self.roads)
-<<<<<<< Updated upstream
+
+
+<< << << < Updated upstream
             print('Initial position: ', runner.init_position)
-=======
+== == == =
             # runner.init_position = (46, 21)
             # print('Initial position: ', runner.init_position)
->>>>>>> Stashed changes
+>>>>>> > Stashed changes
             self.grid.place_agent(runner, runner.init_position)
             self.schedule.add(runner)