Changeset 6226 for issm/trunk/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp

Timestamp:

10/11/10 10:05:52 (15 years ago)

Author:

Mathieu Morlighem

Message:

Multivariable optimization now available (still a problem to be fixed in Gradient)

File:

• issm/trunk/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp (modified) (3 diffs)

issm/trunk/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp

@@ -43 +43 @@
                 parameters->AddObject(new DoubleParam(MeanVelEnum,iomodel->meanvel));
                 parameters->AddObject(new DoubleParam(CmNoiseDmpEnum,iomodel->cm_noisedmp));
-                parameters->AddObject(new DoubleParam(CmMinEnum,iomodel->cm_min));
-                parameters->AddObject(new DoubleParam(CmMaxEnum,iomodel->cm_max));
+
                 parameters->AddObject(new BoolParam(CmGradientEnum,iomodel->cm_gradient));
 
@@ -50 +49 @@
                 IoModelFetchData(&iomodel->cm_responses,NULL,NULL,iomodel_handle,"cm_responses");
                 IoModelFetchData(&iomodel->cm_jump,NULL,NULL,iomodel_handle,"cm_jump");
+                IoModelFetchData(&iomodel->cm_min,NULL,NULL,iomodel_handle,"cm_min");
+                IoModelFetchData(&iomodel->cm_max,NULL,NULL,iomodel_handle,"cm_max");
                 IoModelFetchData(&iomodel->optscal,NULL,NULL,iomodel_handle,"optscal");
                 IoModelFetchData(&iomodel->maxiter,NULL,NULL,iomodel_handle,"maxiter");
@@ -55 +56 @@
                 parameters->AddObject(new DoubleVecParam(CmResponsesEnum,iomodel->cm_responses,iomodel->nsteps));
                 parameters->AddObject(new DoubleVecParam(CmJumpEnum,iomodel->cm_jump,iomodel->nsteps));
-                parameters->AddObject(new DoubleVecParam(OptScalEnum,iomodel->optscal,iomodel->nsteps));
+                parameters->AddObject(new DoubleMatParam(OptScalEnum,iomodel->optscal,iomodel->nsteps,iomodel->num_control_type));
+                parameters->AddObject(new DoubleVecParam(CmMinEnum,iomodel->cm_min,iomodel->num_control_type));
+                parameters->AddObject(new DoubleVecParam(CmMaxEnum,iomodel->cm_max,iomodel->num_control_type));
                 parameters->AddObject(new DoubleVecParam(MaxIterEnum,iomodel->maxiter,iomodel->nsteps));
 
                 xfree((void**)&iomodel->cm_responses);
                 xfree((void**)&iomodel->cm_jump);
+                xfree((void**)&iomodel->cm_min);
+                xfree((void**)&iomodel->cm_max);
                 xfree((void**)&iomodel->optscal);
                 xfree((void**)&iomodel->maxiter);