From 89544e1bacaddc6d619bab7e002dc066fd82da3e Mon Sep 17 00:00:00 2001 From: Mario beraha Date: Mon, 11 Jul 2022 14:10:56 +0200 Subject: [PATCH] pr fix --- .gitignore | 3 ++- CMakeLists.txt | 2 +- python/reproducibility/replicate_jss_paper.py | 1 - resources/tutorial/algo.asciipb | 4 ++-- src/hierarchies/updaters/nnw_updater.h | 7 ------- 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 54e323520..e64179c7a 100644 --- a/.gitignore +++ b/.gitignore @@ -25,9 +25,10 @@ resources/2d .idea/ # Build debug folder cmake-build-debug/ -# lib/math/ folder +# lib/math/ folder lib/math/ # .old folders src/hierarchies/updaters/.old/ test/.old/ examples/gamma_hierarchy/.old/ +.env diff --git a/CMakeLists.txt b/CMakeLists.txt index f7fe7a414..efd3471e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ endif() project(bayesmix) set(CMAKE_CXX_STANDARD 17) -set(CMAKE_BUILD_TYPE Debug) +set(CMAKE_BUILD_TYPE Release) set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) set(CMAKE_CXX_FLAGS_RELEASE "-O3 -funroll-loops -fopenmp -ftree-vectorize -Wno-deprecated") diff --git a/python/reproducibility/replicate_jss_paper.py b/python/reproducibility/replicate_jss_paper.py index 01ec77ca0..7206d0606 100644 --- a/python/reproducibility/replicate_jss_paper.py +++ b/python/reproducibility/replicate_jss_paper.py @@ -17,7 +17,6 @@ OUTPUT_PATH = "reproducibility" ALGORITHMS = "Neal2 Neal3 Neal8 SplitMerge".split() -# ALGORITHMS = ["Neal3"] ALGO_SETTINGS = """ algo_id: "{}" diff --git a/resources/tutorial/algo.asciipb b/resources/tutorial/algo.asciipb index 5aba2ccb5..921405024 100644 --- a/resources/tutorial/algo.asciipb +++ b/resources/tutorial/algo.asciipb @@ -1,12 +1,12 @@ ##### GENERIC SETTINGS FOR ALL ALGORITHMS ##### # Algorithm ID string, e.g. "Neal2" -algo_id: "SplitMerge" +algo_id: "Neal2" # RNG initial seed: any nonnegative integer rng_seed: 20201124 # Number of iterations of the algorithm -iterations: 4000 +iterations: 1100 # Number of initial iterations discarded by the algorithm burnin: 100 diff --git a/src/hierarchies/updaters/nnw_updater.h b/src/hierarchies/updaters/nnw_updater.h index 091c9402c..b7877274d 100644 --- a/src/hierarchies/updaters/nnw_updater.h +++ b/src/hierarchies/updaters/nnw_updater.h @@ -31,13 +31,6 @@ class NNWUpdater ProtoHypersPtr compute_posterior_hypers(AbstractLikelihood &like, AbstractPriorModel &prior) override; - - std::shared_ptr clone() const override { - auto out = - std::make_shared(static_cast(*this)); - out->clear_hypers(); - return out; - } }; #endif // BAYESMIX_HIERARCHIES_UPDATERS_NNW_UPDATER_H_