Revision 1109 trunk/src/df1b2-separable/df1b2lmn2.cpp

df1b2lmn2.cpp (revision 1109)
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
/**
8 8
 * \file
......
37 37
      cerr << "Usage -fntrap option needs two non-negative integers  -- ignored" << endl;
38 38
    }
39 39
    else
40
    {   
40
    {
41 41
      ifn_trap=atoi(ad_comm::argv[on+1]);
42 42
      itn_trap=atoi(ad_comm::argv[on+2]);
43 43
    }
......
49 49
  // block for quasi-newton minimization
50 50
  //int itnold=0;
51 51
  int nx=nvar;
52
  if (negdirections) 
52
  if (negdirections)
53 53
  {
54
    nx=negdirections->indexmax(); 
54
    nx=negdirections->indexmax();
55 55
  }
56 56
  fmmt1 fmc(nx,nsteps);
57 57
  int on1;
......
68 68
      //fmc.iprint=iprint;
69 69
    }
70 70
    else
71
    {   
71
    {
72 72
      int jj=atoi(ad_comm::argv[on1+1]);
73 73
      fmc.dcheck_flag=jj;
74 74
    }
......
82 82
      fmc.iprint=iprint;
83 83
    }
84 84
    else
85
    {   
85
    {
86 86
      int jj=atoi(ad_comm::argv[on1+1]);
87 87
      fmc.iprint=jj;
88 88
    }
......
103 103
      cerr << "Usage -dfn option needs number  -- ignored" << endl;
104 104
    }
105 105
    else
106
    {   
107
  
106
    {
107

  
108 108
      istringstream ist(ad_comm::argv[on+1]);
109 109
      ist >> _dfn;
110
  
110

  
111 111
      if (_dfn<0)
112 112
      {
113 113
        cerr << "Usage -dfn option needs positive number  -- ignored" << endl;
114 114
        _dfn=0.0;
115
      } 
115
      }
116 116
    }
117 117
  }
118
  if (_dfn>=0) 
118
  if (_dfn>=0)
119 119
  {
120 120
    fmc.dfn=_dfn;
121 121
  }
......
143 143
  int unvar=1;
144 144
  if (random_effects_flag)
145 145
  {
146
    initial_params::set_active_only_random_effects(); 
146
    initial_params::set_active_only_random_effects();
147 147
    //cout << nvar << endl;
148 148
    unvar=initial_params::nvarcalc(); // get the number of active
149
    initial_params::restore_start_phase(); 
150
    initial_params::set_inactive_random_effects(); 
149
    initial_params::restore_start_phase();
150
    initial_params::set_inactive_random_effects();
151 151
    int nvar1=initial_params::nvarcalc(); // get the number of active
152 152
    if (nvar1 != nvar)
153 153
    {
......
157 157
    }
158 158
  }
159 159

  
160
  
161 160
  if (!random_effects_flag || !unvar)
162 161
  {
163 162
    dvariable xf=initial_params::reset(dvar_vector(x));
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff