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

issue_913 add SimpleMergeSelector settings configuration #914

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

zhaojintaozhao
Copy link
Contributor

##Improvement:
Add SimpleMergeSelector settings configuration. issue: #913

@dmthuc dmthuc requested a review from zeromem December 4, 2023 13:10
Copy link
Collaborator

@zeromem zeromem left a comment

Choose a reason for hiding this comment

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

it's ok to merge this PR after comments are addressed, but we recommend to use dance selector which already be the default choice.

catch (Exception & e)
{
if (e.code() == ErrorCodes::UNKNOWN_SETTING)
e.addMessage("in DanceMergeSelector config");
Copy link
Collaborator

Choose a reason for hiding this comment

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

need to change the selector name

@@ -157,7 +185,7 @@ bool allow(

// std::cerr << "combined_ratio: " << combined_ratio << "\n";

double lowered_base = interpolateLinear(settings.base, 2.0, combined_ratio);
double lowered_base = interpolateLinear(settings.base, settings.standard_baseline, combined_ratio);
Copy link
Collaborator

Choose a reason for hiding this comment

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

here I think 2 means the min value for merge task, and if you want to adjust the progress of merge selection, you can change settings.base but not this value. like if you lower settings.base, it will be more aggressive

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.

None yet

2 participants