Changeset 13899

Timestamp:

11/07/12 15:57:06 (12 years ago)

Author:

jschierm

Message:

FIX: Try again to allow WriteData.py for lists and tuples.

File:

• issm/trunk-jpl/src/m/solve/WriteData.py (modified) (6 diffs)

issm/trunk-jpl/src/m/solve/WriteData.py

@@ -17 +17 @@
         #process options
         #  the import above the function level doesn't work?
-        from pairoptions import *
+        from pairoptions import pairoptions
         options=pairoptions(*args)
 
@@ -101 +101 @@
         elif strcmpi(format,'BooleanMat'):    # {{{
 
-                if not isinstance(data,numpy.ndarray):
+                if   isinstance(data,bool):
                         data=numpy.array([data])
+                elif isinstance(data,(list,tuple)):
+                        data=numpy.array(data).reshape(-1,1)
                 if len(data.shape) == 1:
                         if numpy.size(data):
@@ -132 +134 @@
         elif strcmpi(format,'IntMat'):    # {{{
 
-                if not isinstance(data,numpy.ndarray):
+                if   isinstance(data,(int,long)):
                         data=numpy.array([data])
+                elif isinstance(data,(list,tuple)):
+                        data=numpy.array(data).reshape(-1,1)
                 if len(data.shape) == 1:
                         if numpy.size(data):
@@ -163 +167 @@
         elif strcmpi(format,'DoubleMat'):    # {{{
 
-                if not isinstance(data,numpy.ndarray):
+                if   isinstance(data,(bool,int,long,float)):
                         data=numpy.array([data])
+                elif isinstance(data,(list,tuple)):
+                        data=numpy.array(data).reshape(-1,1)
                 if len(data.shape) == 1:
                         if numpy.size(data):
@@ -197 +203 @@
                 recordlength=4+4    #number of records + code
                 for matrix in data:
-                        if not isinstance(matrix,numpy.ndarray):
+                        if   isinstance(matrix,(bool,int,long,float)):
                                 matrix=numpy.array([matrix])
+                        elif isinstance(matrix,(list,tuple)):
+                                matrix=numpy.array(matrix).reshape(-1,1)
                         if len(matrix.shape) == 1:
                                 if numpy.size(matrix):
@@ -219 +227 @@
                 #write each matrix: 
                 for matrix in data:
-                        if not isinstance(matrix,numpy.ndarray):
+                        if   isinstance(matrix,(bool,int,long,float)):
                                 matrix=numpy.array([matrix])
+                        elif isinstance(matrix,(list,tuple)):
+                                matrix=numpy.array(matrix).reshape(-1,1)
                         if len(matrix.shape) == 1:
                                 matrix=matrix.reshape(numpy.size(matrix),1)