Changeset 2393

Timestamp:

10/08/09 09:04:43 (15 years ago)

Author:

Mathieu Morlighem

Message:

modified parametercontrol accordingly to the modification of pairoptions

File:

• issm/trunk/src/m/classes/public/parametercontrol.m (modified) (3 diffs)

issm/trunk/src/m/classes/public/parametercontrol.m

@@ -13 +13 @@
 
 %nsteps
-if exist(options,'nsteps'),
-        nsteps=getoption(options,'nsteps');
-        if (length(nsteps)~=1 | nsteps<=0 | floor(nsteps)~=nsteps)
-                md.nsteps=100;
-        else
-                md.nsteps=nsteps;
-        end
+nsteps=getfieldvalue(options,'nsteps',100);
+if (length(nsteps)~=1 | nsteps<=0 | floor(nsteps)~=nsteps)
+        md.nsteps=100;
 else
-        md.nsteps=100;
+        md.nsteps=nsteps;
 end
 
 %cm_min
-if exist(options,'cm_min'),
-        cm_min=getoption(options,'cm_min');
-        if (length(cm_min)~=1)
-                md.cm_min=1;
-        else
-                md.cm_min=cm_min;
-        end
+cm_min=getfieldvalue(options,'cm_min',1);
+if (length(cm_min)~=1)
+        md.cm_min=1;
 else
-        md.cm_min=1;
+        md.cm_min=cm_min;
 end
 
 %cm_max
-if exist(options,'cm_max'),
-        cm_max=getoption(options,'cm_max');
-        if (length(cm_max)~=1)
-                md.cm_max=180;
-        else
-                md.cm_max=cm_max;
-        end
+cm_max=getfieldvalue(options,'cm_max',180);
+if (length(cm_max)~=1)
+        md.cm_max=180;
 else
-        md.cm_max=180;
+        md.cm_max=cm_max;
 end
 
 %cm_noisedmp
-if exist(options,'cm_noisedmp'),
-        cm_noisedmp=getoption(options,'cm_noisedmp');
-        if (length(cm_noisedmp)~=1)
-                md.cm_noisedmp=5*10^-5;
-        else
-                md.cm_noisedmp=cm_noisedmp;
-        end
+cm_noisedmp=getfieldvalue(options,'cm_noisedmp',5*10^-5);
+if (length(cm_noisedmp)~=1)
+        md.cm_noisedmp=5*10^-5;
 else
-        md.cm_noisedmp=5*10^-5;
+        md.cm_noisedmp=cm_noisedmp;
 end
 
 %eps_cm
-if exist(options,'eps_cm'),
-        eps_cm=getoption(options,'eps_cm');
-        if (length(eps_cm)~=1 | eps_cm<0 )
-                md.eps_cm=NaN;
-        else
-                md.eps_cm=eps_cm;
-        end
+eps_cm=getfieldvalue(options,'eps_cm',NaN);
+if (length(eps_cm)~=1 | eps_cm<0 )
+        md.eps_cm=NaN;
 else
-        md.eps_cm=NaN;
+        md.eps_cm=eps_cm;
 end
 
 %maxiter
-if exist(options,'maxiter'),
-        maxiter=getoption(options,'maxiter');
-        if (any(maxiter<0) | any(floor(maxiter)~=maxiter))
-                md.maxiter=10*ones(md.nsteps,1);
-        else
-                md.maxiter=repmat(maxiter(:),md.nsteps,1);
-                md.maxiter(md.nsteps+1:end)=[];
-        end
+maxiter=getfieldvalue(options,'maxiter',10*ones(md.nsteps,1));
+if (any(maxiter<0) | any(floor(maxiter)~=maxiter))
+        md.maxiter=10*ones(md.nsteps,1);
 else
-        md.maxiter=10*ones(md.nsteps,1);
+        md.maxiter=repmat(maxiter(:),md.nsteps,1);
+        md.maxiter(md.nsteps+1:end)=[];
 end
 
 %cm_jump
-if exist(options,'cm_jump'),
-        cm_jump=getoption(options,'cm_jump');
-        if ~isreal(cm_jump)
-                md.cm_jump=0.8*ones(md.nsteps,1);
-        else
-                md.cm_jump=repmat(cm_jump(:),md.nsteps,1);
-                md.cm_jump(md.nsteps+1:end)=[];
-        end
+cm_jump=getfieldvalue(options,'cm_jump',0.8*ones(md.nsteps,1));
+if ~isreal(cm_jump)
+        md.cm_jump=0.8*ones(md.nsteps,1);
 else
-        md.cm_jump=0.8*ones(md.nsteps,1);
+        md.cm_jump=repmat(cm_jump(:),md.nsteps,1);
+        md.cm_jump(md.nsteps+1:end)=[];
 end
 
@@ -101 +73 @@
 found=0;
 if exist(options,'fit'),
-        fit=getoption(options,'fit');
+        fit=getfieldvalue(options,'fit');
         if ~any(fit~=0 & fit~=1 & fit~=2),
                 md.fit=repmat(fit(:),md.nsteps,1);
@@ -117 +89 @@
 found=0;
 if exist(options,'optscal'),
-        optscal=getoption(options,'optscal');
+        optscal=getfieldvalue(options,'optscal');
         if ~any(optscal<0),
                 md.optscal=repmat(optscal(:),md.nsteps,1);