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

paral5re.cpp (revision 752)
70 70
  {
71 71
    fmc.crit = _crit;
72 72
  }
73
  if (!(!convergence_criteria))
73
  if (!convergence_criteria)
74 74
  {
75
    int ind=min(convergence_criteria.indexmax(),
75
    int ind=min(convergence_criteria->indexmax(),
76 76
      initial_params::current_phase);
77
    fmc.crit=convergence_criteria(ind);
77
    fmc.crit = (*convergence_criteria)(ind);
78 78
  }
79
  if (!(!maximum_function_evaluations))
79
  if (!maximum_function_evaluations)
80 80
  {
81
    int ind=min(maximum_function_evaluations.indexmax(),
81
    int ind=min(maximum_function_evaluations->indexmax(),
82 82
      initial_params::current_phase);
83
    fmc.maxfn= (int) maximum_function_evaluations(ind);
83
    fmc.maxfn = (int)(*maximum_function_evaluations)(ind);
84 84
  }
85 85

  
86 86

  

Also available in: Unified diff