Revision 1108 trunk/src/nh99/xmodelm3.cpp

xmodelm3.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 <sstream>
8 8
using std::istringstream;
......
49 49
#endif
50 50

  
51 51

  
52
  int function_minimizer::bad_step_flag=0;  
52
  int function_minimizer::bad_step_flag=0;
53 53

  
54 54
  void function_minimizer::minimize(void)
55 55
  {
......
80 80
           ad_exit(1);
81 81
        }
82 82
#    endif
83
     
83

  
84 84
#   endif
85 85
    //initial_params::read(); // read in the values for the initial parameters
86 86
    if (initial_params::restart_phase)
......
96 96
        cerr << "Usage -maxph option needs integer  -- ignored" << endl;
97 97
      }
98 98
      else
99
      {   
99
      {
100 100
        int jj=atoi(ad_comm::argv[on+1]);
101 101
        if (jj<=0)
102 102
        {
103 103
          cerr << "Usage -maxph option needs positive integer  -- ignored" << endl;
104
        } 
104
        }
105 105
        else
106 106
        {
107 107
          if (jj>allphases)
......
122 122
        cerr << "Usage -ndv option needs integer  -- ignored" << endl;
123 123
      }
124 124
      else
125
      {   
125
      {
126 126
        int jj=atoi(ad_comm::argv[on+1]);
127 127
        if (jj<=0)
128 128
        {
129 129
          cerr << "Usage -ndv option needs positive integer  -- ignored" << endl;
130
        } 
130
        }
131 131
        else
132 132
        {
133 133
          gradient_structure::NUM_DEPENDENT_VARIABLES=jj;
......
143 143
        cerr << "Usage -maxph option needs integer  -- ignored" << endl;
144 144
      }
145 145
      else
146
      {   
146
      {
147 147
        int _maxfn=atoi(ad_comm::argv[on+1]);
148 148
        if (_maxfn<0)
149 149
        {
150 150
          cerr << "Usage -maxfn option needs positive integer  -- ignored" << endl;
151
        } 
151
        }
152 152
        else
153 153
        {
154 154
          maxfn=_maxfn;
......
164 164
        cerr << "Usage -crit option needs number  -- ignored" << endl;
165 165
      }
166 166
      else
167
      {   
168
    
167
      {
168

  
169 169
        istringstream ist(ad_comm::argv[on+1]);
170 170
        ist >> _crit;
171
    
171

  
172 172
        if (_crit<=0)
173 173
        {
174 174
          cerr << "Usage -crit option needs positive number  -- ignored" << endl;
175 175
          _crit=0.0;
176
        } 
176
        }
177 177
      }
178 178
    }
179 179
    int bandwidth=0;
......
184 184
        cerr << "Usage -bw option needs number  -- ignored" << endl;
185 185
      }
186 186
      else
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff