version 0.9-8

cran · Apr 18, 2004 · 51f11c6 · 51f11c6
1 parent bb5ff09
commit 51f11c6
Show file tree

Hide file tree

Showing 29 changed files with 39 additions and 55 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,13 @@
+2004-04-18  Douglas Bates  <bates@stat.wisc.edu>
+
+	* DESCRIPTION (Depends): Release 0.9-8, change dependencies
+
+	* R/zzz.R: Change require(nls) to require(stats) for R >= 1.9.0
+
 2003-07-22  Douglas Bates  <bates@stat.wisc.edu>
 
-	* man/Gauss1.Rd: Changed use of the \argument macro to \describe.
+	* man/Gauss1.Rd: Changed use of the \argument macro to \describe
+	in this and all the other documentation files.
 
 2001-01-10  Douglas Bates  <bates@stat.wisc.edu>
 

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,12 +1,13 @@
 Package: NISTnls
-Version: 0.9-7
-Date: 2003/07/22
+Version: 0.9-8
+Date: 2004/04/18
 Title: Nonlinear least squares examples from NIST
 Maintainer: Douglas Bates <bates@stat.wisc.edu>
 Author: original from National Institutes for Standards and Technology (NIST)
   http://www.itl.nist.gov/div898/strd/nls/nls_main.shtml
   R port by Douglas Bates <bates@stat.wisc.edu>
 Description: Datasets for testing nonlinear regression routines.
-Depends: nls
+Depends: R (>= 1.9.0), stats
 License: Original pages from NIST web site.  Modifications for R covered by
          GPL (version 2 or later)
+Packaged: Sun Apr 18 11:30:17 2004; bates
diff --git a/R/zzz.R b/R/zzz.R
@@ -1,25 +1 @@
-### $Id: zzz.R,v 1.2 1999/10/21 22:35:58 bates Exp $
-###
-###            Nonlinear least squares for R
-###
-### Copyright 1999-1999 Saikat DebRoy <saikat@stat.wisc.edu>,
-###                     Douglas M. Bates <bates@stat.wisc.edu>
-###
-### This file is part of the NISTnls library for R and related languages.
-### It is made available under the terms of the GNU General Public
-### License, version 2, or at your option, any later version,
-### incorporated herein by reference.
-### 
-### This program is distributed in the hope that it will be
-### useful, but WITHOUT ANY WARRANTY; without even the implied
-### warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-### PURPOSE.  See the GNU General Public License for more
-### details.
-### 
-### You should have received a copy of the GNU General Public
-### License along with this program; if not, write to the Free
-### Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-### MA 02111-1307, USA
-
-### Force loading of the nls package for the examples.
-require(nls)
+require(stats)
diff --git a/man/Bennett5.Rd b/man/Bennett5.Rd
@@ -1,4 +1,4 @@
-%%% $Id: Bennett5.Rd,v 1.3 2001/01/12 05:07:37 bates Exp $
+%%% $Id: Bennett5.Rd,v 1.4 2003/07/22 19:42:20 bates Exp $
 \name{Bennett5}
 \alias{Bennett5}
 \non_function{}

diff --git a/man/Chwirut1.Rd b/man/Chwirut1.Rd
@@ -1,4 +1,4 @@
-%%% $Id: Chwirut1.Rd,v 1.2 2001/01/10 17:49:12 bates Exp $
+%%% $Id: Chwirut1.Rd,v 1.3 2003/07/22 19:42:20 bates Exp $
 \name{Chwirut1}
 \alias{Chwirut1}
 \non_function{}

diff --git a/man/Chwirut2.Rd b/man/Chwirut2.Rd
@@ -1,4 +1,4 @@
-%%% $Id: Chwirut2.Rd,v 1.2 2001/01/10 17:49:12 bates Exp $
+%%% $Id: Chwirut2.Rd,v 1.3 2003/07/22 19:42:20 bates Exp $
 \name{Chwirut2}
 \alias{Chwirut2}
 \non_function{}

diff --git a/man/DanielWood.Rd b/man/DanielWood.Rd
@@ -1,4 +1,4 @@
-%%% $Id: DanielWood.Rd,v 1.2 2001/01/10 17:49:12 bates Exp $
+%%% $Id: DanielWood.Rd,v 1.3 2003/07/22 19:42:20 bates Exp $
 \name{DanielWood}
 \alias{DanielWood}
 \non_function{}

diff --git a/man/ENSO.Rd b/man/ENSO.Rd
@@ -1,4 +1,4 @@
-%%% $Id: ENSO.Rd,v 1.2 2001/01/10 17:49:12 bates Exp $
+%%% $Id: ENSO.Rd,v 1.3 2003/07/22 19:42:20 bates Exp $
 \name{ENSO}
 \alias{ENSO}
 \non_function{}

diff --git a/man/Eckerle4.Rd b/man/Eckerle4.Rd
@@ -1,4 +1,4 @@
-%%% $Id: Eckerle4.Rd,v 1.3 2001/01/10 17:49:12 bates Exp $
+%%% $Id: Eckerle4.Rd,v 1.4 2003/07/22 19:42:20 bates Exp $
 \name{Eckerle4}
 \alias{Eckerle4}
 \non_function{}

diff --git a/man/Gauss1.Rd b/man/Gauss1.Rd
@@ -1,4 +1,4 @@
-%%% $Id: Gauss1.Rd,v 1.2 2001/01/10 17:49:12 bates Exp $
+%%% $Id: Gauss1.Rd,v 1.3 2003/07/22 19:42:20 bates Exp $
 \name{Gauss1}
 \alias{Gauss1}
 \non_function{}

diff --git a/man/Gauss2.Rd b/man/Gauss2.Rd
@@ -1,4 +1,4 @@
-%%% $Id: Gauss2.Rd,v 1.2 2001/01/10 17:49:12 bates Exp $
+%%% $Id: Gauss2.Rd,v 1.3 2003/07/22 19:42:20 bates Exp $
 \name{Gauss2}
 \alias{Gauss2}
 \non_function{}

diff --git a/man/Gauss3.Rd b/man/Gauss3.Rd
@@ -1,4 +1,4 @@
-%%% $Id: Gauss3.Rd,v 1.2 2001/01/10 17:49:12 bates Exp $
+%%% $Id: Gauss3.Rd,v 1.3 2003/07/22 19:42:20 bates Exp $
 \name{Gauss3}
 \alias{Gauss3}
 \non_function{}

diff --git a/man/Hahn1.Rd b/man/Hahn1.Rd
@@ -1,4 +1,4 @@
-%%% $Id: Hahn1.Rd,v 1.2 2001/01/10 17:49:12 bates Exp $
+%%% $Id: Hahn1.Rd,v 1.3 2003/07/22 19:42:20 bates Exp $
 \name{Hahn1}
 \alias{Hahn1}
 \non_function{}

diff --git a/man/Kirby2.Rd b/man/Kirby2.Rd
@@ -1,4 +1,4 @@
-%%% $Id: Kirby2.Rd,v 1.2 2001/01/10 17:49:12 bates Exp $
+%%% $Id: Kirby2.Rd,v 1.3 2003/07/22 19:42:20 bates Exp $
 \name{Kirby2}
 \alias{Kirby2}
 \non_function{}

diff --git a/man/Lanczos1.Rd b/man/Lanczos1.Rd
@@ -1,4 +1,4 @@
-%%% $Id: Lanczos1.Rd,v 1.3 2001/01/10 17:49:12 bates Exp $
+%%% $Id: Lanczos1.Rd,v 1.4 2003/07/22 19:42:20 bates Exp $
 \name{Lanczos1}
 \alias{Lanczos1}
 \non_function{}

diff --git a/man/Lanczos2.Rd b/man/Lanczos2.Rd
@@ -1,4 +1,4 @@
-%%% $Id: Lanczos2.Rd,v 1.3 2001/01/10 17:49:12 bates Exp $
+%%% $Id: Lanczos2.Rd,v 1.4 2003/07/22 19:42:20 bates Exp $
 \name{Lanczos2}
 \alias{Lanczos2}
 \non_function{}

diff --git a/man/Lanczos3.Rd b/man/Lanczos3.Rd
@@ -1,4 +1,4 @@
-%%% $Id: Lanczos3.Rd,v 1.3 2001/01/10 17:49:12 bates Exp $
+%%% $Id: Lanczos3.Rd,v 1.4 2003/07/22 19:42:20 bates Exp $
 \name{Lanczos3}
 \alias{Lanczos3}
 \non_function{}

diff --git a/man/MGH09.Rd b/man/MGH09.Rd
@@ -1,4 +1,4 @@
-%%% $Id: MGH09.Rd,v 1.3 2001/01/10 17:49:12 bates Exp $
+%%% $Id: MGH09.Rd,v 1.4 2003/07/22 19:42:20 bates Exp $
 \name{MGH09}
 \alias{MGH09}
 \non_function{}

diff --git a/man/MGH10.Rd b/man/MGH10.Rd
@@ -1,4 +1,4 @@
-%%% $Id: MGH10.Rd,v 1.3 2001/01/10 17:49:12 bates Exp $
+%%% $Id: MGH10.Rd,v 1.4 2003/07/22 19:42:20 bates Exp $
 \name{MGH10}
 \alias{MGH10}
 \non_function{}

diff --git a/man/MGH17.Rd b/man/MGH17.Rd
@@ -1,4 +1,4 @@
-%%% $Id: MGH17.Rd,v 1.3 2001/01/10 17:49:12 bates Exp $
+%%% $Id: MGH17.Rd,v 1.4 2003/07/22 19:42:20 bates Exp $
 \name{MGH17}
 \alias{MGH17}
 \non_function{}

diff --git a/man/Misra1a.Rd b/man/Misra1a.Rd
@@ -1,4 +1,4 @@
-%%% $Id: Misra1a.Rd,v 1.2 2001/01/10 17:49:12 bates Exp $
+%%% $Id: Misra1a.Rd,v 1.3 2003/07/22 19:42:20 bates Exp $
 \name{Misra1a}
 \alias{Misra1a}
 \non_function{}

diff --git a/man/Misra1b.Rd b/man/Misra1b.Rd
@@ -1,4 +1,4 @@
-%%% $Id: Misra1b.Rd,v 1.2 2001/01/10 17:49:12 bates Exp $
+%%% $Id: Misra1b.Rd,v 1.3 2003/07/22 19:42:20 bates Exp $
 \name{Misra1b}
 \alias{Misra1b}
 \non_function{}

diff --git a/man/Misra1c.Rd b/man/Misra1c.Rd
@@ -1,4 +1,4 @@
-%%% $Id: Misra1c.Rd,v 1.2 2001/01/10 17:49:12 bates Exp $
+%%% $Id: Misra1c.Rd,v 1.3 2003/07/22 19:42:20 bates Exp $
 \name{Misra1c}
 \alias{Misra1c}
 \non_function{}

diff --git a/man/Misra1d.Rd b/man/Misra1d.Rd
@@ -1,4 +1,4 @@
-%%% $Id: Misra1d.Rd,v 1.2 2001/01/10 17:49:12 bates Exp $
+%%% $Id: Misra1d.Rd,v 1.3 2003/07/22 19:42:20 bates Exp $
 \name{Misra1d}
 \alias{Misra1d}
 \non_function{}

diff --git a/man/Nelson.Rd b/man/Nelson.Rd
@@ -1,4 +1,4 @@
-%%% $Id: Nelson.Rd,v 1.3 2001/01/10 17:49:12 bates Exp $
+%%% $Id: Nelson.Rd,v 1.4 2003/07/22 19:42:20 bates Exp $
 \name{Nelson}
 \alias{Nelson}
 \non_function{}

diff --git a/man/Ratkowsky2.Rd b/man/Ratkowsky2.Rd
@@ -1,4 +1,4 @@
-%%% $Id: Ratkowsky2.Rd,v 1.3 2001/01/10 17:49:12 bates Exp $
+%%% $Id: Ratkowsky2.Rd,v 1.4 2003/07/22 19:42:20 bates Exp $
 \name{Ratkowsky2}
 \alias{Ratkowsky2}
 \non_function{}

diff --git a/man/Ratkowsky3.Rd b/man/Ratkowsky3.Rd
@@ -1,4 +1,4 @@
-%%% $Id: Ratkowsky3.Rd,v 1.3 2001/01/10 17:49:12 bates Exp $
+%%% $Id: Ratkowsky3.Rd,v 1.4 2003/07/22 19:42:20 bates Exp $
 \name{Ratkowsky3}
 \alias{Ratkowsky3}
 \non_function{}

diff --git a/man/Roszman1.Rd b/man/Roszman1.Rd
@@ -1,4 +1,4 @@
-%%% $Id: Roszman1.Rd,v 1.3 2001/01/10 17:49:12 bates Exp $
+%%% $Id: Roszman1.Rd,v 1.4 2003/07/22 19:42:20 bates Exp $
 \name{Roszman1}
 \alias{Roszman1}
 \non_function{}

diff --git a/man/Thurber.Rd b/man/Thurber.Rd
@@ -1,4 +1,4 @@
-%%% $Id: Thurber.Rd,v 1.3 2001/01/10 17:49:12 bates Exp $
+%%% $Id: Thurber.Rd,v 1.4 2003/07/22 19:42:20 bates Exp $
 \name{Thurber}
 \alias{Thurber}
 \non_function{}