[Rcolony-commits] r90 - in pkg: . R man

[noreply at r-forge.r-project.org]

Author: jonesor
Date: 2012-12-12 12:56:28 +0100 (Wed, 12 Dec 2012)
New Revision: 90

Modified:
   pkg/DESCRIPTION
   pkg/R/get.colony.data.R
   pkg/man/get.colony.data.Rd
Log:
Changed default version to 2.0 for get.colony.data

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2012-12-12 11:53:35 UTC (rev 89)
+++ pkg/DESCRIPTION	2012-12-12 11:56:28 UTC (rev 90)
@@ -1,10 +1,10 @@
 Package: rcolony
 Type: Package
-Title: Tools for implementation and visualisation of Colony and its outputs.
-Version: 1.2
-Date: 2012-11-16
+Title: Tools for implementation and visualisation of Colony2 and its outputs.
+Version: 1.3
+Date: 2012-12-12
 Author: Owen R. Jones
 Maintainer: Owen R. Jones <jones at demogr.mpg.de>
-Description: The RColony package provides tools for the implementation of the Colony pedigree analysis software. In addition it provides tools for visualising, and summarising the results of the Colony analyses.
+Description: The RColony package provides tools for the implementation of the Colony pedigree analysis software. In addition it provides tools for visualising, and summarising the results of the Colony analyses. 
 License: GNU General Public License (GPL)
 LazyLoad: yes

Modified: pkg/R/get.colony.data.R
===================================================================
--- pkg/R/get.colony.data.R	2012-12-12 11:53:35 UTC (rev 89)
+++ pkg/R/get.colony.data.R	2012-12-12 11:56:28 UTC (rev 90)
@@ -1,4 +1,4 @@
-get.colony.data <- function(datadir, filename = list.files(datadir, pattern = ".DAT", ignore.case=TRUE), colonyVersion = "2.0.3"){
+get.colony.data <- function(datadir, filename = list.files(datadir, pattern = ".DAT", ignore.case=TRUE), colonyVersion = "2.0"){
 
     colony.object = NULL
     x = readLines(paste(datadir, filename, sep = ""))

Modified: pkg/man/get.colony.data.Rd
===================================================================
--- pkg/man/get.colony.data.Rd	2012-12-12 11:53:35 UTC (rev 89)
+++ pkg/man/get.colony.data.Rd	2012-12-12 11:56:28 UTC (rev 90)
@@ -10,7 +10,7 @@
 \arguments{
   \item{datadir}{The path to the directory that contains the Colony output files and the *.DAT Colony input file.}
   \item{filename}{Optional. The name of the Colony input file. If this argument is omitted, the command will search for a *.DAT file in the data directory (datadir) and use that as the input file.}
-  \item{colonyVersion}{The version of Colony that was used (default is 2.0.3, other option is 2.0).}}
+  \item{colonyVersion}{The version of Colony that was used (default is 2.0, other option is 2.0.3).}}
 \details{}
 \value{A list, containing data extracted from the Colony output files}