Revision 1108 trunk/src/nh99/randeff.cpp

randeff.cpp (revision 1108)
2 2
 * $Id$
3 3
 *
4 4
 * Author: David Fournier
5
 * Copyright (c) 2008-2012 Regents of the University of California 
5
 * Copyright (c) 2008-2012 Regents of the University of California
6 6
 */
7 7
#include <admodel.h>
8 8

  
......
32 32
  int maxiter=50;
33 33
  int iprint=-10;
34 34

  
35
  dvar_vector& x = (dvar_vector&)(_x); 
35
  dvar_vector& x = (dvar_vector&)(_x);
36 36

  
37 37
  integer nvar=x.indexmax()-x.indexmin()+1; // get the number of active
38 38
  if (m<=0)
......
63 63
      cerr << "Usage -crit option needs number  -- ignored" << endl;
64 64
    }
65 65
    else
66
    {   
66
    {
67 67
      char * end;
68 68
      _crit=strtod(ad_comm::argv[on+1],&end);
69 69
      if (_crit<=0)
70 70
      {
71 71
        cerr << "Usage -crit option needs positive number  -- ignored" << endl;
72 72
        _crit=0.0;
73
      } 
73
      }
74 74
    }
75 75
  }
76 76
  gradient_structure::set_YES_DERIVATIVES();
......
85 85
  if (_crit)
86 86
  {
87 87
    crit = _crit;
88
  } 
88
  }
89 89
  dvector maximum_function_evaluations;
90 90
  if (!(!maximum_function_evaluations) && !maxfn_option)
91 91
  {
......
130 130
    xbest=x;
131 131
    gbest=g;
132 132
  }
133
  
133

  
134 134
  //gradcalc(nvar,g);
135 135
  g=user_dfrandeff(x);
136 136

  

Also available in: Unified diff