@@ -1 +1,2 @@

-cprotos.pyc libtcodpy.pyc

+*.pyc

+*.swp

@@ -34,34 +34,23 @@ def scale_array(arr, min, max):

 	arr += min

 	return arr

-cm = np.array([[1,1,1],[1,0,1],[1,1,1]])

-#cm = np.random.random_integers(0,np.random.random_integers(1,3), (3,3))

+# For Conway's game of life:

+#cm = np.array([[1,1,1],[1,0,1],[1,1,1]])

+# For a random neighbour selection:

+cm = np.random.random_integers(0,np.random.random_integers(1,3), (3,3))

 gens = 0

 def change(arr):

 	global gens

 	gens += 1

 	live = arr == 1

-	new = sig.convolve2d(arr,cm,'same')

+	# Finite grid

+	#new = sig.convolve2d(arr,cm,'same')

+	# Torus

 	new = sig.convolve2d(arr,cm,'same', 'wrap')

 	arr[live & (new < 2)] = 0

 	arr[live & (new > 3)] = 0

 	arr[new == 3] = 1

-pattern = np.array(

-	[

-		[0,0,0,0,0,0,0],

-		[0,0,0,1,0,0,0],

-		[0,1,1,0,0,0,0],

-		[0,0,1,0,0,0,0],

-		[0,1,0,0,1,0,0],

-		[0,0,0,0,0,1,0],

-		[0,0,1,0,0,1,0],

-		[0,0,0,1,0,1,0],

-		[0,0,1,0,0,0,0],

-		[0,0,0,0,0,0,0]

-	]

-)

-			

 class Application(object):

 	def __init__(self):

 		self.screen = console.Screen(WIDTH, HEIGHT+5)

@@ -77,29 +66,8 @@ class Application(object):

 		self.tc_events = events.TCODEventHandler()

 		self.events = events.EventHandler()

-		#tc.sys_set_fps(30)

-		#self.arr = np.random.random_integers(0,1,(HEIGHT,WIDTH))

-		self.arr = np.zeros((HEIGHT,WIDTH))

-		self.arr[HEIGHT/2-5:HEIGHT/2+5,WIDTH/2-4:WIDTH/2+3] = pattern

-

-	def tick_actor(self, actor):

-		keep = actor.tick()

-		if not keep:

-			self.actors.remove(actor)

-			self.objects.append(actor)

-

-	def update_actors(self):

-		self.player.tick()

-

-	def tick_actors(self, player):

-		print 'actor_tick'

-		to_pop = []

-		for idx,actor in enumerate(self.actors[1:],1):

-			if not actor.tick():

-				bisect.insort(to_pop, idx)

-		for pop in reversed(to_pop):

-			actor = self.actors.pop(pop)

-			self.objects.append(actor)

+		tc.sys_set_fps(30)

+		self.arr = np.random.random_integers(0,1,(HEIGHT,WIDTH))

 	def init(self):

 		self.screen.init("test")

@@ -107,17 +75,12 @@ class Application(object):

 		self.border.blit()

 		self.message_console.fill(0,0,128)

 		self.rule.update()

-		#self.player.draw()

-		#for overlay in self.actors + self.objects:

-		#   overlay.draw()

 	def tick(self):

 		self.tc_events.tick()

 		self.fps_display.set_text('%d', tc.sys_get_fps())

 		self.generations.set_text('%d' % gens)

-		#self.update_actors()

-		#self.map.draw(self.console)

-		#change(self.arr)

+		change(self.arr)

 		c = self.arr*255

 		tc.console_fill_background(self.console.con, c,c,c)

deleted file mode 100644

@@ -1,17 +0,0 @@

-import numpy as np

-from scipy import signal

-

-class SmellMap(object):

-	def __init__(self, size_x, size_y):

-		self.map = np.zeros((size_x, size_y), int)

-	def tick(self):

-		self.map -= 1

-		self.map[self.map<0] = 0

-	def impress(self, pos, degree):

-		self.map[pos] = degree

-	def get_move(self, pos):

-		x,y = pos

-		neighbours = self.map[x-1:x+2,y-1:y+2]

-		neighbours[1,1] = 0

-		dx,dy = np.unravel_index(neighbours.argmax(), neighbours.shape)

-		return dx-1, dy-1