Changeset 1040


Ignore:
Timestamp:
09/25/12 15:05:07 (5 years ago)
Author:
jjr8
Message:

Fixed miscellaneous bugs.

Location:
MGET/Branches/Jason/PythonPackage/src/GeoEco
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • MGET/Branches/Jason/PythonPackage/src/GeoEco/Datasets/GDAL.py

    r938 r1040  
    4141        # TODO: Validation 
    4242 
    43         if isinstance(cls, ArcGISTabularLayer): 
     43        if isinstance(cls, OGRTabularLayer): 
    4444            className = cls.__class__.__name__ 
    4545        else: 
     
    9090        # TODO: Validation 
    9191 
    92         if isinstance(cls, ArcGISTabularLayer): 
     92        if isinstance(cls, OGRTabularLayer): 
    9393            className = cls.__class__.__name__ 
    9494        else: 
  • MGET/Branches/Jason/PythonPackage/src/GeoEco/Datasets/__init__.py

    r938 r1040  
    43354335 
    43364336Not all derived classes support all of these geometry types. For 
    4337 example, ArcGISTabularLayers do not support the GeometryCollection or 
     4337example, ArcGISTables do not support the GeometryCollection or 
    43384338GeometryCollection25D geometry type. To test whether a derived class 
    43394339supports a geometry type, pass the string 'GeometryType t' to the 
  • MGET/Branches/Jason/PythonPackage/src/GeoEco/OceanographicAnalysis/Fronts.py

    r955 r1040  
    849849                noDataValue = self._Grid.UnscaledNoDataValue 
    850850                if self._Grid.DataType != self._Grid.UnscaledDataType: 
    851                     minPopMeanDifference = float(self._Grid.GetLazyPropertyValue('UnscalingFunction')(self._MinPopMeanDifference)) - float(self._Grid.GetLazyPropertyValue('UnscalingFunction')(0.))      # Convert self._MinPopMeanDifference from degrees C to unscaled integer counts 
     851                    minPossibleSST = self._Grid.GetLazyPropertyValue('ScalingFunction')(0) 
     852                    minPopMeanDifference = float(self._Grid.GetLazyPropertyValue('UnscalingFunction')(minPossibleSST + self._MinPopMeanDifference)) - float(self._Grid.GetLazyPropertyValue('UnscalingFunction')(minPossibleSST))      # Convert self._MinPopMeanDifference from degrees C to unscaled integer counts 
    852853                else: 
    853854                    minPopMeanDifference = self._MinPopMeanDifference 
  • MGET/Branches/Jason/PythonPackage/src/GeoEco/SpatialAnalysis/Points.py

    r1034 r1040  
    24012401 
    24022402AddArgumentMetadata(ArcGISPoints.CreatePointsAlongLines, u'inputLines', 
    2403     typeMetadata=ArcGISFeatureClassTypeMetadata(allowedShapeTypes=[u'Polyline'], mustExist=True), 
     2403    typeMetadata=ArcGISFeatureLayerTypeMetadata(allowedShapeTypes=[u'Polyline'], mustExist=True), 
    24042404    description=_( 
    24052405u"""Lines to generate points along. 
  • MGET/Branches/Jason/PythonPackage/src/GeoEco/Statistics/Modeling.py

    r1019 r1040  
    13301330            mColumnName = None 
    13311331 
    1332             responseVariable, allPredictors, minResponseValue, maxResponseValue, minFittedPredictorValues, maxFittedPredictorValues, categoricalPredictors, categoricalPredictorLevels, warnedAboutMissingLevels, allValuesForPredictorAreNA, allValuesAreNA = r('PrepareForPrediction(model, %s, %s)' % (trainingData, rPackage)) 
     1332            responseVariable, allPredictors, minResponseValue, maxResponseValue, isBinaryClassification, isNonbinaryClassification, minFittedPredictorValues, maxFittedPredictorValues, categoricalPredictors, categoricalPredictorLevels, warnedAboutMissingLevels, allValuesForPredictorAreNA, allValuesAreNA = r('PrepareForPrediction(model, %s, %s)' % (trainingData, rPackage)) 
     1333             
     1334            if isinstance(allPredictors, basestring):       # rpy will return a vector of one string as a Python string, rather than a Python list containing one Python string 
     1335                allPredictors = [allPredictors] 
    13331336 
    13341337            for var in allPredictors: 
     
    14561459        # Move the temporary output files to the requested location. 
    14571460 
    1458         if outputPlotFile is not None: 
     1461        if outputPlotFile is not None and os.path.isfile(tempPlotFile[1:-1]): 
    14591462            File.MoveSilent(tempPlotFile[1:-1], outputPlotFile, overwriteExisting=overwriteExisting) 
    14601463 
    1461         if outputSummaryFile is not None: 
     1464        if outputSummaryFile is not None and os.path.isfile(tempSummaryFile[1:-1]): 
    14621465            File.MoveSilent(tempSummaryFile[1:-1], outputSummaryFile, overwriteExisting=overwriteExisting) 
    14631466 
Note: See TracChangeset for help on using the changeset viewer.