Merge pull request #2269 from stan-dev/bugfix/issue-2268_fix_nuts_cla…

…ssic_comp_err

Bugfix/issue 2268 fix nuts classic comp err

make/tests

@@ -185,6 +185,8 @@ src/test/unit/mcmc/hmc/integrators/impl_leapfrog_test.cpp: src/test/test-models/
 src/test/unit/mcmc/hmc/integrators/impl_leapfrog2_test.cpp: src/test/test-models/good/mcmc/hmc/integrators/gauss.hpp
 src/test/unit/mcmc/hmc/nuts/unit_e_nuts_test.cpp: src/test/test-models/good/mcmc/hmc/common/gauss3D.hpp
 src/test/unit/mcmc/hmc/nuts/softabs_nuts_test.cpp: src/test/test-models/good/mcmc/hmc/common/gauss3D.hpp
+src/test/unit/mcmc/hmc/nuts/instantiation_test.cpp: src/test/test-models/good/mcmc/hmc/common/gauss3D.hpp
+src/test/unit/mcmc/hmc/nuts_classic/instantiation_test.cpp: src/test/test-models/good/mcmc/hmc/common/gauss3D.hpp
 src/test/unit/mcmc/hmc/xhmc/unit_e_xhmc_test.cpp: src/test/test-models/good/mcmc/hmc/common/gauss3D.hpp
 src/test/unit/mcmc/hmc/xhmc/softabs_xhmc_test.cpp: src/test/test-models/good/mcmc/hmc/common/gauss3D.hpp
 src/test/unit/mcmc/hmc/static_uniform/derived_static_uniform_test.cpp: src/test/test-models/good/mcmc/hmc/common/gauss.hpp

src/stan/mcmc/hmc/nuts_classic/adapt_dense_e_nuts_classic.hpp

@@ -1,5 +1,5 @@
-#ifndef STAN_MCMC_HMC_NUTS_ADAPT_DENSE_E_NUTS_CLASSIC_HPP
-#define STAN_MCMC_HMC_NUTS_ADAPT_DENSE_E_NUTS_CLASSIC_HPP
+#ifndef STAN_MCMC_HMC_NUTS_CLASSIC_ADAPT_DENSE_E_NUTS_CLASSIC_HPP
+#define STAN_MCMC_HMC_NUTS_CLASSIC_ADAPT_DENSE_E_NUTS_CLASSIC_HPP
 
 #include <stan/callbacks/writer.hpp>
 #include <stan/mcmc/stepsize_covar_adapter.hpp>
@@ -28,7 +28,8 @@ namespace stan {
                  callbacks::writer& error_writer) {
         sample s
           = dense_e_nuts_classic<Model, BaseRNG>::transition(init_sample,
-                                                             info_writer);
+                                                             info_writer,
+                                                             error_writer);
 
         if (this->adapt_flag_) {
           this->stepsize_adaptation_.learn_stepsize(this->nom_epsilon_,
@@ -38,7 +39,7 @@ namespace stan {
                                                                  this->z_.q);
 
           if (update) {
-            this->init_stepsize(info_writer);
+            this->init_stepsize(info_writer, error_writer);
 
             this->stepsize_adaptation_.set_mu(log(10 * this->nom_epsilon_));
             this->stepsize_adaptation_.restart();

src/stan/mcmc/hmc/nuts_classic/adapt_diag_e_nuts_classic.hpp

@@ -1,5 +1,5 @@
-#ifndef STAN_MCMC_HMC_NUTS_ADAPT_DIAG_E_NUTS_CLASSIC_HPP
-#define STAN_MCMC_HMC_NUTS_ADAPT_DIAG_E_NUTS_CLASSIC_HPP
+#ifndef STAN_MCMC_HMC_NUTS_CLASSIC_ADAPT_DIAG_E_NUTS_CLASSIC_HPP
+#define STAN_MCMC_HMC_NUTS_CLASSIC_ADAPT_DIAG_E_NUTS_CLASSIC_HPP
 
 #include <stan/callbacks/writer.hpp>
 #include <stan/mcmc/stepsize_var_adapter.hpp>
@@ -40,7 +40,7 @@ namespace stan {
                                                              this->z_.q);
 
           if (update) {
-            this->init_stepsize(info_writer);
+            this->init_stepsize(info_writer, error_writer);
 
             this->stepsize_adaptation_.set_mu(log(10 * this->nom_epsilon_));
             this->stepsize_adaptation_.restart();

src/stan/mcmc/hmc/nuts_classic/adapt_unit_e_nuts_classic.hpp

@@ -1,5 +1,5 @@
-#ifndef STAN_MCMC_HMC_NUTS_ADAPT_UNIT_E_NUTS_CLASSIC_HPP
-#define STAN_MCMC_HMC_NUTS_ADAPT_UNIT_E_NUTS_CLASSIC_HPP
+#ifndef STAN_MCMC_HMC_NUTS_CLASSIC_ADAPT_UNIT_E_NUTS_CLASSIC_HPP
+#define STAN_MCMC_HMC_NUTS_CLASSIC_ADAPT_UNIT_E_NUTS_CLASSIC_HPP
 
 #include <stan/callbacks/writer.hpp>
 #include <stan/mcmc/hmc/nuts_classic/unit_e_nuts_classic.hpp>

src/stan/mcmc/hmc/nuts_classic/base_nuts_classic.hpp

@@ -1,5 +1,5 @@
-#ifndef STAN_MCMC_HMC_NUTS_BASE_NUTS_HPP
-#define STAN_MCMC_HMC_NUTS_BASE_NUTS_HPP
+#ifndef STAN_MCMC_HMC_NUTS_CLASSIC_BASE_NUTS_CLASSIC_HPP
+#define STAN_MCMC_HMC_NUTS_CLASSIC_BASE_NUTS_CLASSIC_HPP
 
 #include <stan/callbacks/writer.hpp>
 #include <boost/math/special_functions/fpclassify.hpp>

src/stan/mcmc/hmc/nuts_classic/dense_e_nuts_classic.hpp

@@ -1,5 +1,5 @@
-#ifndef STAN_MCMC_HMC_NUTS_DENSE_E_NUTS_CLASSIC_HPP
-#define STAN_MCMC_HMC_NUTS_DENSE_E_NUTS_CLASSIC_HPP
+#ifndef STAN_MCMC_HMC_NUTS_CLASSIC_DENSE_E_NUTS_CLASSIC_HPP
+#define STAN_MCMC_HMC_NUTS_CLASSIC_DENSE_E_NUTS_CLASSIC_HPP
 
 #include <stan/mcmc/hmc/nuts_classic/base_nuts_classic.hpp>
 #include <stan/mcmc/hmc/hamiltonians/dense_e_point.hpp>

src/stan/mcmc/hmc/nuts_classic/diag_e_nuts_classic.hpp

@@ -1,5 +1,5 @@
-#ifndef STAN_MCMC_HMC_NUTS_DIAG_E_NUTS_CLASSIC_HPP
-#define STAN_MCMC_HMC_NUTS_DIAG_E_NUTS_CLASSIC_HPP
+#ifndef STAN_MCMC_HMC_NUTS_CLASSIC_DIAG_E_NUTS_CLASSIC_HPP
+#define STAN_MCMC_HMC_NUTS_CLASSIC_DIAG_E_NUTS_CLASSIC_HPP
 
 #include <stan/mcmc/hmc/nuts_classic/base_nuts_classic.hpp>
 #include <stan/mcmc/hmc/hamiltonians/diag_e_point.hpp>

src/stan/mcmc/hmc/nuts_classic/unit_e_nuts_classic.hpp

@@ -1,5 +1,5 @@
-#ifndef STAN_MCMC_HMC_NUTS_UNIT_E_NUTS_CLASSIC_HPP
-#define STAN_MCMC_HMC_NUTS_UNIT_E_NUTS_CLASSIC_HPP
+#ifndef STAN_MCMC_HMC_NUTS_CLASSIC_UNIT_E_NUTS_CLASSIC_HPP
+#define STAN_MCMC_HMC_NUTS_CLASSIC_UNIT_E_NUTS_CLASSIC_HPP
 
 #include <stan/mcmc/hmc/nuts_classic/base_nuts_classic.hpp>
 #include <stan/mcmc/hmc/hamiltonians/unit_e_point.hpp>

src/test/unit/mcmc/hmc/nuts/instantiation_test.cpp

@@ -0,0 +1,46 @@
+#include <test/test-models/good/mcmc/hmc/common/gauss3D.hpp>
+#include <stan/callbacks/stream_writer.hpp>
+#include <stan/mcmc/hmc/nuts/unit_e_nuts.hpp>
+#include <stan/mcmc/hmc/nuts/diag_e_nuts.hpp>
+#include <stan/mcmc/hmc/nuts/dense_e_nuts.hpp>
+#include <stan/mcmc/hmc/nuts/adapt_unit_e_nuts.hpp>
+#include <stan/mcmc/hmc/nuts/adapt_diag_e_nuts.hpp>
+#include <stan/mcmc/hmc/nuts/adapt_dense_e_nuts.hpp>
+#include <boost/random/additive_combine.hpp>
+#include <stan/io/dump.hpp>
+#include <fstream>
+
+#include <gtest/gtest.h>
+
+typedef boost::ecuyer1988 rng_t;
+
+TEST(McmcNuts, instantiaton_test) {
+  rng_t base_rng(4839294);
+
+  std::stringstream output;
+  stan::callbacks::stream_writer writer(output);
+  std::stringstream error_stream;
+  stan::callbacks::stream_writer error_writer(error_stream);
+
+  std::fstream empty_stream("", std::fstream::in);
+  stan::io::dump data_var_context(empty_stream);
+  gauss3D_model_namespace::gauss3D_model model(data_var_context);
+
+  stan::mcmc::unit_e_nuts<gauss3D_model_namespace::gauss3D_model, rng_t>
+    unit_e_sampler(model, base_rng);
+
+  stan::mcmc::diag_e_nuts<gauss3D_model_namespace::gauss3D_model, rng_t>
+    diag_e_sampler(model, base_rng);
+
+  stan::mcmc::dense_e_nuts<gauss3D_model_namespace::gauss3D_model, rng_t>
+    dense_e_sampler(model, base_rng);
+
+  stan::mcmc::adapt_unit_e_nuts<gauss3D_model_namespace::gauss3D_model, rng_t>
+    adapt_unit_e_sampler(model, base_rng);
+
+  stan::mcmc::adapt_diag_e_nuts<gauss3D_model_namespace::gauss3D_model, rng_t>
+    adapt_diag_e_sampler(model, base_rng);
+
+  stan::mcmc::adapt_dense_e_nuts<gauss3D_model_namespace::gauss3D_model, rng_t>
+    adapt_dense_e_sampler(model, base_rng);
+}

src/test/unit/mcmc/hmc/nuts/softabs_nuts_test.cpp

@@ -1,8 +1,7 @@
-#include <stan/math/rev/mat.hpp>
+#include <test/test-models/good/mcmc/hmc/common/gauss3D.hpp>
 #include <stan/callbacks/stream_writer.hpp>
 #include <stan/mcmc/hmc/nuts/softabs_nuts.hpp>
 #include <boost/random/additive_combine.hpp>
-#include <test/test-models/good/mcmc/hmc/common/gauss3D.hpp>
 #include <stan/io/dump.hpp>
 #include <fstream>
 

src/test/unit/mcmc/hmc/nuts/unit_e_nuts_test.cpp

@@ -1,8 +1,7 @@
-#include <stan/math/rev/mat.hpp>
+#include <test/test-models/good/mcmc/hmc/common/gauss3D.hpp>
 #include <stan/callbacks/stream_writer.hpp>
 #include <stan/mcmc/hmc/nuts/unit_e_nuts.hpp>
 #include <boost/random/additive_combine.hpp>
-#include <test/test-models/good/mcmc/hmc/common/gauss3D.hpp>
 #include <stan/io/dump.hpp>
 #include <fstream>
 

src/test/unit/mcmc/hmc/nuts_classic/instantiation_test.cpp

@@ -0,0 +1,46 @@
+#include <test/test-models/good/mcmc/hmc/common/gauss3D.hpp>
+#include <stan/callbacks/stream_writer.hpp>
+#include <stan/mcmc/hmc/nuts_classic/unit_e_nuts_classic.hpp>
+#include <stan/mcmc/hmc/nuts_classic/diag_e_nuts_classic.hpp>
+#include <stan/mcmc/hmc/nuts_classic/dense_e_nuts_classic.hpp>
+#include <stan/mcmc/hmc/nuts_classic/adapt_unit_e_nuts_classic.hpp>
+#include <stan/mcmc/hmc/nuts_classic/adapt_diag_e_nuts_classic.hpp>
+#include <stan/mcmc/hmc/nuts_classic/adapt_dense_e_nuts_classic.hpp>
+#include <boost/random/additive_combine.hpp>
+#include <stan/io/dump.hpp>
+#include <fstream>
+
+#include <gtest/gtest.h>
+
+typedef boost::ecuyer1988 rng_t;
+
+TEST(McmcNutsClassic, instantiaton_test) {
+  rng_t base_rng(4839294);
+
+  std::stringstream output;
+  stan::callbacks::stream_writer writer(output);
+  std::stringstream error_stream;
+  stan::callbacks::stream_writer error_writer(error_stream);
+
+  std::fstream empty_stream("", std::fstream::in);
+  stan::io::dump data_var_context(empty_stream);
+  gauss3D_model_namespace::gauss3D_model model(data_var_context);
+
+  stan::mcmc::unit_e_nuts_classic<gauss3D_model_namespace::gauss3D_model, rng_t>
+    unit_e_sampler(model, base_rng);
+
+  stan::mcmc::diag_e_nuts_classic<gauss3D_model_namespace::gauss3D_model, rng_t>
+    diag_e_sampler(model, base_rng);
+
+  stan::mcmc::dense_e_nuts_classic<gauss3D_model_namespace::gauss3D_model, rng_t>
+    dense_e_sampler(model, base_rng);
+
+  stan::mcmc::adapt_unit_e_nuts_classic<gauss3D_model_namespace::gauss3D_model, rng_t>
+    adapt_unit_e_sampler(model, base_rng);
+
+  stan::mcmc::adapt_diag_e_nuts_classic<gauss3D_model_namespace::gauss3D_model, rng_t>
+    adapt_diag_e_sampler(model, base_rng);
+
+  stan::mcmc::adapt_dense_e_nuts_classic<gauss3D_model_namespace::gauss3D_model, rng_t>
+    adapt_dense_e_sampler(model, base_rng);
+}