Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed handling of numeric variables in factorDesign #47

Open
wants to merge 455 commits into
base: master
Choose a base branch
from
Open

Fixed handling of numeric variables in factorDesign #47

wants to merge 455 commits into from

Conversation

coreybrier
Copy link

factorDesign assumed numeric variables preceded all factor variables, which may cause incorrect name assignment.

Also, fixed handling of multiple numeric variables (indcounter and assignment of numeric data.frame into the x matrix)

Thank you!

(This is my first pull request and real use of git: I hope I have completed it appropriately. Thank you for your understanding!)

jonathan-taylor and others added 30 commits August 15, 2017 21:54
@jonathan-taylor
removed print statement
e87d12d
@jonathan-taylor
using C for each row
210d0fe
@jonathan-taylor
optimized the C code a bit -- still has debug statements
c7c41e4
@jonathan-taylor
removing debug statements, making objective computation faster
f6ae738
@tibshirani
Merge pull request selective-inference#18 from jonathan-taylor/master
2bd33e8 
comparing test
@jonathan-taylor
slightly lower tolerance
1a8e2ad
@jonathan-taylor
using active sets
c391bd3
@jonathan-taylor
begun the Rcpp extension
096b0b8
@jonathan-taylor
trying to save some copy time -- R doesn't seem to care about extra a…
faf0436 
…rguments to .C
@jonathan-taylor
don't lose this
5bf8018
@jonathan-taylor
segfaulting on the test_big.R :(
944ae7d
@jonathan-taylor
changes to funs.fixed.R that will be overwritten
4caf225
@jonathan-taylor
success -- about 2ms now -- python still faster (as timed through rpy…
f53af23 
…2) :)
@jonathan-taylor
BF: column major, removing print statements
7920c8c
@jonathan-taylor
changing name of function, evaluation of feasibility in Rcpp
6756ab2
@jonathan-taylor
RF: renamed C function, removing R solver for one row
0e58435
@jonathan-taylor
need to make Rcpp exports
0614305
@jonathan-taylor
ignore first two lines if status not OK?
ca60bc9
@jonathan-taylor
install Rcpp earlier
60f6cde
@jonathan-taylor
using Rcpp for matrixcomps as well -- update1 and downdate1 -- exampl…
c1aef63 
…es now OK on Rcmd check
@jonathan-taylor
using a warm start if available
f468510
@jonathan-taylor
trying to find segfault
a8805b8
@jonathan-taylor
BF: order of arguments to is_active, renamed the function as well
abf0351
@jonathan-taylor
removing debug statements
27af0d5
@jonathan-taylor
not using the C code
3a46ad8
@jonathan-taylor
removing useC
de103f7
@jonathan-taylor
BF: percent signs in example
d487526
@jonathan-taylor
smaller changes in mu per step in line search
7360386
@jonathan-taylor
renaming Sigma_theta to gradient, making sure we loop through active set
a9a8bbb
@jonathan-taylor
more renaming
7f1e4a6
Jelena Markovic and others added 28 commits November 7, 2017 16:00
working instance
2b49b94
@jonathan-taylor
export of randomized and man page
571cf82
@jonathan-taylor
adding resid to namespace
9adbe9b
@jonathan-taylor
fixing to make check pass
eda1482
@jonathan-taylor
param_stop
3ca4431
@jonathan-taylor
merged with smaller dimensional matrices
d838b07
@jonathan-taylor
For gaussian randomization, remove all p-dimensional matrices
7f8b8fd 
Merge branch 'jelena-markovic-randomized_jelena_highdim'
@jonathan-taylor
fixing function signature
690f0ea
@tibshirani
Merge pull request selective-inference#39 from jonathan-taylor/master
9e7a081 
beta version of randomized LASSO
added mean and cov of a gaussian
6c1a123
transpose
d2a3b9b
working! bugs fixed. new sampler
e2efbdc
active set zero
e739255
removed set seed when gen randomization
b4fd8b5
amir sampler working with subgrad condition false as well
d2438c9
logistic
ce13171
E of zero length
157c1db
@jonathan-taylor
fixing man page so check passes
1dfbea8
@jonathan-taylor
Merge branch 'jelena-markovic-randomized_jelena'
fa08285
@jonathan-taylor
renaming file
b21260a
@jonathan-taylor
stop instead of print
183bc3a
@jonathan-taylor
Merge branch 'master' into logistic
4fc539d
@jonathan-taylor
WIP: adding logistic option, need to solve logistic problem
42cd878
@jonathan-taylor
Merge branch 'jelena-markovic-logistic'
69bf473
@jonathan-taylor
fixing empty inactive set indexing problem
af3b818
@tibshirani
Merge pull request selective-inference#41 from jonathan-taylor/master
a2e32dc 
Some bug fixes of randomizedLasso, most of framework for randomized logistic
@tibshirani
rob chanegd NAMESPACE
9de1b7c
@coreybrier
Fixed handling of numeric variables in factorDesign
a6c495b
joftius
joftius approved these changes Apr 9, 2018
View reviewed changes
Copy link

@joftius joftius left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for addressing this oversight on my part!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joftius joftius joftius approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@coreybrier @joftius @jonathan-taylor @tibshirani @nicoballarini