Change the wy walls are checked for to include grey values and add ne…

…w example

checkers_and_stripes.py

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+"""
+Created on Tue May 12 16:09:18 2020
+
+@author: Tom
+"""
+
+import pytrax as pt
+import numpy as np
+import matplotlib.pyplot as plt
+plt.close('all')
+if __name__ == '__main__':
+ n = 5
+ im_chess = np.ones([10*n, 10*n])
+ g = 0.25
+ for i in range(10*n):
+ for j in range(10*n):
+ if (np.floor(i/n) % 2) != (np.floor(j/n) % 2):
+ im_chess[i, j] = g
+ plt.figure()
+ plt.imshow(im_chess)
+ rw_c = pt.RandomWalk(im_chess)
+ rw_c.run(nt=10000, nw=10000, num_proc=1, same_start=True)
+ rw_c.calc_msd()
+ rw_c.plot_msd()
+ rw_c.plot_walk_2d()
+ rw_c.plot_walk_2d(w_id=np.argmin(rw_c.sq_disp[-1, :]), data='t')
+ rw_c.plot_walk_2d(w_id=np.argmax(rw_c.sq_disp[-1, :]), data='t')
+
+ im = np.ones([10*n, 10*n])
+ for i in range(10*n):
+ if (np.floor(i/n) % 2 == 0):
+ im[i, :] = g
+ plt.figure()
+ plt.imshow(im)
+ rw = pt.RandomWalk(im)
+ rw.run(nt=10000, nw=10000, stride=10, num_proc=1, same_start=True)
+ rw.calc_msd()
+ rw.plot_msd()
+ rw.plot_walk_2d()
+ rw.plot_walk_2d(w_id=np.argmin(rw.sq_disp[-1, :]), data='t')
+ rw.plot_walk_2d(w_id=np.argmax(rw.sq_disp[-1, :]), data='t')

grey.py

@@ -21,7 +21,7 @@
 
  for case in [im, grey]:
  rw = pt.RandomWalk(case, seed=False)
- rw.run(num_t, num_w, same_start=False, stride=stride, num_proc=8)
+ rw.run(num_t, num_w, same_start=False, stride=stride, num_proc=10)
  # Plot mean square displacement
  rw.plot_msd()
  rw.plot_walk_2d()

pytrax/__RandomWalk__.py

@@ -127,10 +127,8 @@ def _get_wall_map(self, image):
  def check_wall(self, walkers, move):
  r'''
  The walkers are an array of coordinates of the image,
- the wall map is a boolean map of the image rolled in each direction.
- directions is an array referring to the movement up or down an axis
- and is used to increment the walker coordinates if a wall is not met
-
+ move is the vector of their next movement, if a wall is not met
+ or the chance of entering a grey value is met then False is returned
  Parameters
  ----------
  walkers: ndarray of int and shape [nw, dim]
@@ -141,14 +139,7 @@ def check_wall(self, walkers, move):
  the index of the wall map corresponding to the move vector
  '''
  next_move = walkers + move
- if self.dim == 2:
- move_ok = self.wall_map[next_move[:, 0],
- next_move[:, 1]]
- elif self.dim == 3:
- move_ok = self.wall_map[next_move[:, 0],
- next_move[:, 1],
- next_move[:, 2]]
- return ~move_ok
+ return self.get_probable_cancels(next_move)
 
  def check_edge(self, walkers, axis, move, real):
  r'''