Changeset 2826 for trunk

Timestamp:

11/19/2008 07:52:18 AM (7 weeks ago)

Author:

guyer

Message:

getTypecode -> obj2sctype to unify with NumPy

Location:

trunk/fipy

Files:

• tools/dimensions/physicalField.py (modified) (1 diff)
• tools/numerix.py (modified) (1 diff)
• variables/cellVariable.py (modified) (1 diff)
• variables/meshVariable.py (modified) (1 diff)
• variables/operatorVariable.py (modified) (1 diff)
• variables/variable.py (modified) (5 diffs)

trunk/fipy/tools/dimensions/physicalField.py

@@ -760 +760 @@
             return tuple(result)
 
+    def getsctype(self, default=None):
+        """
+
+        Returns the Numpy sctype of the underlying array.
+
+            >>> PhysicalField(1, 'm').getsctype()
+            <type 'numpy.int32'>
+            >>> PhysicalField(1., 'm').getsctype()
+            <type 'numpy.float64'>
+            >>> PhysicalField((1,1.), 'm').getsctype()
+            <type 'numpy.float64'>
+            
+        """
+        
+        if not hasattr(self, 'typecode'):
+            self.typecode = numerix.obj2sctype(rep=numerix.array(self.getNumericValue()), 
+                                               default=default)
+        
+        return self.typecode
+
     def getUnit(self):
         """

trunk/fipy/tools/numerix.py

@@ -1170 +1170 @@
     return lst
 
+def obj2sctype(rep, default=None):
+    if _isPhysical(rep):
+        sctype = rep.getsctype(default=default)
+    else:
+        if type(rep) in (type(()), type([])):
+            rep = array(rep)
+        sctype = NUMERIX.obj2sctype(rep=rep, default=default)
+        
+    if sctype is None:
+        return obj2sctype(type(rep), default=default)
+    else:
+        return sctype
+        
+
 def getTypecode(arr):
     """

trunk/fipy/variables/cellVariable.py

@@ -85 +85 @@
             >>> print b
             [2]
-            >>> b.getTypecode()
-            'l'
+            >>> b.getsctype()
+            <type 'numpy.int32'>
             
         replacing with the same thing is no problem

trunk/fipy/variables/meshVariable.py

@@ -73 +73 @@
             array = numerix.zeros(self.elementshape 
                                   + self._getShapeFromMesh(mesh),
-                                  numerix.obj2sctype(numerix.array(value)))
+                                  numerix.obj2sctype(value))
             if numerix._broadcastShape(array.shape, numerix.shape(value)) is None:
                 if not isinstance(value, Variable):

trunk/fipy/variables/operatorVariable.py

@@ -246 +246 @@
 
         >>> a = Variable(1.) * Variable(1)
-        >>> a.getTypecode()
-        'd'
+        >>> a.getsctype()
+        <type 'numpy.float64'>
 
     The following test is to correct an `--inline` bug that was

trunk/fipy/variables/variable.py

@@ -316 +316 @@
             
     def __repr__(self):
-        if len(self.name) > 0:
+        if hasattr(self, 'name') and len(self.name) > 0:
             return self.name
         else:
@@ -549 +549 @@
 
         if where is not None:
-            tmp = numerix.zeros(numerix.getShape(where), numerix.getTypecode(value))
+            tmp = numerix.zeros(numerix.getShape(where), numerix.obj2sctype(value))
             tmp[:] = value
             tmp = numerix.where(where, tmp, self.getValue())
@@ -603 +603 @@
     shape = property(fget=lambda self: self.getShape(), doc="Tuple of array dimensions.")
 
+    def getsctype(self, default=None):
+        """
+
+        Returns the Numpy sctype of the underlying array.
+
+            >>> Variable(1).getsctype()
+            <type 'numpy.int32'>
+            >>> Variable(1.).getsctype()
+            <type 'numpy.float64'>
+            >>> Variable((1,1.)).getsctype()
+            <type 'numpy.float64'>
+            
+        """
+        
+        if not hasattr(self, 'typecode'):
+            self.typecode = numerix.obj2sctype(rep=self.getNumericValue(), default=default)
+        
+        return self.typecode
+    
     def getTypecode(self):
         """
@@ -618 +637 @@
         
         if not hasattr(self, 'typecode'):
-            self.typecode = numerix.getTypecode(self.getValue())
+            self.typecode = numerix.getTypecode(self.getNumericValue())
         
         return self.typecode
@@ -737 +756 @@
             argDict['result'] = self.getValue()
             self.canInline = True
-            self.typecode = numerix.getTypecode(argDict['result'])
+            self.typecode = numerix.obj2sctype(argDict['result'])
         else:
             if self.value is None:
-                if self.getTypecode() == '?':
-                    argDict['result'] = numerix.empty(dim, 'b')
+                if self.getsctype() == numpy.bool_:
+                    argDict['result'] = numerix.empty(dim, numpy.int8)
                 else:
-                    argDict['result'] = numerix.empty(dim, self.getTypecode())
+                    argDict['result'] = numerix.empty(dim, self.getsctype())
             else:
                 argDict['result'] = self.value