From 4a8bd7b22525863cfd8d62dae3de5004ff35ca32 Mon Sep 17 00:00:00 2001 From: Jan Petykiewicz Date: Sun, 16 Sep 2018 19:55:16 -0700 Subject: [PATCH] Update for numpy 1.15 --- gridlock/draw.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gridlock/draw.py b/gridlock/draw.py index ed900a4..c608296 100644 --- a/gridlock/draw.py +++ b/gridlock/draw.py @@ -130,8 +130,8 @@ def draw_polygons(self, edge_slices = [numpy.s_[i:f + 2] for i, f in zip(corner_min, corner_max)] # Then for the pixel centers (-bdi_min since we're # calculating weights within a subspace) - centers_slice = [numpy.s_[i:f + 1] for i, f in zip(corner_min - bdi_min[surface], - corner_max - bdi_min[surface])] + centers_slice = tuple(numpy.s_[i:f + 1] for i, f in zip(corner_min - bdi_min[surface], + corner_max - bdi_min[surface])) aa_x, aa_y = (self.shifted_exyz(i)[a][s] for a, s in zip(surface, edge_slices)) w_xy[centers_slice] += raster(polygon.T, aa_x, aa_y) @@ -165,7 +165,7 @@ def draw_polygons(self, w = (w_xy[:, :, newaxis] * w_z).transpose(numpy.insert([0, 1], surface_normal, (2,))) # ## Modify the grid - g_slice = [numpy.s_[bdi_min[a]:bdi_max[a] + 1] for a in range(3)] + g_slice = tuple(numpy.s_[bdi_min[a]:bdi_max[a] + 1] for a in range(3)) self.grids[i][g_slice] = (1 - w) * self.grids[i][g_slice] + w * eps[i]