Revision 692 branches/merge-trunk-davef/src/df1b2-separable/df1b2qnm.cpp

df1b2qnm.cpp (revision 692)
8 8
 * \file
9 9
 * Description not yet available.
10 10
 */
11
#include <sstream>
12
using std::istringstream;
13

  
14 11
#if defined(USE_LAPLACE)
15 12
#  include <admodel.h>
16 13
#  include <df1b2fun.h>
17 14
#  include <adrndeff.h>
18 15
//#include <vmon.h>
19
static int no_stuff=0;
16
extern int no_stuff;
20 17
//static void xxxy(void) {}
21 18

  
22 19
/**
......
175 172
          pre_userfunction();
176 173
          if ( no_stuff ==0 && quadratic_prior::get_num_quadratic_prior()>0)
177 174
          {
175
            quadratic_prior::calc_matrix_flag=0;
176
            quadratic_prior::matrix_mult_flag=1;
178 177
            quadratic_prior::get_M_calculations();
178
            quadratic_prior::matrix_mult_flag=0;
179 179
          }
180 180
          vf+=*objective_function_value::pobjfun;
181 181
          f=value(vf);

Also available in: Unified diff