From ad834f51062a3062cdbc63f87640ff67a33bc5dc Mon Sep 17 00:00:00 2001 From: svmiller Date: Thu, 11 Nov 2021 11:27:18 -0500 Subject: [PATCH] update for UTF-8 stuff. --- NEWS.md | 2 +- R/add_democracy.R | 2 +- R/add_igos.R | 2 +- R/add_ucdp_acd.R | 4 +-- R/add_ucdp_onsets.R | 4 +-- R/data.R | 52 ++++++++++++++++------------ cran-comments.md | 4 +-- docs/reference/add_democracy.html | 11 ++++-- docs/reference/add_igos.html | 2 +- docs/reference/add_ucdp_acd.html | 11 ++---- docs/reference/add_ucdp_onsets.html | 4 +-- docs/reference/archigos.html | 34 +++++++++++------- docs/reference/atop_alliance.html | 2 +- docs/reference/ccode_democracy.html | 2 +- docs/reference/gwcode_democracy.html | 2 +- docs/reference/ucdp_acd.html | 4 +-- docs/reference/ucdp_onsets.html | 4 +-- man/add_democracy.Rd | 2 +- man/add_igos.Rd | 2 +- man/add_ucdp_acd.Rd | 4 +-- man/add_ucdp_onsets.Rd | 4 +-- man/archigos.Rd | 34 +++++++++++------- man/atop_alliance.Rd | 2 +- man/ccode_democracy.Rd | 2 +- man/gwcode_democracy.Rd | 2 +- man/ucdp_acd.Rd | 4 +-- man/ucdp_onsets.Rd | 4 +-- 27 files changed, 116 insertions(+), 90 deletions(-) diff --git a/NEWS.md b/NEWS.md index 401c7667..dcc84d12 100644 --- a/NEWS.md +++ b/NEWS.md @@ -48,7 +48,7 @@ peacesciencer 0.6.0 - Add dispute-level summary of GML conflict data to assist with user-run whittle functions. This is `gml_mid_disps`. - Add `ps_conflict_type` attributes for some conflict data (e.g. CoW-MID, GML). - Add messages about case exclusion rules to `add_cow_mids()` and `add_gml_mids()`. -- Add "whittle" class of functions. These include `whittle_conflicts_onsets()`, `whittle_conflicts_fatality()`, `whittle_conflicts_hostility()`, `whittle_conflicts_duration()`, `whittle_conflicts_reciprocation()`, `whittle_conflicts_startmonth()`, and `whittle_conflicts_jds()`. These are admittedly gnarly function names to type out if you don't have an IDE like Rstudio to assist you. Thus, these respective functions come with shortcuts of `wc_` (e.g. `wc_onsets()`). Check the package documentation to see what these are. +- Add "whittle" class of functions. These include `whittle_conflicts_onsets()`, `whittle_conflicts_fatality()`, `whittle_conflicts_hostility()`, `whittle_conflicts_duration()`, `whittle_conflicts_reciprocation()`, `whittle_conflicts_startmonth()`, and `whittle_conflicts_jds()`. These are admittedly gnarly function names to type out if you don't have an IDE like RStudio to assist you. Thus, these respective functions come with shortcuts of `wc_` (e.g. `wc_onsets()`). Check the package documentation to see what these are. - Add `show_duplicates()` as a diagnostic tool. This function is useful for users who want to do some advanced stuff with data created in `{peacesciencer}` (e.g. merging in custom data) and want to see if they botched a merge by creating duplicate observations. - Add/update stuff related to leaders. The `archigos` data frame now includes some more information about leaders (e.g. name, gender, and year of birth). `create_leaderyears()` will create leader-year data as well. The next update will expand more on leader functions. For now, the ensuing output from this function is treated as synonymous to state-year data. - Add `download_extdata()` as a way of side-stepping package space limitations. Some files will have to be stored remotely and then loaded at the user's discretion, which is what this function will do. This was largely brought on by the CoW trade data (`cow_trade_ndy`), which is also removed in this update. More data may have to be moved remotely in the future, though this package will endeavor to keep this to a bare minimum. Importantly, `download_extdata()` keeps inventory of what it is downloading. Data information is included therein. This develop does implicitly assume that the directory in which this package is installed is writable by the user. For like 99% of users, this shouldn't be a problem (and executing `.libPaths()` should confirm that). Do reach out if it is. diff --git a/R/add_democracy.R b/R/add_democracy.R index 81bb4bd9..3c972b0b 100644 --- a/R/add_democracy.R +++ b/R/add_democracy.R @@ -49,7 +49,7 @@ #' Allen Hicken, Anna Luhrmann, Kyle L. Marquardt, Kelly McMann, Pamela #' Paxton, Daniel Pemstein, Brigitte Seim, Rachel Sigman, Svend-Erik #' Skaaning, Jeffrey Staton, Agnes Cornell, Lisa Gastaldi, Haakon Gjerlow, -#' Valeriya Mechkova, Johannes von Römer, Aksel Sundtrom, Eitan Tzelgov, +#' Valeriya Mechkova, Johannes von Romer, Aksel Sundtrom, Eitan Tzelgov, #' Luca Uberti, Yi-ting Wang, Tore Wig, and Daniel Ziblatt. 2020. #' "V-Dem Codebook v10" Varieties of Democracy (V-Dem) Project. #' diff --git a/R/add_igos.R b/R/add_igos.R index c44fccb3..60b5d97b 100644 --- a/R/add_igos.R +++ b/R/add_igos.R @@ -8,7 +8,7 @@ #' the Correlates of War International Governmental Organizations data. If the data are dyad-year, the function returns #' the original data with just one additional column for the total number of mutual IGOs for which both members of the dyad #' are full members. If the data are state-year, the function returns the original data with four additional columns. These are -#' the number oF IGOs for which the state is a full member, the number of IGOs for which the state is an associate member, the +#' the number of IGOs for which the state is a full member, the number of IGOs for which the state is an associate member, the #' number of IGOs for which the state is an observer, and the number of IGOs for which the state is involved in any way (i.e. the #' sum of the other three columns). #' diff --git a/R/add_ucdp_acd.R b/R/add_ucdp_acd.R index c03b212a..da38589b 100644 --- a/R/add_ucdp_acd.R +++ b/R/add_ucdp_acd.R @@ -24,10 +24,10 @@ #' #' @references #' -#' Gleditsch, Nils Petter; Peter Wallensteen, Mikael Eriksson, Margareta Sollenberg & Håvard Strand (2002) +#' Gleditsch, Nils Petter; Peter Wallensteen, Mikael Eriksson, Margareta Sollenberg & Havard Strand (2002) #' Armed Conflict 1946–2001: A New Dataset. \emph{Journal of Peace Research} 39(5): 615–637. #' -#' Pettersson, Therese; Stina Högbladh & Magnus Öberg (2019). Organized violence, 1989-2018 and peace +#' Pettersson, Therese; Stina Hogbladh & Magnus Oberg (2019). Organized violence, 1989-2018 and peace #' agreements. *Journal of Peace Research* 56(4): 589-603. #' #' @examples diff --git a/R/add_ucdp_onsets.R b/R/add_ucdp_onsets.R index 852c057b..3a23e197 100644 --- a/R/add_ucdp_onsets.R +++ b/R/add_ucdp_onsets.R @@ -23,10 +23,10 @@ #' #' @references #' -#' Gleditsch, Nils Petter; Peter Wallensteen, Mikael Eriksson, Margareta Sollenberg & Håvard Strand (2002) +#' Gleditsch, Nils Petter; Peter Wallensteen, Mikael Eriksson, Margareta Sollenberg & Havard Strand (2002) #' Armed Conflict 1946–2001: A New Dataset. \emph{Journal of Peace Research} 39(5): 615–637. #' -#' Pettersson, Therese; Stina Högbladh & Magnus Öberg (2019). Organized violence, 1989-2018 and peace +#' Pettersson, Therese; Stina Hogbladh & Magnus Oberg (2019). Organized violence, 1989-2018 and peace #' agreements. *Journal of Peace Research* 56(4): 589-603. #' diff --git a/R/data.R b/R/data.R index e753c3bb..87713576 100644 --- a/R/data.R +++ b/R/data.R @@ -125,7 +125,7 @@ NULL #' Allen Hicken, Anna Luhrmann, Kyle L. Marquardt, Kelly McMann, Pamela #' Paxton, Daniel Pemstein, Brigitte Seim, Rachel Sigman, Svend-Erik #' Skaaning, Jeffrey Staton, Agnes Cornell, Lisa Gastaldi, Haakon Gjerlow, -#' Valeriya Mechkova, Johannes von Römer, Aksel Sundtrom, Eitan Tzelgov, +#' Valeriya Mechkova, Johannes von Romer, Aksel Sundtrom, Eitan Tzelgov, #' Luca Uberti, Yi-ting Wang, Tore Wig, and Daniel Ziblatt. 2020. #' "V-Dem Codebook v10" Varieties of Democracy (V-Dem) Project. #' @@ -638,7 +638,7 @@ NULL #' \item{\code{atop_offense}}{a numeric vector that equals 1 if there was an alliance observed with a offense pledge} #' \item{\code{atop_neutral}}{a numeric vector that equals 1 if there was an alliance observed with a neutrality pledge} #' \item{\code{atop_nonagg}}{a numeric vector that equals 1 if there was an alliance observed with a non-aggression pledge} -#' \item{\code{atop_consul}}{a numeric vector that equals 1 if there was an alliance obeserved with a consultation pledge} +#' \item{\code{atop_consul}}{a numeric vector that equals 1 if there was an alliance observed with a consultation pledge} #' } #' @details The \code{data-raw} directory on the project's Github shows how the data were processed. #' @@ -670,24 +670,32 @@ NULL #' \item{\code{exit}}{a character vector for the leader's exit type} #' \item{\code{exitcode}}{a character vector for more information about the leader's exit type} #' } -#' @details Space considerations mean I can only offer a few columns from the overall data. Archigos data are rich with information. Consult -#' the raw data available on Hein Goeman's website for more. -#' -#' To best conform with data requirements on CRAN, a few leader names were renamed if they included irregular -#' characters (e.g. umlauts or accents). These leaders are "(Juan Orlando) Hernández" (`HON-2014`), -#' "(Antonio) Saca González" (`SAL-2004`), "Julián Trujillo Largacha" (`COL-1878`), "César Gaviria Trujillo" -#' (`COL-1990`), "Gabriel García Moreno" (`ECU-1869`), "Marcos A. Morínigo" (`PAR-1894-1`), "Higinio Morínigo" (`PAR-1940`), -#' "Sebastián Piñera" (`CHL-2010`), "Sauli Niinistö" (`FIN-2012`), "Louis Gerhard De Geer" (`SWD-1876`), -#' "Stefan Löfven" (`SWD-2014`), "Lars Løkke Rasmussen" (`DEN-2009`, `DEN-2015`), and "Fernando de Araújo" -#' (`ETM-2008-1`). None of these names contain these special characters in the data here. -#' -#' For clarity's sake, I renamed the `ccode` column in the raw data to be `gwcode`. This is because it may deceive the user peeking into -#' the data that these are not Correlates of War state codes, but Gleditsch-Ward state codes. +#' @details Space considerations mean I can only offer a few columns from the +#' overall data. Archigos data are rich with information. Consult the raw data +#' available on Hein Goeman's website for more. +#' +#' To best conform with data requirements on CRAN, a few leader names were +#' renamed if they included irregular characters (e.g. umlauts or accents). +#' These leaders, in these particular applications, hav been renamed to "(Juan +#' Orlando) Hernandez" (`HON-2014`), "(Antonio) Saca Gonzalez" (`SAL-2004`), +#' "Julian Trujillo Largacha" (`COL-1878`), "Cesar Gaviria Trujillo" +#' (`COL-1990`), "Gabriel Garcia Moreno" (`ECU-1869`), "Marcos A. Morinigo" +#' (`PAR-1894-1`), "Higinio Morinigo" (`PAR-1940`), "Sebastian Pinera" +#' (`CHL-2010`), "Sauli Niinisto" (`FIN-2012`), "Louis Gerhard De Geer" +#' (`SWD-1876`), "Stefan Lofven" (`SWD-2014`), "Lars Lokke Rasmussen" +#' (`DEN-2009`, `DEN-2015`), and "Fernando de Araujo" (`ETM-2008-1`). None of +#' these names contain these special characters in the data here. +#' +#' For clarity's sake, I renamed the `ccode` column in the raw data to be +#' `gwcode`. This is because it may deceive the user peeking into the data +#' that these are not Correlates of War state codes, but Gleditsch-Ward +#' state codes. #' #' @references #' -#' Goemans, Henk E., Kristian Skrede Gleditsch, and Giacomo Chiozza. 2009. "Introducing Archigos: A Dataset of Political Leaders" -#' \emph{Journal of Peace Research} 46(2): 269--83. +#' Goemans, Henk E., Kristian Skrede Gleditsch, and Giacomo Chiozza. 2009. "Introducing +#' Archigos: A Dataset of Political Leaders" \emph{Journal of Peace Research} +#' 46(2): 269--83. #' #' @md @@ -785,10 +793,10 @@ NULL #' #' @references #' -#' Gleditsch, Nils Petter; Peter Wallensteen, Mikael Eriksson, Margareta Sollenberg & Håvard Strand (2002) +#' Gleditsch, Nils Petter; Peter Wallensteen, Mikael Eriksson, Margareta Sollenberg & Havard Strand (2002) #' Armed Conflict 1946–2001: A New Dataset. \emph{Journal of Peace Research} 39(5): 615–637. #' -#' Pettersson, Therese; Stina Högbladh & Magnus Öberg (2019). Organized violence, 1989-2018 and peace +#' Pettersson, Therese; Stina Hogbladh & Magnus Oberg (2019). Organized violence, 1989-2018 and peace #' agreements. Journal of Peace Research 56(4): 589-603. "ucdp_onsets" @@ -821,10 +829,10 @@ NULL #' #' @references #' -#' Gleditsch, Nils Petter; Peter Wallensteen, Mikael Eriksson, Margareta Sollenberg & Håvard Strand (2002) +#' Gleditsch, Nils Petter; Peter Wallensteen, Mikael Eriksson, Margareta Sollenberg & Havard Strand (2002) #' Armed Conflict 1946–2001: A New Dataset. \emph{Journal of Peace Research} 39(5): 615–637. #' -#' Pettersson, Therese; Stina Högbladh & Magnus Öberg (2019). Organized violence, 1989-2018 and peace +#' Pettersson, Therese; Stina Hogbladh & Magnus Oberg (2019). Organized violence, 1989-2018 and peace #' agreements. Journal of Peace Research 56(4): 589-603. "ucdp_acd" @@ -1234,7 +1242,7 @@ NULL #' Allen Hicken, Anna Luhrmann, Kyle L. Marquardt, Kelly McMann, Pamela #' Paxton, Daniel Pemstein, Brigitte Seim, Rachel Sigman, Svend-Erik #' Skaaning, Jeffrey Staton, Agnes Cornell, Lisa Gastaldi, Haakon Gjerlow, -#' Valeriya Mechkova, Johannes von Römer, Aksel Sundtrom, Eitan Tzelgov, +#' Valeriya Mechkova, Johannes von Romer, Aksel Sundtrom, Eitan Tzelgov, #' Luca Uberti, Yi-ting Wang, Tore Wig, and Daniel Ziblatt. 2020. #' "V-Dem Codebook v10" Varieties of Democracy (V-Dem) Project. #' diff --git a/cran-comments.md b/cran-comments.md index ed47770c..dda7537a 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -4,9 +4,9 @@ ## R CMD check results, Other Comments -R CMD check done via `devtools::check()`, resulting in 0 errors, 0 warnings, and 0 notes. This release includes the removal of a deprecated function, which triggered a warning in the last update. All tests passed. +R CMD check done via `devtools::check()`, resulting in 0 errors, 0 warnings, and 0 notes. All tests passed. -CRAN's check log also identifies many UTF-8 strings, though I think don't think these issues in the check log are ultimately actionable or problematic. +CRAN's check log also identifies many UTF-8 strings and I think I've found and removed all of those as well. `devtools::spell_check()` suggests several spelling errors. However, what I submit to CRAN includes only the false positives. Almost all of these false positives occur in the R Documentation files and concern proper nouns (e.g. data set authors) or peculiar terms that are unfamiliar in the R programming context (e.g. "dyad"). diff --git a/docs/reference/add_democracy.html b/docs/reference/add_democracy.html index d1942530..80436774 100644 --- a/docs/reference/add_democracy.html +++ b/docs/reference/add_democracy.html @@ -216,7 +216,7 @@

R Allen Hicken, Anna Luhrmann, Kyle L. Marquardt, Kelly McMann, Pamela Paxton, Daniel Pemstein, Brigitte Seim, Rachel Sigman, Svend-Erik Skaaning, Jeffrey Staton, Agnes Cornell, Lisa Gastaldi, Haakon Gjerlow, -Valeriya Mechkova, Johannes von Römer, Aksel Sundtrom, Eitan Tzelgov, +Valeriya Mechkova, Johannes von Romer, Aksel Sundtrom, Eitan Tzelgov, Luca Uberti, Yi-ting Wang, Tore Wig, and Daniel Ziblatt. 2020. "V-Dem Codebook v10" Varieties of Democracy (V-Dem) Project.

Marshall, Monty G., Ted Robert Gurr, and Keith Jaggers. 2017. @@ -235,7 +235,14 @@

Examp
# just call `library(tidyverse)` at the top of the your script library(magrittr) - +
#> +#> Attaching package: ‘magrittr’
#> The following objects are masked from ‘package:testthat’: +#> +#> equals, is_less_than, not
#> The following object is masked from ‘package:purrr’: +#> +#> set_names
#> The following object is masked from ‘package:tidyr’: +#> +#> extract
cow_ddy %>% add_democracy()
#> # A tibble: 2,063,610 × 9 #> ccode1 ccode2 year v2x_polyarchy1 polity21 xm_qudsest1 v2x_polyarchy2 diff --git a/docs/reference/add_igos.html b/docs/reference/add_igos.html index 208a40c9..0379ffff 100644 --- a/docs/reference/add_igos.html +++ b/docs/reference/add_igos.html @@ -186,7 +186,7 @@

Value

the Correlates of War International Governmental Organizations data. If the data are dyad-year, the function returns the original data with just one additional column for the total number of mutual IGOs for which both members of the dyad are full members. If the data are state-year, the function returns the original data with four additional columns. These are -the number oF IGOs for which the state is a full member, the number of IGOs for which the state is an associate member, the +the number of IGOs for which the state is a full member, the number of IGOs for which the state is an associate member, the number of IGOs for which the state is an observer, and the number of IGOs for which the state is involved in any way (i.e. the sum of the other three columns).

Details

diff --git a/docs/reference/add_ucdp_acd.html b/docs/reference/add_ucdp_acd.html index 847600fa..45683b2c 100644 --- a/docs/reference/add_ucdp_acd.html +++ b/docs/reference/add_ucdp_acd.html @@ -207,9 +207,9 @@

Details

Right now, only state-year data are supported. Function is in true pilot mode.

References

-

Gleditsch, Nils Petter; Peter Wallensteen, Mikael Eriksson, Margareta Sollenberg & Håvard Strand (2002) +

Gleditsch, Nils Petter; Peter Wallensteen, Mikael Eriksson, Margareta Sollenberg & Havard Strand (2002) Armed Conflict 1946–2001: A New Dataset. Journal of Peace Research 39(5): 615–637.

-

Pettersson, Therese; Stina Högbladh & Magnus Öberg (2019). Organized violence, 1989-2018 and peace +

Pettersson, Therese; Stina Hogbladh & Magnus Oberg (2019). Organized violence, 1989-2018 and peace agreements. Journal of Peace Research 56(4): 589-603.

Author

@@ -221,12 +221,7 @@

Examp # just call `library(tidyverse)` at the top of the your script library(magrittr) library(dplyr) -

#> -#> Attaching package: ‘dplyr’
#> The following objects are masked from ‘package:stats’: -#> -#> filter, lag
#> The following objects are masked from ‘package:base’: -#> -#> intersect, setdiff, setequal, union
+ create_stateyears(system = "gw") %>% filter(between(year, 1946, 2019)) %>% add_ucdp_acd() diff --git a/docs/reference/add_ucdp_onsets.html b/docs/reference/add_ucdp_onsets.html index 20069d5b..6799c222 100644 --- a/docs/reference/add_ucdp_onsets.html +++ b/docs/reference/add_ucdp_onsets.html @@ -197,9 +197,9 @@

Details into summaries. The user will probably want to consider some kind of recoding here.

References

-

Gleditsch, Nils Petter; Peter Wallensteen, Mikael Eriksson, Margareta Sollenberg & Håvard Strand (2002) +

Gleditsch, Nils Petter; Peter Wallensteen, Mikael Eriksson, Margareta Sollenberg & Havard Strand (2002) Armed Conflict 1946–2001: A New Dataset. Journal of Peace Research 39(5): 615–637.

-

Pettersson, Therese; Stina Högbladh & Magnus Öberg (2019). Organized violence, 1989-2018 and peace +

Pettersson, Therese; Stina Hogbladh & Magnus Oberg (2019). Organized violence, 1989-2018 and peace agreements. Journal of Peace Research 56(4): 589-603.

Author

diff --git a/docs/reference/archigos.html b/docs/reference/archigos.html index 8af0f6a1..781f818e 100644 --- a/docs/reference/archigos.html +++ b/docs/reference/archigos.html @@ -191,21 +191,29 @@

FormatDetails

-

Space considerations mean I can only offer a few columns from the overall data. Archigos data are rich with information. Consult -the raw data available on Hein Goeman's website for more.

-

To best conform with data requirements on CRAN, a few leader names were renamed if they included irregular -characters (e.g. umlauts or accents). These leaders are "(Juan Orlando) Hernández" (HON-2014), -"(Antonio) Saca González" (SAL-2004), "Julián Trujillo Largacha" (COL-1878), "César Gaviria Trujillo" -(COL-1990), "Gabriel García Moreno" (ECU-1869), "Marcos A. Morínigo" (PAR-1894-1), "Higinio Morínigo" (PAR-1940), -"Sebastián Piñera" (CHL-2010), "Sauli Niinistö" (FIN-2012), "Louis Gerhard De Geer" (SWD-1876), -"Stefan Löfven" (SWD-2014), "Lars Løkke Rasmussen" (DEN-2009, DEN-2015), and "Fernando de Araújo" -(ETM-2008-1). None of these names contain these special characters in the data here.

-

For clarity's sake, I renamed the ccode column in the raw data to be gwcode. This is because it may deceive the user peeking into -the data that these are not Correlates of War state codes, but Gleditsch-Ward state codes.

+

Space considerations mean I can only offer a few columns from the +overall data. Archigos data are rich with information. Consult the raw data +available on Hein Goeman's website for more.

+

To best conform with data requirements on CRAN, a few leader names were +renamed if they included irregular characters (e.g. umlauts or accents). +These leaders, in these particular applications, hav been renamed to "(Juan +Orlando) Hernandez" (HON-2014), "(Antonio) Saca Gonzalez" (SAL-2004), +"Julian Trujillo Largacha" (COL-1878), "Cesar Gaviria Trujillo" +(COL-1990), "Gabriel Garcia Moreno" (ECU-1869), "Marcos A. Morinigo" +(PAR-1894-1), "Higinio Morinigo" (PAR-1940), "Sebastian Pinera" +(CHL-2010), "Sauli Niinisto" (FIN-2012), "Louis Gerhard De Geer" +(SWD-1876), "Stefan Lofven" (SWD-2014), "Lars Lokke Rasmussen" +(DEN-2009, DEN-2015), and "Fernando de Araujo" (ETM-2008-1). None of +these names contain these special characters in the data here.

+

For clarity's sake, I renamed the ccode column in the raw data to be +gwcode. This is because it may deceive the user peeking into the data +that these are not Correlates of War state codes, but Gleditsch-Ward +state codes.

References

-

Goemans, Henk E., Kristian Skrede Gleditsch, and Giacomo Chiozza. 2009. "Introducing Archigos: A Dataset of Political Leaders" -Journal of Peace Research 46(2): 269--83.

+

Goemans, Henk E., Kristian Skrede Gleditsch, and Giacomo Chiozza. 2009. "Introducing +Archigos: A Dataset of Political Leaders" Journal of Peace Research +46(2): 269--83.

diff --git a/docs/reference/ucdp_onsets.html b/docs/reference/ucdp_onsets.html index b25bbc98..40d530e2 100644 --- a/docs/reference/ucdp_onsets.html +++ b/docs/reference/ucdp_onsets.html @@ -192,9 +192,9 @@

Details particular application

References

-

Gleditsch, Nils Petter; Peter Wallensteen, Mikael Eriksson, Margareta Sollenberg & Håvard Strand (2002) +

Gleditsch, Nils Petter; Peter Wallensteen, Mikael Eriksson, Margareta Sollenberg & Havard Strand (2002) Armed Conflict 1946–2001: A New Dataset. Journal of Peace Research 39(5): 615–637.

-

Pettersson, Therese; Stina Högbladh & Magnus Öberg (2019). Organized violence, 1989-2018 and peace +

Pettersson, Therese; Stina Hogbladh & Magnus Oberg (2019). Organized violence, 1989-2018 and peace agreements. Journal of Peace Research 56(4): 589-603.

diff --git a/man/add_democracy.Rd b/man/add_democracy.Rd index 1921cf6e..07ae75e4 100644 --- a/man/add_democracy.Rd +++ b/man/add_democracy.Rd @@ -61,7 +61,7 @@ Jan Teorell, David Altman, Michael Bernhard, M. Steven Fish, Adam Glynn, Allen Hicken, Anna Luhrmann, Kyle L. Marquardt, Kelly McMann, Pamela Paxton, Daniel Pemstein, Brigitte Seim, Rachel Sigman, Svend-Erik Skaaning, Jeffrey Staton, Agnes Cornell, Lisa Gastaldi, Haakon Gjerlow, -Valeriya Mechkova, Johannes von Römer, Aksel Sundtrom, Eitan Tzelgov, +Valeriya Mechkova, Johannes von Romer, Aksel Sundtrom, Eitan Tzelgov, Luca Uberti, Yi-ting Wang, Tore Wig, and Daniel Ziblatt. 2020. "V-Dem Codebook v10" Varieties of Democracy (V-Dem) Project. diff --git a/man/add_igos.Rd b/man/add_igos.Rd index 13e6b78b..eaa59d76 100644 --- a/man/add_igos.Rd +++ b/man/add_igos.Rd @@ -14,7 +14,7 @@ add_igos(data) the Correlates of War International Governmental Organizations data. If the data are dyad-year, the function returns the original data with just one additional column for the total number of mutual IGOs for which both members of the dyad are full members. If the data are state-year, the function returns the original data with four additional columns. These are -the number oF IGOs for which the state is a full member, the number of IGOs for which the state is an associate member, the +the number of IGOs for which the state is a full member, the number of IGOs for which the state is an associate member, the number of IGOs for which the state is an observer, and the number of IGOs for which the state is involved in any way (i.e. the sum of the other three columns). } diff --git a/man/add_ucdp_acd.Rd b/man/add_ucdp_acd.Rd index b74c3340..3a26529f 100644 --- a/man/add_ucdp_acd.Rd +++ b/man/add_ucdp_acd.Rd @@ -52,10 +52,10 @@ add_ucdp_acd(type = "intrastate", issue = "government") } \references{ -Gleditsch, Nils Petter; Peter Wallensteen, Mikael Eriksson, Margareta Sollenberg & Håvard Strand (2002) +Gleditsch, Nils Petter; Peter Wallensteen, Mikael Eriksson, Margareta Sollenberg & Havard Strand (2002) Armed Conflict 1946–2001: A New Dataset. \emph{Journal of Peace Research} 39(5): 615–637. -Pettersson, Therese; Stina Högbladh & Magnus Öberg (2019). Organized violence, 1989-2018 and peace +Pettersson, Therese; Stina Hogbladh & Magnus Oberg (2019). Organized violence, 1989-2018 and peace agreements. \emph{Journal of Peace Research} 56(4): 589-603. } \author{ diff --git a/man/add_ucdp_onsets.Rd b/man/add_ucdp_onsets.Rd index dce5b6d2..a8d76c0f 100644 --- a/man/add_ucdp_onsets.Rd +++ b/man/add_ucdp_onsets.Rd @@ -51,10 +51,10 @@ create_stateyears(system="gw") \%>\% } \references{ -Gleditsch, Nils Petter; Peter Wallensteen, Mikael Eriksson, Margareta Sollenberg & Håvard Strand (2002) +Gleditsch, Nils Petter; Peter Wallensteen, Mikael Eriksson, Margareta Sollenberg & Havard Strand (2002) Armed Conflict 1946–2001: A New Dataset. \emph{Journal of Peace Research} 39(5): 615–637. -Pettersson, Therese; Stina Högbladh & Magnus Öberg (2019). Organized violence, 1989-2018 and peace +Pettersson, Therese; Stina Hogbladh & Magnus Oberg (2019). Organized violence, 1989-2018 and peace agreements. \emph{Journal of Peace Research} 56(4): 589-603. } \author{ diff --git a/man/archigos.Rd b/man/archigos.Rd index 8cf04d42..2a30c2d1 100644 --- a/man/archigos.Rd +++ b/man/archigos.Rd @@ -28,22 +28,30 @@ These are leader-level data drawn from the Archigos data. Space considerations m based on these data. Data are version 4.1. } \details{ -Space considerations mean I can only offer a few columns from the overall data. Archigos data are rich with information. Consult -the raw data available on Hein Goeman's website for more. +Space considerations mean I can only offer a few columns from the +overall data. Archigos data are rich with information. Consult the raw data +available on Hein Goeman's website for more. -To best conform with data requirements on CRAN, a few leader names were renamed if they included irregular -characters (e.g. umlauts or accents). These leaders are "(Juan Orlando) Hernández" (\code{HON-2014}), -"(Antonio) Saca González" (\code{SAL-2004}), "Julián Trujillo Largacha" (\code{COL-1878}), "César Gaviria Trujillo" -(\code{COL-1990}), "Gabriel García Moreno" (\code{ECU-1869}), "Marcos A. Morínigo" (\code{PAR-1894-1}), "Higinio Morínigo" (\code{PAR-1940}), -"Sebastián Piñera" (\code{CHL-2010}), "Sauli Niinistö" (\code{FIN-2012}), "Louis Gerhard De Geer" (\code{SWD-1876}), -"Stefan Löfven" (\code{SWD-2014}), "Lars Løkke Rasmussen" (\code{DEN-2009}, \code{DEN-2015}), and "Fernando de Araújo" -(\code{ETM-2008-1}). None of these names contain these special characters in the data here. +To best conform with data requirements on CRAN, a few leader names were +renamed if they included irregular characters (e.g. umlauts or accents). +These leaders, in these particular applications, hav been renamed to "(Juan +Orlando) Hernandez" (\code{HON-2014}), "(Antonio) Saca Gonzalez" (\code{SAL-2004}), +"Julian Trujillo Largacha" (\code{COL-1878}), "Cesar Gaviria Trujillo" +(\code{COL-1990}), "Gabriel Garcia Moreno" (\code{ECU-1869}), "Marcos A. Morinigo" +(\code{PAR-1894-1}), "Higinio Morinigo" (\code{PAR-1940}), "Sebastian Pinera" +(\code{CHL-2010}), "Sauli Niinisto" (\code{FIN-2012}), "Louis Gerhard De Geer" +(\code{SWD-1876}), "Stefan Lofven" (\code{SWD-2014}), "Lars Lokke Rasmussen" +(\code{DEN-2009}, \code{DEN-2015}), and "Fernando de Araujo" (\code{ETM-2008-1}). None of +these names contain these special characters in the data here. -For clarity's sake, I renamed the \code{ccode} column in the raw data to be \code{gwcode}. This is because it may deceive the user peeking into -the data that these are not Correlates of War state codes, but Gleditsch-Ward state codes. +For clarity's sake, I renamed the \code{ccode} column in the raw data to be +\code{gwcode}. This is because it may deceive the user peeking into the data +that these are not Correlates of War state codes, but Gleditsch-Ward +state codes. } \references{ -Goemans, Henk E., Kristian Skrede Gleditsch, and Giacomo Chiozza. 2009. "Introducing Archigos: A Dataset of Political Leaders" -\emph{Journal of Peace Research} 46(2): 269--83. +Goemans, Henk E., Kristian Skrede Gleditsch, and Giacomo Chiozza. 2009. "Introducing +Archigos: A Dataset of Political Leaders" \emph{Journal of Peace Research} +46(2): 269--83. } \keyword{datasets} diff --git a/man/atop_alliance.Rd b/man/atop_alliance.Rd index 519c10ef..411304a6 100644 --- a/man/atop_alliance.Rd +++ b/man/atop_alliance.Rd @@ -14,7 +14,7 @@ A data frame with 272,046 observations on the following eight variables. \item{\code{atop_offense}}{a numeric vector that equals 1 if there was an alliance observed with a offense pledge} \item{\code{atop_neutral}}{a numeric vector that equals 1 if there was an alliance observed with a neutrality pledge} \item{\code{atop_nonagg}}{a numeric vector that equals 1 if there was an alliance observed with a non-aggression pledge} -\item{\code{atop_consul}}{a numeric vector that equals 1 if there was an alliance obeserved with a consultation pledge} +\item{\code{atop_consul}}{a numeric vector that equals 1 if there was an alliance observed with a consultation pledge} } } \usage{ diff --git a/man/ccode_democracy.Rd b/man/ccode_democracy.Rd index e3baba0e..679fbffd 100644 --- a/man/ccode_democracy.Rd +++ b/man/ccode_democracy.Rd @@ -32,7 +32,7 @@ Jan Teorell, David Altman, Michael Bernhard, M. Steven Fish, Adam Glynn, Allen Hicken, Anna Luhrmann, Kyle L. Marquardt, Kelly McMann, Pamela Paxton, Daniel Pemstein, Brigitte Seim, Rachel Sigman, Svend-Erik Skaaning, Jeffrey Staton, Agnes Cornell, Lisa Gastaldi, Haakon Gjerlow, -Valeriya Mechkova, Johannes von Römer, Aksel Sundtrom, Eitan Tzelgov, +Valeriya Mechkova, Johannes von Romer, Aksel Sundtrom, Eitan Tzelgov, Luca Uberti, Yi-ting Wang, Tore Wig, and Daniel Ziblatt. 2020. "V-Dem Codebook v10" Varieties of Democracy (V-Dem) Project. diff --git a/man/gwcode_democracy.Rd b/man/gwcode_democracy.Rd index 601971a6..deb02dfc 100644 --- a/man/gwcode_democracy.Rd +++ b/man/gwcode_democracy.Rd @@ -32,7 +32,7 @@ Jan Teorell, David Altman, Michael Bernhard, M. Steven Fish, Adam Glynn, Allen Hicken, Anna Luhrmann, Kyle L. Marquardt, Kelly McMann, Pamela Paxton, Daniel Pemstein, Brigitte Seim, Rachel Sigman, Svend-Erik Skaaning, Jeffrey Staton, Agnes Cornell, Lisa Gastaldi, Haakon Gjerlow, -Valeriya Mechkova, Johannes von Römer, Aksel Sundtrom, Eitan Tzelgov, +Valeriya Mechkova, Johannes von Romer, Aksel Sundtrom, Eitan Tzelgov, Luca Uberti, Yi-ting Wang, Tore Wig, and Daniel Ziblatt. 2020. "V-Dem Codebook v10" Varieties of Democracy (V-Dem) Project. diff --git a/man/ucdp_acd.Rd b/man/ucdp_acd.Rd index 2dc8e0eb..b4fafbd2 100644 --- a/man/ucdp_acd.Rd +++ b/man/ucdp_acd.Rd @@ -34,10 +34,10 @@ These are (kind of) dyadic, but mostly state-level data, used internally for doi The \code{data-raw} directory on the project's Github will show how I processed the multiple strings for when there are multiple states on a given side. } \references{ -Gleditsch, Nils Petter; Peter Wallensteen, Mikael Eriksson, Margareta Sollenberg & Håvard Strand (2002) +Gleditsch, Nils Petter; Peter Wallensteen, Mikael Eriksson, Margareta Sollenberg & Havard Strand (2002) Armed Conflict 1946–2001: A New Dataset. \emph{Journal of Peace Research} 39(5): 615–637. -Pettersson, Therese; Stina Högbladh & Magnus Öberg (2019). Organized violence, 1989-2018 and peace +Pettersson, Therese; Stina Hogbladh & Magnus Oberg (2019). Organized violence, 1989-2018 and peace agreements. Journal of Peace Research 56(4): 589-603. } \keyword{datasets} diff --git a/man/ucdp_onsets.Rd b/man/ucdp_onsets.Rd index 44de417f..af343943 100644 --- a/man/ucdp_onsets.Rd +++ b/man/ucdp_onsets.Rd @@ -30,10 +30,10 @@ these data can do for the package's mission is provide summary information. The particular application } \references{ -Gleditsch, Nils Petter; Peter Wallensteen, Mikael Eriksson, Margareta Sollenberg & Håvard Strand (2002) +Gleditsch, Nils Petter; Peter Wallensteen, Mikael Eriksson, Margareta Sollenberg & Havard Strand (2002) Armed Conflict 1946–2001: A New Dataset. \emph{Journal of Peace Research} 39(5): 615–637. -Pettersson, Therese; Stina Högbladh & Magnus Öberg (2019). Organized violence, 1989-2018 and peace +Pettersson, Therese; Stina Hogbladh & Magnus Oberg (2019). Organized violence, 1989-2018 and peace agreements. Journal of Peace Research 56(4): 589-603. } \keyword{datasets}