Changeset 12842
- Timestamp:
- 07/31/12 14:41:46 (13 years ago)
- Location:
- issm/trunk-jpl/src/m
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/m/model/MatlabFuncs.py
r12675 r12842 1 def strcmp(s tr1,str2):1 def strcmp(s1,s2): 2 2 3 if s tr1 == str2:3 if s1 == s2: 4 4 return True 5 5 else: 6 6 return False 7 7 8 def strncmp(s tr1,str2,n):8 def strncmp(s1,s2,n): 9 9 10 if s tr1[0:n] == str2[0:n]:10 if s1[0:n] == s2[0:n]: 11 11 return True 12 12 else: 13 13 return False 14 14 15 def strcmpi(s tr1,str2):15 def strcmpi(s1,s2): 16 16 17 if s tr1.lower() == str2.lower():17 if s1.lower() == s2.lower(): 18 18 return True 19 19 else: 20 20 return False 21 21 22 def strncmpi(s tr1,str2,n):22 def strncmpi(s1,s2,n): 23 23 24 if s tr1.lower()[0:n] == str2.lower()[0:n]:24 if s1.lower()[0:n] == s2.lower()[0:n]: 25 25 return True 26 26 else: 27 27 return False 28 28 29 def ismember(a,s): 30 import numpy 31 32 if not isinstance(s,(tuple,list,dict,numpy.ndarray)): 33 s=[s] 34 35 if not isinstance(a,(tuple,list,dict,numpy.ndarray)): 36 a=[a] 37 38 if not isinstance(a,numpy.ndarray): 39 b=[item in s for item in a] 40 41 else: 42 b=numpy.empty_like(a) 43 for i,item in enumerate(a.flat): 44 b.flat[i]=item in s 45 46 return b 47 -
issm/trunk-jpl/src/m/utils/consistency/checkfield.m
r12674 r12842 54 54 end 55 55 else 56 if ((size(field )~=fieldsize(1)) | (size(field,2)~=fieldsize(2)))56 if ((size(field,1)~=fieldsize(1)) | (size(field,2)~=fieldsize(2))) 57 57 md = checkmessage(md,getfieldvalue(options,'message',... 58 58 ['field ''' fieldname ''' size should be ' num2str(fieldsize(1)) ' x ' num2str(fieldsize(2))])); … … 87 87 end 88 88 89 %check NaN89 %check cell 90 90 if getfieldvalue(options,'cell',0); 91 91 if ~iscell(field), … … 99 99 fieldvalues=getfieldvalue(options,'values'); 100 100 if iscell(fieldvalues), %strings 101 if ischar(field) | iscell(fieldvalues), 102 if any(~ismember(field,fieldvalues)), 103 if length(fieldvalues)==1 104 md = checkmessage(md,getfieldvalue(options,'message',... 105 ['field ''' fieldname ''' value should be ' fieldvalues{1} ])); 106 elseif length(fieldvalues)==2 107 md = checkmessage(md,getfieldvalue(options,'message',... 108 ['field ''' fieldname ''' values should be ' fieldvalues{1} ' or ' fieldvalues{2} ])); 109 else 110 md = checkmessage(md,getfieldvalue(options,'message',... 111 ['field ''' fieldname ''' should have values in ' sprintf('''%s'', ',fieldvalues{1:end-1}) 'or ''' fieldvalues{end} ''''])); 101 if ischar(field) | iscell(fieldvalues), 102 if any(~ismember(field,fieldvalues)), 103 if length(fieldvalues)==1 104 md = checkmessage(md,getfieldvalue(options,'message',... 105 ['field ''' fieldname ''' value should be ''' fieldvalues{1} ''''])); 106 elseif length(fieldvalues)==2 107 md = checkmessage(md,getfieldvalue(options,'message',... 108 ['field ''' fieldname ''' values should be ''' fieldvalues{1} ''' or ''' fieldvalues{2} ''''])); 109 else 110 md = checkmessage(md,getfieldvalue(options,'message',... 111 ['field ''' fieldname ''' should have values in ' sprintf('''%s'', ',fieldvalues{1:end-1}) 'or ''' fieldvalues{end} ''''])); 112 end 112 113 end 114 else 115 md = checkmessage(md,getfieldvalue(options,'message',... 116 ['field ''' fieldname ''' should be one of the following strings: ' sprintf('''%s'', ',fieldvalues{1:end-1}) 'or ''' fieldvalues{end} ''''])); 113 117 end 114 118 else 115 md = checkmessage(md,getfieldvalue(options,'message',...116 ['field ''' fieldname ''' should be one of the following strings: ' sprintf('''%s'', ',fieldvalues{1:end-1}) 'or ''' fieldvalues{end} '''']));117 end118 else 119 field2=reshape(field,prod(size(field)),1);120 if isnumeric(field),121 if any(~ismember(field2,fieldvalues)),119 field2=reshape(field,prod(size(field)),1); 120 if isnumeric(field), 121 if any(~ismember(field2,fieldvalues)), 122 md = checkmessage(md,getfieldvalue(options,'message',... 123 ['field ''' fieldname ''' should have values in [' num2str(fieldvalues) ']'])); 124 end 125 else 122 126 md = checkmessage(md,getfieldvalue(options,'message',... 123 ['field ''' fieldname ''' should have valuesin [' num2str(fieldvalues) ']']));127 ['field ''' fieldname ''' should be a number in [' num2str(fieldvalues) ']'])); 124 128 end 125 else126 md = checkmessage(md,getfieldvalue(options,'message',...127 ['field ''' fieldname ''' should be a number in [' num2str(fieldvalues) ']']));128 end129 129 end 130 130 end … … 162 162 if any(field2>=upperbound), 163 163 md = checkmessage(md,getfieldvalue(options,'message',... 164 ['field ''' fieldname ''' should have values below ' num2str(upperbound (1))]));164 ['field ''' fieldname ''' should have values below ' num2str(upperbound)])); 165 165 end 166 166 end … … 169 169 if getfieldvalue(options,'file',0), 170 170 if ~exist(field,'file') 171 md = checkmessage(md,['file pro fided in ''' fieldname ''': ''' field ''' does not exist']);171 md = checkmessage(md,['file provided in ''' fieldname ''': ''' field ''' does not exist']); 172 172 end 173 173 end
Note:
See TracChangeset
for help on using the changeset viewer.