Changeset 824

Timestamp:

07/29/11 16:31:51 (22 months ago)

Author:

jjr8

Message:

Incremented build number. Fixed some bugs. Resumed development of Linear Mixed Modeling tools.

Location:

MGET/Branches/Jason/PythonPackage/src/GeoEco

Files:

• DataManagement/NetCDFs.py (modified) (3 diffs)
• Datasets/Virtual.py (modified) (2 diffs)
• Statistics/Modeling.py (modified) (6 diffs)
• __init__.py (modified) (1 diff)

MGET/Branches/Jason/PythonPackage/src/GeoEco/DataManagement/NetCDFs.py

@@ -175 +175 @@
         dataset = netCDF3.Dataset(netCDFFileTemp, 'r')
         try:
-            data = cls.GetNumpyArrayFor2DVariableInDataset(dataset, variableName, netCDFFile)
+            data = cls.GetNumpyArrayFor2DVariableInDataset(dataset, variableName, netCDFFile).squeeze()
         finally:
             try:
@@ -195 +195 @@
         variables2D = []
         for name, var in dataset.variables.items():
-            if len(var.dimensions) == 2:
+            ndim = 0
+            for dim in var.dimensions:
+                if len(dataset.dimensions[dim]) > 1:
+                    ndim += 1
+            if ndim == 2:
                 variables2D.append(name)
         if len(variables2D) <= 0:
@@ -206 +210 @@
             Logger.RaiseException(ValueError(_(u'The netCDF file %(netCDFFile)s does not contain a variable named "%(var)s". The 2D variables contained in this file are: %(vars)s.') % {u'netCDFFile' :  netCDFFile, u'var' :  variableName, u'vars' : u', '.join(variables2D)}))
             
-        if len(dataset.variables[variableName].dimensions) != 2:
+        if name not in variables2D:
             variables2D.sort()
             Logger.RaiseException(ValueError(_(u'The %(var)s variable in netCDF file %(netCDFFile)s has %(dims)i dimensions. This tool can only process variables with 2 dimensions. The 2D variables contained in this file are: %(vars)s.') % {u'netCDFFile' :  netCDFFile, u'var' :  variableName, u'dims' : len(dataset.variables[variableName].dimensions), u'vars' : u', '.join(variables2D)}))

MGET/Branches/Jason/PythonPackage/src/GeoEco/Datasets/Virtual.py

@@ -2066 +2066 @@
         startDateTime = datetime.datetime(2001, 1, 1) + datetime.timedelta(startDayOfYear - 1)      # Use a non-leap year for this calculation
         if startDateTime.day > 28:
-            raise NotImplementedError(_(u'The Start Day Of Year parameter specifies that the first climatological grid should start on %(day)i %(month)s. This is not supported. The grid may not start later than day 28 of any month. We apologize for the inconvenience.') % {u'day': startDateTime.day, u'month': startDateTime.strftime('%B')})
+            raise NotImplementedError(_(u'The Start Day Of Year parameter specifies that the first climatological grid should start on %(day)i %(month)s. This is not supported. The grid may not start later than day 28 of any month. We apologize for the inconvenience.') % {u'day': startDateTime.day, u'month': self._Str(startDateTime.strftime('%B'))})
 
         # If the grid has a time increment that is larger than the bin
@@ -2240 +2240 @@
                     if self._BinDuration == 1:
                         queryableAttributeValues = {u'ClimatologyBinName': u'month%02i' % (binMonthsAndDays[bin][0] / 100)}
-                        displayName = _(u'%(month)s climatological %(statistic)s of the %(dn)s') % {u'dn': self._Grid.DisplayName, u'month': datetime.datetime(2001, binMonthsAndDays[bin][0]/100, 1).strftime('%B'), u'statistic': self._Statistic}
+                        displayName = _(u'%(month)s climatological %(statistic)s of the %(dn)s') % {u'dn': self._Grid.DisplayName, u'month': self._Str(datetime.datetime(2001, binMonthsAndDays[bin][0]/100, 1).strftime('%B')), u'statistic': self._Statistic}
                     else:
                         queryableAttributeValues = {u'ClimatologyBinName': u'months%02ito%02i' % (binMonthsAndDays[bin][0] / 100, binMonthsAndDays[bin][1] / 100)}

MGET/Branches/Jason/PythonPackage/src/GeoEco/Statistics/Modeling.py

@@ -3584 +3584 @@
 
 AddArgumentMetadata(LinearMixedModel.FitToArcGISTable, u'correlationStructure',
-    typeMetadata=UnicodeStringTypeMetadata(canBeNone=True, makeLowercase=True, allowedValues=[u'REML', u'ML']),
-    description=_(
-u"""TODO"""),
+    typeMetadata=UnicodeStringTypeMetadata(canBeNone=True, allowedValues=[u'Exponential', u'Gaussian', u'Linear', u'Rational quadratic', u'Spherical']),
+    description=_(
+u"""TODO: Write documentation for this parameter."""),
     arcGISDisplayName=_(u'Correlation structure'),
     arcGISCategory=_(u'Within-group correlation structure'))
@@ -3593 +3593 @@
     typeMetadata=UnicodeStringTypeMetadata(canBeNone=True),
     description=_(
-u"""TODO"""),
+u"""TODO: Write documentation for this parameter."""),
     arcGISDisplayName=_(u'Correlation formula'),
     arcGISCategory=_(u'Within-group correlation structure'))
@@ -3600 +3600 @@
     typeMetadata=FloatTypeMetadata(canBeNone=True, mustBeGreaterThan=0.),
     description=_(
-u"""TODO"""),
+u"""TODO: Write documentation for this parameter."""),
     arcGISDisplayName=_(u'Range'),
     arcGISCategory=_(u'Within-group correlation structure'))
@@ -3607 +3607 @@
     typeMetadata=FloatTypeMetadata(canBeNone=True, minValue=0., maxValue=1.),
     description=_(
-u"""TODO"""),
+u"""TODO: Write documentation for this parameter."""),
     arcGISDisplayName=_(u'Nugget'),
     arcGISCategory=_(u'Within-group correlation structure'))
@@ -3614 +3614 @@
     typeMetadata=UnicodeStringTypeMetadata(canBeNone=True, makeLowercase=True, allowedValues=[u'Euclidean', u'Manhattan', u'Maximum']),
     description=_(
-u"""TODO"""),
+u"""TODO: Write documentation for this parameter."""),
     arcGISDisplayName=_(u'Distance metric'),
     arcGISCategory=_(u'Within-group correlation structure'))
@@ -3621 +3621 @@
     typeMetadata=BooleanTypeMetadata(),
     description=_(
-u"""TODO"""),
+u"""TODO: Write documentation for this parameter."""),
     arcGISDisplayName=_(u'Keep coefficients fixed during model optimization'),
     arcGISCategory=_(u'Within-group correlation structure'))

MGET/Branches/Jason/PythonPackage/src/GeoEco/__init__.py

@@ -1 @@
-__version__ = u'0.8a27'
+__version__ = u'0.8a28'