Merge branch 'master' of github.com:Drakirus/Marabunta-24h-du-code

ant.py

@@ -65,7 +65,7 @@ def moveTo(self, uniq):
 		print ("MOVE_TO " + str(uniq) )
 
 	def putPheromone(self, t):
-		print ("PUT_PHEROMONE " + str(type))
+		print ("PUT_PHEROMONE " + str(t))
 
 	def changePheromone(self, uniq, t):
 		print ("CHANGE_PHEROMONE " + str(uniq) + " " + str(t))
@@ -92,4 +92,4 @@ def suicide(self):
 		print ("SUICIDE")
 
 	def commitMemory(self):
-		print ("SET_MEMORY " + str(self.m0) + " " + str(self.m1))
+		print ("SET_MEMORY " + str(self.m1) + " " + str(self.m2))

ia.py

@@ -48,6 +48,7 @@ def antIA(ant):
 			return
 
 		# partie calcul min distance
+		ant.say("test")
 		phs    = compareKey("id", ant.arrSeePheromone, operator.eq, idPathStart - 1)
 
 		nestsFriendly = compareKey("friend", ant.arrSeeNest, operator.eq, "FRIEND")
@@ -59,32 +60,31 @@ def antIA(ant):
 			distance = min(nestDist, phDist)
 
 			if distance["dist"] > DISTANCE_NEED_PUT_PH:
-				ant.say("ON A BESOIN DE PLACER UN PHEROMONE, ON S ELOIGNE TROP")
+				ant.say("ON A BESOIN DE PLACER UN PHEROMONE, ON S ELOIGNE TROP 2")
 				ant.putPheromone(idPathStart)
-				idPathStart += 1
 				ant.setMemory(idPathStart, gotFood)
 				ant.commitMemory()
 				return
 		if phs:
 			distance = minMaxKey("dist", phs, min)
 
 			if distance["dist"] > DISTANCE_NEED_PUT_PH:
-				ant.say("ON A BESOIN DE PLACER UN PHEROMONE, ON S ELOIGNE TROP")
+				ant.say("ON A BESOIN DE PLACER UN PHEROMONE, ON S ELOIGNE TROP phs")
 				ant.putPheromone(idPathStart)
 				idPathStart += 1
 				ant.setMemory(idPathStart, gotFood)
 				ant.commitMemory()
 				return
 
-		if nestsFriendly:
+		if nestsFriendly and len(phs) == 0:
 			distance = minMaxKey("dist", nestsFriendly, min)
 
 			if distance["dist"] > DISTANCE_NEED_PUT_PH:
-				ant.say("ON A BESOIN DE PLACER UN PHEROMONE, ON S ELOIGNE TROP")
+				ant.say("ON A BESOIN DE PLACER UN PHEROMONE, ON S ELOIGNE TROP nest " + str(idPathStart))
 				ant.putPheromone(idPathStart)
-				idPathStart += 1
-				ant.setMemory(idPathStart, gotFood)
-				ant.commitMemory()
+				#  idPathStart += 1
+				#  ant.setMemory(idPathStart, gotFood)
+				#  ant.commitMemory()
 				return
 
 

wrapper.py

@@ -56,7 +56,7 @@ def readAnt(cls):
 				ant.setFood(food)
 
 			elif cmd == 'SEE_PHEROMONE':
-				ident, zone, typePheromone, persistance = args
+				ident, zone, dist, typePheromone, persistance = args
 				ident = int(ident)
 				dist = int(dist)
 				typePheromone = int(typePheromone)