Changeset 22744 for issm/trunk-jpl/src/m/classes/autodiff.m

Timestamp:

05/07/18 13:12:44 (7 years ago)

Author:

erobo

Message:

CHG: add .m fields for adolc m1qn3

File:

• issm/trunk-jpl/src/m/classes/autodiff.m (modified) (2 diffs)

issm/trunk-jpl/src/m/classes/autodiff.m ¶

@@ -130 +130 @@
                                         names{i}=indep.name;
                                         types(i)=indep.typetoscalar();
-                                        min_parameters(:,i)=indep.min_parameters;
-                                        max_parameters(:,i)=indep.max_parameters;
+                                        min_parameters(:,:,i)=indep.min_parameters;
+                                        max_parameters(:,:,i)=indep.max_parameters;
                                         scaling_factors(i)=indep.control_scaling_factor;
+                                        control_sizes(i) = indep.control_size;
+
                                 end
                                 WriteData(fid,prefix,'data',names,'name','md.autodiff.independent_object_names','format','StringArray');
@@ -138 +140 @@
                                 WriteData(fid,prefix,'data',min_parameters,'name','md.autodiff.independent_min_parameters','format','DoubleMat','mattype',3);
                  WriteData(fid,prefix,'data',max_parameters,'name','md.autodiff.independent_max_parameters','format','DoubleMat','mattype',3);
-                 WriteData(fid,prefix,'data',scaling_factors,'name','md.autodiff.independent_scaling_factors','format','DoubleMat','mattype',3);
-
+                 WriteData(fid,prefix,'data',scaling_factors,'name','md.autodiff.independent_scaling_factors','format','IntMat','mattype',3);
+                                WriteData(fid,prefix,'data',control_sizes,'name','md.autodiff.independent_control_sizes','format','IntMat','mattype',3);
 
                         end