[r-cran-matchit] 14/45: Import Upstream version 2.2-10

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository r-cran-matchit.

commit c7e8bed61688fd5c211dbebb9be0f2628c2b70fd
Author: Andreas Tille <tille at debian.org>
Date:   Fri Oct 20 07:40:53 2017 +0200

    Import Upstream version 2.2-10
---
 DESCRIPTION        |  8 ++++----
 NAMESPACE          |  4 ++--
 R/load.first.R     |  4 ----
 R/user.prompt.R    |  2 ++
 demo/analysis.R    |  2 +-
 man/user.prompt.Rd | 27 +++++++++++++++++++++++++++
 6 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 1c315ca..db65148 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,13 +1,13 @@
 Package: MatchIt
-Version: 2.2-7
-Date: 2006-04-11
+Version: 2.2-10
+Date: 2006-05-09
 Title: MatchIt: Nonparametric Preprocessing for Parametric Casual Inference
 Author: Daniel Ho <daniel.e.ho at gmail.com>,
         Kosuke Imai <kimai at Princeton.Edu>, 
         Gary King <king at harvard.edu>,
         Elizabeth Stuart <stuart at stat.harvard.edu>
 Maintainer: Kosuke Imai <kimai at Princeton.Edu>
-Depends: R (>= 2.2), MASS, Zelig
+Depends: R (>= 2.2), MASS
 Suggests: optmatch, Matching, WhatIf
 Description:  MatchIt selects matched samples of the
   the original treated and control groups with similar
@@ -18,4 +18,4 @@ LazyLoad: yes
 LazyData: yes
 License: GPL version 2 or newer
 URL: http://gking.harvard.edu/matchit
-Packaged: Wed Apr 12 20:25:56 2006; kimai
+Packaged: Wed May 10 09:33:05 2006; kimai
diff --git a/NAMESPACE b/NAMESPACE
index ed73030..c6afeb7 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -1,8 +1,8 @@
 import(MASS)
-importFrom(Zelig, user.prompt)
 export(matchit,	
        help.matchit,
-       match.data) 
+       match.data, 
+       user.prompt) 
 
 S3method(print, matchit)
 S3method(print, matchit.exact)
diff --git a/R/load.first.R b/R/load.first.R
index 7e792e2..4d67543 100644
--- a/R/load.first.R
+++ b/R/load.first.R
@@ -6,9 +6,5 @@
   cat("##  Please refer to http://gking.harvard.edu/matchit for full documentation \n",
       "##  or help.matchit() for help with commands supported by MatchIt.\n##\n",
       sep="")
-  if(!any(search()=="package:MASS"))
-    require(MASS) 
-  if(!any(search()=="package:Zelig"))
-    require(Zelig) 
   options(digits = 4)
 }
diff --git a/R/user.prompt.R b/R/user.prompt.R
new file mode 100644
index 0000000..ca31067
--- /dev/null
+++ b/R/user.prompt.R
@@ -0,0 +1,2 @@
+user.prompt <- function() 
+  silent <- readline("\nPress <return> to continue: ")
diff --git a/demo/analysis.R b/demo/analysis.R
index b4ab1d7..61cb677 100644
--- a/demo/analysis.R
+++ b/demo/analysis.R
@@ -58,7 +58,7 @@ user.prompt()
 ##  (observed control outcome minus the imputed outcome under treatment
 ##  from the model).  Hence, to combine treatment effects just reverse
 ##  the signs of the estimated treatment effect of controls.
-ate.all <- c(s.out1$qi$ate.ev, -s.out2$qi$ate.ev)
+ate.all <- c(s.out1$qi$att.ev, -s.out2$qi$att.ev)
 user.prompt()
 
 ## some summaries
diff --git a/man/user.prompt.Rd b/man/user.prompt.Rd
new file mode 100644
index 0000000..277b4fb
--- /dev/null
+++ b/man/user.prompt.Rd
@@ -0,0 +1,27 @@
+\name{user.prompt}
+
+\alias{user.prompt}
+
+\title{Pause in demo files}
+
+\description{
+  Use \code{user.prompt} while writing demo files to force users to hit
+  return before continuing.  
+}
+
+\usage{
+user.prompt()
+}
+
+\seealso{\code{readline}}
+
+\author{Olivia Lau <\email{olau at fas.harvard.edu}>
+}
+
+\examples{
+\dontrun{
+user.prompt()
+}
+}
+
+\keyword{file}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-matchit.git