Skip to content

⚡ Bolt: Optimize spatial loop boundaries in CC3D steppables #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NoWon1 wants to merge 1 commit into
base: chemo_mito_grow_steppables
Choose a base branch
from
Open

⚡ Bolt: Optimize spatial loop boundaries in CC3D steppables #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 25 additions & 18 deletions Simulation/CancerInvasionSteppables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,14 +169,19 @@ def create_paper_cell(self, center_x, center_y, radius):
cell = self.new_cell(self.CELL)
pixels_added = 0

for dx in range(-radius, radius + 1):
for dy in range(-radius, radius + 1):
min_x = max(0, center_x - radius)
max_x = min(self.dim.x, center_x + radius + 1)
min_y = max(0, center_y - radius)
max_y = min(self.dim.y, center_y + radius + 1)

for px in range(min_x, max_x):
for py in range(min_y, max_y):
dx = px - center_x
dy = py - center_y
if dx*dx + dy*dy <= radius*radius:
px, py = center_x + dx, center_y + dy
if 0 <= px < self.dim.x and 0 <= py < self.dim.y:
if self.cell_field[px, py, 0] is None:
self.cell_field[px, py, 0] = cell
pixels_added += 1
if self.cell_field[px, py, 0] is None:
self.cell_field[px, py, 0] = cell
pixels_added += 1

if pixels_added >= 20:
return True
Expand Down Expand Up @@ -205,10 +210,9 @@ def safe_cell_removal(self, cell):
min(self.dim.x, int(cell.xCOM) + search_radius)):
for y in range(max(0, int(cell.yCOM) - search_radius),
min(self.dim.y, int(cell.yCOM) + search_radius)):
if 0 <= x < self.dim.x and 0 <= y < self.dim.y:
if self.cell_field[x, y, 0] == cell:
self.cell_field[x, y, 0] = None
pixels_cleared += 1
if self.cell_field[x, y, 0] == cell:
self.cell_field[x, y, 0] = None
pixels_cleared += 1
return pixels_cleared > 0
except Exception as e:
return False
Expand Down Expand Up @@ -299,13 +303,16 @@ def check_ecm_contact(self, cell):
try:
cx, cy = int(cell.xCOM), int(cell.yCOM)

for dx in range(-3, 4):
for dy in range(-3, 4):
nx, ny = cx + dx, cy + dy
if 0 <= nx < self.dim.x and 0 <= ny < self.dim.y:
neighbor = self.cell_field[nx, ny, 0]
if neighbor and neighbor.type == self.ECMFIBER:
return True
min_x = max(0, cx - 3)
max_x = min(self.dim.x, cx + 4)
min_y = max(0, cy - 3)
max_y = min(self.dim.y, cy + 4)

for nx in range(min_x, max_x):
for ny in range(min_y, max_y):
neighbor = self.cell_field[nx, ny, 0]
if neighbor and neighbor.type == self.ECMFIBER:
return True
return False
except:
return False
Expand Down