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

Handling Constraints using feasibleFirst parameterless fitness #1455

Merged
merged 22 commits into from
Jul 11, 2021

Conversation

Jimmy-INL
Copy link
Collaborator

@Jimmy-INL Jimmy-INL commented Mar 3, 2021


Pull Request Description

What issue does this change request address? (Use "#" before the issue to link it, i.e., #42.)

closes #1454 1454

What are the significant changes in functionality due to this change request?

enabling constraint handling in GA


For Change Control Board: Change Request Review

The following review must be completed by an authorized member of the Change Control Board.

  • 1. Review all computer code.
  • 2. If any changes occur to the input syntax, there must be an accompanying change to the user manual and xsd schema. If the input syntax change deprecates existing input files, a conversion script needs to be added (see Conversion Scripts).
  • 3. Make sure the Python code and commenting standards are respected (camelBack, etc.) - See on the wiki for details.
  • 4. Automated Tests should pass, including run_tests, pylint, manual building and xsd tests. If there are changes to Simulation.py or JobHandler.py the qsub tests must pass.
  • 5. If significant functionality is added, there must be tests added to check this. Tests should cover all possible options. Multiple short tests are preferred over one large test. If new development on the internal JobHandler parallel system is performed, a cluster test must be added setting, in XML block, the node <internalParallel> to True.
  • 6. If the change modifies or adds a requirement or a requirement based test case, the Change Control Board's Chair or designee also needs to approve the change. The requirements and the requirements test shall be in sync.
  • 7. The merge request must reference an issue. If the issue is closed, the issue close checklist shall be done.
  • 8. If an analytic test is changed/added is the the analytic documentation updated/added?
  • 9. If any test used as a basis for documentation examples (currently found in raven/tests/framework/user_guide and raven/docs/workshop) have been changed, the associated documentation must be reviewed and assured the text matches the example.

@Jimmy-INL Jimmy-INL added priority_critical task This tag should be used for any new capability, improvement or enanchment RAVENv2.1 All tasks and defects that will go in RAVEN v2.1 labels Mar 3, 2021
@Jimmy-INL Jimmy-INL changed the title [WIP] Handling Constraints using feasibleFirst parameterless fitness Handling Constraints using feasibleFirst parameterless fitness Mar 3, 2021
@moosebuild
Copy link

Job Test mac on d1508d2 : invalidated by @Jimmy-INL

@moosebuild
Copy link

Job Mingw Test on 2518466 : invalidated by @Jimmy-INL

@moosebuild
Copy link

Job Mingw Test on 336d7cd : invalidated by @Jimmy-INL

@moosebuild
Copy link

Job Mingw Test on 91314f3 : invalidated by @Jimmy-INL

@moosebuild
Copy link

Job Mingw Test on 086516c : invalidated by @Jimmy-INL

@alfoa
Copy link
Collaborator

alfoa commented Apr 5, 2021

@Jimmy-INL is this reviewable?

@Jimmy-INL
Copy link
Collaborator Author

Jimmy-INL commented Apr 5, 2021 via email

@aalfonsi
Copy link
Collaborator

@Jimmy-INL can you fix the conflicts ?

@moosebuild
Copy link

Job Mingw Test on 45132cd : invalidated by @Jimmy-INL

1 similar comment
@moosebuild
Copy link

Job Mingw Test on 45132cd : invalidated by @Jimmy-INL

@moosebuild
Copy link

Job Test Ubuntu 18 PIP on 45132cd : invalidated by @Jimmy-INL

@moosebuild
Copy link

Job Mingw Test on 45132cd : invalidated by @joshua-cogliati-inl

checking civet.

2 similar comments
@moosebuild
Copy link

Job Mingw Test on 45132cd : invalidated by @joshua-cogliati-inl

checking civet.

@moosebuild
Copy link

Job Mingw Test on 45132cd : invalidated by @joshua-cogliati-inl

checking civet.

Copy link
Contributor

@joshua-cogliati-inl joshua-cogliati-inl left a comment

Choose a reason for hiding this comment

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

One place has a unordered dictionary that might be causing differences.

framework/utils/gaUtils.py Outdated Show resolved Hide resolved
@joshua-cogliati-inl
Copy link
Contributor

Hm, I don't see any other obvious uses of unordered dictionaries.
I suppose you could try:
<python skip_check='True'>3.7</python>
in dependencies.xml

@joshua-cogliati-inl
Copy link
Contributor

joshua-cogliati-inl commented Jun 2, 2021

Hm, looking at the results, what is happening with x and y in tests/framework/Optimizers/GeneticAlgorithms/continuous/constrained/rosenbrockCubicandLineConstrained/opt_export_0.csv?:

  Different values in x for -0.95568497606 and -0.0469615763395
  Different values in y for 0.95303842366 and 0.0443150239401
  Different values in ans for 3.98234965029 and 1.27345067232
  Different values in fitness for -3.98234965029 and -1.27345067232
  Different values in x for -0.0469615763395 and -0.95568497606
  Different values in y for 0.0443150239401 and 0.95303842366
  Different values in ans for 1.27345067232 and 3.98234965029
  Different values in fitness for -1.27345067232 and -3.98234965029
  Different values in x for -0.95568497606 and -0.0469615763395
  Different values in y for 0.95303842366 and 0.0443150239401
  Different values in ans for 3.98234965029 and 1.27345067232
  Different values in fitness for -3.98234965029 and -1.27345067232
  Different values in x for -0.0469615763395 and -0.95568497606
  Different values in y for 0.0443150239401 and 0.95303842366
  Different values in ans for 1.27345067232 and 3.98234965029
  Different values in fitness for -1.27345067232 and -3.98234965029
  Different values in x for -0.0469615763395 and -0.95568497606
  Different values in y for 0.0443150239401 and 0.95303842366
  Different values in ans for 1.27345067232 and 3.98234965029
  Different values in fitness for -1.27345067232 and -3.98234965029

@joshua-cogliati-inl
Copy link
Contributor

It would also be worth trying using the unordered csv checker instead of the ordered csv.

@moosebuild
Copy link

Job Test mac on 9ed8de9 : invalidated by @Jimmy-INL

@moosebuild
Copy link

Job Test Ubuntu 16 on bc82bc4 : invalidated by @mandd

@moosebuild
Copy link

Job Test qsubs on bc82bc4 : invalidated by @mandd

@moosebuild
Copy link

Job Test qsubs on 52d53cd : invalidated by @aalfonsi

@moosebuild
Copy link

Job Test Ubuntu 18-2 Python 3 on 52d53cd : invalidated by @aalfonsi

@mandd
Copy link
Collaborator

mandd commented Jul 8, 2021

Are we ready for merging this PR?

Copy link
Collaborator

@wangcj05 wangcj05 left a comment

Choose a reason for hiding this comment

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

I have provided couple of comments for your consideration. In addition:

  1. please try to answer all reviewers' comments, even if we have discussed in person
  2. Please remove png files, I think you do not check the difference between png files, but just check the existence, right?

@wangcj05
Copy link
Collaborator

wangcj05 commented Jul 8, 2021

Are we ready for merging this PR?

@wangcj05 wangcj05 closed this Jul 8, 2021
@wangcj05
Copy link
Collaborator

wangcj05 commented Jul 8, 2021

@mandd I have couple of comments for this PR.
@Jimmy-INL I sorry, I just accidentally closed this PR

@wangcj05 wangcj05 reopened this Jul 8, 2021
@mandd mandd mentioned this pull request Jul 8, 2021
9 tasks
@moosebuild
Copy link

Job Test Ubuntu 18-2 Python 3 on 8a50404 : invalidated by @mandd

@aalfonsi
Copy link
Collaborator

Can we merge this?

@wangcj05 wangcj05 removed the request for review from alfoa July 11, 2021 17:36
@wangcj05
Copy link
Collaborator

Changes are good, and checklist is satisfied.

@wangcj05 wangcj05 merged commit 99bed4b into devel Jul 11, 2021
@wangcj05 wangcj05 deleted the alfoa/mandd/Jimmy-GA-ConstraintHandling branch July 11, 2021 17:42
@wangcj05
Copy link
Collaborator

@Jimmy-INL @mandd @aalfonsi FYI. I have merged this PR. Thanks @Jimmy-INL and @mandd.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority_critical RAVENv2.1 All tasks and defects that will go in RAVEN v2.1 task This tag should be used for any new capability, improvement or enanchment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[TASK] Contraint Handling in GA
8 participants