Skip to content

Commit 7f1e4a6

Browse files
jonathan-taylorjonathan-taylor
committed
more renaming
1 parent a9a8bbb commit 7f1e4a6

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

‎selectiveInference/src/debias.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// Update one coordinate
1212

1313
double objective(double *Sigma, /* A covariance matrix: X^TX/n */
14-
int *ever_active, /* Ever active set: 0-based */
14+
int *ever_active_ptr, /* Ever active set: 0-based */
1515
int *nactive_ptr, /* Size of ever active set */
1616
int nrow, /* how many rows in Sigma */
1717
int row, /* which row: 0-based */
@@ -31,13 +31,13 @@ double objective(double *Sigma, /* A covariance matrix: X^TX/n */
3131

3232
for (irow=0; irow<nactive; irow++) {
3333

34-
active_row_ptr = ((int *) ever_active + irow);
34+
active_row_ptr = ((int *) ever_active_ptr + irow);
3535
active_row = *active_row_ptr;
3636
theta_row_ptr = ((double *) theta + active_row);
3737

3838
for (icol=0; icol<nactive; icol++) {
3939

40-
active_col_ptr = ((int *) ever_active + icol);
40+
active_col_ptr = ((int *) ever_active_ptr + icol);
4141
active_col = *active_col_ptr;
4242
theta_col_ptr = ((double *) theta + active_col);
4343

@@ -57,23 +57,23 @@ double objective(double *Sigma, /* A covariance matrix: X^TX/n */
5757
// Check if active and add it to active list if necessary
5858

5959
int update_ever_active(int coord,
60-
int *ever_active,
60+
int *ever_active_ptr,
6161
int *nactive_ptr) {
6262
int iactive;
6363
int active_var;
6464
int nactive = *nactive_ptr;
65-
int *ever_active_ptr = ever_active;
65+
int *ever_active_ptr_tmp = ever_active_ptr;
6666

6767
for (iactive=0; iactive<nactive; iactive++) {
68-
ever_active_ptr = ((int *) ever_active + iactive);
69-
active_var = (*ever_active_ptr);
68+
ever_active_ptr_tmp = ((int *) ever_active_ptr + iactive);
69+
active_var = (*ever_active_ptr_tmp);
7070
if (active_var == coord) {
7171

7272
// Add it to the active set and increment the
7373
// number of active variables
7474

75-
ever_active_ptr = ((int *) ever_active + *nactive_ptr);
76-
*ever_active_ptr = coord;
75+
ever_active_ptr_tmp = ((int *) ever_active_ptr + *nactive_ptr);
76+
*ever_active_ptr_tmp = coord;
7777
*nactive_ptr += 1;
7878

7979
return(1);
@@ -129,7 +129,7 @@ int check_KKT(double *theta, /* current theta */
129129
double update_one_coord(double *Sigma, /* A covariance matrix: X^TX/n */
130130
double *Sigma_diag, /* Diagonal entries of Sigma */
131131
double *gradient_ptr, /* Sigma times theta */
132-
int *ever_active, /* Ever active set: 0-based */
132+
int *ever_active_ptr, /* Ever active set: 0-based */
133133
int *nactive_ptr, /* Size of ever active set */
134134
int nrow, /* How many rows in Sigma */
135135
double bound, /* feasibility parameter */
@@ -151,7 +151,7 @@ double update_one_coord(double *Sigma, /* A covariance matrix: X^TX/n
151151
double *quadratic_ptr = ((double *) Sigma_diag + coord);
152152
double quadratic_term = *quadratic_ptr;
153153

154-
int *ever_active_ptr;
154+
// int *ever_active_ptr_tmp;
155155

156156
gradient_ptr_tmp = ((double *) gradient_ptr + coord);
157157
linear_term = *gradient_ptr_tmp;
@@ -186,7 +186,7 @@ double update_one_coord(double *Sigma, /* A covariance matrix: X^TX/n
186186
// Add to active set if necessary
187187

188188
if (!is_active) {
189-
update_ever_active(coord, ever_active, nactive_ptr);
189+
update_ever_active(coord, ever_active_ptr, nactive_ptr);
190190
}
191191

192192
// Update the linear term
@@ -215,7 +215,7 @@ double update_one_coord(double *Sigma, /* A covariance matrix: X^TX/n
215215
int find_one_row_(double *Sigma, /* A covariance matrix: X^TX/n */
216216
double *Sigma_diag, /* Diagonal entry of covariance matrix */
217217
double *gradient_ptr, /* Sigma times theta */
218-
int *ever_active, /* Ever active set: 0-based */
218+
int *ever_active_ptr, /* Ever active set: 0-based */
219219
int *nactive_ptr, /* Size of ever active set */
220220
int nrow, /* How many rows in Sigma */
221221
double bound, /* feasibility parameter */
@@ -230,7 +230,7 @@ int find_one_row_(double *Sigma, /* A covariance matrix: X^TX/n */
230230
int *active_ptr;
231231

232232
double old_value = objective(Sigma,
233-
ever_active,
233+
ever_active_ptr,
234234
nactive_ptr,
235235
nrow,
236236
row,
@@ -243,13 +243,13 @@ int find_one_row_(double *Sigma, /* A covariance matrix: X^TX/n */
243243

244244
// Update the active variables first
245245

246-
active_ptr = (int *) ever_active;
246+
active_ptr = (int *) ever_active_ptr;
247247

248248
for (iactive=0; iactive < *nactive_ptr; iactive++) {
249249
update_one_coord(Sigma,
250250
Sigma_diag,
251251
gradient_ptr,
252-
ever_active,
252+
ever_active_ptr,
253253
nactive_ptr,
254254
nrow,
255255
bound,
@@ -273,7 +273,7 @@ int find_one_row_(double *Sigma, /* A covariance matrix: X^TX/n */
273273
update_one_coord(Sigma,
274274
Sigma_diag,
275275
gradient_ptr,
276-
ever_active,
276+
ever_active_ptr,
277277
nactive_ptr,
278278
nrow,
279279
bound,
@@ -292,7 +292,7 @@ int find_one_row_(double *Sigma, /* A covariance matrix: X^TX/n */
292292
}
293293

294294
new_value = objective(Sigma,
295-
ever_active,
295+
ever_active_ptr,
296296
nactive_ptr,
297297
nrow,
298298
row,

‎selectiveInference/src/debias.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ extern "C"
55

66
int find_one_row_(double *Sigma, /* A covariance matrix: X^TX/n */
77
double *Sigma_diag, /* Diagonal entry of covariance matrix */
8-
double *Sigma_theta, /* Sigma times theta */
9-
int *ever_active, /* Ever active set: 0-based */
8+
double *gradient_ptr, /* Current gradient of quadratic loss */
9+
int *ever_active_ptr, /* Ever active set: 0-based */
1010
int *nactive_ptr, /* Size of ever active set */
1111
int nrow, /* How many rows in Sigma */
1212
double bound, /* feasibility parameter */
1313
double *theta, /* current value */
1414
int maxiter, /* how many iterations */
1515
int row); /* which coordinate to update: 0-based */
1616

17-
int check_KKT(double *theta, /* current theta */
18-
double *Sigma_theta, /* Sigma times theta */
19-
int nrow, /* how many rows in Sigma */
20-
int row, /* which row: 0-based */
21-
double bound); /* Lagrange multipler for \ell_1 */
17+
int check_KKT(double *theta, /* current theta */
18+
double *gradient_ptr, /* Current gradient of quadratic loss */
19+
int nrow, /* how many rows in Sigma */
20+
int row, /* which row: 0-based */
21+
double bound); /* Lagrange multipler for \ell_1 */
2222

2323

2424
#ifdef __cplusplus

0 commit comments

Comments
 (0)