[GRASS-SVN] r63968 - grass-addons/grass7/raster/r.random.weight

[svn_grass at osgeo.org]

Author: pvanbosgeo
Date: 2015-01-06 14:03:42 -0800 (Tue, 06 Jan 2015)
New Revision: 63968

Removed:
   grass-addons/grass7/raster/r.random.weight/r.random.weight_legacy.py
Modified:
   grass-addons/grass7/raster/r.random.weight/r.random.weight.py
Log:
Small corrections, delete 'legacy' script file

Modified: grass-addons/grass7/raster/r.random.weight/r.random.weight.py
===================================================================
--- grass-addons/grass7/raster/r.random.weight/r.random.weight.py	2015-01-06 15:45:42 UTC (rev 63967)
+++ grass-addons/grass7/raster/r.random.weight/r.random.weight.py	2015-01-06 22:03:42 UTC (rev 63968)
@@ -76,22 +76,19 @@
 import os
 import sys
 import atexit
-import time
 import grass.script as grass
 
 # Runs modules silently
-#os.environ['GRASS_VERBOSE']='-1' 
+os.environ['GRASS_VERBOSE']='-1' 
 
+clean_rast = set()
 def cleanup():
-	grass.run_command('g.remove', 
-      type = 'raster', 
-      name = 'tmp_map',
-      flags = 'f',
-      quiet = True)
+    for rast in clean_rast:
+        grass.run_command("g.remove", 
+        type="rast", name = rast, quiet = True)
 
 # main function
 def main():
-    global tmp_map
     
     # check if GISBASE is set
     if "GISBASE" not in os.environ:
@@ -107,8 +104,8 @@
     seed = options['seed']
        
     # setup temporary files and seed
-    tmp_map = 'r_w_rand_987654321'
-    tmp_map2 = 'r_w_rand_987654321a'
+    tmp_map = "r_w_rand_" + str(uuid.uuid4())
+            tmp_map = string.replace(tmpf0, '-', '_')
     
     # Compute minimum and maximum value raster
     minmax = grass.parse_command('r.univar', 
@@ -127,6 +124,7 @@
             minval = minval, 
             maxval = maxval,
             tmp_map = tmp_map)
+    clean_rast.add(tmp_map) 
 
     grass.mapcalc("${outmap} = if($tmp_map <= ${weight},1,0)",
         weight = weight,

Deleted: grass-addons/grass7/raster/r.random.weight/r.random.weight_legacy.py
===================================================================
--- grass-addons/grass7/raster/r.random.weight/r.random.weight_legacy.py	2015-01-06 15:45:42 UTC (rev 63967)
+++ grass-addons/grass7/raster/r.random.weight/r.random.weight_legacy.py	2015-01-06 22:03:42 UTC (rev 63968)
@@ -1,135 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-##############################################################################
-#
-# MODULE:       r.rand.weight
-# AUTHOR(S):    paulo van Breugel <paulo at ecodiv.org>         
-# PURPOSE:      Create a layer with weighted random sample
-# COPYRIGHT: (C) 2014 Paulo van Breugel
-#            http://ecodiv.org
-#            http://pvanb.wordpress.com/
-#
-#        This program is free software under the GNU General Public
-#        License (>=v2). Read the file COPYING that comes with GRASS
-#        for details.
-##############################################################################
-
-#%module
-#% description: Weighted sample
-#% keyword: raster
-#% keyword: sample
-#%end
-
-#%option
-#% key: weights
-#% type: string
-#% gisprompt: old,cell,raster
-#% description: layer with weight
-#% key_desc: weight
-#% required: yes
-#% multiple: no
-#%end
-
-#%option
-#% key: output
-#% type: string
-#% gisprompt: new,cell,raster
-#% description: output layer
-#% key_desc: output
-#% required: yes
-#% multiple: no
-#%end
-
-#%option
-#% key: start
-#% type: double
-#% description: minimum weight
-#% key_desc: start
-#% answer: 0
-#% required: yes
-#%end
-
-#%option
-#% key: end
-#% type: double
-#% description: maximum weight
-#% key_desc: end
-#% answer: 100
-#% required: yes
-#%end
-
-#%option
-#% key: subsample
-#% type: string
-#% description: subsample - not implemented yet
-#% key_desc: ss
-#% answer: 0
-#% required: no
-#%end
-
-#%option
-#% key: seed
-#% type: double
-#% description: set seed for random number generation
-#% key_desc: seed
-#% required: no
-#%end
-
-# import libraries
-import os
-import sys
-import atexit
-import time
-import grass.script as grass
-
-# Runs modules silently
-# os.environ['GRASS_VERBOSE']='-1' 
-
-def cleanup():
-	grass.run_command('g.remove', flags = 'f',
-      type = 'raster', name = tmp_map, quiet = True)
-
-# main function
-def main():
-    global tmp_map
-    
-    # check if GISBASE is set
-    if "GISBASE" not in os.environ:
-    # return an error advice
-       grass.fatal(_("You must be in GRASS GIS to run this program"))
-       
-    # input raster map and parameters   
-    minval = options['start']
-    maxval = options['end']
-    weight = options['weights']
-    outmap = options['output']
-    subsample = options['subsample']
-    seed = options['seed']
-    
-    # setup temporary files and seed
-    tmp_map = 'r_w_rand_987654321'
-    if seed == "":
-        ticks = str(int(time.time()*1000)),
-        print("seed used is: " + str(ticks[0]))
-        os.environ['GRASS_RND_SEED'] = ticks[0]
-    else:
-        print("Seed used for random number generation is: " + str(seed))
-        
-    grass.mapcalc("$tmp_map = rand(${minval},${maxval})", 
-        minval = minval, 
-        maxval = maxval,
-        tmp_map = tmp_map)
-   
-    grass.mapcalc("${outmap} = if($tmp_map < ${weight},1,0)",
-        weight = weight,
-        outmap = outmap,
-        tmp_map = tmp_map)
-    
-    print("Ready, name of raster created is " + outmap)
-    
-if __name__ == "__main__":
-    options, flags = grass.parser()
-    atexit.register(cleanup)
-    sys.exit(main())
-