Revision 1110 trunk/src/df1b2-separable/f1b2fnl2.cpp

f1b2fnl2.cpp (revision 1110)
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
......
31 31
    f1b2gradlist->nlist.initialize();
32 32
    f1b2gradlist->nlist2.initialize();
33 33
    f1b2gradlist->nlist3.initialize();
34
    funnel_init_var::num_vars=0; 
35
    funnel_init_var::num_active_parameters=0; 
36
    funnel_init_var::num_inactive_vars=0; 
34
    funnel_init_var::num_vars=0;
35
    funnel_init_var::num_active_parameters=0;
36
    funnel_init_var::num_inactive_vars=0;
37 37
    if (funnel_init_var::funnel_constraints_penalty)
38 38
    {
39 39
      delete funnel_init_var::funnel_constraints_penalty;
......
50 50
    delete funnel_init_var::funnel_constraints_penalty;
51 51
    funnel_init_var::funnel_constraints_penalty=0;
52 52
  }
53
  
53

  
54 54
  // this should not be called a block diagopnal flag but it is for now.
55 55
  //if (pool_check_flag)
56 56
   // check_pool_depths();
......
62 62
    case 2:
63 63
      do_separable_stuff_newton_raphson_block_diagonal(ff);
64 64
      break;
65
    case 3: //banded 
66
    case 4: // full matrix 
65
    case 3: //banded
66
    case 4: // full matrix
67 67
      do_separable_stuff_newton_raphson_banded(ff);
68 68
  //if (pool_check_flag)
69 69
   // check_pool_depths();
......
88 88
      }
89 89
      break;
90 90
    case 3:
91
    case 4: // full matrix 
91
    case 4: // full matrix
92 92
      do_separable_stuff_laplace_approximation_banded(ff);
93 93
      break;
94 94
    default:
......
103 103
      do_separable_stuff_laplace_approximation_importance_sampling_adjoint(ff);
104 104
      break;
105 105
    case 3:
106
    case 4: // full matrix 
106
    case 4: // full matrix
107 107
      do_separable_stuff_laplace_approximation_banded_adjoint(ff);
108 108
      break;
109 109
    default:
......
118 118
      get_block_diagonal_hessian(ff);
119 119
      break;
120 120
  default:
121
    cerr << "illegal value for block_diagonal_flag = " 
121
    cerr << "illegal value for block_diagonal_flag = "
122 122
      << block_diagonal_flag << endl;
123 123
    ad_exit(1);
124 124
  }
......
144 144
  df1b2_gradlist::set_no_derivatives();
145 145
  df1b2variable::passnumber=1;
146 146
  df1b2_gradcalc1();
147
   
147

  
148 148
  init_df1b2vector & locy= *funnel_init_var::py;
149 149
  imatrix& list=*funnel_init_var::plist;
150 150
  int num_local_re=0;
......
157 157

  
158 158
  for (i=1;i<=funnel_init_var::num_active_parameters;i++)
159 159
  {
160
    if (list(i,1)>xsize) 
160
    if (list(i,1)>xsize)
161 161
    {
162 162
      lre_index(++num_local_re)=i;
163 163
    }
164
    else if (list(i,1)>0) 
164
    else if (list(i,1)>0)
165 165
    {
166 166
      lfe_index(++num_fixed_effects)=i;
167 167
    }
168 168
  }
169
  
169

  
170 170
  if (num_local_re > 0)
171 171
  {
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff