Changeset 264

Timestamp:

05/06/09 14:25:17 (16 years ago)

Author:

jschierm

Message:

Modification of parameter writing to Dakota requirements.

File:

• issm/trunk/src/m/classes/@dakota_method/dmeth_params_write.m (modified) (4 diffs)

issm/trunk/src/m/classes/@dakota_method/dmeth_params_write.m

@@ -283 +283 @@
         end
         
-    case {'lstsq'}
+    case {'lsq'}
         switch dm.method
             case {'nl2sol'}
@@ -351 +351 @@
                 param_write(fid,sbeg,'fixed_seed','','\n',dm.params);
                 param_write(fid,sbeg,'samples','          = ','\n',dm.params);
-                param_write(fid,sbeg,'sample_type','      = ','\n',dm.params);
+                param_write(fid,sbeg,'sample_type','        ','\n',dm.params);
                 param_write(fid,sbeg,'all_variables','','\n',dm.params);
                 param_write(fid,sbeg,'variance_based_decomp','','\n',dm.params);
-                param_write(fid,sbeg,'previous_samples',' = ','\n',dm.params);
+                if strcmp(dm.params.sample_type,'incremental_random') || ...
+                   strcmp(dm.params.sample_type,'incremental_lhs'   )
+                    param_write(fid,sbeg,'previous_samples',' = ','\n',dm.params);
+                end
 
             case {'nond_local_reliability'}
@@ -361 +364 @@
 
                 param_write(fid,sbeg,'mpp_search','  = ','\n',dm.params);
-                if (dm.params.sqp + ...
-                    dm.params.nip > 1)
-                    error('''%s'' method must have only one algorithm.',...
-                        dm.method);
-                end
-                param_write(fid,sbeg,'sqp','','\n',dm.params);
-                param_write(fid,sbeg,'nip','','\n',dm.params);
-                param_write(fid,sbeg,'integration',' = ','\n',dm.params);
-                param_write(fid,sbeg,'refinement','  = ','\n',dm.params);
-                param_write(fid,sbeg,'samples','     = ','\n',dm.params);
-                param_write(fid,sbeg,'seed','        = ','\n',dm.params);
+                if ischar(dm.params.mpp_search)
+                    if (dm.params.sqp + ...
+                        dm.params.nip > 1)
+                        error('''%s'' method must have only one algorithm.',...
+                            dm.method);
+                    end
+                    param_write(fid,sbeg,'sqp','','\n',dm.params);
+                    param_write(fid,sbeg,'nip','','\n',dm.params);
+                    param_write(fid,sbeg,'integration','   ','\n',dm.params);
+                    param_write(fid,sbeg,'refinement','  = ','\n',dm.params);
+                    if ischar(dm.params.refinement)
+                        param_write(fid,sbeg,'samples','     = ','\n',dm.params);
+                        param_write(fid,sbeg,'seed','        = ','\n',dm.params);
+                    end
+                end
 
             case {'nond_global_reliability'}
@@ -552 +559 @@
 if     islogical(params.(pname))
     fprintf(fidi,[sbeg '%s' send],pname);
+elseif isnumeric(params.(pname))
+    fprintf(fidi,[sbeg '%s' smid '%g'],pname,params.(pname)(1));
+    for i=2:numel(params.(pname))
+        fprintf(fidi,[' %g'],params.(pname)(i));
+    end
+    fprintf(fidi,[send]);
 elseif ischar   (params.(pname))
     fprintf(fidi,[sbeg '%s' smid '%s' send],pname,params.(pname));
-elseif isnumeric(params.(pname))
-    fprintf(fidi,[sbeg '%s' smid '%g' send],pname,params.(pname));
 else
     warning('param_write:param_unrecog',...