Skip to content
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

Input the contacts in parallel from numpy #2

Merged
merged 10 commits into from
Sep 29, 2023

Conversation

fabmazz
Copy link
Member

@fabmazz fabmazz commented Aug 5, 2023

No description provided.

@codecov
Copy link

codecov bot commented Aug 5, 2023

Codecov Report

Attention: 9 lines in your changes are missing coverage. Please review.

Comparison is base (8a6e76d) 62.09% compared to head (bea441e) 64.27%.

❗ Current head bea441e differs from pull request most recent head 7969a8b. Consider uploading reports for the commit 7969a8b to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##           master       #2      +/-   ##
==========================================
+ Coverage   62.09%   64.27%   +2.18%     
==========================================
  Files           8        8              
  Lines         910      985      +75     
==========================================
+ Hits          565      633      +68     
- Misses        345      352       +7     
Files Coverage Δ
bp.h 100.00% <ø> (+7.70%) ⬆️
bp.cpp 77.52% <91.43%> (+2.34%) ⬆️
pysib.cpp 67.26% <83.79%> (-0.60%) ⬇️

... and 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@abraunst abraunst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

poi guardo il tutto

bp.cpp Outdated
void FactorGraph::check_neighbors(int i, int j){
if (i == j)
throw invalid_argument("self loops are not allowed");
add_node(i);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Qui e dopo: abbiamo usato tabs e non spazi per il codice in c++

bp.cpp Outdated
add_node(j);
add_node(i);
add_node(j);
//node i
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

questo commento non agigunge niente, toglierei

bp.cpp Outdated
Node & fi = nodes[i];
//node j
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

idem, etc

test/data_load.py Outdated Show resolved Hide resolved
@@ -102,6 +103,8 @@ class FactorGraph {
std::vector<std::tuple<int, std::shared_ptr<Proba>, std::shared_ptr<Proba>, std::shared_ptr<Proba>, std::shared_ptr<Proba>> > const & individuals = std::vector<std::tuple<int, std::shared_ptr<Proba>, std::shared_ptr<Proba>, std::shared_ptr<Proba>, std::shared_ptr<Proba>>>());
int find_neighbor(int i, int j) const;
void append_contact(int i, int j, times_t t, real_t lambdaij, real_t lambdaji = DO_NOT_OVERWRITE);
void check_neighbors(int i, int j);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l'aggiunta di queste due funzioni sembrano gli unici cambiamenti "veri" in bp.h e bp.cpp. Puoi lasciare solo questo in questo PR?

grazie mille fabio

bp.h Outdated Show resolved Hide resolved
ab changes
@abraunst abraunst merged commit 173d8aa into sibyl-team:master Sep 29, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants