[Gmpm-commits] r16 - in pkg: . R

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

Author: dalebarr
Date: 2010-03-09 23:16:48 +0100 (Tue, 09 Mar 2010)
New Revision: 16

Modified:
   pkg/DESCRIPTION
   pkg/R/gmpm.R
Log:
fixed .parseFormula

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2010-02-23 01:26:51 UTC (rev 15)
+++ pkg/DESCRIPTION	2010-03-09 22:16:48 UTC (rev 16)
@@ -1,7 +1,7 @@
 Package: gmpm
 Type: Package
 Title: Generalized Multilevel Permutation Models
-Version: 0.4-0
+Version: 0.4-1
 Date: 2010-02-22
 Author: Dale Barr <dalejbarr3 at gmail.com>
 Maintainer: Dale Barr <dalejbarr3 at gmail.com>

Modified: pkg/R/gmpm.R
===================================================================
--- pkg/R/gmpm.R	2010-02-23 01:26:51 UTC (rev 15)
+++ pkg/R/gmpm.R	2010-03-09 22:16:48 UTC (rev 16)
@@ -887,7 +887,10 @@
             #print("~~~ in .parseFormula ~~~")
             nameObject <- deparse(substitute(object))
 
-            fstr <- deparse(formula)
+            fstr <- deparse(formula, width.cutoff=500L)
+            if (length(fstr) > 1) {
+              fstr <- paste(fstr, collapse="")
+            } else {}
             object at mform <- formula
 
             fterms <- strsplit(fstr, "~")