Revision 1935 trunk/src/nh99/model7.cpp

model7.cpp (revision 1935)
4 4
 * Author: David Fournier
5 5
 * Copyright (c) 2008-2012 Regents of the University of California
6 6
 */
7
#if defined(USE_LAPLACE)
8 7
#  include <df1b2fun.h>
9
#else
10 8
#  include <admodel.h>
11
#endif
12 9
//#include <parallel.h>
13 10
#include <signal.h>
14 11

  
......
563 560

  
564 561
void function_minimizer::pre_userfunction(void)
565 562
{
566
#if defined(USE_LAPLACE)
567 563
  if (lapprox)
568 564
  {
569 565
    if (lapprox->hesstype==2)
......
572 568
      lapprox->separable_calls_counter=0;
573 569
    }
574 570
  }
575
#endif
576 571
  userfunction();
577
#if defined(USE_LAPLACE)
578 572
  if (lapprox)
579 573
  {
580 574
    if (lapprox->hesstype==2)
......
604 598
      }
605 599
    }
606 600
  }
607
#endif
608 601
}

Also available in: Unified diff