Skip to content

Commit 71e3dee

Browse files
mitzimorrismitzimorris
committed
merge fix
2 parents 0aa03e2 + ee06165 commit 71e3dee

File tree

531 files changed

+10738
-10432
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

531 files changed

+10738
-10432
lines changed

‎ARM/Ch.10/ideo_interactions.stan‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
data {
2-
int<lower=0> N;
2+
int<lower=0> N;
33
vector[N] party;
44
vector[N] score1;
55
vector[N] x;
66
}
77
transformed data {
88
vector[N] inter = party .* x;
9-
matrix[N,3] cov = [party', x', inter']';
9+
matrix[N, 3] cov = [party', x', inter']';
1010
}
1111
parameters {
1212
real alpha;
1313
vector[3] beta;
1414
real<lower=0> sigma;
15-
}
15+
}
1616
model {
1717
score1 ~ normal_id_glm(cov, alpha, beta, sigma);
1818
}

‎ARM/Ch.10/ideo_reparam.stan‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
data {
2-
int<lower=0> N;
2+
int<lower=0> N;
33
vector[N] party;
44
vector[N] score1;
55
vector[N] z1; //z value for party 0, 0 otherwise
66
vector[N] z2; //z value for party 1, 0 otherwise
77
}
88
transformed data {
9-
matrix[N,3] x = [party', z1', z2']';
9+
matrix[N, 3] x = [party', z1', z2']';
1010
}
1111
parameters {
1212
real alpha;
1313
vector[3] beta;
1414
real<lower=0> sigma;
15-
}
15+
}
1616
model {
1717
score1 ~ normal_id_glm(x, alpha, beta, sigma);
1818
}

‎ARM/Ch.10/ideo_two_pred.stan‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
data {
2-
int<lower=0> N;
2+
int<lower=0> N;
33
vector[N] party;
44
vector[N] score1;
55
vector[N] x;
66
}
77
transformed data {
8-
matrix[N,2] cov = [party', x']';
8+
matrix[N, 2] cov = [party', x']';
99
}
1010
parameters {
1111
real alpha;
1212
vector[2] beta;
1313
real<lower=0> sigma;
14-
}
14+
}
1515
model {
1616
score1 ~ normal_id_glm(cov, alpha, beta, sigma);
1717
}

‎ARM/Ch.10/sesame_multi_preds_3a.stan‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
11
data {
2-
int<lower=0> N;
2+
int<lower=0> N;
33
vector[N] encouraged;
44
vector[N] setting;
5-
int site[N];
5+
array[N] int site;
66
vector[N] pretest;
77
vector[N] watched;
88
}
99
transformed data {
10-
vector[N] site2;
11-
vector[N] site3;
12-
vector[N] site4;
10+
vector[N] site2;
11+
vector[N] site3;
12+
vector[N] site4;
1313
vector[N] site5;
14-
matrix[N,7] x;
15-
16-
for (i in 1:N) {
14+
matrix[N, 7] x;
15+
16+
for (i in 1 : N) {
1717
site2[i] = site[i] == 2;
1818
site3[i] = site[i] == 3;
1919
site4[i] = site[i] == 4;
2020
site5[i] = site[i] == 5;
2121
}
22-
23-
x = [encouraged', pretest', site2', site3',
24-
site4', site5', setting']';
22+
23+
x = [encouraged', pretest', site2', site3', site4', site5', setting']';
2524
}
2625
parameters {
2726
real alpha;
2827
vector[7] beta;
2928
real<lower=0> sigma;
30-
}
29+
}
3130
model {
3231
watched ~ normal_id_glm(x, alpha, beta, sigma);
3332
}

‎ARM/Ch.10/sesame_multi_preds_3b.stan‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
11
data {
2-
int<lower=0> N;
2+
int<lower=0> N;
33
vector[N] pretest;
44
vector[N] setting;
5-
int site[N];
5+
array[N] int site;
66
vector[N] watched_hat;
77
vector[N] y;
88
}
99
transformed data {
10-
vector[N] site2;
11-
vector[N] site3;
12-
vector[N] site4;
10+
vector[N] site2;
11+
vector[N] site3;
12+
vector[N] site4;
1313
vector[N] site5;
14-
matrix[N,7] x;
15-
16-
for (i in 1:N) {
14+
matrix[N, 7] x;
15+
16+
for (i in 1 : N) {
1717
site2[i] = site[i] == 2;
1818
site3[i] = site[i] == 3;
1919
site4[i] = site[i] == 4;
2020
site5[i] = site[i] == 5;
2121
}
22-
23-
x = [watched_hat', pretest', site2', site3',
24-
site4', site5', setting']';
22+
23+
x = [watched_hat', pretest', site2', site3', site4', site5', setting']';
2524
}
2625
parameters {
2726
real alpha;
2827
vector[7] beta;
2928
real<lower=0> sigma;
30-
}
29+
}
3130
model {
3231
y ~ normal_id_glm(x, alpha, beta, sigma);
3332
}

‎ARM/Ch.10/sesame_one_pred_2b.stan‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
data {
2-
int<lower=0> N;
2+
int<lower=0> N;
33
vector[N] watched_hat;
44
vector[N] y;
55
}
66
transformed data {
7-
matrix[N,1] x = [watched_hat']';
7+
matrix[N, 1] x = [watched_hat']';
88
}
99
parameters {
1010
real alpha;
1111
vector[1] beta;
1212
real<lower=0> sigma;
13-
}
13+
}
1414
model {
1515
y ~ normal_id_glm(x, alpha, beta, sigma);
1616
}

‎ARM/Ch.10/sesame_one_pred_a.stan‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
data {
2-
int<lower=0> N;
2+
int<lower=0> N;
33
vector[N] encouraged;
44
vector[N] watched;
55
}
66
transformed data {
7-
matrix[N,1] x = [encouraged']';
7+
matrix[N, 1] x = [encouraged']';
88
}
99
parameters {
1010
real alpha;
1111
vector[1] beta;
1212
real<lower=0> sigma;
13-
}
13+
}
1414
model {
1515
watched ~ normal_id_glm(x, alpha, beta, sigma);
1616
}

‎ARM/Ch.10/sesame_one_pred_b.stan‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
data {
2-
int<lower=0> N;
2+
int<lower=0> N;
33
vector[N] encouraged;
44
vector[N] y;
55
}
66
transformed data {
7-
matrix[N,1] x = [encouraged']';
7+
matrix[N, 1] x = [encouraged']';
88
}
99
parameters {
1010
real alpha;
1111
vector[1] beta;
1212
real<lower=0> sigma;
13-
}
13+
}
1414
model {
1515
y ~ normal_id_glm(x, alpha, beta, sigma);
1616
}

‎ARM/Ch.12/radon_complete_pool.stan‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ data {
44
vector[N] y;
55
}
66
transformed data {
7-
matrix[N,1] cov = [x']';
7+
matrix[N, 1] cov = [x']';
88
}
99
parameters {
1010
real alpha;

‎ARM/Ch.12/radon_group.stan‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
data {
22
int<lower=1> N;
3-
int<lower=1> J; # number of counties
4-
int<lower=1,upper=J> county[N];
3+
int<lower=1> J; // number of counties
4+
array[N] int<lower=1, upper=J> county;
55
vector[N] u;
66
vector[N] x;
77
vector[N] y;
88
}
99
transformed data {
10-
matrix[N,2] cov = [x', u']';
10+
matrix[N, 2] cov = [x', u']';
1111
}
1212
parameters {
1313
real mu_alpha;
@@ -26,6 +26,6 @@ model {
2626
sigma_alpha ~ cauchy(0, 2.5);
2727
mu_beta ~ std_normal();
2828
sigma_beta ~ cauchy(0, 2.5);
29-
29+
3030
y ~ normal_id_glm(cov, alpha[county], beta, sigma);
3131
}

0 commit comments

Comments
 (0)