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

Merge content of preventive stop criterion into type, no impact on te… #1141

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

Conversation

pjeanmarie
Copy link
Member

@pjeanmarie pjeanmarie commented Sep 18, 2024

…sts results expected

Please check if the PR fulfills these requirements

  • The commit message follows our guidelines
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)

Does this PR already have an issue describing the problem?

#1084

What kind of change does this PR introduce?

What is the current behavior?

What is the new behavior (if this is a feature change)?

Does this PR introduce a breaking change or deprecate an API?

  • Yes
  • No

If yes, please check if the following requirements are fulfilled

  • The Breaking Change or Deprecated label has been added
  • The migration steps are described in the following section

What changes might users need to make in their application due to this PR? (migration steps)

    obj_fun = data[tag_by_file_type[file_type]]
    prev_secure = "preventive-stop-criterion" not in obj_fun or obj_fun["preventive-stop-criterion"] == "SECURE"
    if prev_secure and ("type" in obj_fun or "preventive-stop-criterion" in obj_fun):
        obj_fun["type"] = "SECURE_FLOW"
    elif not prev_secure and "type" not in obj_fun:
        obj_fun["type"] = "MAX_MIN_MARGIN"
    if "preventive-stop-criterion" in obj_fun:
        del obj_fun["preventive-stop-criterion"]

Other information:

@pjeanmarie pjeanmarie changed the title Merge content of preventive stop criterion into type, no impact on te… [WIP] Merge content of preventive stop criterion into type, no impact on te… Sep 18, 2024
@pjeanmarie pjeanmarie force-pushed the rao_parameters_use_unit_from_is_dc branch from affc299 to 2924276 Compare September 23, 2024 08:09
@pjeanmarie pjeanmarie force-pushed the rao_parameters_merge_type_and_preventive_stop_criterion branch from 925df6e to 27fdbce Compare September 23, 2024 08:12
@pjeanmarie pjeanmarie force-pushed the rao_parameters_use_unit_from_is_dc branch from 2924276 to 5ce3d76 Compare September 23, 2024 12:31
@pjeanmarie pjeanmarie force-pushed the rao_parameters_merge_type_and_preventive_stop_criterion branch from 27fdbce to fae79bc Compare September 24, 2024 08:14
@pjeanmarie pjeanmarie force-pushed the rao_parameters_use_unit_from_is_dc branch from 5ce3d76 to 1706a08 Compare September 24, 2024 09:10
@pjeanmarie pjeanmarie force-pushed the rao_parameters_merge_type_and_preventive_stop_criterion branch from fae79bc to fe7230c Compare September 24, 2024 09:11
@pjeanmarie pjeanmarie requested review from phiedw and obrix September 25, 2024 10:20
@pjeanmarie pjeanmarie force-pushed the rao_parameters_use_unit_from_is_dc branch from 1706a08 to 7f7e969 Compare October 1, 2024 15:31
@pjeanmarie pjeanmarie force-pushed the rao_parameters_merge_type_and_preventive_stop_criterion branch from fe7230c to fd71fe6 Compare October 2, 2024 08:49
@pjeanmarie pjeanmarie force-pushed the rao_parameters_use_unit_from_is_dc branch from 7f7e969 to b65e806 Compare October 2, 2024 14:23
@pjeanmarie pjeanmarie force-pushed the rao_parameters_merge_type_and_preventive_stop_criterion branch 2 times, most recently from 46212b0 to dfd6477 Compare October 2, 2024 14:48
@pjeanmarie pjeanmarie force-pushed the rao_parameters_use_unit_from_is_dc branch from b65e806 to 54aa50a Compare October 8, 2024 09:31
@pjeanmarie pjeanmarie force-pushed the rao_parameters_merge_type_and_preventive_stop_criterion branch from dfd6477 to ba19da2 Compare October 8, 2024 14:22
@pjeanmarie pjeanmarie force-pushed the rao_parameters_use_unit_from_is_dc branch from 54aa50a to 802f70b Compare October 28, 2024 15:03
@pjeanmarie pjeanmarie force-pushed the rao_parameters_merge_type_and_preventive_stop_criterion branch from ba19da2 to 8810fed Compare October 28, 2024 15:30
@pjeanmarie pjeanmarie changed the title [WIP] Merge content of preventive stop criterion into type, no impact on te… Merge content of preventive stop criterion into type, no impact on te… Oct 28, 2024
@pjeanmarie pjeanmarie added breaking-change Changes could break users' code PR : dont-merge-before-other PR mustn't be merged before another (referenced in the description or in the comments) labels Nov 5, 2024
@pjeanmarie pjeanmarie force-pushed the rao_parameters_merge_type_and_preventive_stop_criterion branch from 8810fed to 4e59f6b Compare November 19, 2024 11:20
@pjeanmarie pjeanmarie changed the base branch from rao_parameters_use_unit_from_is_dc to rao_parameters_separate_unit_from_objective_function_type November 19, 2024 11:21
@pjeanmarie pjeanmarie added the PR: waiting-for-review This PR is waiting to be reviewed label Nov 19, 2024
@pjeanmarie pjeanmarie linked an issue Nov 25, 2024 that may be closed by this pull request
@obrix obrix self-requested a review November 26, 2024 09:49
Copy link
Member

@obrix obrix left a comment

Choose a reason for hiding this comment

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

DCO needs to be fixed

@pjeanmarie pjeanmarie force-pushed the rao_parameters_separate_unit_from_objective_function_type branch from 8cadd8c to 02f55a5 Compare November 29, 2024 09:09
@pjeanmarie pjeanmarie force-pushed the rao_parameters_merge_type_and_preventive_stop_criterion branch from 4e59f6b to 68f03a1 Compare November 29, 2024 09:12
@pjeanmarie pjeanmarie force-pushed the rao_parameters_separate_unit_from_objective_function_type branch from 02f55a5 to c85394f Compare November 29, 2024 10:18
@pjeanmarie pjeanmarie force-pushed the rao_parameters_merge_type_and_preventive_stop_criterion branch from 68f03a1 to 448cd9e Compare November 29, 2024 10:19
@pjeanmarie pjeanmarie force-pushed the rao_parameters_separate_unit_from_objective_function_type branch from c85394f to d588d48 Compare December 9, 2024 10:37
@pjeanmarie pjeanmarie force-pushed the rao_parameters_merge_type_and_preventive_stop_criterion branch from 448cd9e to f3fd6b2 Compare December 9, 2024 10:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking-change Changes could break users' code PR : dont-merge-before-other PR mustn't be merged before another (referenced in the description or in the comments) PR: waiting-for-review This PR is waiting to be reviewed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make RaoParameters generic
3 participants