Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Ahmad Reza Cheraghi
swarm-sim
Commits
3db8d81b
Commit
3db8d81b
authored
Oct 08, 2019
by
Ahmad Reza
Browse files
deleted some unnecessary attributes from world.py
parent
6b638d6d
Changes
1
Hide whitespace changes
Inline
Side-by-side
lib/world.py
View file @
3db8d81b
...
@@ -29,28 +29,20 @@ class World:
...
@@ -29,28 +29,20 @@ class World:
self
.
__round_counter
=
1
self
.
__round_counter
=
1
self
.
__end
=
False
self
.
__end
=
False
self
.
init_particles
=
[]
self
.
particle_id_counter
=
0
self
.
particle_id_counter
=
0
self
.
particles
=
[]
self
.
particles
=
[]
self
.
particles_created
=
[]
self
.
particle_rm
=
[]
self
.
particle_map_coordinates
=
{}
self
.
particle_map_coordinates
=
{}
self
.
particle_map_id
=
{}
self
.
particle_map_id
=
{}
self
.
__particle_deleted
=
False
self
.
__particle_deleted
=
False
self
.
tiles
=
[]
self
.
tiles
=
[]
self
.
tiles_created
=
[]
self
.
tiles_rm
=
[]
self
.
tile_map_coordinates
=
{}
self
.
tile_map_coordinates
=
{}
self
.
tile_map_id
=
{}
self
.
tile_map_id
=
{}
self
.
__tile_deleted
=
False
self
.
__tile_deleted
=
False
self
.
new_tile
=
None
self
.
markers
=
[]
self
.
markers
=
[]
self
.
markers_created
=
[]
self
.
marker_map_coordinates
=
{}
self
.
marker_map_coordinates
=
{}
self
.
marker_map_id
=
{}
self
.
marker_map_id
=
{}
self
.
markers_rm
=
[]
self
.
__marker_deleted
=
False
self
.
__marker_deleted
=
False
self
.
config_data
=
config_data
self
.
config_data
=
config_data
...
@@ -284,13 +276,11 @@ class World:
...
@@ -284,13 +276,11 @@ class World:
self
.
particle_id_counter
+=
1
self
.
particle_id_counter
+=
1
new_particle
=
particle
.
Particle
(
self
,
x
,
y
,
color
,
transparency
,
self
.
particle_id_counter
)
new_particle
=
particle
.
Particle
(
self
,
x
,
y
,
color
,
transparency
,
self
.
particle_id_counter
)
print
(
new_particle
.
number
)
print
(
new_particle
.
number
)
self
.
particles_created
.
append
(
new_particle
)
self
.
particle_map_coordinates
[
new_particle
.
coordinates
]
=
new_particle
self
.
particle_map_coordinates
[
new_particle
.
coordinates
]
=
new_particle
self
.
particle_map_id
[
new_particle
.
get_id
()]
=
new_particle
self
.
particle_map_id
[
new_particle
.
get_id
()]
=
new_particle
self
.
particles
.
append
(
new_particle
)
self
.
particles
.
append
(
new_particle
)
new_particle
.
touch
()
new_particle
.
touch
()
self
.
csv_round
.
update_particle_num
(
len
(
self
.
particles
))
self
.
csv_round
.
update_particle_num
(
len
(
self
.
particles
))
self
.
init_particles
.
append
(
new_particle
)
new_particle
.
created
=
True
new_particle
.
created
=
True
logging
.
info
(
"Created particle at %s"
,
new_particle
.
coordinates
)
logging
.
info
(
"Created particle at %s"
,
new_particle
.
coordinates
)
return
new_particle
return
new_particle
...
@@ -365,17 +355,17 @@ class World:
...
@@ -365,17 +355,17 @@ class World:
transparency
=
1
transparency
=
1
if
check_values_are_coordinates
(
x
,
y
)
==
True
:
if
check_values_are_coordinates
(
x
,
y
)
==
True
:
if
(
x
,
y
)
not
in
self
.
tile_map_coordinates
:
if
(
x
,
y
)
not
in
self
.
tile_map_coordinates
:
self
.
new_tile
=
tile
.
Tile
(
self
,
x
,
y
,
color
,
transparency
)
new_tile
=
tile
.
Tile
(
self
,
x
,
y
,
color
,
transparency
)
print
(
"Before adding "
,
len
(
self
.
tiles
)
)
print
(
"Before adding "
,
len
(
self
.
tiles
)
)
self
.
tiles
.
append
(
self
.
new_tile
)
self
.
tiles
.
append
(
new_tile
)
self
.
csv_round
.
update_tiles_num
(
len
(
self
.
tiles
))
self
.
csv_round
.
update_tiles_num
(
len
(
self
.
tiles
))
self
.
tile_map_coordinates
[
self
.
new_tile
.
coordinates
]
=
self
.
new_tile
self
.
tile_map_coordinates
[
new_tile
.
coordinates
]
=
new_tile
self
.
tile_map_id
[
self
.
new_tile
.
get_id
()]
=
self
.
new_tile
self
.
tile_map_id
[
new_tile
.
get_id
()]
=
new_tile
print
(
"Afer adding "
,
len
(
self
.
tiles
),
self
.
new_tile
.
coordinates
)
print
(
"Afer adding "
,
len
(
self
.
tiles
),
new_tile
.
coordinates
)
logging
.
info
(
"Created tile with tile id %s on coordinates %s"
,
str
(
self
.
new_tile
.
get_id
()),
str
(
self
.
new_tile
.
coordinates
))
logging
.
info
(
"Created tile with tile id %s on coordinates %s"
,
str
(
new_tile
.
get_id
()),
str
(
new_tile
.
coordinates
))
self
.
new_tile
.
touch
()
new_tile
.
touch
()
return
self
.
new_tile
return
new_tile
else
:
else
:
logging
.
info
(
"on x %f and y %f coordinates is a tile already"
,
x
,
y
)
logging
.
info
(
"on x %f and y %f coordinates is a tile already"
,
x
,
y
)
return
False
return
False
...
@@ -394,15 +384,15 @@ class World:
...
@@ -394,15 +384,15 @@ class World:
"""
"""
if
check_values_are_coordinates
(
x
,
y
)
==
True
:
if
check_values_are_coordinates
(
x
,
y
)
==
True
:
if
(
x
,
y
)
not
in
self
.
tile_map_coordinates
:
if
(
x
,
y
)
not
in
self
.
tile_map_coordinates
:
self
.
new_tile
=
tile
.
Tile
(
self
,
x
,
y
,
color
,
transparency
)
new_tile
=
tile
.
Tile
(
self
,
x
,
y
,
color
,
transparency
)
self
.
tiles
.
append
(
self
.
new_tile
)
self
.
tiles
.
append
(
new_tile
)
self
.
tile_map_coordinates
[
self
.
new_tile
.
coordinates
]
=
self
.
new_tile
self
.
tile_map_coordinates
[
new_tile
.
coordinates
]
=
new_tile
self
.
tile_map_id
[
self
.
new_tile
.
get_id
()]
=
self
.
new_tile
self
.
tile_map_id
[
new_tile
.
get_id
()]
=
new_tile
print
(
"world.add_tile"
,
self
.
new_tile
.
coordinates
)
print
(
"world.add_tile"
,
new_tile
.
coordinates
)
logging
.
info
(
"Created tile with tile id %s on coordinates %s"
,
str
(
self
.
new_tile
.
get_id
()),
logging
.
info
(
"Created tile with tile id %s on coordinates %s"
,
str
(
new_tile
.
get_id
()),
str
(
self
.
new_tile
.
coordinates
))
str
(
new_tile
.
coordinates
))
return
True
return
True
else
:
else
:
logging
.
info
(
"on x %f and y %f coordinates is a tile already"
,
x
,
y
)
logging
.
info
(
"on x %f and y %f coordinates is a tile already"
,
x
,
y
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment