-
Notifications
You must be signed in to change notification settings - Fork 144
Rng improvements #2534
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
Open
W0lfShAd0w
wants to merge
32
commits into
idaholab:devel
Choose a base branch
from
W0lfShAd0w:RNG_improvements
base: devel
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Rng improvements #2534
Changes from 5 commits
Commits
Show all changes
32 commits
Select commit
Hold shift + click to select a range
b984f8f
Adding modification for equilibrium cycle optimzation samplers and ch…
0613cad
update and add PRLO module
wangcj05 83067a3
Minor bug fixes and formatting improvements. Fixed the bug previously…
0f5b01e
Fixed plot name printed in error messages.
8307e5f
Added logic to allow 'Inputs', 'Outputs', and 'Index' to be None. Thi…
05b2414
Applied hotfix from Khang Nguyen that corrects a synchronization issu…
54b6af7
Further improvements from Khang and Mohammad Abdo to improve the sync…
afcf1fa
The outdated behavior of having randomUtils initialize the RNG with a…
f10a52a
Merge pull request #1 from W0lfShAd0w/EquilibriumCycleWork_June25
W0lfShAd0w 3b4706f
fixed a bug frontUtils.py that was causing nonfitness pareto fronts t…
W0lfShAd0w 7baf9fc
globalSeed parameter of RunInfo now supports 'None' as a valid input.
6baef0d
Added functionality in the GA optimizer to perform zscore normalizati…
5a9b834
Temporary fix made to correct desyncing issues in the Optimizer betwe…
7c7db7b
Fixed a bug in NSGA-II causing the fitness values to be desynced from…
144c65d
Changed the utility of the scaling factors in fitness.py so that they…
ba2943f
Fixed the way default scaling factors were being applied to accomodat…
e427807
Overhauled the method by which NSGA-II was storing data/tracking for …
0471b64
Adopted some lines from Josh Cogliati to ensure that the most fit ind…
bdd5ed6
Added a print statement for when no GlobalSeed is provided.
4500020
Improved the data storing used in the sampler._solutionExport to redu…
c270783
The outdated behavior of having randomUtils initialize the RNG with a…
4c64114
globalSeed parameter of RunInfo now supports 'None' as a valid input.
020ac52
Added a print statement for when no GlobalSeed is provided.
d12f00a
Minor changes made to address comments in PR #2534. Several tests wer…
26fc55f
global seed added to more tests to ensure consistency with golds.
661b0f2
Minor change to clarify output messages from globalSeed check.
dc2c069
Added globalSeed parameter to test input file for backwards compatabi…
a30e2d3
resolve merge conflicts with idaholab/devel
e98f7bc
Modified the tolerance on the multiYearDWT test to account for uncert…
392a784
Increased tolerances further for multiYearDWT test to get around fitt…
a5fbc8e
Attempt at addressing the possible intermittent test error on Fedora …
ac6132f
Merge branch 'devel' into RNG_improvements
W0lfShAd0w File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| # Copyright 2017 Battelle Energy Alliance, LLC | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| import xml.etree.ElementTree as ET | ||
|
|
||
| def convert(tree,fileName=None): | ||
| """ | ||
| Converts input files to include the <globalSeed> argument under <RunInfo>. This enables | ||
| backwards compatibility following updates made to randomUtils.py. | ||
| @ In, tree, xml.etree.ElementTree.ElementTree object, the contents of a RAVEN input file | ||
| @ In, fileName, the name for the raven input file | ||
| @Out, tree, xml.etree.ElementTree.ElementTree object, the modified RAVEN input file | ||
| """ | ||
| newTag = 'globalSeed' | ||
| newValue = 5489 | ||
|
|
||
| simulation = tree.getroot() | ||
| runInfo = simulation.find('RunInfo') | ||
| if runInfo is not None: | ||
| elemExists = False | ||
| for child in runInfo: | ||
| if child.tag == newTag: | ||
| elemExists = True | ||
| if not elemExists: | ||
| newElem = ET.Element(newTag) | ||
| newElem.text = str(newValue) | ||
| runInfo.append(newElem) | ||
| return tree | ||
|
|
||
| if __name__=='__main__': | ||
| import convert_utils | ||
| import sys | ||
| convert_utils.standardMain(sys.argv,convert) | ||
| ## the following is provided as an example format for the expected content of the system arguments (sys.argv): | ||
| #sys.argv = ['/home/rollnk/LWRS-PRLO/raven_latest/scripts/conversionScripts/convert_globalseed.py','--tests','--no-rewrite'] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,6 +10,7 @@ | |
| pbs | ||
| <runQSUB/> | ||
| </mode> | ||
| <globalSeed>5489</globalSeed> | ||
| </RunInfo> | ||
|
|
||
| <Steps> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,6 +26,7 @@ | |
| <coresneeded>2</coresneeded> | ||
| <runQSUB/> | ||
| </mode> | ||
| <globalSeed>5489</globalSeed> | ||
| </RunInfo> | ||
|
|
||
| <Files> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Make sure you don't commit any *.xml.bak files, but we shouldn't need to have this in the .gitignore file.