Changeset 12842

Timestamp:

07/31/12 14:41:46 (13 years ago)

Author:

jschierm

Message:

Preliminary python version of checkfield.

Location:

issm/trunk-jpl/src/m

Files:

• model/MatlabFuncs.py (modified) (1 diff)
• utils/consistency/checkfield.m (modified) (5 diffs)
• utils/consistency/checkfield.py (added)

issm/trunk-jpl/src/m/model/MatlabFuncs.py

@@ -1 @@
-def strcmp(str1,str2):
+def strcmp(s1,s2):
 
-        if str1 == str2:
+        if s1 == s2:
                 return True
         else:
                 return False
 
-def strncmp(str1,str2,n):
+def strncmp(s1,s2,n):
 
-        if str1[0:n] == str2[0:n]:
+        if s1[0:n] == s2[0:n]:
                 return True
         else:
                 return False
 
-def strcmpi(str1,str2):
+def strcmpi(s1,s2):
 
-        if str1.lower() == str2.lower():
+        if s1.lower() == s2.lower():
                 return True
         else:
                 return False
 
-def strncmpi(str1,str2,n):
+def strncmpi(s1,s2,n):
 
-        if str1.lower()[0:n] == str2.lower()[0:n]:
+        if s1.lower()[0:n] == s2.lower()[0:n]:
                 return True
         else:
                 return False
 
+def ismember(a,s):
+        import numpy
+
+        if not isinstance(s,(tuple,list,dict,numpy.ndarray)):
+                s=[s]
+
+        if not isinstance(a,(tuple,list,dict,numpy.ndarray)):
+                a=[a]
+
+        if not isinstance(a,numpy.ndarray):
+                b=[item in s for item in a]
+
+        else:
+                b=numpy.empty_like(a)
+                for i,item in enumerate(a.flat):
+                        b.flat[i]=item in s
+
+        return b
+

issm/trunk-jpl/src/m/utils/consistency/checkfield.m

@@ -54 +54 @@
                 end
         else
-                if ((size(field)~=fieldsize(1)) |  (size(field,2)~=fieldsize(2)))
+                if ((size(field,1)~=fieldsize(1)) |  (size(field,2)~=fieldsize(2)))
                         md = checkmessage(md,getfieldvalue(options,'message',...
                                 ['field ''' fieldname ''' size should be ' num2str(fieldsize(1)) ' x ' num2str(fieldsize(2))]));
@@ -87 +87 @@
 end
 
-%check NaN
+%check cell
 if getfieldvalue(options,'cell',0);
         if ~iscell(field),
@@ -99 +99 @@
         fieldvalues=getfieldvalue(options,'values');
         if iscell(fieldvalues), %strings
-        if ischar(field) | iscell(fieldvalues),
-                if any(~ismember(field,fieldvalues)),
-                        if length(fieldvalues)==1
-                                md = checkmessage(md,getfieldvalue(options,'message',...
-                                        ['field ''' fieldname ''' value should be ' fieldvalues{1} ]));
-                        elseif length(fieldvalues)==2
-                                md = checkmessage(md,getfieldvalue(options,'message',...
-                                        ['field ''' fieldname ''' values should be ' fieldvalues{1} ' or ' fieldvalues{2} ]));
-                        else
-                                md = checkmessage(md,getfieldvalue(options,'message',...
-                                        ['field ''' fieldname ''' should have values in ' sprintf('''%s'', ',fieldvalues{1:end-1}) 'or ''' fieldvalues{end} '''']));
+                if ischar(field) | iscell(fieldvalues),
+                        if any(~ismember(field,fieldvalues)),
+                                if length(fieldvalues)==1
+                                        md = checkmessage(md,getfieldvalue(options,'message',...
+                                                ['field ''' fieldname ''' value should be ''' fieldvalues{1} '''']));
+                                elseif length(fieldvalues)==2
+                                        md = checkmessage(md,getfieldvalue(options,'message',...
+                                                ['field ''' fieldname ''' values should be ''' fieldvalues{1} ''' or ''' fieldvalues{2} '''']));
+                                else
+                                        md = checkmessage(md,getfieldvalue(options,'message',...
+                                                ['field ''' fieldname ''' should have values in ' sprintf('''%s'', ',fieldvalues{1:end-1}) 'or ''' fieldvalues{end} '''']));
+                                end
                         end
+                else
+                        md = checkmessage(md,getfieldvalue(options,'message',...
+                                ['field ''' fieldname ''' should be one of the following strings: ' sprintf('''%s'', ',fieldvalues{1:end-1}) 'or ''' fieldvalues{end} '''']));
                 end
         else
-                md = checkmessage(md,getfieldvalue(options,'message',...
-                        ['field ''' fieldname ''' should be one of the following strings: ' sprintf('''%s'', ',fieldvalues{1:end-1}) 'or ''' fieldvalues{end} '''']));
-        end
-else
-        field2=reshape(field,prod(size(field)),1);
-        if isnumeric(field),
-                if any(~ismember(field2,fieldvalues)),
+                field2=reshape(field,prod(size(field)),1);
+                if isnumeric(field),
+                        if any(~ismember(field2,fieldvalues)),
+                                md = checkmessage(md,getfieldvalue(options,'message',...
+                                        ['field ''' fieldname ''' should have values in [' num2str(fieldvalues) ']']));
+                        end
+                else
                         md = checkmessage(md,getfieldvalue(options,'message',...
-                                ['field ''' fieldname ''' should have values in [' num2str(fieldvalues) ']']));
+                                ['field ''' fieldname ''' should be a number in [' num2str(fieldvalues) ']']));
                 end
-        else
-                md = checkmessage(md,getfieldvalue(options,'message',...
-                        ['field ''' fieldname ''' should be a number in [' num2str(fieldvalues) ']']));
-        end
         end
 end
@@ -162 +162 @@
         if any(field2>=upperbound),
                 md = checkmessage(md,getfieldvalue(options,'message',...
-                        ['field ''' fieldname ''' should have values below ' num2str(upperbound(1))]));
+                        ['field ''' fieldname ''' should have values below ' num2str(upperbound)]));
         end
 end
@@ -169 +169 @@
 if getfieldvalue(options,'file',0),
         if ~exist(field,'file')
-                md = checkmessage(md,['file profided in ''' fieldname ''': ''' field ''' does not exist']);
+                md = checkmessage(md,['file provided in ''' fieldname ''': ''' field ''' does not exist']);
         end
 end