Merge pull request #58 from jhollway/develop

Adding more data

Author: jhollway

.github/pull_request_template.md

@@ -10,11 +10,12 @@ Closes #(issue no.)
 
 # Checklist:
 
-- [ ] I have added tests that prove my fix is effective or that my feature works
 - [ ] The package builds on my OS without issues (please add workstation details)
 - [ ] My changes generate no new warnings
 - [ ] My code follows the style guidelines of this project
 - [ ] I have commented my code, particularly in hard-to-understand areas
-- [ ] I have made corresponding changes to the documentation (.R, NEWS.md)
+- [ ] I have added tests that prove my fix is effective or that my feature works
+- [ ] I have documented any functions or data in an .R script
+- [ ] I have updated NEWS.md
 - [ ] I have bumped the version by the appropriate increment in the DESCRIPTION file (major, minor, patch)
 - [ ] PR checks all pass for latest commit

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: roctopus
 Title: Utility functions for multimode and multilevel network analysis
-Version: 0.2.1
+Version: 0.2.3
 Description: This package assembles a number of utility functions for 
    loading, visualising, and analysing multimode, multiplex, and multilevel networks.
 URL: https://bitbucket.org/jhollway/roctopus/

NAMESPACE

@@ -5,6 +5,7 @@ export(create_match)
 export(create_nest)
 export(create_poles)
 export(create_random)
+export(df_to_mat)
 export(plot_2x2)
 export(plot_globalnet)
 export(plot_multilevel)

NEWS.md

@@ -1,3 +1,17 @@
+# roctopus 0.2.3
+
+2020-07-19
+
+## Data
+
+* Added `mexicanpower` dataset
+* Added `senate112` datasets
+* Updated `evs` datasets to matrices
+
+## Package
+
+* Added `df_to_mat()` function for converting regular adjacency and incidence data frames into matrices
+
 # roctopus 0.2.1
 
 2020-07-17

R/evs.R

@@ -10,9 +10,8 @@
 #' @keywords datasets
 #' @name evs
 #' @usage data(IT_1990)
-#' @format Data frames with 15 variables:
+#' @format Matrices with 14 columns:
 #' \describe{
-#'   \item{ID}{Anonymised individual identifiers}
 #'   \item{Welfare}{1 if individual associated}
 #'   \item{Religious}{1 if individual associated}
 #'   \item{Education.culture}{1 if individual associated}

R/mexicanpower.R

@@ -0,0 +1,22 @@
+#' Mexican power network
+#'
+#' A network of 11 core members of the 1990s Mexican power elite (Knoke 2017), 
+#' three of which were successively elected presidents of Mexico: 
+#' José López Portillo (1976-82), Miguel de la Madrid (1982-88), and Carlos Salinas de Gortari (1988-94, 
+#' who was also the son of another core member, Raúl Salinas Lozano). 
+#' The undirected lines connecting pairs of men represent any formal, informal, 
+#' or organizational relation between a dyad; 
+#' for example, “common belonging (school, sports, business, political participation), 
+#' or a common interest (political power)” (Mendieta et al. 1997: 37). 
+#'
+#' @docType data
+#' @keywords datasets
+#' @name mexicanpower
+#' @usage data(mexicanpower)
+#' @format Matrix with 11 rows/columns
+#' @source Knoke, David. 1990. \emph{Political Networks}. 
+#' 
+#' Knoke, Christopoulos, Diani, and Hollway. 2020. 
+#' \emph{Multimodal Political Networks: The Structural Perspective}. 
+#' Cambridge University Press: Cambridge.
+"mexicanpower"

R/mm_conversion.R

@@ -81,3 +81,16 @@ project_list <- function(eventlist){
   out <- out %>% mutate(time = as.POSIXct(time), increment = as.numeric(increment))
   out
 }
+
+
+#' Transform a data frame to an adjacency or incidence matrix
+#' 
+#' @param df a data frame, with the first column ID
+#' @return an adjacency or incidence matrix
+#' @export
+df_to_mat <- function(df){
+  df <- as.data.frame(df)
+  row.names(df) <- df[,1]
+  df[,1] <- NULL
+  as.matrix(df)
+}

R/senate112.R

@@ -0,0 +1,38 @@
+#' 112th Congress Senate Voting
+#'
+#' These datasets list the U.S. Senators who served in the 112th Congress, 
+#' which met from January 3, 2011 to January 3, 2013. 
+#' Although the Senate has 100 seats, 103 persons served during this period due to two resignations and a death. 
+#' However, the third replacement occurred only two days before the end and cast no votes on the bills investigated here. 
+#' Hence, the number of Senators we analyzed is 102.
+#' 
+#' CQ Almanac identified 25 key bills on which the Senate voted during the 112th Congress,
+#' and which Democratic and Republican Senators voting “yea” and “nay” on each proposal.
+#' 
+#' Lastly, we obtained data on campaign contributions made by 92 PACs from the Open Secrets Website. 
+#' We recorded all contributions made during the 2008, 2010, and 2012 election campaigns 
+#' to the 102 persons who were Senators in the 112th Congress. 
+#' The vast majority of PAC contributions to a candidate during a campaign was for $10,000 
+#' (the legal maximum is $5,000 each for a primary and the general election). 
+#' We aggregated the contributions across all three electoral cycles, then dichotomized the sums into no contribution (0) 
+#' and any contribution (1).
+#'
+#' @docType data
+#' @keywords datasets
+#' @name senate112
+#' @usage data(DemSxP)
+#' @format Matrix of 51 rows (Senators) and 63 columns (PACS)
+#' @source Knoke, Christopoulos, Diani, and Hollway. 2020. 
+#' \emph{Multimodal Political Networks}. 
+#' Cambridge University Press: Cambridge.
+"DemSxP"
+
+#' @rdname senate112
+#' @usage data(RepSxP)
+#' @format Matrix of 62 rows (Senators) and 72 columns (PACS)
+"RepSxP"
+
+#' @rdname senate112
+#' @usage data(OverSxP)
+#' @format Matrix of 20 rows (Senators) and 32 columns (PACS)
+"OverSxP"

data/DE_1990.rda

@@ -0,0 +1,13 @@
+context('df_to_mat')
+
+data1 <- data.frame(ID = LETTERS[1:3],
+                    G = c(0,1,1),
+                    H = c(0,0,1),
+                    I = c(1,1,0))
+mat1 <- matrix(c(0,1,1,0,0,1,1,1,0),3,3)
+rownames(mat1) <- LETTERS[1:3]
+colnames(mat1) <- LETTERS[7:9]
+
+test_that("data frame converted to matrix correctly",{
+  expect_equal(df_to_mat(data1), mat1)
+})