diff --git a/DESCRIPTION b/DESCRIPTION index 3bea3ef..ef30369 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,8 +2,8 @@ Package: fastclime Type: Package Title: A fast solver for parameterized lp problems and constrained l1 minimization approach to sparse precision matrix estimation -Version: 1.2.1 -Date: 2013-09-27 +Version: 1.2.2 +Date: 2013-09-29 Author: Haotian Pang, Han Liu and Robert Vanderbei Maintainer: Haotian Pang Depends: R (>= 2.15.0), lattice, igraph, MASS, Matrix @@ -13,6 +13,6 @@ Description: The package "fastclime" provides a method of recover the solver. It also contains a generic LP solver and a parameterized LP solver using parametric simplex method. License: GPL-2 Repository: CRAN -Packaged: 2013-09-28 19:16:21 UTC; haotian +Packaged: 2013-09-29 17:29:56 UTC; haotian NeedsCompilation: yes -Date/Publication: 2013-09-28 22:14:20 +Date/Publication: 2013-09-29 21:55:54 diff --git a/MD5 b/MD5 index cc428ee..e4a8c8e 100644 --- a/MD5 +++ b/MD5 @@ -1,15 +1,15 @@ -38e318edfe714ea2be6440be20ae4fb9 *DESCRIPTION +a628ba945bb5b1720622f5fbec9ca806 *DESCRIPTION 6ac07db2f55a0658e0376750775f2243 *NAMESPACE -d19179176bc6d19cb38486ff592794ad *R/fastclime.R -cfb813a2ae8889f6ef3695a71a737149 *R/fastclime.generator.R -fce9c5e5fdffd24a2bbdad90e18dfa72 *R/fastclime.plot.R -b2dd1b71a512f935eca5e29276def467 *R/fastclime.roc.R -9fbde251309af793243e786e6db12e89 *R/fastlp.R -020034101a3d59db779edb36859bdbd5 *R/paralp.R +1c7b5e46e8d815008c84a80d021f69ef *R/fastclime.R +f328bd33bec04c64396fec8927f8fec7 *R/fastclime.generator.R +18401355de1771f98c9c22bc5500522d *R/fastclime.plot.R +c7b158953c3d5ca0aaf8153f501f6e43 *R/fastclime.roc.R +a7c9bf9baafcb6640f7e55b713484c74 *R/fastlp.R +f8c7471afee9f4e7018552d8c76f78d0 *R/paralp.R 1277179930e937a9008706654244ce61 *build/vignette.rds ec90576375b24e35502847bdd1d85b6e *data/stockdata.rda 9cf23fc8036ec97c902be03c40a08490 *inst/doc/vignette.Rnw -402c200f3776be804b05fd4c2e566650 *inst/doc/vignette.pdf +434d4f8324f9e83dfdae623bbfd74c13 *inst/doc/vignette.pdf ac3cc2f9c850519fd3916973d120c492 *man/fastclime-package.Rd c964cd215020211b41c9abdaec9a24b3 *man/fastclime.Rd f13eef1099b8dad1091dd5764e6b6eb5 *man/fastclime.generator.Rd @@ -34,7 +34,7 @@ c5217e444b843a5a358b905e6cb1c975 *src/linalg.c f27fb8d738a94ff945bf48498eeee3ab *src/lu.h abc0a80ca8d0260b12e96ba9f9df608f *src/macros.h e1be8277ecf906d37bc71e80fb591490 *src/myalloc.h -823c572666450d3e35ec3ca07a13f739 *src/paralp.c +eaec13b596d53d29898ed18e959ff02a *src/paralp.c 236bcdaa0532e3454d61fec79f0648d7 *src/parametric.c 38e9ff9c3d2f5b3b832010d120069caf *src/tree.c ebd8db35929bc9a80f444621e0e0f909 *src/tree.h diff --git a/R/fastclime.R b/R/fastclime.R index 8e3e229..7b31350 100644 --- a/R/fastclime.R +++ b/R/fastclime.R @@ -3,8 +3,8 @@ # fastclime(): Main Function # # Authors: Haotian Pang, Han Liu and Robert Vanderbei # # Emails: , and # -# Date: September 27th 2013 # -# Version: 1.2.1 # +# Date: September 29th 2013 # +# Version: 1.2.2 # #-------------------------------------------------------------------------------# fastclime <- function(x, lambda.min.ratio = NULL, nlambda = 50) { diff --git a/R/fastclime.generator.R b/R/fastclime.generator.R index e456fc9..7c3955c 100644 --- a/R/fastclime.generator.R +++ b/R/fastclime.generator.R @@ -3,8 +3,8 @@ # fastclime.generator(): Data generator # # Authors: Haotian Pang, Han Liu and Robert Vanderbei # # Emails: , and # -# Date: September 27th 2013 # -# Version: 1.2.1 # +# Date: September 29th 2013 # +# Version: 1.2.2 # #-------------------------------------------------------------------------------# ## Main function diff --git a/R/fastclime.plot.R b/R/fastclime.plot.R index 9237167..727f264 100644 --- a/R/fastclime.plot.R +++ b/R/fastclime.plot.R @@ -3,8 +3,8 @@ # fastclime.generator(): graph visualization # # Authors: Haotian Pang, Han Liu and Robert Vanderbei # # Emails: , and # -# Date: September 27th 2013 # -# Version: 1.2.1 # +# Date: September 29th 2013 # +# Version: 1.2.2 # #-------------------------------------------------------------------------------# fastclime.plot = function(G, epsflag = FALSE, graph.name = "default", cur.num = 1, location=NULL){ diff --git a/R/fastclime.roc.R b/R/fastclime.roc.R index 972e6cf..09d8190 100644 --- a/R/fastclime.roc.R +++ b/R/fastclime.roc.R @@ -4,8 +4,8 @@ # The ground truth is required # # Authors: Haotian Pang, Han Liu and Robert Vanderbei # # Emails: , and # -# Date: September 27th 2013 # -# Version: 1.2.1 # +# Date: September 29th 2013 # +# Version: 1.2.2 # #-------------------------------------------------------------------------------# fastclime.roc = function(path, theta, verbose = TRUE){ diff --git a/R/fastlp.R b/R/fastlp.R index 92face4..ed83f52 100644 --- a/R/fastlp.R +++ b/R/fastlp.R @@ -3,8 +3,8 @@ # fastclp(): A parametric simplex LP solver # # Authors: Haotian Pang, Han Liu and Robert Vanderbei # # Emails: , and # -# Date: September 27th 2013 # -# Version: 1.2.1 # +# Date: September 29th 2013 # +# Version: 1.2.2 # #-------------------------------------------------------------------------------# fastlp <- function(obj, mat, rhs,lambda=0){ diff --git a/R/paralp.R b/R/paralp.R index 7b6df05..d26c742 100644 --- a/R/paralp.R +++ b/R/paralp.R @@ -3,8 +3,8 @@ # fastclp(): A parametric simplex LP solver for parameterized LP problems # # Authors: Haotian Pang, Han Liu and Robert Vanderbei # # Emails: , and # -# Date: September 27th 2013 # -# Version: 1.2.1 # +# Date: September 29th 2013 # +# Version: 1.2.2 # #-------------------------------------------------------------------------------# paralp <- function(obj, mat, rhs, obj_bar, rhs_bar, lambda=0){ diff --git a/inst/doc/vignette.pdf b/inst/doc/vignette.pdf index 607d372..4188957 100644 Binary files a/inst/doc/vignette.pdf and b/inst/doc/vignette.pdf differ diff --git a/src/paralp.c b/src/paralp.c index 1f1863e..813c612 100644 --- a/src/paralp.c +++ b/src/paralp.c @@ -276,7 +276,7 @@ void solver21( Nt_times_y( N, at, iat, kat, basicflag, vec, ivec, nvec, dy_N, idy_N, &ndy_N ); - col_in = ratio_test0( dy_N, idy_N, ndy_N, y_N, ybar_N,mu ); + col_in = ratio_test1( dy_N, idy_N, ndy_N, y_N, ybar_N,mu ); /************************************************************* * STEP 3: Ratio test to find entering column * @@ -324,7 +324,7 @@ void solver21( * STEP 3: Ratio test to find leaving column * *************************************************************/ - col_out = ratio_test0( dx_B, idx_B, ndx_B, x_B, xbar_B, mu ); + col_out = ratio_test1( dx_B, idx_B, ndx_B, x_B, xbar_B, mu ); if (col_out == -1) { /* UNBOUNDED */ status0 = 2;