Revision 1935 trunk/src/nh99/admodel.h

admodel.h (revision 1935)
54 54

  
55 55
#define BIG_INIT_PARAMS
56 56

  
57
#if defined(USE_LAPLACE)
58 57
  class laplace_approximation_calculator;
59 58
  void cleanup_laplace_stuff(laplace_approximation_calculator *);
60
#endif
61 59

  
62 60
#include <fvar.hpp>
63 61
#if defined(USE_ADPVM)
......
1752 1750
typedef void (model_parameters::*PMFVIV4) (const dvar_vector&,int n,
1753 1751
  dvariable& f1, const dvariable& f2, const dvariable& f3, const dvariable& f4);
1754 1752

  
1755
#if defined(USE_LAPLACE)
1756 1753
  class init_df1b2vector;
1757 1754
  class df1b2vector;
1758 1755
  class df1b2variable;
1759
#endif
1760 1756

  
1761 1757
/**
1762 1758
 * Description not yet available.
......
1772 1768
  static int random_effects_flag;
1773 1769
  dmatrix * negdirections;
1774 1770
  static int negative_eigenvalue_flag;
1775
#if defined(USE_LAPLACE)
1776 1771
  static int inner_opt_flag;
1777 1772
  static int inner_opt(void);
1778 1773
  laplace_approximation_calculator * lapprox;
1779 1774
  dvector * multinomial_weights;
1780 1775
  void set_multinomial_weights(dvector&d);
1781 1776
  //init_df1b2vector* py;
1782
  virtual void AD_uf_inner(void);
1783
  virtual void AD_uf_outer(void);
1784
  virtual void user_function(void);
1777
  virtual void AD_uf_inner();
1778
  virtual void AD_uf_outer();
1779
  virtual void user_function();
1785 1780
  void pre_user_function(void);
1786 1781
  //void df1b2_pre_user_function(void);
1787 1782
  //virtual void user_function(const init_df1b2vector& x,df1b2variable& f);
......
1796 1791
  void get_function_difference(void);
1797 1792
  void start_get_importance_sampling_comnponent(void);
1798 1793
  void end_get_importance_sampling_comnponent(void);
1799
#endif
1800 1794
  int spminflag;
1801 1795
  int repeatminflag;
1802 1796
  int mcmc2_flag;
......
2034 2028
    independent_variables& x,const dvector& _g,const double& _f,
2035 2029
    int nsteps);
2036 2030

  
2037
#if defined(USE_LAPLACE)
2038 2031
  void function_evaluation_block_pvm_slave_random_effects(int nvar,int _crit,
2039 2032
    independent_variables& x,const dvector& g,const double& f);
2040 2033
  void quasi_newton_block_pvm_master_random_effects(int nvar,int _crit,
2041 2034
    independent_variables& x,const dvector& g,const double& f);
2042 2035
  void function_evaluation_block_pvm_slave_random_effects(void);
2043 2036
  void hess_routine_random_effects(void);
2044
#endif
2045 2037
  void quasi_newton_block_pvm_master(int nvar,int _crit,
2046 2038
    independent_variables& x,const dvector& g,const double& f);
2047 2039
  void hess_routine_noparallel_random_effects(void);
......
2050 2042
  void hess_routine_slave_random_effects(void);
2051 2043
#endif
2052 2044
  dvariable do_gauss_hermite_integration(void);
2053
  dvariable do_gauss_hermite_integration_multi(void);
2054 2045
  void end_df1b2_funnel_stuff(void);
2046

  
2047
private:
2048
  dvariable do_gauss_hermite_integration_multi(void);
2055 2049
};
2056 2050

  
2057 2051
cifstream& operator>>(const cifstream& s, const param_init_number& x);
......
2841 2835
  void send_variable_values_to_slaves(void);
2842 2836
  adpvm_manager(int);
2843 2837
  ~adpvm_manager();
2844
#  if defined(USE_LAPLACE)
2845 2838
      int start_slave_processes_for_random_effects(const ad_comm& mp);
2846
#  endif
2847 2839
};
2848 2840

  
2849 2841
void send_dmatrix_to_slaves(const dmatrix&  x,ivector& jmin,ivector& jmax);

Also available in: Unified diff