rob bug from quanzao

Author: tibshirani

selectiveInference/DESCRIPTION

@@ -1,7 +1,7 @@
 Package: selectiveInference
 Type: Package
 Title: Tools for Post-Selection Inference
-Version: 1.2.1
+Version: 1.2.2
 Date: 2016-07-3
 Author: Ryan Tibshirani, Rob Tibshirani, Jonathan Taylor,
     Joshua Loftus, Stephen Reid

selectiveInference/R/funs.fixed.R

@@ -158,7 +158,7 @@ function(x, y, beta, lambda, a) {
   if (length(za)>1) dz = diag(za)
   if (length(za)==1) dz = matrix(za,1,1)
 
-  P = diag(1,nrow(xa)) - xa %*% xap
+#  P = diag(1,nrow(xa)) - xa %*% xap
   #NOTE: inactive constraints not needed below!
 
   G = -rbind(

selectiveInference/R/funs.fixedLogit.R

@@ -45,8 +45,8 @@ fixedLogitLassoInf=function(x,y,beta,lambda,alpha=.1, type=c("partial"), tol.bet
 
 #check KKT
    z=etahat+(y-prhat)/ww
- #      g=  t(x)%*%w%*%(z-etahat)/lambda # negative gradient scaled by lambda
-  gg=scale(t(x),FALSE,1/ww)%*%(z-etahat)/lambda # negative gradient scaled by lambda
+  # g=  t(x)%*%w%*%(z-etahat)/lambda # negative gradient scaled by lambda
+  g=scale(t(x),FALSE,1/ww)%*%(z-etahat)/lambda # negative gradient scaled by lambda
      if (any(abs(g) > 1+tol.kkt) )
     warning(paste("Solution beta does not satisfy the KKT conditions",
                   "(to within specified tolerances)"))