From b09d1a0ce43331a84473fe7cfb3f731e5e02bf17 Mon Sep 17 00:00:00 2001 From: Stan Jenkins Date: Wed, 5 Feb 2020 04:13:55 -0500 Subject: [PATCH] [Jenkins] auto-formatting by clang-format version 6.0.0 (tags/google/stable/2017-11-14) --- .../rev/core/thread_stack_instance_test.cpp | 11 ++++--- test/unit/math/rev/err/check_bounded_test.cpp | 14 +++++--- .../rev/err/check_consistent_size_test.cpp | 7 ++-- .../rev/err/check_consistent_sizes_test.cpp | 7 ++-- test/unit/math/rev/err/check_finite_test.cpp | 20 ++++++++---- .../rev/err/check_greater_or_equal_test.cpp | 20 ++++++++---- test/unit/math/rev/err/check_greater_test.cpp | 20 ++++++++---- .../math/rev/err/check_less_or_equal_test.cpp | 23 +++++++++---- test/unit/math/rev/err/check_less_test.cpp | 20 ++++++++---- .../math/rev/err/check_nonnegative_test.cpp | 32 +++++++++++++------ test/unit/math/rev/err/check_not_nan_test.cpp | 28 +++++++++++----- .../rev/err/check_pos_semidefinite_test.cpp | 6 ++-- .../rev/err/check_positive_finite_test.cpp | 17 +++++++--- .../unit/math/rev/err/check_positive_test.cpp | 7 ++-- 14 files changed, 162 insertions(+), 70 deletions(-) diff --git a/test/unit/math/rev/core/thread_stack_instance_test.cpp b/test/unit/math/rev/core/thread_stack_instance_test.cpp index 53a8f2b40b4..c47d4f0d2d6 100644 --- a/test/unit/math/rev/core/thread_stack_instance_test.cpp +++ b/test/unit/math/rev/core/thread_stack_instance_test.cpp @@ -91,13 +91,16 @@ TEST(thread_stack_instance, child_instances) { auto thread_tester = [&]() -> void { ChainableStack thread_instance; - EXPECT_TRUE(main_ad_stack->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size() + EXPECT_TRUE( + main_ad_stack->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size() #ifdef STAN_THREADS - > + > #else - == + == #endif - ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size()); + ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size()); }; std::thread other_work(thread_tester); diff --git a/test/unit/math/rev/err/check_bounded_test.cpp b/test/unit/math/rev/err/check_bounded_test.cpp index e450af7b1d1..3f3e00455ce 100644 --- a/test/unit/math/rev/err/check_bounded_test.cpp +++ b/test/unit/math/rev/err/check_bounded_test.cpp @@ -15,13 +15,16 @@ TEST(AgradRevErrorHandlingScalar, CheckBoundedVarCheckVectorized) { for (int i = 0; i < N; ++i) a.push_back(var(i)); - size_t stack_size = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + size_t stack_size + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size); EXPECT_NO_THROW(check_bounded(function, "a", a, -1.0, 6.0)); size_t stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size_after_call); stan::math::recover_memory(); } @@ -145,13 +148,16 @@ TEST(AgradRevErrorHandlingScalar, CheckBoundedVarCheckUnivariate) { const char* function = "check_bounded"; var a(5.0); - size_t stack_size = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + size_t stack_size + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size); EXPECT_NO_THROW(check_bounded(function, "a", a, 4.0, 6.0)); size_t stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size_after_call); stan::math::recover_memory(); diff --git a/test/unit/math/rev/err/check_consistent_size_test.cpp b/test/unit/math/rev/err/check_consistent_size_test.cpp index 92a93497ee1..0701c642693 100644 --- a/test/unit/math/rev/err/check_consistent_size_test.cpp +++ b/test/unit/math/rev/err/check_consistent_size_test.cpp @@ -15,13 +15,16 @@ TEST(AgradRevErrorHandlingScalar, CheckConsistentSizeVarCheckVectorized) { for (int i = 0; i < N; ++i) a.push_back(var(i)); - size_t stack_size = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + size_t stack_size + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size); EXPECT_NO_THROW(check_consistent_size(function, "a", a, 5U)); size_t stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size_after_call); stan::math::recover_memory(); } diff --git a/test/unit/math/rev/err/check_consistent_sizes_test.cpp b/test/unit/math/rev/err/check_consistent_sizes_test.cpp index 4ef4d27153e..c6c87d33389 100644 --- a/test/unit/math/rev/err/check_consistent_sizes_test.cpp +++ b/test/unit/math/rev/err/check_consistent_sizes_test.cpp @@ -17,13 +17,16 @@ TEST(AgradRevErrorHandlingScalar, CheckConsistentSizesVarCheckVectorized) { a.push_back(var(i)); } - size_t stack_size = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + size_t stack_size + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(10U, stack_size); EXPECT_NO_THROW(check_consistent_sizes(function, "a", a, "b", b)); size_t stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(10U, stack_size_after_call); stan::math::recover_memory(); } diff --git a/test/unit/math/rev/err/check_finite_test.cpp b/test/unit/math/rev/err/check_finite_test.cpp index 39cb06fe07f..99a5ad41bd7 100644 --- a/test/unit/math/rev/err/check_finite_test.cpp +++ b/test/unit/math/rev/err/check_finite_test.cpp @@ -15,19 +15,23 @@ TEST(AgradRevErrorHandlingScalar, CheckFiniteVarCheckVectorized) { for (int i = 0; i < N; ++i) a.push_back(var(i)); - size_t stack_size = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + size_t stack_size + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size); EXPECT_NO_THROW(check_finite(function, "a", a)); size_t stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size_after_call); a[1] = std::numeric_limits::infinity(); EXPECT_THROW(check_finite(function, "a", a), std::domain_error); stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(6U, stack_size_after_call); stan::math::recover_memory(); @@ -65,19 +69,23 @@ TEST(AgradRevErrorHandlingScalar, CheckFiniteVarCheckUnivariate) { const char* function = "check_finite"; var a(5.0); - size_t stack_size = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + size_t stack_size + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size); EXPECT_NO_THROW(check_finite(function, "a", a)); size_t stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size_after_call); a = std::numeric_limits::infinity(); EXPECT_THROW(check_finite(function, "a", a), std::domain_error); stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(2U, stack_size_after_call); stan::math::recover_memory(); diff --git a/test/unit/math/rev/err/check_greater_or_equal_test.cpp b/test/unit/math/rev/err/check_greater_or_equal_test.cpp index af66dc77867..24252646030 100644 --- a/test/unit/math/rev/err/check_greater_or_equal_test.cpp +++ b/test/unit/math/rev/err/check_greater_or_equal_test.cpp @@ -15,19 +15,23 @@ TEST(AgradRevErrorHandlingScalar, CheckGreateOrEqualVarCheckVectorized) { for (int i = 0; i < N; ++i) a.push_back(var(i)); - size_t stack_size = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + size_t stack_size + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size); EXPECT_NO_THROW(check_greater_or_equal(function, "a", a, -1.0)); size_t stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size_after_call); EXPECT_THROW(check_greater_or_equal(function, "a", a, 2.0), std::domain_error); stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size_after_call); stan::math::recover_memory(); @@ -192,19 +196,23 @@ TEST(AgradRevErrorHandlingScalar, CheckGreaterOrEqualVarCheckUnivariate) { const char* function = "check_greater_or_equal"; var a(5.0); - size_t stack_size = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + size_t stack_size + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size); EXPECT_NO_THROW(check_greater_or_equal(function, "a", a, 2.0)); size_t stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size_after_call); EXPECT_THROW(check_greater_or_equal(function, "a", a, 10.0), std::domain_error); stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size_after_call); stan::math::recover_memory(); diff --git a/test/unit/math/rev/err/check_greater_test.cpp b/test/unit/math/rev/err/check_greater_test.cpp index 9455b9f8125..1da58eeb7ae 100644 --- a/test/unit/math/rev/err/check_greater_test.cpp +++ b/test/unit/math/rev/err/check_greater_test.cpp @@ -14,18 +14,22 @@ TEST(AgradRevErrorHandlingScalar, CheckGreaterVarCheckVectorized) { for (int i = 0; i < N; ++i) a.push_back(var(i)); - size_t stack_size = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + size_t stack_size + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size); EXPECT_NO_THROW(check_greater(function, "a", a, -1.0)); size_t stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size_after_call); EXPECT_THROW(check_greater(function, "a", a, 2.0), std::domain_error); stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size_after_call); stan::math::recover_memory(); @@ -182,18 +186,22 @@ TEST(AgradRevErrorHandlingScalar, CheckGreaterVarCheckUnivariate) { const char* function = "check_greater"; var a(5.0); - size_t stack_size = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + size_t stack_size + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size); EXPECT_NO_THROW(check_greater(function, "a", a, 2.0)); size_t stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size_after_call); EXPECT_THROW(check_greater(function, "a", a, 10.0), std::domain_error); stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size_after_call); stan::math::recover_memory(); diff --git a/test/unit/math/rev/err/check_less_or_equal_test.cpp b/test/unit/math/rev/err/check_less_or_equal_test.cpp index 83a2a902239..bf63756ff02 100644 --- a/test/unit/math/rev/err/check_less_or_equal_test.cpp +++ b/test/unit/math/rev/err/check_less_or_equal_test.cpp @@ -14,18 +14,22 @@ TEST(AgradRevErrorHandlingScalar, CheckLessOrEqualVarCheckVectorized) { for (int i = 0; i < N; ++i) a.push_back(var(i)); - size_t stack_size = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + size_t stack_size + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size); EXPECT_NO_THROW(check_less_or_equal(function, "a", a, 10.0)); size_t stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size_after_call); EXPECT_THROW(check_less_or_equal(function, "a", a, 2.0), std::domain_error); stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size_after_call); stan::math::recover_memory(); @@ -155,24 +159,29 @@ TEST(AgradRevErrorHandlingScalar, CheckLessOrEqualVarCheckUnivariate) { const char* function = "check_less_or_equal"; var a(5.0); - size_t stack_size = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + size_t stack_size + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size); EXPECT_THROW(check_less_or_equal(function, "a", a, 2.0), std::domain_error); size_t stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size_after_call); EXPECT_NO_THROW(check_less_or_equal(function, "a", a, 5.0)); stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size_after_call); EXPECT_NO_THROW(check_less_or_equal(function, "a", a, 10.0)); stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size_after_call); stan::math::recover_memory(); diff --git a/test/unit/math/rev/err/check_less_test.cpp b/test/unit/math/rev/err/check_less_test.cpp index 1d8efda91f0..241d328b619 100644 --- a/test/unit/math/rev/err/check_less_test.cpp +++ b/test/unit/math/rev/err/check_less_test.cpp @@ -14,18 +14,22 @@ TEST(AgradRevErrorHandlingScalar, CheckLessVarCheckVectorized) { for (int i = 0; i < N; ++i) a.push_back(var(i)); - size_t stack_size = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + size_t stack_size + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size); EXPECT_NO_THROW(check_less(function, "a", a, 10.0)); size_t stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size_after_call); EXPECT_THROW(check_less(function, "a", a, 2.0), std::domain_error); stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size_after_call); stan::math::recover_memory(); @@ -152,18 +156,22 @@ TEST(AgradRevErrorHandlingScalar, CheckLessVarCheckUnivariate) { const char* function = "check_less"; var a(5.0); - size_t stack_size = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + size_t stack_size + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size); EXPECT_THROW(check_less(function, "a", a, 2.0), std::domain_error); size_t stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size_after_call); EXPECT_NO_THROW(check_less(function, "a", a, 10.0)); stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size_after_call); stan::math::recover_memory(); diff --git a/test/unit/math/rev/err/check_nonnegative_test.cpp b/test/unit/math/rev/err/check_nonnegative_test.cpp index 6f839db9ee3..93113b8e186 100644 --- a/test/unit/math/rev/err/check_nonnegative_test.cpp +++ b/test/unit/math/rev/err/check_nonnegative_test.cpp @@ -46,31 +46,37 @@ TEST(AgradRevErrorHandlingScalar, CheckNonnegativeVarCheckVectorized) { for (int i = 0; i < N; ++i) a.push_back(var(i)); - size_t stack_size = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + size_t stack_size + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size); EXPECT_NO_THROW(check_nonnegative(function, "a", a)); size_t stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size_after_call); a[1] = std::numeric_limits::infinity(); EXPECT_NO_THROW(check_nonnegative(function, "a", a)); stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(6U, stack_size_after_call); a[1] = -1.0; EXPECT_THROW(check_nonnegative(function, "a", a), std::domain_error); stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(7U, stack_size_after_call); a[1] = 0.0; EXPECT_NO_THROW(check_nonnegative(function, "a", a)); stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(8U, stack_size_after_call); stan::math::recover_memory(); @@ -108,31 +114,37 @@ TEST(AgradRevErrorHandlingScalar, CheckNonnegativeVarCheckUnivariate) { const char* function = "check_nonnegative"; var a(5.0); - size_t stack_size = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + size_t stack_size + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size); EXPECT_NO_THROW(check_nonnegative(function, "a", a)); size_t stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size_after_call); a = std::numeric_limits::infinity(); EXPECT_NO_THROW(check_nonnegative(function, "a", a)); stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(2U, stack_size_after_call); a = 0.0; EXPECT_NO_THROW(check_nonnegative(function, "a", a)); stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(3U, stack_size_after_call); a = -1.1; EXPECT_THROW(check_nonnegative(function, "a", a), std::domain_error); stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(4U, stack_size_after_call); stan::math::recover_memory(); } diff --git a/test/unit/math/rev/err/check_not_nan_test.cpp b/test/unit/math/rev/err/check_not_nan_test.cpp index 495f69c1644..820cf12b540 100644 --- a/test/unit/math/rev/err/check_not_nan_test.cpp +++ b/test/unit/math/rev/err/check_not_nan_test.cpp @@ -14,13 +14,16 @@ TEST(AgradRevErrorHandlingScalar, CheckNotNanVarCheckVectorized) { for (int i = 0; i < N; ++i) a.push_back(var(i)); - size_t stack_size = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + size_t stack_size + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size); EXPECT_NO_THROW(check_not_nan(function, "a", a)); size_t stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size_after_call); stan::math::recover_memory(); } @@ -36,13 +39,16 @@ TEST(ErrorHandlingScalar, CheckNotNanVarCheckVectorized) { for (int i = 0; i < N; ++i) a.push_back(var(i)); - size_t stack_size = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + size_t stack_size + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size); EXPECT_NO_THROW(check_not_nan(function, "a", a)); size_t stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size_after_call); stan::math::recover_memory(); } @@ -90,13 +96,16 @@ TEST(AgradRevErrorHandlingScalar, CheckNotNanVarCheckUnivariate) { const char* function = "check_not_nan"; var a(5.0); - size_t stack_size = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + size_t stack_size + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size); EXPECT_NO_THROW(check_not_nan(function, "a", a)); size_t stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size_after_call); stan::math::recover_memory(); @@ -109,13 +118,16 @@ TEST(ErrorHandlingScalar, CheckNotNanVarCheckUnivariate) { const char* function = "check_not_nan"; var a(5.0); - size_t stack_size = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + size_t stack_size + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size); EXPECT_NO_THROW(check_not_nan(function, "a", a)); size_t stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size_after_call); stan::math::recover_memory(); diff --git a/test/unit/math/rev/err/check_pos_semidefinite_test.cpp b/test/unit/math/rev/err/check_pos_semidefinite_test.cpp index 0a73a77f95f..b384b023483 100644 --- a/test/unit/math/rev/err/check_pos_semidefinite_test.cpp +++ b/test/unit/math/rev/err/check_pos_semidefinite_test.cpp @@ -49,12 +49,14 @@ TEST(AgradRevErrorHandlingMatrix, checkPosSemiDefiniteMatrixVarCheck) { y << 2, -1, 0, -1, 2, -1, 0, -1, 2; size_t stack_before_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(9U, stack_before_call); EXPECT_NO_THROW(check_pos_semidefinite("checkPosDefiniteMatrix", "y", y)); size_t stack_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(9U, stack_after_call); } diff --git a/test/unit/math/rev/err/check_positive_finite_test.cpp b/test/unit/math/rev/err/check_positive_finite_test.cpp index 0ff4b8c652e..e8fb8af1a92 100644 --- a/test/unit/math/rev/err/check_positive_finite_test.cpp +++ b/test/unit/math/rev/err/check_positive_finite_test.cpp @@ -65,20 +65,24 @@ TEST(AgradRevErrorHandlingScalar, CheckPositiveFiniteVarCheckVectorized) { for (int i = 0; i < N; ++i) a.push_back(var(i)); - size_t stack_size = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + size_t stack_size + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size); EXPECT_THROW(check_positive_finite(function, "a", a), std::domain_error); EXPECT_NO_THROW(check_positive_finite(function, "a", a[2])); size_t stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(5U, stack_size_after_call); a[2] = std::numeric_limits::infinity(); EXPECT_THROW(check_positive_finite(function, "a", a), std::domain_error); stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(6U, stack_size_after_call); stan::math::recover_memory(); } @@ -157,13 +161,16 @@ TEST(AgradRevErrorHandlingScalar, CheckPositiveFiniteVarCheckUnivariate) { const char* function = "check_positive_finite"; var a(5.0); - size_t stack_size = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + size_t stack_size + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size); EXPECT_NO_THROW(check_positive_finite(function, "a", a)); size_t stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size_after_call); stan::math::recover_memory(); diff --git a/test/unit/math/rev/err/check_positive_test.cpp b/test/unit/math/rev/err/check_positive_test.cpp index 833b8186fd3..dee6535363f 100644 --- a/test/unit/math/rev/err/check_positive_test.cpp +++ b/test/unit/math/rev/err/check_positive_test.cpp @@ -58,13 +58,16 @@ TEST(AgradRevErrorHandlingScalar, CheckPositiveVarCheckUnivariate) { const char* function = "check_positive"; var a(5.0); - size_t stack_size = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + size_t stack_size + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size); EXPECT_NO_THROW(check_positive(function, "a", a)); size_t stack_size_after_call - = stan::math::ChainableStack::instance_->var_stack_.size() + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); + = stan::math::ChainableStack::instance_->var_stack_.size() + + stan::math::ChainableStack::instance_->var_nochain_stack_.size(); EXPECT_EQ(1U, stack_size_after_call); stan::math::recover_memory();