[GRASS-SVN] r55330 - grass-addons/grass7/raster/r.agent

[svn_grass at osgeo.org]

Author: mic
Date: 2013-03-11 13:56:50 -0700 (Mon, 11 Mar 2013)
New Revision: 55330

Modified:
   grass-addons/grass7/raster/r.agent/r.agent.aco
Log:
set basic variables

Modified: grass-addons/grass7/raster/r.agent/r.agent.aco
===================================================================
--- grass-addons/grass7/raster/r.agent/r.agent.aco	2013-03-11 20:52:12 UTC (rev 55329)
+++ grass-addons/grass7/raster/r.agent/r.agent.aco	2013-03-11 20:56:50 UTC (rev 55330)
@@ -279,32 +279,32 @@
 
 #    world.playground.setboundsfromlayer("costs")
 
-#    if options['maxpheromone']:
-#        world.maxpheromone = int(options['maxpheromone'])
-#    if options['minpheromone']:
-#        world.minpheromone = int(options['minpheromone'])
-#    if options['volatilizationtime']:
-#        world.volatilizationtime = int(options['volatilizationtime'])
-#    if options['stepintensity']:
-#        world.stepintensity = int(options['stepintensity'])
-#    if options['pathintensity']:
-#        world.pathintensity = int(options['pathintensity'])
-#    if options['maxants']:
-#        world.maxants = int(options['maxants'])
-#    if options['antslife']:
-#        world.antslife = int(options['antslife'])
+    if options['maxpheromone']:
+        world.maxpheromone = int(options['maxpheromone'])
+    if options['minpheromone']:
+        world.minpheromone = int(options['minpheromone'])
+    if options['volatilizationtime']:
+        world.volatilizationtime = int(options['volatilizationtime'])
+    if options['stepintensity']:
+        world.stepintensity = int(options['stepintensity'])
+    if options['pathintensity']:
+        world.pathintensity = int(options['pathintensity'])
+    if options['maxants']:
+        world.maxants = int(options['maxants'])
+    if options['antslife']:
+        world.antslife = int(options['antslife'])
 #    if options['decisionalgorithm']:
 #        world.decisionbase = str(options['decisionalgorithm'])
 #    if options['validposition']:
 #        world.validposition = str(options['validposition'])
 #    if options['agentfreedom']:
 #        world.globalfreedom = int(options['agentfreedom'])
-#    if options['pheromoneweight']:
-#        world.pheroweight = int(options['pheromoneweight'])
-#    if options['randomnessweight']:
-#        world.randomweight = int(options['randomnessweight'])
-#    if options['costweight']:
-#        world.costweight = int(options['costweight'])
+    if options['pheromoneweight']:
+        world.pheroweight = int(options['pheromoneweight'])
+    if options['randomnessweight']:
+        world.randomweight = int(options['randomnessweight'])
+    if options['costweight']:
+        world.costweight = int(options['costweight'])
     #if arglist[0] == "stability":
         #TODO ask silvia..
     try: