Skip to content

Commit

Permalink
Merge pull request #84 from snlab-ch/develop
Browse files Browse the repository at this point in the history
Solves differences between C++ and R estimation engines
  • Loading branch information
auzaheta authored Jun 21, 2023
2 parents f95226f + 83052ff commit 74481fa
Show file tree
Hide file tree
Showing 64 changed files with 4,365 additions and 3,069 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/R-CMD-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: r-lib/actions/setup-pandoc@v2

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: r-lib/actions/setup-pandoc@v2

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/prchecks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ jobs:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: r-lib/actions/setup-r@master
- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
- uses: r-lib/actions/setup-pandoc@master
- uses: r-lib/actions/setup-pandoc@v2

- name: Query dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pushrelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: r-lib/actions/setup-r@v2
with:
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
RELEASE_BRANCHES: main

- name: Checkout two
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Create Release
id: create_release
Expand Down
7 changes: 4 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ Encoding: UTF-8
Package: goldfish
Type: Package
Title: Statistical Network Models for Dynamic Network Data
Version: 1.6.4
Date: 2022-08-23
Version: 1.6.5
Date: 2023-06-20
Authors@R: c(person("James", "Hollway", role = c("cre", "aut", "dtc"),
email = "james.hollway@graduateinstitute.ch",
comment = c("IHEID", ORCID = "0000-0002-8361-9647")),
Expand Down Expand Up @@ -39,6 +39,7 @@ Imports:
stats,
generics,
ggplot2,
rlang,
tibble
LinkingTo:
Rcpp,
Expand All @@ -57,7 +58,7 @@ Suggests:
lmtest
VignetteBuilder: knitr
LazyData: true
RoxygenNote: 7.2.1
RoxygenNote: 7.2.3
Roxygen: list(markdown = TRUE)
NeedsCompilation: yes
Config/testthat/edition: 3
34 changes: 1 addition & 33 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -30,50 +30,18 @@ export(glance)
export(linkEvents)
export(tidy)
importFrom(Rcpp,sourceCpp)
importFrom(changepoint,cpt.mean)
importFrom(changepoint,cpt.var)
importFrom(generics,glance)
importFrom(generics,tidy)
importFrom(ggplot2,aes)
importFrom(ggplot2,aes_string)
importFrom(ggplot2,element_text)
importFrom(ggplot2,geom_line)
importFrom(ggplot2,geom_point)
importFrom(ggplot2,geom_text)
importFrom(ggplot2,geom_vline)
importFrom(ggplot2,ggplot)
importFrom(ggplot2,scale_x_continuous)
importFrom(ggplot2,theme)
importFrom(ggplot2,theme_minimal)
importFrom(ggplot2,xlab)
importFrom(ggplot2,ylab)
importFrom(graphics,points)
importFrom(methods,is)
importFrom(stats,.vcov.aliased)
importFrom(stats,AIC)
importFrom(stats,BIC)
importFrom(rlang,.data)
importFrom(stats,IQR)
importFrom(stats,aggregate)
importFrom(stats,as.formula)
importFrom(stats,coef)
importFrom(stats,confint)
importFrom(stats,end)
importFrom(stats,filter)
importFrom(stats,formula)
importFrom(stats,median)
importFrom(stats,na.exclude)
importFrom(stats,na.omit)
importFrom(stats,pnorm)
importFrom(stats,printCoefmat)
importFrom(stats,qnorm)
importFrom(stats,sd)
importFrom(stats,time)
importFrom(tibble,as_tibble)
importFrom(utils,getTxtProgressBar)
importFrom(utils,head)
importFrom(utils,object.size)
importFrom(utils,packageDescription)
importFrom(utils,packageVersion)
importFrom(utils,setTxtProgressBar)
importFrom(utils,txtProgressBar)
useDynLib(goldfish)
11 changes: 11 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
# goldfish 1.6.5

* Solves `startTime` and `endTime` bug on `DyNAM` and `REM` models
preprocessing.
* Clean unnecessary functions imports.
* Solves `aes_string()` deprecation.
* Solves issue on `C++` engine on DyNAM-rate.
* Enforcing an 80-character line length on C++ code.
* Comply with code style.
* Changes that reduce execution time in the R estimation engine.

# goldfish 1.6.4

* Change mentioning of `.GlobalEnv` and drop `goldfishObjects()`.
Expand Down
Loading

0 comments on commit 74481fa

Please sign in to comment.