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

Opt constraints tests #236

Merged
merged 68 commits into from
Jul 3, 2017

Conversation

PaulTalbot-INL
Copy link
Collaborator


Pull Request Description

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

Closes #46.

What are the significant changes in functionality due to this change request?
  • Fixes optimization constraints, and adds an analytic constraint test, to the repository
  • Adds an 11-page user guide entry on using the optimizers
  • Fixes several ambiguities and incorrect statements in the user manual regarding optimization

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?

…ep sizing in multiple levels, and it needs different convergence tolerances for each ML step
…uter-level step sizes, number of steps in each outer level, and relaxed convergence for some number of iterations
…zation works, it does not work with multiple opt point evaluations as it is implemented currently. From this commit, we begin reworking the submission process so that it will work.
…e gradient evals into localStillReady now, probably
…erateInput instead of localStillReady, which means we might not be as ready as we thought sometimes.
@alfoa alfoa requested review from alfoa and removed request for AaronEpiney July 3, 2017 17:06
@alfoa alfoa self-assigned this Jul 3, 2017
@alfoa alfoa added the task This tag should be used for any new capability, improvement or enanchment label Jul 3, 2017
@@ -436,7 +436,7 @@ def initialize(self,externalSeeding=None,solutionExport=None):
for trajInd in self.optTraj:
for varname in self.getOptVars():
varK[varname] = self.optVarsInit['initial'][varname][trajInd]
satisfied, _ = self.checkConstraint(self.normalizeData(varK))
satisfied, _ = self.checkConstraint(varK)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Thanks

0.0,1.23350487406,-1.63980124837,19.5238896591,22.0
>>>>>>> devel
Copy link
Collaborator

Choose a reason for hiding this comment

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

conflict did not get solved here.

@@ -0,0 +1,73 @@
<?xml version="1.0" ?>
<Simulation>
Copy link
Collaborator

Choose a reason for hiding this comment

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

<TestInfo> missing

<RunInfo>
<WorkingDir>MultipleTraj</WorkingDir>
<Sequence>optimize,print</Sequence>
</RunInfo>
Copy link
Collaborator

Choose a reason for hiding this comment

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

<TestInfo> missing

<RunInfo>
<WorkingDir>Simple</WorkingDir>
<Sequence>optimize,print</Sequence>
</RunInfo>
Copy link
Collaborator

Choose a reason for hiding this comment

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

<TestInfo> missing

<RunInfo>
<WorkingDir>StepSize</WorkingDir>
<Sequence>optimize,print</Sequence>
</RunInfo>
Copy link
Collaborator

Choose a reason for hiding this comment

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

as above

<RunInfo>
<WorkingDir>Summary</WorkingDir>
<Sequence>optimize,getOptPoint,print</Sequence>
</RunInfo>
Copy link
Collaborator

Choose a reason for hiding this comment

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

as above. Sorry for multiple messages

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

No problem! Sorry I forgot this syntax.

@alfoa
Copy link
Collaborator

alfoa commented Jul 3, 2017

The reason of the failure for .\tests\framework\user_guide\ForwardSamplingStrategies.Grid is because the test uses 8 processors and sometimes the one history finishes before the other determining that the diff fails.

@PaulTalbot-INL even if this does not relate to this MR, can you change the test to use a batchsize of 1 or change the CSV we compare to (using UnorderedCSV)?

@PaulTalbot-INL
Copy link
Collaborator Author

Ok, sure.

@alfoa
Copy link
Collaborator

alfoa commented Jul 3, 2017

Ok.

Comments have been addressed...

Once the tests pass, this PR can be accepted

@alfoa alfoa mentioned this pull request Jul 3, 2017
10 tasks
@PaulTalbot-INL PaulTalbot-INL merged commit fb5315c into idaholab:devel Jul 3, 2017
@PaulTalbot-INL
Copy link
Collaborator Author

@bobkinl With the two merges today, we're set for another push to Hybrid, if you have the time this week.

@bobkinl
Copy link
Collaborator

bobkinl commented Jul 5, 2017

I'm on it.

@PaulTalbot-INL PaulTalbot-INL deleted the opt_constraints_tests branch June 7, 2018 14:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

Documentation for Optimizer
4 participants