Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: migraph
Title: Inferential Methods for Multimodal and Other Networks
Version: 1.7.0
Version: 1.7.1
Description: A set of tools for testing networks.
It includes functions for univariate and multivariate conditional uniform graph
and quadratic assignment procedure testing, and network regression.
Expand All @@ -20,7 +20,7 @@ Depends:
R (>= 4.1.0),
manynet (>= 2.3.1),
autograph (>= 1.2.2),
netrics (>= 0.4.0)
netrics (>= 1.0.1)
Imports:
dplyr (>= 1.1.0),
ergm,
Expand Down
10 changes: 10 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# migraph 1.7.1

## Package

- Raised the minimum required version of `{netrics}` to 1.0.1

## Tutorials

- Updated intro tutorial

# migraph 1.7.0

## Package
Expand Down
12 changes: 6 additions & 6 deletions inst/tutorials/tutorial0/tutorial0.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@

### What is RStudio?

<img src="https://www.rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png" alt="RStudio logo" height="250" class="center"/>
<img src="https://cloud.rstudio.com/wp-content/uploads/2018/10/RStudio-Logo.png" alt="RStudio logo" height="200" class="center"/>

[RStudio](https://posit.co/products/open-source/rstudio/) is an integrated development environment (IDE) for R and Python,
enabling researchers to interact with R (and/or Python) through a fully-functional editor
Expand Down Expand Up @@ -105,7 +105,7 @@
Remove the hash symbol at the start of this line to run it:

```{r comments, exercise = TRUE}
# 1/5 # this will still be commented...

Check warning on line 108 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for ubuntu-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=108,col=3,[commented_code_linter] Remove commented code.

Check warning on line 108 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for macOS-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=108,col=3,[commented_code_linter] Remove commented code.

Check warning on line 108 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for windows-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=108,col=3,[commented_code_linter] Remove commented code.
```

In an R script you can toggle commenting for one or more lines using Cmd-Shift-C/Ctrl-Shift-C.
Expand Down Expand Up @@ -148,9 +148,9 @@
In R, we can write such logical statements as:

```{r equivalence, exercise = TRUE}
"James"=="james" # Try also "James"!="james"

Check warning on line 151 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for ubuntu-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=151,col=8,[infix_spaces_linter] Put spaces around all infix operators.

Check warning on line 151 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for macOS-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=151,col=8,[infix_spaces_linter] Put spaces around all infix operators.

Check warning on line 151 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for windows-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=151,col=8,[infix_spaces_linter] Put spaces around all infix operators.
# Other logical statements include: ">", ">=", "<=", "<".
# 1 < 5 # Try also "1 <= 5"

Check warning on line 153 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for ubuntu-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=153,col=3,[commented_code_linter] Remove commented code.

Check warning on line 153 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for macOS-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=153,col=3,[commented_code_linter] Remove commented code.

Check warning on line 153 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for windows-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=153,col=3,[commented_code_linter] Remove commented code.
```

Logical values are always either `TRUE` or `FALSE`,
Expand All @@ -168,10 +168,10 @@

```{r assignment, exercise = TRUE}
surname <- "Hollway"
y.chromosome <- T # or TRUE

Check warning on line 171 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for ubuntu-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=171,col=18,[T_and_F_symbol_linter] Use TRUE instead of the symbol T.

Check warning on line 171 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for ubuntu-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=171,col=1,[object_name_linter] Variable and function name style should match snake_case or symbols.

Check warning on line 171 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for macOS-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=171,col=18,[T_and_F_symbol_linter] Use TRUE instead of the symbol T.

Check warning on line 171 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for macOS-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=171,col=1,[object_name_linter] Variable and function name style should match snake_case or symbols.

Check warning on line 171 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for windows-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=171,col=18,[T_and_F_symbol_linter] Use TRUE instead of the symbol T.

Check warning on line 171 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for windows-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=171,col=1,[object_name_linter] Variable and function name style should match snake_case or symbols.
siblings <- 1
age <- NA # This is used for missing information
# Note that these objects then appear in RStudio's environment pane

Check warning on line 174 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for ubuntu-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=174,col=68,[trailing_whitespace_linter] Remove trailing whitespace.

Check warning on line 174 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for macOS-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=174,col=68,[trailing_whitespace_linter] Remove trailing whitespace.

Check warning on line 174 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for windows-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=174,col=68,[trailing_whitespace_linter] Remove trailing whitespace.
# (by default the top right)
```

Expand All @@ -187,7 +187,7 @@
And even operate on them:

```{r mult, exercise = TRUE, exercise.setup = "assignment"}
siblings*3

Check warning on line 190 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for ubuntu-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=190,col=9,[infix_spaces_linter] Put spaces around all infix operators.

Check warning on line 190 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for macOS-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=190,col=9,[infix_spaces_linter] Put spaces around all infix operators.

Check warning on line 190 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for windows-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=190,col=9,[infix_spaces_linter] Put spaces around all infix operators.
# Try multiplying the other objects by 3
```

Expand All @@ -212,10 +212,10 @@
```{r series, exercise = TRUE}
teenageyrs <- 13:19
teenageqrtrs <- seq(13, 19.99, by = 0.25)
# We can recall every third value from this object using a repeating vector

Check warning on line 215 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for ubuntu-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=215,col=76,[trailing_whitespace_linter] Remove trailing whitespace.

Check warning on line 215 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for macOS-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=215,col=76,[trailing_whitespace_linter] Remove trailing whitespace.

Check warning on line 215 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for windows-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=215,col=76,[trailing_whitespace_linter] Remove trailing whitespace.
teenageqrtrs
teenageqrtrs[c(FALSE, FALSE, TRUE)]
# teenageqrtrs[c(F, F, T)]

Check warning on line 218 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for ubuntu-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=218,col=27,[trailing_whitespace_linter] Remove trailing whitespace.

Check warning on line 218 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for ubuntu-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=218,col=3,[commented_code_linter] Remove commented code.

Check warning on line 218 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for macOS-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=218,col=27,[trailing_whitespace_linter] Remove trailing whitespace.

Check warning on line 218 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for macOS-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=218,col=3,[commented_code_linter] Remove commented code.

Check warning on line 218 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for windows-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=218,col=27,[trailing_whitespace_linter] Remove trailing whitespace.

Check warning on line 218 in inst/tutorials/tutorial0/tutorial0.Rmd

View workflow job for this annotation

GitHub Actions / Build for windows-latest

file=inst/tutorials/tutorial0/tutorial0.Rmd,line=218,col=3,[commented_code_linter] Remove commented code.
# Also works but it is best practice to write out the logic.
```

Expand Down Expand Up @@ -414,10 +414,10 @@
```{r egonet-eg, exercise = TRUE}
mynetwork <- matrix(0,2,2) # this creates an empty network of 2 people
# Next I'm going to name the matrix rows and columns:
rownames(mynetwork) <- c("James Hollway","Korakot Janteerasakul")
colnames(mynetwork) <- c("James Hollway","Korakot Janteerasakul")
mynetwork[1,2] <- 1 # this means I know Korakot already
mynetwork[2,1] <- 1 # I think I can say Korakot knows me already too...
mynetwork["James Hollway","Korakot Janteerasakul"] <- 1 # I could also do this by name
rownames(mynetwork) <- c("James Hollway","Tommaso Fonti")
colnames(mynetwork) <- c("James Hollway","Tommaso Fonti")
mynetwork[1,2] <- 1 # this means I know Tommaso already
mynetwork[2,1] <- 1 # I think I can say Tommaso knows me already too...
mynetwork["James Hollway","Tommaso Fonti"] <- 1 # I could also do this by name
# mynetwork[mynetwork > 0] <- 0 # Just in case you make a mistake, this wipes it!
```