Changeset 926 for trunk/src/toolbox_calib/go_calib_optim.m

Timestamp:

Feb 18, 2016, 12:05:51 PM (8 years ago)

Author:

sommeria

Message:

geometry cqlib updated

File:

• trunk/src/toolbox_calib/go_calib_optim.m (modified) (3 diffs)

trunk/src/toolbox_calib/go_calib_optim.m

@@ -1 @@
-%=======================================================================
-% Copyright 2008-2016, LEGI UMR 5519 / CNRS UGA G-INP, Grenoble, France
-%   http://www.legi.grenoble-inp.fr
-%   Joel.Sommeria - Joel.Sommeria (A) legi.cnrs.fr
-%
-%     This file is part of the toolbox UVMAT.
-%
-%     UVMAT is free software; you can redistribute it and/or modify
-%     it under the terms of the GNU General Public License as published
-%     by the Free Software Foundation; either version 2 of the license,
-%     or (at your option) any later version.
-%
-%     UVMAT is distributed in the hope that it will be useful,
-%     but WITHOUT ANY WARRANTY; without even the implied warranty of
-%     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%     GNU General Public License (see LICENSE.txt) for more details.
-%=======================================================================
-
 %go_calib_optim
 %
@@ -48 +30 @@
 %For now, if using a 3D calibration rig, set quick_init to 1 for an easy initialization of the focal length
 
-if ~exist('rosette_calibration','var')
-    rosette_calibration = 0;
-end;
 
 if ~exist('n_ima'),
@@ -59 +38 @@
 
 check_active_images;
-
 check_extracted_images;
-
 check_active_images;
-
 desactivated_images = [];
 
 recompute_extrinsic = (length(ind_active) < 100); % if there are too many images, do not spend time recomputing the extrinsic parameters twice..
 
-if (rosette_calibration) 
-  %%% Special Setting for the Rosette:
-  est_dist = ones(5,1);
-end;
-
-
 %%% MAIN OPTIMIZATION CALL!!!!! (look into this function for the details of implementation)
 go_calib_optim_iter;
 
-
 if ~isempty(desactivated_images),
-   
    param_list_save = param_list;
-   
    fprintf(1,'\nNew optimization including the images that have been deactivated during the previous optimization.\n');
    active_images(desactivated_images) = ones(1,length(desactivated_images));
    desactivated_images = [];
-   
    go_calib_optim_iter;
-   
    if ~isempty(desactivated_images),
       fprintf(1,['List of images left desactivated: ' num2str(desactivated_images) '\n' ] );
    end;
-   
    param_list = [param_list_save(:,1:end-1) param_list];
-   
 end;
-
-
-%%%%%%%%%%%%%%%%%%%% GRAPHICAL OUTPUT %%%%%%%%%%%%%%%%%%%%%%%%
-
-%graphout_calib;
-