fix 2 typos in names(precip)

git-svn-id: https://svn.r-project.org/R/trunk@88388 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: smeyer

doc/NEWS.Rd

@@ -169,6 +169,9 @@
       \item It is now possible to convert \emph{to} \code{"snpc"} units
       via, e.g., \code{grid::convertWidth()}, fixing \PR{18915}. Thanks to
       \I{Trevor Davis}.
+
+      \item The \code{precip} dataset had typos in the names
+      \code{"Bismarck"} and \code{"Pittsburgh"} (\PR{18895}).
     }
   }
 }

src/library/datasets/data/precip.R

@@ -12,9 +12,9 @@ structure(c(67, 54.7, 7, 48.5, 14, 17.2, 20.7, 13, 43.4, 40.2, 38.9, 54.5,
 "Baltimore", "Boston", "Detroit", "Sault Ste. Marie", "Duluth",
 "Minneapolis/St Paul", "Jackson", "Kansas City", "St Louis", "Great Falls",
 "Omaha", "Reno", "Concord", "Atlantic City", "Albuquerque", "Albany",
-"Buffalo", "New York", "Charlotte", "Raleigh", "Bismark", "Cincinnati",
+"Buffalo", "New York", "Charlotte", "Raleigh", "Bismarck", "Cincinnati",
 "Cleveland", "Columbus", "Oklahoma City", "Portland", "Philadelphia",
-"Pittsburg", "Providence", "Columbia", "Sioux Falls", "Memphis",
+"Pittsburgh", "Providence", "Columbia", "Sioux Falls", "Memphis",
 "Nashville", "Dallas", "El Paso", "Houston", "Salt Lake City", "Burlington",
 "Norfolk", "Richmond", "Seattle Tacoma", "Spokane", "Charleston", "Milwaukee",
 "Cheyenne", "San Juan"))

src/library/datasets/man/precip.Rd

@@ -25,19 +25,31 @@
   New York: Wiley.
 }
 \note{
-  The dataset version up to Nov.16, 2016 had a typo in \code{"Cincinnati"}'s
-  name.  The examples show how to recreate that version.
+  The dataset version before \R 4.6.0 had typos in the names
+  \code{"Pittsburgh"} and \code{"Bismarck"}, and before \R 3.3.3 also in
+  \code{"Cincinnati"}.  The examples show how to recreate these versions.
 }
 \examples{
-require(graphics)
+require(stats); require(graphics)
 dotchart(precip[order(precip)], main = "precip data")
 title(sub = "Average annual precipitation (in.)")
 
-## Old ("wrong") version of dataset (just name change):
-precip.O <- local({
-   p <- precip; names(p)[names(p) == "Cincinnati"] <- "Cincinati" ; p })
-stopifnot(all(precip == precip.O),
-	  match("Cincinnati", names(precip)) == 46,
-	  identical(names(precip)[-46], names(precip.O)[-46]))
+## Recreate pre-4.6.0 version of the dataset with typos in 2 names
+precip.2 <- setNames(precip, local({
+    nms <- names(precip)
+    nms[nms == "Pittsburgh"] <- "Pittsburg"
+    nms[nms == "Bismarck"] <- "Bismark"
+    nms
+}))
+## Recreate original, pre-3.3.3 version of the dataset with one more typo
+precip.O <- setNames(precip.2,
+    replace(names(precip.2), names(precip.2) == "Cincinnati", "Cincinati"))
+
+stopifnot(
+    all(precip == precip.2), all(precip == precip.O), # just name changes
+    setequal(match(c("Bismarck", "Cincinnati", "Pittsburgh"), names(precip)),
+             c(45, 46, 52)),
+    identical(names(precip)[-c(45, 46, 52)], names(precip.O)[-c(45, 46, 52)])
+)
 }
 \keyword{datasets}

tests/Examples/datasets-Ex.Rout.save

@@ -3166,16 +3166,27 @@ nms      body_mass   sex  year
 > 
 > ### ** Examples
 > 
-> require(graphics)
+> require(stats); require(graphics)
 > dotchart(precip[order(precip)], main = "precip data")
 > title(sub = "Average annual precipitation (in.)")
 > 
-> ## Old ("wrong") version of dataset (just name change):
-> precip.O <- local({
-+    p <- precip; names(p)[names(p) == "Cincinnati"] <- "Cincinati" ; p })
-> stopifnot(all(precip == precip.O),
-+ 	  match("Cincinnati", names(precip)) == 46,
-+ 	  identical(names(precip)[-46], names(precip.O)[-46]))
+> ## Recreate pre-4.6.0 version of the dataset with typos in 2 names
+> precip.2 <- setNames(precip, local({
++     nms <- names(precip)
++     nms[nms == "Pittsburgh"] <- "Pittsburg"
++     nms[nms == "Bismarck"] <- "Bismark"
++     nms
++ }))
+> ## Recreate original, pre-3.3.3 version of the dataset with one more typo
+> precip.O <- setNames(precip.2,
++     replace(names(precip.2), names(precip.2) == "Cincinnati", "Cincinati"))
+> 
+> stopifnot(
++     all(precip == precip.2), all(precip == precip.O), # just name changes
++     setequal(match(c("Bismarck", "Cincinnati", "Pittsburgh"), names(precip)),
++              c(45, 46, 52)),
++     identical(names(precip)[-c(45, 46, 52)], names(precip.O)[-c(45, 46, 52)])
++ )
 > 
 > 
 >