-
Notifications
You must be signed in to change notification settings - Fork 2
Dev/covar memberships #6
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Polarolouis
wants to merge
111
commits into
GrossSBM:master
Choose a base branch
from
Polarolouis:dev/covar_memberships
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 50 commits
Commits
Show all changes
111 commits
Select commit
Hold shift + click to select a range
0391c13
Adding nodes_covariates to scalar_model
Polarolouis 12c3827
Various checks added to nodes_covariates
Polarolouis 52bc01e
Adding nodes covariates to all memberships in R
Polarolouis 6e3c6bc
Providing the nodes covariates in the model (default to NULL without …
Polarolouis 3c1f9e5
Transmitting covariates
Polarolouis 6f865b5
Receiving covariates and resending in cpp
Polarolouis 1880aec
Fixing error message
Polarolouis 78abb35
Fixing text
Polarolouis 76805b6
Fixing text
Polarolouis ea940f4
R handling of nodes covariates
Polarolouis 863290d
Handling nodes covariates
Polarolouis a47ccf9
Adding an overloaded assignment operator for LBM in C++
Polarolouis 0ffdba3
Saving default non auto format for C++ and R files
Polarolouis b6d63a3
Implemented LogSumExp, softmax for rowvec and softmax_mat
Polarolouis ee35fa5
Add cpp function necessaries for nodes covariates models
Polarolouis fd28d99
Removing wrong softmax_mat
Polarolouis 1cb5ff0
Removing message to stdout
Polarolouis b1826cf
In from_cc accepting covariates
Polarolouis d09614a
Adding inits for LBM prior probabilities
Polarolouis cc93853
Removing Rcout
Polarolouis c92e3b2
Added optimization in LBM prior probabilities
Polarolouis 21eb50c
Formatting C++
Polarolouis 52a89a8
LBM R : using length to detect nullity
Polarolouis 7fee7b9
Ensuring covariates are non empty
Polarolouis 6a43d82
Formatting and passing memberships
Polarolouis 5a389cf
Full membership is passed
Polarolouis 19ac381
Fixing numbering of non parallel jobs
Polarolouis 0d2fb5e
Removing introduced attributes
Polarolouis dfad97a
Passing covariates in splits
Polarolouis 9cf4f13
Fixing sequences
Polarolouis ac856ae
Handling in C++ the nodes_covariates optimization
Polarolouis aabb911
Implementing nodes covariates in R memberships
Polarolouis 8b91f08
Adding check for the name of nodes covariates for SBM
Polarolouis 4aca740
Fixing various empty calls options
Polarolouis 95d9231
Using BFGS instead of only gradient descent
Polarolouis 1459643
Accumulating only diag(Z * log(alphamat)^T) the relevant values
Polarolouis 1323f52
Adding launch.json in .vscode for R debugging
Polarolouis ec190a9
Adding testthat tests to blockmodels
Polarolouis 7e4102f
Adding nodes covariates to multivariate model
Polarolouis b6ef4e7
Fixing class test replacing by inherits
Polarolouis 65b123a
Adding test with nodes covariates
Polarolouis 3e43cf0
Adding .vscode and dev to .Rbuildignore
Polarolouis 613e606
Added warning if convergence did not occur for nodes covariates
Polarolouis 06e3d9e
Fixing BFGS check to use it
Polarolouis dd2a39a
Using config defined constants
Polarolouis 95b938d
Clamping alpha mat to prevent log errors for lZ and log(alpha) lines
Polarolouis 01d4629
Adding various warning around infinite quantities in BFGS
Polarolouis 4a4d27c
Adding documentation for nodes covariates
Polarolouis 2152168
Incrementing minor version and adding Louis Lacoste as author
Polarolouis b579592
Adding Github Action for CI check
Polarolouis 5c5abd4
Merge branch 'master' into dev/covar_memberships
Polarolouis 3bbd156
Adding test coverage CI with codecov
Polarolouis 2d6b0dd
Adding a README
Polarolouis a762aa1
Updating date in DESCRIPTION
Polarolouis 4cc4acc
Removing Rcpp::LdFlags() as it's no more needed
Polarolouis a3eda80
Adding pkgdown doc
Polarolouis a7b2cf0
Adding README.Rmd and CI
Polarolouis a15d0e3
Adding CRAN status badge to README.Rmd
Polarolouis 0226389
Do not use renv in Render Rmd
Polarolouis 96b30b7
Using correct branch for Codecov
Polarolouis 2a19986
Using Rmarkdown in CI render
Polarolouis cb22d01
Updating author field to Author@R
Polarolouis 53c8bd9
Adding end newline to some header C++ files
Polarolouis b35b5d7
Change test coverage
Polarolouis 2f7c39c
Modify test-coverage ci
Polarolouis ad169c4
Using secret correctly
Polarolouis f02a3c3
Adding debug step for CI test-coverage
Polarolouis a270be8
Removing disable search
Polarolouis 8d51292
Updating render-rmarkdown dependencies setup
Polarolouis 0918019
Changing name of SBM nodes covariates
Polarolouis 9d123a9
Adding some devfiles
Polarolouis 35fc059
Adding explicit compute of B
Polarolouis 5de6780
Using the explicit compute B function
Polarolouis 3f39f1d
Various experiment in dev files
Polarolouis a580c20
Using BFGS to optimize with approximation for init
Polarolouis 110064e
Fiddling with retrieved values
Polarolouis 556fec0
Add beta bench
Polarolouis f496bd7
One cov with identif on alpha
Polarolouis 674197c
Change name
Polarolouis 1cf7bbb
Benchmarking for Beta recovery
Polarolouis ee61675
More plots
Polarolouis fe03d2a
Handling NA in scalar_model.R
Polarolouis c868666
Adding a mask compute function C++
Polarolouis 0cf4f31
passing na replace value to C++
Polarolouis b0e6da0
Adding replace missing values
Polarolouis 7f0cbac
Handling NAs
Polarolouis 6150ce4
test case for NAs
Polarolouis 12f30f7
Adding Rcpp to handle errors
Polarolouis 44e930d
Uncommenting tryCatch
Polarolouis 8c39b41
Adding tests for NA handling
Polarolouis bdc7d2c
Removing missplaced devtools::load_all()
Polarolouis da77ad8
Adding newline
Polarolouis 59030d5
Beginning benchmark
Polarolouis 90894f4
Add NEWS.md
Polarolouis fc6e5fa
Using na_replace_value to check that it does not impact the result an…
Polarolouis 5f9f0ec
Adding NA support
Polarolouis 54f473b
Adding NA testing
Polarolouis 25711a6
Reverting NA handling to reimplement it properly
Polarolouis aacf0a1
Reimplementing masking of bernoulli for NAs
Polarolouis 8a8820c
Reimplementing NA handling for poisson and gaussian models
Polarolouis dbde672
Mask is checked as non zero when built and not per model
Polarolouis 1a990f0
All covariates models now handle NAs
Polarolouis 3224143
Naive Bernoulli handles NAs
Polarolouis e1ed6f2
Integrating NA handling tests to main test files
Polarolouis 96c9754
Restoring to bernoulli_covariates_fast own test file
Polarolouis ec1dc11
Updating NEWS
Polarolouis bedb613
Adding test to ensure all memberships pass covariates and scalar mode…
Polarolouis 1837da5
Fix SBM_sym not passing memberships
Polarolouis 48f75a1
Removing .vscode folder from tracking
Polarolouis c627822
Updating checkout@v6
Polarolouis 888332e
Cleaning up dev files
Polarolouis File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,3 +5,6 @@ HOWTO_WRITE_A_MODEL | |
| mkpkg$ | ||
| orig$ | ||
| LICENSE | ||
| .vscode | ||
| dev | ||
| ^\.github$ | ||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| *.html |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| # Workflow derived from https://github.com/r-lib/actions/tree/v2/examples | ||
| # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help | ||
| on: | ||
| push: | ||
| branches: [main, master] | ||
| pull_request: | ||
|
|
||
| name: R-CMD-check.yaml | ||
|
|
||
| permissions: read-all | ||
|
|
||
| jobs: | ||
| R-CMD-check: | ||
| runs-on: ${{ matrix.config.os }} | ||
|
|
||
| name: ${{ matrix.config.os }} (${{ matrix.config.r }}) | ||
|
|
||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| config: | ||
| - {os: macos-latest, r: 'release'} | ||
| - {os: windows-latest, r: 'release'} | ||
| - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'} | ||
| - {os: ubuntu-latest, r: 'release'} | ||
| - {os: ubuntu-latest, r: 'oldrel-1'} | ||
|
|
||
| env: | ||
| GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} | ||
| R_KEEP_PKG_SOURCE: yes | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
|
|
||
| - uses: r-lib/actions/setup-pandoc@v2 | ||
|
|
||
| - uses: r-lib/actions/setup-r@v2 | ||
| with: | ||
| r-version: ${{ matrix.config.r }} | ||
| http-user-agent: ${{ matrix.config.http-user-agent }} | ||
| use-public-rspm: true | ||
|
|
||
| - uses: r-lib/actions/setup-r-dependencies@v2 | ||
| with: | ||
| extra-packages: any::rcmdcheck | ||
| needs: check | ||
|
|
||
| - uses: r-lib/actions/check-r-package@v2 | ||
| with: | ||
| upload-snapshots: true | ||
| build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")' |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| { | ||
| // Utilisez IntelliSense pour en savoir plus sur les attributs possibles. | ||
| // Pointez pour afficher la description des attributs existants. | ||
| // Pour plus d'informations, visitez : https://go.microsoft.com/fwlink/?linkid=830387 | ||
| "version": "0.2.0", | ||
| "configurations": [ | ||
| { | ||
| "type": "R-Debugger", | ||
| "name": "Launch R-Workspace", | ||
| "request": "launch", | ||
| "debugMode": "workspace", | ||
| "workingDirectory": "${workspaceFolder}" | ||
| }, | ||
| { | ||
| "type": "R-Debugger", | ||
| "name": "Debug R-File", | ||
| "request": "launch", | ||
| "debugMode": "file", | ||
| "workingDirectory": "${workspaceFolder}", | ||
| "file": "${file}" | ||
| }, | ||
| { | ||
| "type": "R-Debugger", | ||
| "name": "Debug R-Function", | ||
| "request": "launch", | ||
| "debugMode": "function", | ||
| "workingDirectory": "${workspaceFolder}", | ||
| "file": "${file}", | ||
| "mainFunction": "main", | ||
| "allowGlobalDebugging": false | ||
| }, | ||
| { | ||
| "type": "R-Debugger", | ||
| "name": "Debug R-Package", | ||
| "request": "launch", | ||
| "debugMode": "workspace", | ||
| "workingDirectory": "${workspaceFolder}", | ||
| "includePackageScopes": true, | ||
| "loadPackages": [ | ||
| "." | ||
| ] | ||
| }, | ||
| { | ||
| "type": "R-Debugger", | ||
| "request": "attach", | ||
| "name": "Attach to R process", | ||
| "splitOverwrittenOutput": true | ||
| } | ||
| ] | ||
| } |
|
Polarolouis marked this conversation as resolved.
Outdated
|
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| { | ||
| "[r]": { | ||
| "editor.formatOnPaste": false, | ||
| "editor.formatOnSave": false, | ||
| "editor.formatOnType": false | ||
| }, | ||
| "[cpp]": { | ||
| "editor.formatOnPaste": false, | ||
| "editor.formatOnSave": false, | ||
| "editor.formatOnType": false | ||
| } | ||
| } |
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.