Commit cf741a1d authored by stefanow's avatar stefanow
Browse files

merge

parents 1b6ddb5f 4fc3734f
......@@ -27,10 +27,10 @@ static inline numeric_t next_rho(numeric_t prev_rho, const Vector & likelihoods)
#ifdef USE_BRENTS_METHOD
const double lower_bound_of_search_space = prev_rho + 0.0001;
const double lower_bound_of_search_space = prev_rho;
const double upper_bound_of_search_space = 1;
boost::uintmax_t maximum_number_of_iterations = 10000;
const int minimum_number_of_correct_binary_digits_in_mantissa = 10;
boost::uintmax_t maximum_number_of_iterations = 100000;
const int minimum_number_of_correct_binary_digits_in_mantissa = 12;
const auto minimizer_result_pair = ::boost::math::tools::brent_find_minima(
f, lower_bound_of_search_space, upper_bound_of_search_space,
......
......@@ -41,7 +41,7 @@ struct PotentialName<Potential::BUCKINGHAM> {
};
constexpr index_t POP_SIZE = 1000000;
constexpr index_t POP_SIZE = 400000;
constexpr index_t N_DIM = (POTENTIAL == Potential::LENNARD_JONES? 2: 3) + 1;// + 1 for the unknown standard deviation
constexpr int MAX_POP_SIZE_FOR_STACK = 5000;
......@@ -56,7 +56,7 @@ typedef Eigen::Matrix<numeric_t, N_DIM, -1> PopMatrix;
typedef double (*PotentialFunction)(const double r, const ThetaVector& theta);
constexpr numeric_t NORMAL_PRIOR_STDDEV = 100;
constexpr numeric_t NORMAL_PRIOR_STDDEV = 10;
/// Beta
constexpr numeric_t BETA = 0.2;
......@@ -67,6 +67,7 @@ extern XoroshiroRandomNumberEngine GEN;
//#define UNIF_PRIOR
//#define USE_BRENTS_METHOD
constexpr numeric_t BOUND = 1e3;
constexpr numeric_t BOUND = 1e2;
#pragma omp threadprivate(GEN)
#define BURNIN 2
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment