Revision 1314
trunk/src/df1b2separable/df1b2lp1.cpp (revision 1314)  

162  162 
if (quadratic_prior::get_num_quadratic_prior()>0) 
163  163 
{ 
164  164 
laplace_approximation_calculator::where_are_we_flag=2; 
165 
/*double maxg=*/fabs(evaluate_function_quiet(uhat,pfmin));


165 
evaluate_function_quiet(uhat,pfmin);


166  166 
laplace_approximation_calculator::where_are_we_flag=0; 
167  167 
quadratic_prior::get_cHessian_contribution(Hess,xsize); 
168  168 
quadratic_prior::get_cgradient_contribution(grad,xsize); 
...  ...  
170  170  
171  171 
if (ii==1) 
172  172 
{ 
173 
/*double diff=*/fabs(re_objective_function_value::fun_without_pen


174 
objective_function_value::fun_without_pen);


175 
/*


173 
/* 

174 
double diff = fabs(re_objective_function_value::fun_without_pen


175 
 objective_function_value::fun_without_pen);


176  176 
if (diff>1.e7) 
177  177 
{ 
178  178 
cout << "there is a difference in the the user_functions " 
...  ...  
294  294 
if (quadratic_prior::get_num_quadratic_prior()>0) 
295  295 
{ 
296  296 
laplace_approximation_calculator::where_are_we_flag=2; 
297 
/*double maxg=*/fabs(evaluate_function_quiet(uhat,pfmin));


297 
evaluate_function_quiet(uhat,pfmin);


298  298 
laplace_approximation_calculator::where_are_we_flag=0; 
299  299 
quadratic_prior::get_cHessian_contribution(Hess,xsize); 
300  300 
quadratic_prior::get_cgradient_contribution(grad,xsize); 
trunk/src/df1b2separable/df1b2lp6.cpp (revision 1314)  

1135  1135 
//cout << "norm(uhat_old) = " << norm(uhat_old) 
1136  1136 
// << " norm(uhat) = " << norm(uhat) << endl; 
1137  1137  
1138 
/*double maxg=*/fabs(evaluate_function(newval,uhat,pfmin));


1138 
/*double maxg=*/evaluate_function(newval,uhat,pfmin);


1139  1139 
if (have_value && newval>newfbest) 
1140  1140 
{ 
1141  1141 
break; 
Also available in: Unified diff