[GRASS-SVN] r49187 - in grass-addons/grass7/raster/r.agent: . libagent

[svn_grass at osgeo.org]

Author: mic
Date: 2011-11-13 01:16:33 -0800 (Sun, 13 Nov 2011)
New Revision: 49187

Modified:
   grass-addons/grass7/raster/r.agent/libagent/aco.py
   grass-addons/grass7/raster/r.agent/r.agent.aco
Log:
prepare refactoring

Modified: grass-addons/grass7/raster/r.agent/libagent/aco.py
===================================================================
--- grass-addons/grass7/raster/r.agent/libagent/aco.py	2011-11-11 19:29:34 UTC (rev 49186)
+++ grass-addons/grass7/raster/r.agent/libagent/aco.py	2011-11-13 09:16:33 UTC (rev 49187)
@@ -3,7 +3,7 @@
 # MODULE:       r.agent.*
 # AUTHOR(S):    michael lustenberger inofix.ch
 # PURPOSE:      library file for the r.agent.* suite
-# COPYRIGHT:    (C) 2011 by Michael Lustenberger and Michael Lustenberger and Michael Lustenberger and the GRASS Development Team
+# COPYRIGHT:    (C) 2011 by  Michael Lustenberger and the GRASS Development Team
 #
 #               This program is free software under the GNU General Public
 #               License (>=v2). Read the file COPYING that comes with GRASS

Modified: grass-addons/grass7/raster/r.agent/r.agent.aco
===================================================================
--- grass-addons/grass7/raster/r.agent/r.agent.aco	2011-11-11 19:29:34 UTC (rev 49186)
+++ grass-addons/grass7/raster/r.agent/r.agent.aco	2011-11-13 09:16:33 UTC (rev 49187)
@@ -26,7 +26,7 @@
 #% required : yes
 #%end
 #%option
-#% key: inpheromap
+#% key: inputmap
 #% type: string
 #% gisprompt: old,cell,raster
 #% description: Name of pheromone map, input raster data (e.g. from prior run)
@@ -63,19 +63,35 @@
 #% required : no
 #%end
 #%option
+#% key: highcostlimit
+#% type: integer
+#% gisprompt: number
+#% description: Position values above this point an ant considers as an illegal
+#% options: 0-<max integer on system would make sense>
+#% required : no
+#%end
+#%option                                                       
+#% key: lowcostlimit
+#% type: integer
+#% gisprompt: number
+#% description: Position values below this point an ant considers as an illegal
+#% options: <min integer on system would make sense>-0
+#% required : no
+#%end
+#%option
 #% key: maxpheromone
 #% type: integer
 #% gisprompt: number
-#% description: Maximum value for pheromone
-#% options: 0-2147483647
+#% description: Absolute maximum of pheromone intensity a position may have
+#% options: <minpheromone>-<max integer on system would make sense>
 #% required : no
 #%end
 #%option
 #% key: minpheromone
 #% type: integer
 #% gisprompt: number
-#% description: Name of vector data map that shows possible points of origin
-#% options: 0-2147483647
+#% description: Absolute minimum of pheromone intensity to leave on playground
+#% options: 0-<maxpheromone>
 #% required : no
 #%end
 #%option
@@ -83,7 +99,7 @@
 #% type: integer
 #% gisprompt: number
 #% description: Half-life for pheromone to volatize
-#% options: 0-2147483647
+#% options: 0-<max integer on system would make sense>
 #% required : no
 #%end
 #%option
@@ -91,7 +107,7 @@
 #% type: integer
 #% gisprompt: number
 #% description: Pheromone intensity to leave on each step
-#% options: 0-2147483647
+#% options: 0-<max integer on system would make sense>
 #% required : no
 #%end
 #%option
@@ -99,7 +115,7 @@
 #% type: integer
 #% gisprompt: number
 #% description: Pheromone intensity to leave on found paths
-#% options: 0-2147483647
+#% options: 0-<max integer on system would make sense>
 #% required : no
 #%end
 #%option
@@ -107,7 +123,7 @@
 #% type: integer
 #% gisprompt: number
 #% description: Maximum amount of ants that may live concurrently
-#% options: 0-2147483647
+#% options: 0-<the bigger the playground, the more space they have>
 #% required : no
 #%end
 #%option
@@ -115,7 +131,7 @@
 #% type: integer
 #% gisprompt: number
 #% description: Time to live for an ant
-#% options: 0-2147483647
+#% options: 0-<e.g. for times distance between points>
 #% required : no
 #%end
 #%option
@@ -179,8 +195,8 @@
     world.costsurface = layer.raster
     world.playground.setboundsfromlayer("costs")
 
-    if options['inpheromap']:
-        layer = world.importlayer("phero", "raster", options['inpheromap'])
+    if options['inputmap']:
+        layer = world.importlayer("phero", "raster", options['inputmap'])
         world.outfilename = options['outputmap']
     else:
         layer = world.createlayer("phero", "raster", None, options['outputmap'])