Refactoring exposure function #42
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aoliveram
changed the title
…-test-discussion too.
… in rdiffnet function
gvegayon
force-pushed
the
41-refactor-cumadopt-and-adopt
branch
from
a54800b
to
587babb
Compare
gvegayon
changed the title
gvegayon
commented
Nov 11, 2024
DESCRIPTION
Outdated
| @@ -7,6 7,7 @@ Authors@R: c( | |||
| ), | |||
| person("Thomas", "Valente", email="[email protected]", role=c("aut", "cph"), | |||
| comment=c(ORCID="0000-0002-8824-5816", what="R original code")), | |||
| person("Anibal", "Olivera Morales", role = c("aut", "ctb")), | |||
There was a problem hiding this comment.
Add your ORCID like I do.
R/diffnet-class.r
Outdated
| @@ -631,6 631,7 @@ new_diffnet <- function(graph, toa, t0=min(toa, na.rm = TRUE), t1=max(toa, na.rm | |||
| as.character(name))) | |||
| meta$behavior <- ifelse(!length(behavior), "", ifelse(is.na(behavior), "", | |||
| as.character(behavior))) | |||
| meta$version <- 5 | |||
There was a problem hiding this comment.
There's a way of capturing the package version.
Suggested change
| meta$version <- 5 | |
| meta$version <- utils::packageVersion("netdiffuseR") |
R/stats.R
Outdated
| } | ||
|
|
||
| #as.vector(ans) | ||
| return(as.vector(ans)) | ||
| } | ||
|
|
||
| # library(microbenchmark) |
There was a problem hiding this comment.
Suggested change
| # library(microbenchmark) |
R/stats.R
Outdated
Comment on lines
676
to
686
| #out <- matrix(nrow = nrow(cumadopt), ncol = ncol(cumadopt)) | ||
|
|
||
| #if (lags >= 0L) { | ||
| # for (i in 1:(nslices(graph) - lags)) | ||
| # out[,i lags]<- .exposure(graph[[i]], cumadopt[,i,drop=FALSE], attrs[,i,drop=FALSE], | ||
| # outgoing, valued, normalized, self) | ||
| #} else { | ||
| # for (i in (1-lags):nslices(graph)) | ||
| # out[,i lags]<- .exposure(graph[[i]], cumadopt[,i,drop=FALSE], attrs[,i,drop=FALSE], | ||
| # outgoing, valued, normalized, self) | ||
| #} |
There was a problem hiding this comment.
Suggested change
| #out <- matrix(nrow = nrow(cumadopt), ncol = ncol(cumadopt)) | |
| #if (lags >= 0L) { | |
| # for (i in 1:(nslices(graph) - lags)) | |
| # out[,i lags]<- .exposure(graph[[i]], cumadopt[,i,drop=FALSE], attrs[,i,drop=FALSE], | |
| # outgoing, valued, normalized, self) | |
| #} else { | |
| # for (i in (1-lags):nslices(graph)) | |
| # out[,i lags]<- .exposure(graph[[i]], cumadopt[,i,drop=FALSE], attrs[,i,drop=FALSE], | |
| # outgoing, valued, normalized, self) | |
| #} |
R/stats.R
Outdated
Comment on lines
479
to
486
| #ans <- ( graph %*% (attrs * cumadopt) ) | ||
| # | ||
| #if (normalized) { | ||
| # as.vector(ans/( graph %*% attrs 1e-20 )) | ||
| #} else { | ||
| # as.vector(ans) | ||
| #} | ||
| # |
There was a problem hiding this comment.
Suggested change
| #ans <- ( graph %*% (attrs * cumadopt) ) | |
| # | |
| #if (normalized) { | |
| # as.vector(ans/( graph %*% attrs 1e-20 )) | |
| #} else { | |
| # as.vector(ans) | |
| #} | |
| # |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request includes several changes to the
diffnetpackage, focusing on enhancing the exposure calculation functionality, adding support for multiple diffusion processes, and improving the testing framework. The most significant changes include adding a new author, updating the version metadata, modifying the exposure calculation logic, and adding comprehensive tests.Metadata and Documentation Updates:
DESCRIPTIONfile.R/diffnet-class.rfile to version 5.dgr.arrayfunction inR/stats.R.Exposure Calculation Enhancements:
R/stats.Rto handle multiple diffusion processes and added normalization steps. [1] [2]exposure_forfunction to support multiple contagions and added checks for attribute dimensions.Testing Improvements:
tests/testthat/test-stats.Rto validate the multidiffusion exposure calculations, including handling of lagged exposures and structural equivalence.playgrounddirectory to discuss and validate exposure calculations (exposure-ans-discussion.R,exposure-out-discussion.R,multidiff-test-discussion.R). [1] [2] [3]