Revision 1110

trunk/src/df1b2-separable/df1b2fnl.cpp (revision 1110)
88 88
  for (int i=0;i<df1b2variable::adpool_counter;i++)
89 89
  {
90 90
    cout << " Pool depth " << i << "  "
91
         << df1b2variable::adpool_vector[i]->depth_check() 
91
         << df1b2variable::adpool_vector[i]->depth_check()
92 92
         << "  " << df1b2variable::adpool_vector[i]  << endl;
93 93
  }
94 94
}
......
99 99
 */
100 100
void funnel_init_var::allocate_all(void)
101 101
{
102
  re_objective_function_value::pobjfun->deallocate(); 
102
  re_objective_function_value::pobjfun->deallocate();
103 103
  if (lapprox)
104 104
  {
105 105
    if (lapprox->calling_set)
......
108 108
    }
109 109
  }
110 110
  num_active_parameters=funnel_init_var::nvarcalc_all();
111
  if (py) 
111
  if (py)
112 112
  {
113 113
    if (py->indexmax() != num_active_parameters)
114 114
    {
......
143 143
        {
144 144
          cerr << "Memory allocation error" << endl;
145 145
          ad_exit(1);
146
        } 
146
        }
147 147
        if (df1b2variable::adpool_counter>df1b2variable::adpool_vectorsize)
148 148
        {
149 149
          //cerr << "Need to increase adpool_vectorsize" << endl;
......
166 166
          //df1b2variable::adpool_counter++;
167 167
          df1b2variable::increment_adpool_counter();
168 168
        }
169
      }    
169
      }
170 170
    }
171 171
  }
172 172
  else
......
176 176
    {
177 177
      cerr << "Memory allocation error" << endl;
178 178
      ad_exit(1);
179
    } 
179
    }
180 180
    if (df1b2variable::adpool_counter>df1b2variable::adpool_vectorsize)
181 181
    {
182 182
      int offset=1;
......
203 203
  df1b2variable::nvar=num_active_parameters;
204 204
  df1b2variable::set_blocksize();
205 205

  
206
  re_objective_function_value::pobjfun->allocate(); 
206
  re_objective_function_value::pobjfun->allocate();
207 207
  //if (funnel_check_flag)
208 208
   // check_pool_depths();
209 209
  df1b2variable::minder=1;
......
221 221
    ad_exit(1);
222 222
  }
223 223
  //init_df1b2vector& tmp = *py;
224
  
225 224

  
226
  if (plist) 
225

  
226
  if (plist)
227 227
  {
228 228
    if (plist->indexmax() != num_active_parameters)
229 229
    {
......
231 231
      plist=0;
232 232
    }
233 233
  }
234
  if (!plist) 
234
  if (!plist)
235 235
  {
236 236
    plist = new imatrix(1,num_active_parameters,1,2);
237 237
  }
......
259 259
    inactive_list[i]->allocate();
260 260
  }
261 261

  
262
 
263 262
  funnel_init_var::reset(*py);
264 263
  //if (funnel_check_flag)
265 264
  //  check_pool_depths();
......
278 277
  type=0;
279 278
  pointer=0;
280 279
  ind_index=x.get_ind_index();
281
  if (ind_index<0) 
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff