Revision 752 branches/threaded2/src/nh99/newmodm5.cpp

newmodm5.cpp (revision 752)
59 59
       // set convergence criterion for this phase
60 60
       if (!(!convergence_criteria))
61 61
       {
62
         int ind=min(convergence_criteria.indexmax(),
62
         int ind=min(convergence_criteria->indexmax(),
63 63
           initial_params::current_phase);
64
         fmc.crit=convergence_criteria(ind);
64
         fmc.crit = (*convergence_criteria)(ind);
65 65
       }
66 66
       if (!(!maximum_function_evaluations))
67 67
       {
68
 	int ind=min(maximum_function_evaluations.indexmax(),
68
 	int ind=min(maximum_function_evaluations->indexmax(),
69 69
           initial_params::current_phase);
70
         fmc.maxfn=int(maximum_function_evaluations(ind));
70
         fmc.maxfn=int((*maximum_function_evaluations)(ind));
71 71
       }
72 72
       int itnsave=0;
73 73
       //double weight=pow(50.0,profile_phase)/(sigma*sigma);

Also available in: Unified diff