Commit 011efaeb authored by Ahmad Reza's avatar Ahmad Reza
Browse files

deleted some bugs based on the previous commit

parent 8b0d639a
...@@ -43,28 +43,28 @@ tile_mm_size = 2 ...@@ -43,28 +43,28 @@ tile_mm_size = 2
##Examples## ##Examples##
##Moving ##Moving
scenario = lonely_particle #scenario = lonely_particle
solution = random_walk #solution = random_walk
#solution = round_walk.py #solution = round_walk
## Creating and Deleting ## Creating and Deleting
#scenario = lonely_particle.py scenario = lonely_particle
#solution = create_delete.py solution = create_delete
## Take and Drop ## Take and Drop
#scenario = between_particle_one_tile_particle.py #scenario = between_particle_one_tile_particle
#solution= take_drop_aims.py #solution= take_drop_aims
## Read and Write ## Read and Write
#scenario = two_particles_tiles_locations.py #scenario = two_particles_tiles_locations
#solution = read_write.py #solution = read_write
## Scanning for matters ## Scanning for matters
#scenario = particles_tiles_locations_ring.py #scenario = particles_tiles_locations_ring
#solution= scanning_for_all_aims.py #solution= scanning_for_all_aims
## All interfaces ## All interfaces
#scenario = test_interfaces.py #scenario = test_interfaces
#solution = test_all_the_interfaces.py #solution = test_all_the_interfaces
...@@ -31,7 +31,7 @@ read = 0 ...@@ -31,7 +31,7 @@ read = 0
write = 1 write = 1
particle_counter=0 particle_counter=0
class Particle(matter.matter): class Particle(matter.Matter):
"""In the classe location all the methods for the characterstic of a location is included""" """In the classe location all the methods for the characterstic of a location is included"""
def __init__(self, sim, x, y, color=black, alpha=1, mm_limit=0, mm_size=0): def __init__(self, sim, x, y, color=black, alpha=1, mm_limit=0, mm_size=0):
......
...@@ -348,7 +348,7 @@ class Sim: ...@@ -348,7 +348,7 @@ class Sim:
def sim_to_coords(self, x, y): def sim_to_coords(self, x, y):
return x, round(y / math.sqrt(3 / 4), 0) return x, round(y / math.sqrt(3 / 4), 0)
def add_particle(self, x, y, color=black, alpha=1): def add_particle(self, x, y, color=black, alpha=1):
""" """
Add a particle to the sim database Add a particle to the sim database
...@@ -443,7 +443,7 @@ class Sim: ...@@ -443,7 +443,7 @@ class Sim:
:param y: the y coordinates on which the tile should be added :param y: the y coordinates on which the tile should be added
:return: Successful added matter; False: Unsuccsessful :return: Successful added matter; False: Unsuccsessful
""" """
if alpha < 0 or alpha >1: if alpha < 0 or alpha >1:
alpha = 1 alpha = 1
if self.check_coords(x,y) == True: if self.check_coords(x,y) == True:
if (x,y) not in self.tile_map_coords: if (x,y) not in self.tile_map_coords:
......
...@@ -37,6 +37,7 @@ class ConfigData(): ...@@ -37,6 +37,7 @@ class ConfigData():
self.tile_mm_size = config.getint("Matter", "tile_mm_size") self.tile_mm_size = config.getint("Matter", "tile_mm_size")
self.location_mm_size = config.getint("Matter", "location_mm_size") self.location_mm_size = config.getint("Matter", "location_mm_size")
self.dir_name = None self.dir_name = None
def swarm_sim( argv ): def swarm_sim( argv ):
"""In the main function first the config is getting parsed and than """In the main function first the config is getting parsed and than
the simulator and the sim object is created. Afterwards the run method of the simulator the simulator and the sim object is created. Afterwards the run method of the simulator
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment