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.

Sign up for GitHub

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

Jump to bottom

216 add dfo gn #281

Merged
merged 17 commits into from
Nov 1, 2019
Merged

216 add dfo gn #281

merged 17 commits into from
Nov 1, 2019

Conversation

tyronerees
Copy link
Member

Description of Work

Resolves #216

Testing Instructions

  1. Add dfogn to the software list in an example script
  2. Check output is as expected (especially on simple_tests)

Function: Does the change do what it's supposed to?

Tests: Does it pass? Is there adequate coverage for new code?

Style: Is the coding style consistent? Is anything overly confusing?

Documentation: Is there a suitable change to documentation for this change?

AndrewLister-STFC
AndrewLister-STFC requested changes Oct 31, 2019
View reviewed changes
Copy link
Contributor

@AndrewLister-STFC AndrewLister-STFC left a comment

Choose a reason for hiding this comment

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

Looks good, I just spotted a few minor things.

fitbenchmarking/fitting/controllers/dfogn_controller.py Outdated Show resolved Hide resolved
fitbenchmarking/fitting/controllers/dfogn_controller.py Outdated Show resolved Hide resolved
fitbenchmarking/fitting/controllers/dfogn_controller.py Outdated Show resolved Hide resolved
fitbenchmarking/fitbenchmark_one_problem.py Outdated Show resolved Hide resolved
fitbenchmarking/fitting/tests/test_controllers.py Outdated Show resolved Hide resolved
tyronerees and others added 5 commits November 1, 2019 08:42
@tyronerees
Add new controller alphabetically
2a547c3 
I've also added a couple of lines in the docs asking for this.
@tyronerees @AndrewLister-STFC
Scipy -> DFO-GN in comments
93fe239 
Co-Authored-By: AndrewLister-STFC <48282025+AndrewLister-STFC@users.noreply.github.com>
@tyronerees
remove unneeded popt
cf547a0
@tyronerees
Don't redefine use_errors
cc37e09
@tyronerees
Merge branch '216-add_dfo-gn' of https://github.com/mantidproject/fit…
95921de 
…benchmarking into 216-add_dfo-gn
@tyronerees
Copy link
Member Author

@AndrewLister-STFC : thanks for your suggestions, I've changed accordingly -- could you look through the updated code and approve (or suggest further changes)?

AndrewLister-STFC
AndrewLister-STFC approved these changes Nov 1, 2019
View reviewed changes
Copy link
Contributor

@AndrewLister-STFC AndrewLister-STFC left a comment

Choose a reason for hiding this comment

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

Great, thanks for updating the docs with the alphabetical comment too, thats a standard in pep8 so we should watch out for it.

@AndrewLister-STFC AndrewLister-STFC merged commit a9da0c0 into master Nov 1, 2019
@AndrewLister-STFC AndrewLister-STFC deleted the 216-add_dfo-gn branch November 1, 2019 10:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AndrewLister-STFC AndrewLister-STFC AndrewLister-STFC approved these changes

Assignees
No one assigned
Labels
Fitting software
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add DFO-GN
2 participants
@tyronerees @AndrewLister-STFC