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.

Sign up for GitHub

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

Jump to bottom

Fixes to Merging algorithm #54

Open
wants to merge 22 commits into
base: vara-dev
Choose a base branch
from
Open

Fixes to Merging algorithm #54

wants to merge 22 commits into from

Conversation

padupr
Copy link
Contributor

@padupr padupr commented May 24, 2021 •
edited
Loading

Last minute fixes.

@vulder
Copy link
Contributor

vulder commented Jul 18, 2021

@padupr What's the current status of this PR?

@vulder @github-actions
Update include/vara/Feature/FeatureTreeNode.h
4c94e95 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@vulder vulder requested review from vulder and s9latimm July 23, 2021 11:23
@vulder vulder marked this pull request as ready for review July 23, 2021 11:23
Pascal Dupré added 3 commits July 23, 2021 17:19
Merge branch 'vara-dev' into f-mergingFixes
0eba8f7 
# Conflicts:
#	include/vara/Feature/FeatureTreeNode.h
#	unittests/resources/CMakeLists.txt
Revert merge error
eb6aabf
Remove old testcase, reproduced in other tests
5975b52
s9latimm
s9latimm requested changes Jul 28, 2021
View reviewed changes
Copy link
Member

@s9latimm s9latimm left a comment

Choose a reason for hiding this comment

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

Over all LGTM, just some remarks / questions unrelated to the actual algorithm.

include/vara/Feature/FeatureModel.h Show resolved Hide resolved
lib/Feature/FeatureModelWriter.cpp Outdated Show resolved Hide resolved
unittests/Feature/FeatureModelParser.cpp Outdated Show resolved Hide resolved
lib/Feature/FeatureModelTransaction.cpp Outdated Show resolved Hide resolved
unittests/Feature/FeatureModelTransaction.cpp Show resolved Hide resolved
vulder
vulder requested changes Jul 28, 2021
View reviewed changes
unittests/Feature/FeatureModelTransaction.cpp Outdated Show resolved Hide resolved
unittests/Feature/FeatureModel.cpp Outdated Show resolved Hide resolved
lib/Feature/FeatureModelTransaction.cpp Outdated Show resolved Hide resolved
include/vara/Feature/FeatureModelTransaction.h Outdated Show resolved Hide resolved
include/vara/Feature/FeatureModelTransaction.h Show resolved Hide resolved
include/vara/Feature/FeatureModel.h Show resolved Hide resolved
Pascal Dupré and others added 2 commits July 30, 2021 15:19
@padupr @github-actions
Update unittests/Feature/FeatureModelTransaction.cpp
08c1ae5 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@vulder
Copy link
Contributor

vulder commented Aug 20, 2021

What is the current state of this PR? @padupr could you please, if you find time, go over the open remarks and close them if they are resolved.

@vulder
Copy link
Contributor

vulder commented Aug 28, 2021

@padupr I pulled in the current fixes on dev. Otherwise, we need to remove the issues reported from the CI.

@vulder
Copy link
Contributor

vulder commented Jan 17, 2022

@s9latimm I updated the PR to our ne dev state. Can you please double check this PR, especially the TODO part regarding error handling. What should we do in this case? Do we need a specific error here?

@vulder vulder requested a review from s9latimm January 17, 2022 21:46
@vulder vulder requested a review from s9latimm February 4, 2022 12:34
@codecov-commenter
Copy link

codecov-commenter commented Feb 4, 2022 •
edited
Loading

Codecov Report

Merging #54 (df1f5ea) into vara-dev (c33a773) will decrease coverage by 0.43%.
The diff coverage is 79.52%.

Impacted file tree graph

@@             Coverage Diff              @@
##           vara-dev      #54      +/-   ##
============================================
- Coverage     88.48%   88.05%   -0.44%     
============================================
  Files            48       48              
  Lines          5282     5569     +287     
============================================
+ Hits           4674     4904     +230     
- Misses          608      665      +57
Impacted Files Coverage Δ
include/vara/Feature/Error.h 26.47% <0.00%> (-1.66%) ⬇️
include/vara/Feature/FeatureModel.h 82.94% <0.00%> (-2.32%) ⬇️
lib/Feature/FeatureModelWriter.cpp 83.12% <0.00%> (-0.27%) ⬇️
unittests/Feature/FeatureModel.cpp 91.26% <0.00%> (-8.21%) ⬇️
include/vara/Feature/FeatureModelTransaction.h 80.77% <18.42%> (-4.38%) ⬇️
lib/Feature/FeatureModelTransaction.cpp 85.71% <93.10%> (+1.50%) ⬆️
unittests/Feature/Feature.cpp 100.00% <100.00%> (ø)
unittests/Feature/FeatureModelTransaction.cpp 99.48% <100.00%> (+0.11%) ⬆️
unittests/Feature/Relationship.cpp 95.38% <100.00%> (+0.94%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c33a773...df1f5ea. Read the comment docs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

@vulder vulder vulder approved these changes

@s9latimm s9latimm s9latimm approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@padupr @vulder @codecov-commenter @s9latimm