Mandd/pareto front PP prestruct #1479

mandd · 2021-03-15T20:00:02Z

Pull Request Description

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

The current Pareto front PP can handle 2-dimensional multi-objective optimization
This PR extends PP capabilities to multiple dimensions optimization
Issue #1448 #1447

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

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.

mandd · 2021-03-15T20:07:20Z

framework/utils/frontUtils.py

@@ -22,7 +22,7 @@



-def nonDominatedFrontier(data, returnMask):
+def nonDominatedFrontier(data, returnMask, minMask=None):


@wangcj05 I honestly feel like the required structure of returnMask and minMask might not be optimal, if you have comments/suggestions let me know

Sorry, I did not get your point here. Could you clarify it?

I was not sure if passing the data as numpy array and min mask as a separate numpy array was the best way to pass this info to this method

moosebuild · 2021-03-15T23:15:32Z

Job Test mac on 40d5279 : invalidated by @mandd

wangcj05 · 2021-03-16T16:31:50Z

framework/Models/PostProcessors/ParetoFrontierPostProcessor.py

+    for child in paramInput.subparts:
+      if child.getName() == 'objective':
+        self.objectives[child.value]={}
+        if child.parameterValues['goal'] in ['min','max']:


You can use InputTypes.makeEnumType in getInputSpecification to handle this, in that case, you do not need to check the goal input here.

good point: added enumType and removed checks

wangcj05 · 2021-03-16T16:36:55Z

framework/Models/PostProcessors/ParetoFrontierPostProcessor.py

+          self.raiseAnError(IOError, 'ParetoFrontier postprocessor {}: the objective {} expects a min/max goal, but received {} inputs!".'
+                                  .format(self.name,child.value,child.parameterValues['goal']))
+        if 'upperLimit' in child.parameterValues.keys():
+          self.objectives[child.value]['upperLimit'] = child.parameterValues['upperLimit']


Maybe you can use child.parameterValues.get('upperLimit')? Default is None if not available

wangcj05 · 2021-03-16T16:37:15Z

framework/Models/PostProcessors/ParetoFrontierPostProcessor.py

+        if 'upperLimit' in child.parameterValues.keys():
+          self.objectives[child.value]['upperLimit'] = child.parameterValues['upperLimit']
+        if 'lowerLimit' in child.parameterValues.keys():
+          self.objectives[child.value]['lowerLimit'] = child.parameterValues['lowerLimit']


See above comment

wangcj05 · 2021-03-16T16:42:05Z

framework/Models/PostProcessors/ParetoFrontierPostProcessor.py

+    selection = data.isel(RAVEN_sample_ID=np.array(paretoFrontMask))
+
+    for obj in self.objectives.keys():
+      if 'upperLimit' in self.objectives[obj].keys():


If you make changes according to previous comments, this line can be changed:
if self.objectives[obj]['upperLimit']:

yup, code is cleaner

wangcj05 · 2021-03-16T16:42:12Z

framework/Models/PostProcessors/ParetoFrontierPostProcessor.py

+      if 'upperLimit' in self.objectives[obj].keys():
+        selection = selection.where(selection[obj]<=self.objectives[obj]['upperLimit'])
+      if 'lowerLimit' in self.objectives[obj].keys():
+        selection = selection.where(selection[obj]>=self.objectives[obj]['lowerLimit'])


edited as well

wangcj05 · 2021-03-16T16:51:37Z

framework/utils/frontUtils.py

+  if minMask is None:
+    pass
+  elif minMask is not None and minMask.shape[0] != data.shape[1]:
+    raise IOError("nonDominatedFrontier method: minMask has shape " + str(data.shape) + " while minMask has shape " + str(minMask.shape))


Update the error message, it seems not clear to me

message expanded and fixed

wangcj05 · 2021-03-16T16:53:33Z

framework/utils/frontUtils.py

@@ -22,7 +22,7 @@



-def nonDominatedFrontier(data, returnMask):
+def nonDominatedFrontier(data, returnMask, minMask=None):


Sorry, I did not get your point here. Could you clarify it?

moosebuild · 2021-03-16T21:40:45Z

Job Test mac on 40d5279 : invalidated by @mandd

mandd

Addressing comments

mandd · 2021-03-16T23:19:28Z

framework/Models/PostProcessors/ParetoFrontierPostProcessor.py

+    for child in paramInput.subparts:
+      if child.getName() == 'objective':
+        self.objectives[child.value]={}
+        if child.parameterValues['goal'] in ['min','max']:


good point: added enumType and removed checks

mandd · 2021-03-16T23:22:43Z

framework/Models/PostProcessors/ParetoFrontierPostProcessor.py

+          self.raiseAnError(IOError, 'ParetoFrontier postprocessor {}: the objective {} expects a min/max goal, but received {} inputs!".'
+                                  .format(self.name,child.value,child.parameterValues['goal']))
+        if 'upperLimit' in child.parameterValues.keys():
+          self.objectives[child.value]['upperLimit'] = child.parameterValues['upperLimit']


mandd · 2021-03-16T23:22:48Z

framework/Models/PostProcessors/ParetoFrontierPostProcessor.py

+        if 'upperLimit' in child.parameterValues.keys():
+          self.objectives[child.value]['upperLimit'] = child.parameterValues['upperLimit']
+        if 'lowerLimit' in child.parameterValues.keys():
+          self.objectives[child.value]['lowerLimit'] = child.parameterValues['lowerLimit']


mandd · 2021-03-16T23:30:22Z

framework/Models/PostProcessors/ParetoFrontierPostProcessor.py

+    selection = data.isel(RAVEN_sample_ID=np.array(paretoFrontMask))
+
+    for obj in self.objectives.keys():
+      if 'upperLimit' in self.objectives[obj].keys():


yup, code is cleaner

mandd · 2021-03-16T23:30:31Z

framework/Models/PostProcessors/ParetoFrontierPostProcessor.py

+      if 'upperLimit' in self.objectives[obj].keys():
+        selection = selection.where(selection[obj]<=self.objectives[obj]['upperLimit'])
+      if 'lowerLimit' in self.objectives[obj].keys():
+        selection = selection.where(selection[obj]>=self.objectives[obj]['lowerLimit'])


edited as well

mandd · 2021-03-16T23:32:47Z

framework/utils/frontUtils.py

@@ -22,7 +22,7 @@



-def nonDominatedFrontier(data, returnMask):
+def nonDominatedFrontier(data, returnMask, minMask=None):


I was not sure if passing the data as numpy array and min mask as a separate numpy array was the best way to pass this info to this method

mandd · 2021-03-16T23:34:53Z

framework/utils/frontUtils.py

+  if minMask is None:
+    pass
+  elif minMask is not None and minMask.shape[0] != data.shape[1]:
+    raise IOError("nonDominatedFrontier method: minMask has shape " + str(data.shape) + " while minMask has shape " + str(minMask.shape))


message expanded and fixed

wangcj05 · 2021-03-17T02:04:59Z

@mandd please update the user manual regarding the input syntax changes made in this PR.

…olab/raven into mandd/paretoFrontPPrestruct

moosebuild · 2021-03-17T15:48:12Z

Job Test mac on 1cedcba : invalidated by @joshua-cogliati-inl

upgraded miniconda, trying again

moosebuild · 2021-03-17T16:00:56Z

Job Test mac on 1cedcba : invalidated by @joshua-cogliati-inl

restarted civet

moosebuild · 2021-03-17T19:03:13Z

Job Test mac on 40d5279 : invalidated by @mandd

mandd added 5 commits February 25, 2021 19:04

edits

90d8f67

working on PP

5c064ea

fixed conflict

c434f2b

added unit test for new functionality

e5f090f

fixed tests

7037d51

mandd linked an issue Mar 15, 2021 that may be closed by this pull request

[TASK] Extend ParetoFront PP #1478

Closed

10 tasks

delete whitespaces

40d5279

mandd requested review from wangcj05 and Jimmy-INL March 15, 2021 20:02

mandd commented Mar 15, 2021

View reviewed changes

wangcj05 requested changes Mar 16, 2021

View reviewed changes

mandd commented Mar 16, 2021

View reviewed changes

addressing comemnts

b0cffc5

wangcj05 approved these changes Mar 17, 2021

View reviewed changes

Merge branch 'devel' into mandd/paretoFrontPPrestruct

12d0878

mandd added 2 commits March 16, 2021 21:31

update manual

5245d57

Merge branch 'mandd/paretoFrontPPrestruct' of https://github.com/idah…

1cedcba

…olab/raven into mandd/paretoFrontPPrestruct

wangcj05 approved these changes Mar 17, 2021

View reviewed changes

wangcj05 merged commit dad45d8 into devel Mar 18, 2021

mandd added RAVENv2.1 All tasks and defects that will go in RAVEN v2.1 priority_normal task This tag should be used for any new capability, improvement or enanchment labels Mar 31, 2021

alfoa deleted the mandd/paretoFrontPPrestruct branch April 23, 2021 19:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Mandd/pareto front PP prestruct #1479

Mandd/pareto front PP prestruct #1479

mandd commented Mar 15, 2021 •

edited by wangcj05

Loading

mandd Mar 15, 2021

wangcj05 Mar 16, 2021

mandd Mar 16, 2021

moosebuild commented Mar 15, 2021

wangcj05 Mar 16, 2021

mandd Mar 16, 2021

wangcj05 Mar 16, 2021

mandd Mar 16, 2021

wangcj05 Mar 16, 2021

mandd Mar 16, 2021

wangcj05 Mar 16, 2021

mandd Mar 16, 2021

wangcj05 Mar 16, 2021

mandd Mar 16, 2021

wangcj05 Mar 16, 2021

mandd Mar 16, 2021

wangcj05 Mar 16, 2021

moosebuild commented Mar 16, 2021

mandd left a comment

mandd Mar 16, 2021

mandd Mar 16, 2021

mandd Mar 16, 2021

mandd Mar 16, 2021

mandd Mar 16, 2021

mandd Mar 16, 2021

mandd Mar 16, 2021

wangcj05 commented Mar 17, 2021

moosebuild commented Mar 17, 2021

moosebuild commented Mar 17, 2021

moosebuild commented Mar 17, 2021

		@@ -22,7 +22,7 @@



		def nonDominatedFrontier(data, returnMask):
		def nonDominatedFrontier(data, returnMask, minMask=None):

Mandd/pareto front PP prestruct #1479

Mandd/pareto front PP prestruct #1479

Conversation

mandd commented Mar 15, 2021 • edited by wangcj05 Loading

Pull Request Description

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

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

For Change Control Board: Change Request Review

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

moosebuild commented Mar 15, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

moosebuild commented Mar 16, 2021

mandd left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wangcj05 commented Mar 17, 2021

moosebuild commented Mar 17, 2021

moosebuild commented Mar 17, 2021

moosebuild commented Mar 17, 2021

mandd commented Mar 15, 2021 •

edited by wangcj05

Loading