[GRASS-SVN] r64398 - grass-addons/grass7/raster/r.fidimo

[svn_grass at osgeo.org]

Author: jradinger
Date: 2015-02-02 06:23:15 -0800 (Mon, 02 Feb 2015)
New Revision: 64398

Modified:
   grass-addons/grass7/raster/r.fidimo/r.fidimo.py
Log:
# of runs [lwr,fit,upr] for parameter "Random Value within Confidence Interval"

Modified: grass-addons/grass7/raster/r.fidimo/r.fidimo.py
===================================================================
--- grass-addons/grass7/raster/r.fidimo/r.fidimo.py	2015-02-02 13:44:36 UTC (rev 64397)
+++ grass-addons/grass7/raster/r.fidimo/r.fidimo.py	2015-02-02 14:23:15 UTC (rev 64398)
@@ -657,7 +657,7 @@
 	
 	########### Looping over nrun, over segements, over source points ##########
 	
-	if str(options['statistical_interval']) == ("no" or "Random Value within Confidence Interval"):
+	if str(options['statistical_interval']) == "no" or str(options['statistical_interval']) == "Random Value within Confidence Interval":
 		nrun = ['fit']
 	else:
 		nrun = ['fit','lwr','upr']
@@ -1002,7 +1002,7 @@
 
 					RealisedDensity = garray.array()
 					if options['seed2']:
-						numpy.random.seed(seed=int(options['seed2']))
+						numpy.random.seed(int(options['seed2']))
 					RealisedDensity[...] = numpy.random.multinomial(n_fish, (CorrectedDensity/numpy.sum(CorrectedDensity)).flat, size=1).reshape(CorrectedDensity.shape)
 										
 					RealisedDensity.write("realised_density_"+str(cat))