version 1.3

cran · Sep 23, 2013 · 2ba3be8 · 2ba3be8
1 parent eff341b
commit 2ba3be8
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -2,15 +2,15 @@ Package: clogitL1
 Type: Package
 Title: Fitting exact conditional logistic regression with lasso and
         elastic net penalties.
-Version: 1.2
+Version: 1.3
 Date: 2013-09-23
 Author: Stephen Reid and Robert Tibshirani
 Maintainer: Stephen Reid <sreid@stanford.edu>
 Description: Tools for the fitting and cross validation of exact conditional logistic regression models with lasso and elastic net penalties. Uses cyclic coordinate descent and warm starts to compute the entire path efficiently.
 License: GPL-2
 Depends: Rcpp (>= 0.10.2)
 LinkingTo: Rcpp
-Packaged: 2014-04-09 17:04:52 UTC; stephen
+Packaged: 2014-04-16 06:13:09 UTC; User
 NeedsCompilation: yes
 Repository: CRAN
-Date/Publication: 2014-04-09 21:46:35
+Date/Publication: 2014-04-18 10:22:27
diff --git a/MD5 b/MD5
@@ -1,4 +1,4 @@
-e962f3eae5878b851fa2ace5d81fd37d *DESCRIPTION
+13a977a16cbedd26c4d56dc19c4b7cea *DESCRIPTION
 d2d2c07a5391daaa94256aa7e3522961 *NAMESPACE
 2ca5f1f5572e3ed9698403e0e8ade222 *R/RcppExports.R
 49c55acffc6c83745b4fd6dcb4b979d1 *R/clogitL1.R
@@ -8,7 +8,7 @@ b05a7e32f889895432f0462999658b9b *R/plot.cv.clogitL1.R
 5f561e7fd0ee2f2972e0956dfff11a1e *R/print.clogitL1.R
 6b14108d59e515abd446047a9bd8464b *R/summary.clogitL1.R
 684e5893f4c72dd359781048564c9a3d *R/summary.cv.clogitL1.R
-76d348d282e4198be2a603a858f5340d *man/clogitL1-package.Rd
+0af48e2557206e3175d2b16cb6a6a948 *man/clogitL1-package.Rd
 d4b7d79df1f223b44ddb8ceaa6c07bcf *man/clogitL1.Rd
 e13bd0334bebf11f2cb208b913ab4cf9 *man/cv.clogitL1.Rd
 38c9bf3d73a2601203b82be3bd27ef1e *man/plot.clogitL1.Rd
@@ -19,5 +19,5 @@ c8bc7316b61ed3068034162f91706448 *man/summary.clogitL1.Rd
 b3f86c20b81b51f5162874977d38784d *src/Makevars
 73505498722ad4b07b0ddb3067e92523 *src/Makevars.win
 d1045b24fc4eb6ec76b847597b02ef8b *src/RcppExports.cpp
-c1174da64ffbe4667392c902b69c4ce0 *src/clogisticl1_5.cpp
-be43acb3bd583e108720f500a1c49a5f *src/clogisticl1_5cv.cpp
+8b6238986cdafb8785c06c3208c34cc4 *src/clogisticl1_5.cpp
+4e281e9e843f20da8968d80eeaa70874 *src/clogisticl1_5cv.cpp
diff --git a/man/clogitL1-package.Rd b/man/clogitL1-package.Rd
@@ -11,7 +11,7 @@ Tools for the fitting and cross validation of exact conditional logistic regress
 \tabular{ll}{
 Package: \tab clogitL1\cr
 Type: \tab Package\cr
-Version: \tab 1.2\cr
+Version: \tab 1.3\cr
 Date: \tab 2013-05-06\cr
 License: \tab GPL-2\cr
 }

diff --git a/src/clogisticl1_5.cpp b/src/clogisticl1_5.cpp
@@ -449,7 +449,7 @@ NumericMatrix fit_cloglik (const vector<int>& y, const vector<double>& X, int K,
 	for (int k = 0; k < K; k++) totalObs += nVec[k];
 
 	// declare matrix that will house the betas
-	NumericMatrix beta = NumericMatrix (numLambda + 1, p + 6);
+	NumericMatrix beta = NumericMatrix (numLambda + 1, p + 7);
 
 	// initial computations
 	allocateMemoryForLikelihoodComputations(K, p, mVec, nVec, &score, &hessian, &xMean, &caseSums);
@@ -553,6 +553,8 @@ NumericMatrix fit_cloglik (const vector<int>& y, const vector<double>& X, int K,
 	}
 	//printf ("\nOut of for loop\n");
 	deallocateMemoryForLikelihoodComputations(K, p, mVec, &score, &hessian, &xMean, &caseSums, &linPred, &maxLinPred, &sumLinPredCases);
+	free (currentBeta);
+	free (topOfLoopBeta);
 	return beta;
 }
 

diff --git a/src/clogisticl1_5cv.cpp b/src/clogisticl1_5cv.cpp
@@ -440,7 +440,7 @@ NumericMatrix fit_cloglik (const vector<int>& y, const vector<double>& X, int K,
 	for (int k = 0; k < K; k++) totalObs += nVec[k];
 
 	// declare matrix that will house the betas
-	NumericMatrix beta = NumericMatrix (numLambda + 1, p + 6);
+	NumericMatrix beta = NumericMatrix (numLambda + 1, p + 7);
 
 	// initial computations
 	allocateMemoryForLikelihoodComputations(K, p, mVec, nVec, &score, &hessian, &xMean, &caseSums);
@@ -539,7 +539,8 @@ NumericMatrix fit_cloglik (const vector<int>& y, const vector<double>& X, int K,
 	}
 	//printf ("\nOut of for loop\n");
 	deallocateMemoryForLikelihoodComputations(K, p, mVec, &score, &hessian, &xMean, &caseSums, &linPred, &maxLinPred, &sumLinPredCases);
-
+	free (currentBeta);
+	free (topOfLoopBeta);
 	// copy lambda values into last column of beta matrix being returned
 	for (int i = 0; i < numLambda + 1; i++){
 		beta(i, p) = lambdaVec[i];