Revision 752 branches/threaded2/src/df1b2-separable/df1b2lmn2.cpp

df1b2lmn2.cpp (revision 752)
130 130
  }
131 131
  if (!(!convergence_criteria))
132 132
  {
133
    int ind=min(convergence_criteria.indexmax(),
133
    int ind=min(convergence_criteria->indexmax(),
134 134
      initial_params::current_phase);
135
    fmc.crit=convergence_criteria(ind);
135
    fmc.crit=(*convergence_criteria)(ind);
136 136
  }
137 137
  if (!(!maximum_function_evaluations))
138 138
  {
139
    int ind=min(maximum_function_evaluations.indexmax(),
139
    int ind=min(maximum_function_evaluations->indexmax(),
140 140
      initial_params::current_phase);
141
    fmc.maxfn= (int) maximum_function_evaluations(ind);
141
    fmc.maxfn = (int)(*maximum_function_evaluations)(ind);
142 142
  }
143 143
  int unvar=1;
144 144
  if (random_effects_flag)

Also available in: Unified diff