@@ -31,7 +31,6 @@ module fstats_mcmc
3131 ! ! value will be set based upon variances computed as part of the
3232 ! ! initialization process, or user definition during the
3333 ! ! initialization process.
34- logical , private :: m_updateCov = .true.
3534 contains
3635 procedure , public :: get_state_variable_count = > mh_get_nvars
3736 procedure , public :: get_chain_length = > mh_get_chain_length
@@ -42,8 +41,6 @@ module fstats_mcmc
4241 procedure , public :: evaluate = > mh_eval
4342 procedure , public :: get_chain = > mh_get_chain
4443 procedure , public :: initialize = > mh_init
45- procedure , public :: get_update_covariance = > mh_get_update_cov
46- procedure , public :: set_update_covariance = > mh_set_update_cov
4744 procedure , private :: resize_buffer = > mh_resize_buffer
4845 procedure , private :: get_buffer_length = > mh_get_buffer_length
4946 end type
@@ -381,16 +378,6 @@ subroutine mh_eval(this, fcn, x, y, niter, x1, x2, err)
381378 if (errmgr% has_error_occurred()) return
382379 xc = xp
383380 pc = pp
384-
385- ! Update the covariance matrix estimate
386- if (this% get_update_covariance()) then
387- sigma = this% estimate_covariance(fcn, x, xc, check, err = errmgr)
388- if (errmgr% has_error_occurred()) return
389- if (check) return
390-
391- call this% m_sampleDist% initialize(xc, sigma, err = errmgr)
392- if (errmgr% has_error_occurred()) return
393- end if
394381 else
395382 ! Stay where we're at
396383 call this% push_new_state(xc, errmgr)
@@ -568,30 +555,6 @@ function mh_create_cov_mtx(this, fcn, x, mdl, stop, err) result(rst)
568555 if (errmgr% has_error_occurred()) return
569556end function
570557
571- ! ------------------------------------------------------------------------------
572- pure function mh_get_update_cov (this ) result(rst)
573- ! ! Get a value determining if the covariance matrix should be updated after
574- ! ! each successful step.
575- class(metropolis_hastings), intent (in ) :: this
576- ! ! The metropolis_hastings object.
577- logical :: rst
578- ! ! True if the covariance matrix is updated after each successful step;
579- ! ! else, false.
580- rst = this% m_updateCov
581- end function
582-
583- ! ------------------------------------------------------------------------------
584- subroutine mh_set_update_cov (this , x )
585- ! ! Sets a value determining if the covariance matrix should be updated after
586- ! ! each successful step.
587- class(metropolis_hastings), intent (inout ) :: this
588- ! ! The metropolis_hastings object.
589- logical , intent (in ) :: x
590- ! ! True if the covariance matrix is updated after each successful step;
591- ! ! else, false.
592- this% m_updateCov = x
593- end subroutine
594-
595558! ------------------------------------------------------------------------------
596559! TO DO: Define burn-in limits
597560! end function
0 commit comments