Revision 1806 trunk/src/nh99/xxmcmc2.cpp

xxmcmc2.cpp (revision 1806)
32 32

  
33 33
void check_java_flags(int& start_flag,int& quit_flag,int& der_flag,
34 34
  int& next_flag);
35
void print_hist_data(const dmatrix& hist, const dmatrix& values, const dvector& h,
36
  dvector& m, const dvector& s, const dvector& parsave, long int iseed, double size_scale);
35
void print_hist_data(const dmatrix& hist, const dmatrix& values, 
36
                     const dvector& h, dvector& m, const dvector& s, 
37
                     const dvector& parsave, long int iseed, double size_scale);
37 38

  
38 39
void read_hessian_matrix_and_scale1(int nvar, const dmatrix& _SS,double s,
39 40
  int flag=0);
......
42 43
int maxnz(const dvector& xa);
43 44

  
44 45
int read_hist_data(const dmatrix& hist, const dvector& h,
45
  dvector& m, const dvector& s, const dvector& parsave,long int& iseed, const double& size_scale);
46
  dvector& m, const dvector& s, const dvector& parsave,long int& iseed, 
47
  const double& size_scale);
46 48

  
47
void make_preliminary_hist(const dvector& s, const dvector& m,int nsim, const dmatrix& values,
48
  dmatrix& hist, const dvector& h,int slots,double total_spread,int probflag=0);
49
void make_preliminary_hist(const dvector& s, const dvector& m,int nsim, 
50
                           const dmatrix& values, dmatrix& hist, const dvector& h,
51
                           int slots,double total_spread,int probflag=0);
49 52

  
50 53
void add_hist_values(const dvector& s, const dvector& m, const dmatrix& hist,
51 54
  dvector& mcmc_values,double llc, const dvector& h,int nslots,
......
55 58
  const dmatrix& _hist, dvector& mcmcnumber_values, double llc,
56 59
  const dvector& h,int nslots,double total_spread);
57 60

  
58
void write_empirical_covariance_matrix(int ncor, const dvector& s_mean, const dmatrix& s_covar,
59
  adstring& prog_name);
61
void write_empirical_covariance_matrix(int ncor, const dvector& s_mean, 
62
                                       const dmatrix& s_covar, 
63
                                       adstring& prog_name);
60 64

  
61
void read_empirical_covariance_matrix(int nvar, const dmatrix& S, const adstring& prog_name);
65
void read_empirical_covariance_matrix(int nvar, const dmatrix& S, 
66
                                      const adstring& prog_name);
62 67

  
63 68

  
64
void read_hessian_matrix_and_scale(int nvar, const dmatrix& S, const dvector& pen_vector);
69
void read_hessian_matrix_and_scale(int nvar, const dmatrix& S, 
70
                                   const dvector& pen_vector);
65 71

  
66 72
int user_stop(void);
67 73

  
......
69 75
class admb_javapointers;
70 76
extern admb_javapointers * adjm_ptr;
71 77

  
72
dvector new_probing_bounded_multivariate_normal(int nvar, const dvector& a1, const dvector& b1,
78
dvector new_probing_bounded_multivariate_normal(int nvar, const dvector& a1, 
79
                                                const dvector& b1,
73 80
  dmatrix& ch, const double& wght,double pprobe, random_number_generator& rng);
74 81

  
75
void new_probing_bounded_multivariate_normal_mcmc(int nvar, const dvector& a1, const dvector& b1,
76
  dmatrix& ch, const double& wght, const dvector& _y,double pprobe, random_number_generator& rng);
82
void new_probing_bounded_multivariate_normal_mcmc(int nvar, const dvector& a1, 
83
                                                  const dvector& b1,
84
  dmatrix& ch, const double& wght, const dvector& _y,double pprobe, 
85
  random_number_generator& rng);
77 86

  
78 87
//void  newton_raftery_bayes_estimate(double cbf,int ic, const dvector& lk,double d);
79
void  newton_raftery_bayes_estimate_new(double cbf,int ic, const dvector& lk,double d);
88
void  newton_raftery_bayes_estimate_new(double cbf,int ic, const dvector& lk,
89
                                        double d);
80 90

  
81 91
void ad_update_mcmc_stats_report
82 92
  (int feval,int iter,double fval,double gmax);
......
93 103
void function_minimizer::pvm_master_mcmc_routine(int nmcmc,int iseed0,
94 104
  double dscale,int restart_flag){;}
95 105
#else
96
void function_minimizer::pvm_master_mcmc_routine(int nmcmc,int iseed0,double dscale,
97
  int restart_flag)
106
void function_minimizer::pvm_master_mcmc_routine(int nmcmc,int iseed0,
107
                                              double dscale, int restart_flag)
98 108
{
99 109
  uostream * pofs_psave=NULL;
100 110
  dmatrix mcmc_display_matrix;

Also available in: Unified diff