Commit 5b7b587e authored by stefanow's avatar stefanow
Browse files

Added for version to makefile

parent 98d8c1cd
......@@ -25,6 +25,13 @@ else
$(info using double)
endif
ifdef USE_FOR_VERSION
$(info Using for version for mcmc)
macroDefines += -DUSE_FOR_VERSION
else
$(info not using for version)
endif
ifdef USE_BRENTS_METHOD
$(info Using Brent's method to find the tho values, needs boost)
......
......@@ -48,11 +48,11 @@ struct PotentialName<Potential::BUCKINGHAM> {
};
constexpr index_t POP_SIZE = 1000;
constexpr index_t POP_SIZE = 1000000;
constexpr index_t N_DIM = (POTENTIAL == Potential::LENNARD_JONES? 2: 3) + 1;// + 1 for the unknown standard deviation
constexpr index_t MAX_POP_SIZE_FOR_STACK = 5000;
constexpr index_t EIGEN_NUM_ROWS_FOR_POP = (POP_SIZE > MAX_POP_SIZE_FOR_STACK? Eigen::Dynamic: POP_SIZE);
constexpr int EIGEN_NUM_ROWS_FOR_POP = (POP_SIZE > MAX_POP_SIZE_FOR_STACK? Eigen::Dynamic: POP_SIZE);
typedef Eigen::Matrix<numeric_t, N_DIM, 1> ThetaVector;
typedef Eigen::Matrix<numeric_t, EIGEN_NUM_ROWS_FOR_POP, 1> WeightVector;
typedef Eigen::Matrix<index_t, EIGEN_NUM_ROWS_FOR_POP, 1> CountVector;
......
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