Skip to content

Commit 58631ee

Browse files
committed
Merge branch 'feature/2815-vectorize-conj' of github.com:stan-dev/math into feature/2815-vectorize-conj
2 parents a0d4a75 + 2d47b69 commit 58631ee

File tree

1 file changed

+32
-36
lines changed

1 file changed

+32
-36
lines changed

test/unit/math/test_ad.hpp

Lines changed: 32 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,9 +1259,8 @@ enum class ScalarSupport { Real, RealAndComplex, ComplexOnly };
12591259
* double and integer inputs and 1st-, 2nd-, and 3rd-order derivatives
12601260
* consistent with finite differences of double inputs.
12611261
*
1262-
* @tparam ScalarSupport whether the input supports real numbers, complex numbers,
1263-
* or both.
1264-
* This specialization is for real numbers only.
1262+
* @tparam ScalarSupport whether the input supports real numbers, complex
1263+
* numbers, or both. This specialization is for real numbers only.
12651264
* @tparam F type of polymorphic, vectorized functor to test
12661265
* @tparam T1 type of first argument (integer or double)
12671266
* @param tols tolerances for test
@@ -1312,9 +1311,9 @@ void expect_ad_vectorized(const ad_tolerances& tols, const F& f, const T1& x1) {
13121311
* double and integer inputs and 1st-, 2nd-, and 3rd-order derivatives
13131312
* consistent with finite differences of double inputs.
13141313
*
1315-
* @tparam ScalarSupport whether the input supports real numbers, complex numbers,
1316-
* or both.
1317-
* This specialization is for when complex and real numbers are supported.
1314+
* @tparam ScalarSupport whether the input supports real numbers, complex
1315+
* numbers, or both. This specialization is for when complex and real numbers
1316+
* are supported.
13181317
* @tparam F type of polymorphic, vectorized functor to test
13191318
* @tparam T1 type of first argument (integer or double)
13201319
* @param tols tolerances for test
@@ -1397,9 +1396,9 @@ void expect_ad_vectorized(const ad_tolerances& tols, const F& f, const T1& x1) {
13971396
* double and integer inputs and 1st-, 2nd-, and 3rd-order derivatives
13981397
* consistent with finite differences of double inputs.
13991398
*
1400-
* @tparam ScalarSupport whether the input supports real numbers, complex numbers,
1401-
* or both.
1402-
* This specialization is for when only complex numbers are supported.
1399+
* @tparam ScalarSupport whether the input supports real numbers, complex
1400+
* numbers, or both. This specialization is for when only complex numbers are
1401+
* supported.
14031402
* @tparam F type of polymorphic, vectorized functor to test
14041403
* @tparam T1 type of first argument (integer or double)
14051404
* @param tols tolerances for test
@@ -1462,8 +1461,8 @@ void expect_ad_vectorized(const ad_tolerances& tols, const F& f, const T1& x1) {
14621461
* 3rd-order derivatives consistent with primitive values and finite
14631462
* differences using default tolerances.
14641463
*
1465-
* @tparam ScalarSupport whether the input supports real numbers, complex numbers,
1466-
* or both.
1464+
* @tparam ScalarSupport whether the input supports real numbers, complex
1465+
* numbers, or both.
14671466
* @tparam F type of function
14681467
* @tparam T type of argument
14691468
* @param f function to test
@@ -1867,9 +1866,9 @@ void expect_complex_common_comparison(const F& f) {
18671866
* input type. The value for containers must be the same as applying
18681867
* the scalar function elementwise.
18691868
*
1870-
* @tparam ScalarSupport whether the input supports real numbers, complex numbers,
1871-
* or both.
1872-
* This specialization is for whenever complex numbers are not supported.
1869+
* @tparam ScalarSupport whether the input supports real numbers, complex
1870+
* numbers, or both. This specialization is for whenever complex numbers are not
1871+
* supported.
18731872
* @tparam F type of functor to test
18741873
* @param f functor to test
18751874
*/
@@ -1898,9 +1897,9 @@ void expect_common_unary_vectorized(const F& f) {
18981897
* input type. The value for containers must be the same as applying
18991898
* the scalar function elementwise.
19001899
*
1901-
* @tparam ScalarSupport whether the input supports real numbers, complex numbers,
1902-
* or both.
1903-
* This specialization is for when complex and real numbers are supported.
1900+
* @tparam ScalarSupport whether the input supports real numbers, complex
1901+
* numbers, or both. This specialization is for when complex and real numbers
1902+
* are supported.
19041903
* @tparam F type of functor to test
19051904
* @param f functor to test
19061905
*/
@@ -1919,8 +1918,6 @@ void expect_common_unary_vectorized(const F& f) {
19191918
stan::test::expect_ad_vectorized<ComplexSupport>(tols, f, x1);
19201919
}
19211920

1922-
1923-
19241921
/**
19251922
* Test that the specified vectorized unary function produces the same
19261923
* results and exceptions, and has 1st-, 2nd-, and 3rd-order
@@ -1933,9 +1930,9 @@ void expect_common_unary_vectorized(const F& f) {
19331930
* input type. The value for containers must be the same as applying
19341931
* the scalar function elementwise.
19351932
*
1936-
* @tparam ScalarSupport whether the input supports real numbers, complex numbers,
1937-
* or both.
1938-
* This specialization is for when only complex numbers are supported.
1933+
* @tparam ScalarSupport whether the input supports real numbers, complex
1934+
* numbers, or both. This specialization is for when only complex numbers are
1935+
* supported.
19391936
* @tparam F type of functor to test
19401937
* @param f functor to test
19411938
*/
@@ -1957,8 +1954,8 @@ void expect_unary_vectorized(const ad_tolerances& tols, const F& f) {}
19571954
* differences. Tests both scalar and container behavior. Integer
19581955
* arguments will be preserved through to function calls.
19591956
*
1960-
* @tparam ScalarSupport whether the input supports real numbers, complex numbers,
1961-
* or both.
1957+
* @tparam ScalarSupport whether the input supports real numbers, complex
1958+
* numbers, or both.
19621959
* @tparam F type of function
19631960
* @tparam Ts types of arguments
19641961
* @param tols test relative tolerances
@@ -1978,8 +1975,8 @@ void expect_unary_vectorized(const ad_tolerances& tols, const F& f, T x,
19781975
* values for the specified values that are consistent with primitive
19791976
* values and finite differences. Tests both scalars and containers.
19801977
*
1981-
* @tparam ScalarSupport whether the input supports real numbers, complex numbers,
1982-
* or both.
1978+
* @tparam ScalarSupport whether the input supports real numbers, complex
1979+
* numbers, or both.
19831980
* @tparam F type of function to test
19841981
* @tparam Ts type of remaining arguments to test
19851982
* @param f function to test
@@ -1999,9 +1996,9 @@ void expect_unary_vectorized(const F& f, Ts... xs) {
19991996
* when applied to all common non-zero integer and double arguments.
20001997
* This includes tests for standard vector and Eigen vector containers.
20011998
*
2002-
* @tparam ScalarSupport whether the input supports real numbers, complex numbers,
2003-
* or both.
2004-
* This specialization is for when complex numbers are not supported.
1999+
* @tparam ScalarSupport whether the input supports real numbers, complex
2000+
* numbers, or both. This specialization is for when complex numbers are not
2001+
* supported.
20052002
* @tparam F type of functor to test
20062003
* @param f functor to test
20072004
*/
@@ -2023,9 +2020,9 @@ void expect_common_nonzero_unary_vectorized(const F& f) {
20232020
* when applied to all common non-zero integer and double arguments.
20242021
* This includes tests for standard vector and Eigen vector containers.
20252022
*
2026-
* @tparam ScalarSupport whether the input supports real numbers, complex numbers,
2027-
* or both.
2028-
* This specialization is for when complex and real numbers are supported.
2023+
* @tparam ScalarSupport whether the input supports real numbers, complex
2024+
* numbers, or both. This specialization is for when complex and real numbers
2025+
* are supported.
20292026
* @tparam F type of functor to test
20302027
* @param f functor to test
20312028
*/
@@ -2042,17 +2039,16 @@ void expect_common_nonzero_unary_vectorized(const F& f) {
20422039
stan::test::expect_ad_vectorized<ComplexSupport>(tols, f, x1);
20432040
}
20442041

2045-
20462042
/**
20472043
* Test that the specified vectorized unary function produces the same
20482044
* results and exceptions, and has derivatives consistent with finite
20492045
* differences as returned by the primitive version of the function
20502046
* when applied to all common non-zero integer and double arguments.
20512047
* This includes tests for standard vector and Eigen vector containers.
20522048
*
2053-
* @tparam ScalarSupport whether the input supports real numbers, complex numbers,
2054-
* or both.
2055-
* This specialization is for when only complex numbers are supported.
2049+
* @tparam ScalarSupport whether the input supports real numbers, complex
2050+
* numbers, or both. This specialization is for when only complex numbers are
2051+
* supported.
20562052
* @tparam F type of functor to test
20572053
* @param f functor to test
20582054
*/

0 commit comments

Comments
 (0)