Skip to content

Commit

Permalink
Fix bug causing memory over-run.
Browse files Browse the repository at this point in the history
  • Loading branch information
kbroman committed Apr 9, 2012
1 parent 10015be commit 7d8a353
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 396 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
@@ -1,6 +1,6 @@
Package: negenes
Version: 0.99-2
Date: 7 Nov 2011
Version: 1.0-1
Date: 9 Mar 2012
Title: Estimating the number of essential genes in a genome
Author: Karl W Broman <kbroman@biostat.wisc.edu>
Maintainer: Karl W Broman <kbroman@biostat.wisc.edu>
Expand Down
6 changes: 3 additions & 3 deletions R/negenes.R
Expand Up @@ -2,8 +2,8 @@
#
# negenes.R
#
# copyright (c) 2002-4, Karl W Broman
# last modified June, 2004
# copyright (c) 2002-2012, Karl W Broman
# last modified Mar, 2012
# first written June, 2002
# Licensed under the GNU General Public License version 2 (June, 1991)
#
Expand Down Expand Up @@ -100,7 +100,7 @@ function(n.sites, counts, n.sites2, counts2,
output = as.integer(rep(0,(n.mcmc-1)*n.genes*temp+n.genes)),
n.ess = as.integer(rep(0,n.mcmc)),
geneprob = as.double(rep(0,n.genes)),
as.integer(rep(0,n.genes+1)),
as.integer(rep(0,n.genes+2)),
as.integer(n.notknown),
as.integer(notknown),
as.integer(calc.prob),
Expand Down
16 changes: 8 additions & 8 deletions inst/INSTALL_ME.txt
@@ -1,5 +1,5 @@

README file for the negenes package
INSTALL_ME file for the negenes package
----------------------------------------------------------------------
This explains the installation of the negenes package for R. If you
have any problems with installation, send an email to Karl Broman
Expand Down Expand Up @@ -30,7 +30,7 @@ OBTAINING R/NEGENES
INSTALLATION OF R AND R/NEGENES (Windows)

1. The Windows version of R is distributed as a single file,
with a name something like R-2.12.1-win32.exe. Install R by executing
with a name something like R-2.15.0-win32.exe. Install R by executing
this file. We recommend installing R in "c:\R" rather than
"c:\Program Files\R". Why didn't Microsoft use "Programs" rather
than "Program files"?
Expand All @@ -41,17 +41,17 @@ INSTALLATION OF R AND R/NEGENES (Windows)

This will download the binary from CRAN and install it.

Alternatively, you can download the "negenes_0.98-9.zip" (or the
Alternatively, you can download the "negenes_1.0-1.zip" (or the
equivalent). Then start R and select (on the menu bar)
"Packages" and then "Install package from local zip file...".
Find the file "negenes_0.98-9.zip" on your hard drive, and click
Find the file "negenes_1.0-1.zip" on your hard drive, and click
"Open".


INSTALLATION OF R AND R/NEGENES (MacOS version 10.2.x and above)

1. Download the file R-2.12.1.dmg and double-click it to mount a
"drive" with a name something like "R-2.12.1". Follow the
1. Download the file R-2.15.0.dmg and double-click it to mount a
"drive" with a name something like "R-2.15.0". Follow the
instructions in the file "ReadMe.txt".

2. To install R/qtl, the simplest approach is to start R and type
Expand All @@ -61,7 +61,7 @@ INSTALLATION OF R AND R/NEGENES (MacOS version 10.2.x and above)
This will download the binary from CRAN and install it.

Alternatively, download the compiled version of R/qtl for
Mac OS X, a file like "negenes_0.98-9.tgz". Then start R and
Mac OS X, a file like "negenes_1.0-1.tgz". Then start R and
select (on the menu bar) "Packages & Data" -> "Package
Installer". Select "Local Binary Package" from the drop-down
menu at the top of the window that comes up. Click "Install"
Expand Down Expand Up @@ -123,4 +123,4 @@ QUESTIONS/COMMENTS/CONCERNS
regarding R/negenes, please email Karl Broman <kbroman@biostat.wisc.edu>.

----------------------------------------------------------------------
end of README.txt
end of INSTALL_ME.txt

0 comments on commit 7d8a353

Please sign in to comment.