changing order of stops

Author: jonathan-taylor

selectiveInference/R/funs.fixed.R

@@ -453,8 +453,8 @@ debiasingRow = function (Xinfo,               # could be X or t(X) %*% X / n dep
                             objective_tol, 
 			    parameter_tol,
                             max_active,
-			    objective_stop,
 			    kkt_stop,
+			    objective_stop,
 			    parameter_stop)
       } else {
           result = solve_QP_wide(Xinfo,                      # this is a design matrix
@@ -471,8 +471,8 @@ debiasingRow = function (Xinfo,               # could be X or t(X) %*% X / n dep
                                  objective_tol, 
 				 parameter_tol,
                                  max_active,
-				 objective_stop,	
 				 kkt_stop,
+				 objective_stop,	
 				 parameter_stop)
 
       }

selectiveInference/R/funs.fixedCox.R

@@ -73,7 +73,7 @@ b1= -(mydiag(sign_bhat)%*%MM)%*%sign_bhat*lambda
        vup[jj]=junk$vup
        sd[jj]=junk$sd
 
-      junk2=TG.interval(bbar, A1, b1, vj, MM, alpha)
+      junk2=TG.interval(bbar, A1, b1, vj, MM, alpha, flip=(sign_bhat[jj]==-1))
        ci[jj,]=junk2$int
        tailarea[jj,] = junk2$tailarea
 

selectiveInference/R/funs.fixedLogit.R

@@ -96,7 +96,7 @@ fixedLogitLassoInf=function(x,y,beta,lambda,alpha=.1, type=c("partial"), tol.bet
    vup[jj]=junk$vup
        sd[jj]=junk$sd
 
-     junk2=TG.interval(bbar, A1, b1, vj, MM,alpha=alpha)
+     junk2=TG.interval(bbar, A1, b1, vj, MM,alpha=alpha, flip=(sign_bhat[jj+1]==-1))
 
      ci[jj,]=junk2$int
      tailarea[jj,] = junk2$tailarea

selectiveInference/src/Rcpp-debias.cpp

@@ -17,8 +17,8 @@ Rcpp::List solve_QP(Rcpp::NumericMatrix Sigma,
 		    double objective_tol,
 		    double parameter_tol,
 		    int max_active,
-		    int objective_stop,
 		    int kkt_stop,
+		    int objective_stop,
 		    int param_stop
 		    ) {
 
@@ -55,8 +55,8 @@ Rcpp::List solve_QP(Rcpp::NumericMatrix Sigma,
 		      objective_tol,
 		      parameter_tol,
 		      max_active,
-		      objective_stop,
 		      kkt_stop,
+		      objective_stop,
 		      param_stop);
 
   // Check whether feasible
@@ -96,8 +96,8 @@ Rcpp::List solve_QP_wide(Rcpp::NumericMatrix X,
 			 double objective_tol,
 			 double parameter_tol,
 			 int max_active,
-			 int objective_stop,
 			 int kkt_stop,
+			 int objective_stop,
 			 int param_stop
 			 ) {
 
@@ -148,8 +148,8 @@ Rcpp::List solve_QP_wide(Rcpp::NumericMatrix X,
 			objective_tol,
 			parameter_tol,
 			max_active,
-			objective_stop,
 			kkt_stop,
+			objective_stop,
 			param_stop);
 
   // Check whether feasible