updated for compatibility with newer point implementation

Author: lsampras

pheromone-driver.py

@@ -1,6 +1,6 @@
 from pheromone import pheromone
 import numpy as np
-import next_moves
+import moves
 import random
 np.set_printoptions(formatter={'float': lambda x: "{0:0.3f}".format(x)})
 
@@ -14,7 +14,7 @@ def addEnemy():
  ph.addEnemy(x,y)
 
 obstacles = getObstacleData(20,0.1)
-ph = pheromone(obstacles,next_moves.adjacent_octile(),decayRate=0,dropOff=0.0)
+ph = pheromone(obstacles,moves.adjacent_octile(),decayRate=0,dropOff=0.0)
 
 for i in range(40):
  addEnemy()

pheromone.py

@@ -2,14 +2,15 @@
 import matplotlib.pyplot as plt
 from matplotlib import colors
 import matplotlib as mpl
+from point import Point
 class pheromone(object):
  def __init__(self,obstacleData,possible_moves,decayRate = 0.7,dropOff = 0.1):
  # initialize map size of obstacles and set obstacles position as -1
  self.map = np.zeros(shape = obstacleData.shape, dtype = np.float32) - obstacleData
  self.obstacleData = obstacleData
  self.dropOff = dropOff
  self.moves = possible_moves
- self.moves.append((0,0))
+ self.moves.append(Point(0,0))
  self.multiplier = (1 - decayRate) #normalize
  self.temp = np.zeros(shape = self.map.shape,dtype = np.float32)
  self.cmap = mpl.cm.Reds
@@ -20,6 +21,10 @@ def __init__(self,obstacleData,possible_moves,decayRate = 0.7,dropOff = 0.1):
  def addEnemy(self,x,y):
  self.map[x][y] = 1.0
 
+
+ def decay(self):
+ self.map = self.map*self.multiplier
+
  def propogate(self):
  for i,rows in enumerate(self.map):
  for j,value in enumerate(rows):
@@ -34,8 +39,8 @@ def propogate_point(self,value,x,y):
  delta = 0
  changes = []
  for move in self.moves:
- finalx = x + move[0]
- finaly = y + move[1]
+ finalx = x + move.x
+ finaly = y + move.y
  if(finalx >= 0 and finalx < self.map.shape[0]):
  if(finaly >= 0 and finaly < self.map.shape[1]):
  if(self.obstacleData[finalx][finaly] == False):