version 0.2-14

cran · Sep 26, 2007 · e6d85f4 · e6d85f4
1 parent fead9b0
commit e6d85f4
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,9 @@
+
+
+CHANGES IN `modeltools' VERSION 0.2-14
+
+  o `object' in `Predict(object)' might be an S4 object and $ can't be used.
+
 CHANGES IN `modeltools' VERSION 0.2-13
 
   o new generic Lapply

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: modeltools
 Title: Tools and Classes for Statistical Models
-Date: $Date: 2007-09-07 11:51:52 +0200 (Fri, 07 Sep 2007) $
-Version: 0.2-13
+Date: $Date: 2007-09-26 19:02:09 +0200 (Wed, 26 Sep 2007) $
+Version: 0.2-14
 Author: Torsten Hothorn, Friedrich Leisch, Achim Zeileis 
 Maintainer: Torsten Hothorn <Torsten.Hothorn@R-project.org>
 Description: A collection of tools to deal with statistical models. 
@@ -14,4 +14,4 @@ Depends: stats, stats4
 Imports: methods
 LazyLoad: yes
 License: GPL-2
-Packaged: Tue Sep 11 14:23:48 2007; leisch
+Packaged: Wed Sep 26 19:02:35 2007; hothorn
diff --git a/R/Methods.R b/R/Methods.R
@@ -167,11 +167,9 @@ setMethod("dpp", signature = "StatModel",
 ### don't want to redefine stats:::predict, but ...
 
 Predict <- function(object, ...) {
-    if (!is.null(object$statmodel) && 
-        is(object$statmodel, "StatModel")) {
-        object$statmodel@predict(object, ...)
-    } else {
-        predict(object, ...)
+    if ("statmodel" %in% names(object)) {
+        if (is(object$statmodel, "StatModel"))
+            return(object$statmodel@predict(object, ...))
     }
+    return(predict(object))
 }
-
diff --git a/inst/CHANGES b/inst/CHANGES
@@ -1,3 +1,9 @@
+
+
+CHANGES IN `modeltools' VERSION 0.2-14
+
+  o `object' in `Predict(object)' might be an S4 object and $ can't be used.
+
 CHANGES IN `modeltools' VERSION 0.2-13
 
   o new generic Lapply