tristanz / ScytheMCMC / changeset / 2c3f6d31fdc3

@@ -127,7 +127,7 @@ mersenne myrng;
  * MCMC samplers.  Other options are passed through an .ini config file.
  */
 struct MCMCOptions {
-  /// Sample size. (iterations - burnin)/thin.
+  /// Sample size. (iterations - burnin)/(thin + 1).
   int sample_size;
   /// Thinning interval
   int thin;
@@ -688,7 +688,7 @@ public:
+   *
    * \param idenominator Tuning parameter equal to the inverse denominator \f$1/d\f$ of a Beta distribution.
    */
-  BetaProposal(double idenominator) : {
+  BetaProposal(double idenominator) {
     denom_ = 1/idenominator;
+  }
@@ -697,8 +697,8 @@ public:
    * \param starting_value Starting value (mean of Beta distribution).
    */
   double Draw(double starting_value) {
     double alpha_ = starting_value * denom_;
     double beta_ = alpha - denom_;
     double alpha = starting_value * denom_;
     double beta = alpha - denom_;
     return myrng.rbeta(alpha, beta);
+  }
@@ -710,7 +710,7 @@ public:
   double LogDensity(double new_value, double starting_value) {
     double alpha = starting_value * denom_;
     double beta = alpha - denom_;
-    return myrng.dbeta(new_value, alpha, beta);
+    return dbeta(new_value, alpha, beta);
+  }
 private:
@@ -756,7 +756,7 @@ public:
    */
   double LogDensity(double new_value, double starting_value) {
     double logmean = log(starting_value);
-    return myrng.dbeta(new_value, logmean, logsd_);
+    return dlnorm(new_value, logmean, logsd_);
+  }
 private: