Changeset 14170

Timestamp:

12/14/12 18:03:41 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added conversion constructor from taoinversion to inversion and viceversa

Location:

issm/trunk-jpl/src/m/classes

Files:

• inversion.m (modified) (1 diff)
• taoinversion.m (modified) (1 diff)

issm/trunk-jpl/src/m/classes/inversion.m

@@ -31 +31 @@
                                 case 0
                                         obj=setdefaultparameters(obj);
+                                case 1
+                                        if isa(varargin{1},'taoinversion'),
+                                                disp('converting taoinversion to inversion');
+                                                in=varargin{1};
+                                                obj.iscontrol                   = in.iscontrol;
+                                                obj.tao                         = 1;
+                                                obj.incomplete_adjoint          = in.incomplete_adjoint;
+                                                obj.control_parameters          = in.control_parameters;
+                                                obj.nsteps                      = in.nsteps;
+                                                obj.maxiter_per_step            = 10*ones(in.nsteps,1);
+                                                obj.cost_functions              = repmat(in.cost_functions,in.nsteps,1);
+                                                obj.cost_functions_coefficients = in.cost_functions_coefficients;
+                                                obj.gradient_scaling            = 100*ones(in.nsteps,1);
+                                                obj.cost_function_threshold     = NaN;
+                                                obj.min_parameters              = in.min_parameters;
+                                                obj.max_parameters              = in.max_parameters;
+                                                obj.step_threshold              = .99*ones(in.nsteps,1);
+                                                obj.vx_obs                      = in.vx_obs;
+                                                obj.gradient_only               = 0;
+                                                obj.vy_obs                      = in.vy_obs;
+                                                obj.vz_obs                      = in.vz_obs;
+                                                obj.vel_obs                     = in.vel_obs;
+                                                obj.thickness_obs               = in.thickness_obs;
+                                        end
                                 otherwise
                                         error('constructor not supported');

issm/trunk-jpl/src/m/classes/taoinversion.m

@@ -25 +25 @@
                                 case 0
                                         obj=setdefaultparameters(obj);
+                                case 1
+                                        if isa(varargin{1},'inversion'),
+                                                disp('converting inversion to taoinversion');
+                                                in=varargin{1};
+                                                obj.iscontrol                   = in.iscontrol;
+                                                obj.incomplete_adjoint          = in.incomplete_adjoint;
+                                                obj.control_parameters          = in.control_parameters;
+                                                obj.nsteps                      = in.nsteps;
+                                                obj.cost_functions              = in.cost_functions(1,:); %Keep first line only
+                                                obj.cost_functions_coefficients = in.cost_functions_coefficients;
+                                                obj.min_parameters              = in.min_parameters;
+                                                obj.max_parameters              = in.max_parameters;
+                                                obj.vx_obs                      = in.vx_obs;
+                                                obj.vy_obs                      = in.vy_obs;
+                                                obj.vz_obs                      = in.vz_obs;
+                                                obj.vel_obs                     = in.vel_obs;
+                                                obj.thickness_obs               = in.thickness_obs;
+                                        end
                                 otherwise
                                         error('constructor not supported');