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

lmnewton.cpp (revision 752)
64 64
  // set convergence criterion for this phase
65 65
  if (!(!convergence_criteria))
66 66
  {
67
    int ind=min(convergence_criteria.indexmax(),
67
    int ind=min(convergence_criteria->indexmax(),
68 68
    initial_params::current_phase);
69
    crit=convergence_criteria(ind);
69
    crit = (*convergence_criteria)(ind);
70 70
  }
71 71
  if (_crit)
72 72
  {
......
74 74
  } 
75 75
  if (!(!maximum_function_evaluations) && !maxfn_option)
76 76
  {
77
    int ind=min(maximum_function_evaluations.indexmax(),
77
    int ind=min(maximum_function_evaluations->indexmax(),
78 78
      initial_params::current_phase);
79
    maxfn= (int) maximum_function_evaluations(ind);
79
    maxfn = (int)(*maximum_function_evaluations)(ind);
80 80
  }
81 81
  dvariable vf=0.0;
82 82

  

Also available in: Unified diff