Skip to content

Commit a7ae57f

Browse files
committed
sfsfs
1 parent ee56e62 commit a7ae57f

File tree

4 files changed

+58
-36
lines changed

4 files changed

+58
-36
lines changed

R/add_atop_alliance.R

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,26 @@
5858
#' directed dyad-year and the merging proceeds without further consideration. If
5959
#' there are no instances in which `ccode1` is greater than `ccode2`, the data
6060
#' are assumed to be non-directed dyad-years and the behavior of this function
61-
#' hinges on the logical condition supplied to the `ndir` argument. If `ndir` is
62-
#' `TRUE` (default), the function assumes you are aware the data you have are
63-
#' non-directed while the alliance data are directed. It will then summarize the
64-
#' directed dyad-year data looking for the highest observed value in the
65-
#' dyad-year in either direction. In the above illustration, it would mean that
66-
#' the Belgium-France dyad would have a defense pledge in 1832 no matter how the
67-
#' non-directed dyad is entered in the data. If `ndir` is `FALSE`, the function
68-
#' performs a simple merge on matching dyad-year keys. In the above illustration,
69-
#' it would mean a Belgium-France dyad in 1832 would have no defense pledge
70-
#' because it was incidentally the case that the defense pledge that does appear
71-
#' in that dyad is made by the state with the higher state code. Use this
72-
#' argument with that in mind if your data are non-directed.
61+
#' hinges on the logical condition supplied to the `ndir` argument.
62+
#'
63+
#' - If `ndir` is `TRUE` (default): the function assumes you are aware the data
64+
#' you have are non-directed while the alliance data are directed. It will then
65+
#' summarize the directed dyad-year data looking for the highest observed value
66+
#' in the dyad-year in either direction. In the above illustration, it would mean
67+
#' that the Belgium-France dyad would have a defense pledge in 1832 no matter how
68+
#' the non-directed dyad is entered in the data. Belgium may not be pledging to
69+
#' defend France, but that is immaterial because the non-directed version of the
70+
#' directed dyad has a defense pledge in it.
71+
#'
72+
#' - If `ndir` is `FALSE`, the function performs a simple merge on matching
73+
#' dyad-year keys. In the above illustration, it would mean a Belgium-France
74+
#' dyad in 1832 would have no defense pledge because it was incidentally the
75+
#' case that the defense pledge that does appear in that dyad is made by the
76+
#' state with the higher state code. Use this argument with that in mind if your
77+
#' data are non-directed.
78+
#'
79+
#' The impetus behind this argument comes by way of an issue raised by Kevin
80+
#' Galambos and J. Andrés Gannon. You can [read about it here](https://github.com/svmiller/peacesciencer/issues/13).
7381
#'
7482
#' @author Steven V. Miller
7583
#'

cran-comments.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ R CMD check done via `devtools::check()`, resulting in 0 errors, 0 warnings, and
88

99
`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").
1010

11+
`devtools::check(manual = TRUE, remote = TRUE, incoming = TRUE)` identified any URL redirect issues in advance of submission. This check is always the death of me. It did identify a note about the DOI being forbidden in the `inst/CITATION` file but my review of others who have received this note suggest it's not an issue for CRAN. The DOI itself is valid.
12+
1113
## Downstream dependencies
1214

1315
There are no downstream dependencies to note.

docs/reference/add_atop_alliance.html

Lines changed: 16 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/add_atop_alliance.Rd

Lines changed: 20 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)