train running dataset fixed

lib/objects/map.py

@@ -45,7 +45,7 @@ class Map(object):
 
     @property
     def as_2d_array(self):
-        return self.map_array[1:]
+        return self.map_array.squeeze()
 
     def __init__(self, name='', array_like_map_representation=None):
         if array_like_map_representation is not None:
@@ -145,9 +145,9 @@ class Map(object):
 
         img = Image.new('L', (self.height, self.width), 0)
         draw = ImageDraw.Draw(img)
-        draw.polygon(polyline, outline=255, fill=255)
+        draw.polygon(polyline, outline=1, fill=1)
 
-        a = (np.asarray(img) * np.where(self.as_2d_array == self.white, 0, 1)).sum()
+        a = (np.where(np.asarray(img) == self.white, 1, 0) * np.where(self.as_2d_array == self.white, 1, 0)).sum()
 
         if a:
             return False  # Non-Homotoph
@@ -159,7 +159,7 @@ class Map(object):
         # The standard colormaps also all have reversed versions.
         # They have the same names with _r tacked on to the end.
         # https: // matplotlib.org / api / pyplot_summary.html?highlight = colormaps
-        img = ax.imshow(self.as_array, cmap='Greys_r')
+        img = ax.imshow(self.as_2d_array, cmap='Greys_r')
         return dict(img=img, fig=fig, ax=ax)
 
 

lib/objects/trajectory.py

@@ -14,7 +14,7 @@ class Trajectory(object):
 
     @property
     def xy_vertices(self):
-        return [(x,y) for _, x,y in self._vertices]
+        return [(x, y) for _, y, x in self._vertices]
 
     @property
     def endpoints(self):
@@ -30,11 +30,11 @@ class Trajectory(object):
 
     @property
     def xs(self):
-        return [x[1] for x in self._vertices]
+        return [x[2] for x in self._vertices]
 
     @property
     def ys(self):
-        return [x[0] for x in self._vertices]
+        return [x[1] for x in self._vertices]
 
     @property
     def as_paired_list(self):
@@ -59,7 +59,7 @@ class Trajectory(object):
             kwargs.update(color='red' if label == V.HOMOTOPIC else 'green',
                           label='Homotopic' if label == V.HOMOTOPIC else 'Alternative')
         if highlights:
-            kwargs.update(marker='bo')
+            kwargs.update(marker='o')
         fig, ax = plt.gcf(), plt.gca()
         img = plt.plot(self.xs, self.ys, **kwargs)
         return dict(img=img, fig=fig, ax=ax)