[GRASS-SVN] r42002 - grass/branches/develbranch_6/scripts/v.krige

[svn_grass at osgeo.org]

Author: aghisla
Date: 2010-04-23 11:26:58 -0400 (Fri, 23 Apr 2010)
New Revision: 42002

Modified:
   grass/branches/develbranch_6/scripts/v.krige/v.krige.py
Log:
Works again, rpy2 code for variogram formula now fixed.

Modified: grass/branches/develbranch_6/scripts/v.krige/v.krige.py
===================================================================
--- grass/branches/develbranch_6/scripts/v.krige/v.krige.py	2010-04-23 14:35:44 UTC (rev 42001)
+++ grass/branches/develbranch_6/scripts/v.krige/v.krige.py	2010-04-23 15:26:58 UTC (rev 42002)
@@ -212,7 +212,8 @@
             # obtain the model name. *Too* complicated to get the string instead of level, unlike R does.
             VariogramAsDF = robjects.r['as.data.frame'](VariogramModel.rx('var_model')[0]) # force conversion
             ModelDF = VariogramAsDF.rx('model')[0]
-            Variograms['model'] = robjects.r.levels(ModelDF).subset(ModelDF[1])[0]
+            #Variograms['model'] = robjects.r.levels(ModelDF).subset(ModelDF[1])[0]
+            Variograms['model'] = ModelDF.levels[ModelDF[1] - 1]
         else:
             DataVariogram = robjects.r['variogram'](formula, inputdata)
             VariogramModel = robjects.r['fit.variogram'](DataVariogram,