Skip to content

Commit 0cf99e2

Browse files
committed
Remove clang-format key not present in some versions.
1 parent df28186 commit 0cf99e2

File tree

5 files changed

+22
-23
lines changed

5 files changed

+22
-23
lines changed

.clang-format

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ BraceWrapping:
3232
BeforeCatch: false
3333
BeforeElse: false
3434
IndentBraces: false
35-
SplitEmptyFunctionBody: true
3635
BreakBeforeBinaryOperators: All
3736
BreakBeforeBraces: Attach
3837
BreakBeforeInheritanceComma: false

stan/math/prim/scal/fun/gamma_p.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ namespace math {
4848
\f[
4949
\frac{\partial \, P(a, z)}{\partial z} = \frac{z^{a-1}e^{-z}}{\Gamma(a)}
5050
\f]
51-
51+
5252
* @throws domain_error if x is at pole
5353
5454
*/

test/unit/math/rev/mat/prob/neg_binomial_2_log_glm_lpmf_test.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,15 @@ typedef std::chrono::high_resolution_clock::time_point TimeVar;
111111
TEST(ProbDistributionsNegBinomial2LogGLM, glm_matches_neg_binomial_2_log_speed)
112112
{ for (size_t exponent = 7; exponent < 10; exponent++) { const int R = 10000;
113113
const int C = std::pow(3, exponent);
114-
114+
115115
Matrix<int,Dynamic,1> n(R, 1);
116116
for (size_t i = 0; i < R; i++) {
117117
n[i] = rand()%2;
118118
}
119-
119+
120120
int T1 = 0;
121121
int T2 = 0;
122-
122+
123123
for (size_t testnumber = 0; testnumber < 30; testnumber++){
124124
Matrix<double, Dynamic, Dynamic> xreal = Matrix<double, Dynamic,
125125
Dynamic>::Random(R, C); Matrix<double, Dynamic, 1> betareal = Matrix<double,
@@ -128,12 +128,12 @@ Dynamic, Dynamic>::Random(C, 1); Matrix<double, 1, 1> alphareal = Matrix<double,
128128
1>::Ones() * alphareal; Matrix<double, Dynamic, 1> phireal = Matrix<double,
129129
Dynamic, Dynamic>::Random(R, 1) + Matrix<double, Dynamic, 1>::Ones(R, 1); // We
130130
want phireal to be positive.
131-
131+
132132
Matrix<var, Dynamic, 1> beta = betareal;
133133
Matrix<var, Dynamic, 1> phi = phireal;
134134
Matrix<var, Dynamic, 1> theta(R, 1);
135135
136-
136+
137137
TimeVar t1 = timeNow();
138138
theta = (xreal * beta) + alpharealvec;
139139
var lp = stan::math::neg_binomial_2_log_lpmf(n, theta, phi);
@@ -145,7 +145,7 @@ want phireal to be positive.
145145
146146
Matrix<var, Dynamic, 1> beta2 = betareal;
147147
Matrix<var, Dynamic, 1> phi2 = phireal;
148-
148+
149149
TimeVar t3 = timeNow();
150150
var lp2 = stan::math::neg_binomial_2_log_glm_lpmf(n, xreal, beta2,
151151
alphareal[0], phi2); lp2.grad(); TimeVar t4 = timeNow();
@@ -154,7 +154,7 @@ alphareal[0], phi2); lp2.grad(); TimeVar t4 = timeNow();
154154
T2 += duration(t4 - t3);
155155
156156
}
157-
157+
158158
std::cout << "Existing Primitives:" << std::endl << T1 << std::endl << "New
159159
Primitives:" << std::endl << T2 << std::endl;
160160
}

test/unit/math/rev/mat/prob/normal_id_glm_lpdf_test.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,15 @@ typedef std::chrono::high_resolution_clock::time_point TimeVar;
106106
TEST(ProbDistributionsNormalIdGLM, glm_matches_normal_id_speed) {
107107
const int R = 30000;
108108
const int C = 1000;
109-
109+
110110
Matrix<int,Dynamic,1> n(R, 1);
111111
for (size_t i = 0; i < R; i++) {
112112
n[i] = rand()%2000;
113113
}
114-
114+
115115
int T1 = 0;
116116
int T2 = 0;
117-
117+
118118
for (size_t testnumber = 0; testnumber < 1; testnumber++){
119119
Matrix<double, Dynamic, Dynamic> xreal = Matrix<double, Dynamic,
120120
Dynamic>::Random(R, C); Matrix<double, Dynamic, 1> betareal = Matrix<double,
@@ -124,12 +124,12 @@ Matrix<double, Dynamic, Dynamic>::Random(R, 1)
124124
and 1. We add 1 to it to get positive entries. Matrix<double, 1, 1> alphareal =
125125
Matrix<double, 1, 1>::Random(1, 1); Matrix<double, Dynamic, 1> alpharealvec =
126126
Matrix<double, R, 1>::Ones() * alphareal;
127-
127+
128128
Matrix<var, Dynamic, 1> beta = betareal;
129129
Matrix<var, Dynamic, 1> sigma = sigmareal;
130130
Matrix<var, Dynamic, 1> theta(R, 1);
131131
132-
132+
133133
TimeVar t1 = timeNow();
134134
theta = (xreal * beta) + alpharealvec;
135135
var lp = stan::math::normal_lpdf(n, theta, sigma);
@@ -141,7 +141,7 @@ Matrix<double, R, 1>::Ones() * alphareal;
141141
142142
Matrix<var, Dynamic, 1> beta2 = betareal;
143143
Matrix<var, Dynamic, 1> sigma2 = sigmareal;
144-
144+
145145
TimeVar t3 = timeNow();
146146
var lp2 = stan::math::normal_id_glm_lpdf(n, xreal, beta2, alphareal[0],
147147
sigma2);
@@ -152,7 +152,7 @@ Matrix<double, R, 1>::Ones() * alphareal;
152152
T2 += duration(t4 - t3);
153153
154154
}
155-
155+
156156
std::cout << "Existing Primitives:" << std::endl << T1 << std::endl << "New
157157
Primitives:" << std::endl << T2 << std::endl;
158158
}

test/unit/math/rev/mat/prob/poisson_log_glm_lpmf_test.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -96,26 +96,26 @@ typedef std::chrono::high_resolution_clock::time_point TimeVar;
9696
TEST(ProbDistributionsPoissonLogGLM, glm_matches_poisson_log_speed) {
9797
const int R = 30000;
9898
const int C = 1000;
99-
99+
100100
Matrix<int,Dynamic,1> n(R, 1);
101101
for (size_t i = 0; i < R; i++) {
102102
n[i] = rand()%200;
103103
}
104-
104+
105105
int T1 = 0;
106106
int T2 = 0;
107-
107+
108108
for (size_t testnumber = 0; testnumber < 30; testnumber++){
109109
Matrix<double, Dynamic, Dynamic> xreal = Matrix<double, Dynamic,
110110
Dynamic>::Random(R, C); Matrix<double, Dynamic, 1> betareal = Matrix<double,
111111
Dynamic, Dynamic>::Random(C, 1); Matrix<double, 1, 1> alphareal = Matrix<double,
112112
1, 1>::Random(1, 1); Matrix<double, Dynamic, 1> alpharealvec = Matrix<double, R,
113113
1>::Ones() * alphareal;
114-
114+
115115
Matrix<var, Dynamic, 1> beta = betareal;
116116
Matrix<var, Dynamic, 1> theta(R, 1);
117117
118-
118+
119119
TimeVar t1 = timeNow();
120120
theta = (xreal * beta) + alpharealvec;
121121
var lp = stan::math::poisson_log_lpmf(n, theta);
@@ -126,7 +126,7 @@ Dynamic, Dynamic>::Random(C, 1); Matrix<double, 1, 1> alphareal = Matrix<double,
126126
stan::math::recover_memory();
127127
128128
Matrix<var, Dynamic, 1> beta2 = betareal;
129-
129+
130130
TimeVar t3 = timeNow();
131131
var lp2 = stan::math::poisson_log_glm_lpmf(n, xreal, beta2, alphareal[0]);
132132
lp2.grad();
@@ -136,7 +136,7 @@ Dynamic, Dynamic>::Random(C, 1); Matrix<double, 1, 1> alphareal = Matrix<double,
136136
T2 += duration(t4 - t3);
137137
138138
}
139-
139+
140140
std::cout << "Existing Primitives:" << std::endl << T1 << std::endl << "New
141141
Primitives:" << std::endl << T2 << std::endl;
142142
}

0 commit comments

Comments
 (0)