Commit 3361430c authored by chbauman's avatar chbauman
Browse files

fixes

parent 91535d4c
......@@ -38,7 +38,7 @@ int main(){
WeightVector likelihoods(POP_SIZE);
WeightVector likelihoods_old(POP_SIZE);
CountVector resample_count(POP_SIZE);
std::vector<WeightVector> best_thetas;
std::vector<ThetaVector> best_thetas;
CovMat sample_cov_mat;
ThetaVector sample_mean;
numeric_t evidence_s = 1.0;
......
......@@ -45,17 +45,17 @@ struct PotentialName<Potential::BUCKINGHAM> {
static constexpr const char* value = "Buckingham";
};
constexpr index_t POP_SIZE = 100000;
constexpr index_t POP_SIZE = 100;
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 = -1;//(POP_SIZE > MAX_POP_SIZE_FOR_STACK? Eigen::Dynamic: POP_SIZE);
constexpr index_t 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;
typedef Eigen::Matrix<numeric_t, N_DIM, N_DIM> CovMat;
typedef Eigen::Matrix<numeric_t, N_DIM, EIGEN_NUM_ROWS_FOR_POP> PopMatrix;
typedef Eigen::Matrix<numeric_t, N_DIM, -1> PartPopMatrix;
typedef Eigen::Matrix<numeric_t, N_DIM, EIGEN_NUM_ROWS_FOR_POP> PartPopMatrix;
typedef numeric_t (*PotentialFunction)(const numeric_t r, const ThetaVector& theta);
......
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