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

paralle2.cpp (revision 752)
66 66
  {
67 67
    fmc.crit = _crit;
68 68
  }
69
  if (!(!convergence_criteria))
69
  if (!convergence_criteria)
70 70
  {
71
    int ind=min(convergence_criteria.indexmax(),
71
    int ind=min(convergence_criteria->indexmax(),
72 72
      initial_params::current_phase);
73
    fmc.crit=convergence_criteria(ind);
73
    fmc.crit = (*convergence_criteria)(ind);
74 74
  }
75
  if (!(!maximum_function_evaluations))
75
  if (!maximum_function_evaluations)
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
    fmc.maxfn= (int) maximum_function_evaluations(ind);
79
    fmc.maxfn = (int)(*maximum_function_evaluations)(ind);
80 80
  }
81 81
  tracing_message(traceflag,"E2");
82 82
  dvariable xf=initial_params::reset(dvar_vector(x));

Also available in: Unified diff