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

The integration of SasView #199

Merged
merged 50 commits into from
Sep 1, 2019
Merged

The integration of SasView #199

merged 50 commits into from
Sep 1, 2019

Commits on Aug 20, 2019

  1. Add SasView example_runScripts

    @AtomAnu
    AtomAnu committed Aug 20, 2019
    Configuration menu
    Copy the full SHA
    49bd1ea View commit details
    Browse the repository at this point in the history

  2. Create parse file for SasView

    @AtomAnu
    AtomAnu committed Aug 20, 2019
    Configuration menu
    Copy the full SHA
    519174c View commit details
    Browse the repository at this point in the history

  3. Update prob_def_1.txt

    @AtomAnu
    AtomAnu committed Aug 20, 2019
    Configuration menu
    Copy the full SHA
    7f6d3a9 View commit details
    Browse the repository at this point in the history

  4. Update parse_sasview_data.py

    @AtomAnu
    AtomAnu committed Aug 20, 2019
    Configuration menu
    Copy the full SHA
    eb3d8dd View commit details
    Browse the repository at this point in the history

  5. Further integration of SasView

    @AtomAnu
    AtomAnu committed Aug 20, 2019
    Configuration menu
    Copy the full SHA
    e1e3259 View commit details
    Browse the repository at this point in the history

  6. SasView Successful Integration

    @AtomAnu
    AtomAnu committed Aug 20, 2019
    Configuration menu
    Copy the full SHA
    8cda081 View commit details
    Browse the repository at this point in the history

  7. Enable FitBenchmarking to fit SasView models using 'scipy.optimize.cu… 

    …rve_fit`
    @AtomAnu
    AtomAnu committed Aug 20, 2019
    Configuration menu
    Copy the full SHA
    d29060b View commit details
    Browse the repository at this point in the history

  8. Update misc.py

    @AtomAnu
    AtomAnu committed Aug 20, 2019
    Configuration menu
    Copy the full SHA
    1f60683 View commit details
    Browse the repository at this point in the history

  9. Some errors fixed in the case of using SasView models in scipy fitting

    @AtomAnu
    AtomAnu committed Aug 20, 2019
    Configuration menu
    Copy the full SHA
    4c70d12 View commit details
    Browse the repository at this point in the history

  10. Futher Integration of SasView

    @AtomAnu
    AtomAnu committed Aug 20, 2019
    Configuration menu
    Copy the full SHA
    53113fa View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2019

  1. Update example_runScripts_SasView.py and add sas/sascalc to FitBe… 

    …nchmarking

The file `example_runScripts_SasView.py` has been updated so that it will prompt a message if Bumps, sasmodels or sascalc is/are not installed.

The folder `sas/sascalc` is added as sascalc is not an independent package to be installed via `pip` yet. This folder should be removed once there is an installation method for sascalc.
    @AtomAnu
    AtomAnu committed Aug 21, 2019
    Configuration menu
    Copy the full SHA
    496f614 View commit details
    Browse the repository at this point in the history

  2. Minor adjustments

    @AtomAnu
    AtomAnu committed Aug 21, 2019
    Configuration menu
    Copy the full SHA
    9ee4a31 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2019

  1. Update test_func_def.py

    @AtomAnu
    AtomAnu committed Aug 22, 2019
    Configuration menu
    Copy the full SHA
    5690ad5 View commit details
    Browse the repository at this point in the history

  2. Removal of the test data files and update on parse.py

    @AtomAnu
    AtomAnu committed Aug 22, 2019
    Configuration menu
    Copy the full SHA
    7c3d303 View commit details
    Browse the repository at this point in the history

  3. Update parse.py

    @AtomAnu
    AtomAnu committed Aug 22, 2019
    Configuration menu
    Copy the full SHA
    0da9bae View commit details
    Browse the repository at this point in the history

  4. Update parse_fitbenchmark_data.py

    @AtomAnu
    AtomAnu committed Aug 22, 2019
    Configuration menu
    Copy the full SHA
    f45c1db View commit details
    Browse the repository at this point in the history

  5. Update test_parse_fitbenchmark_data.py

    @AtomAnu
    AtomAnu committed Aug 22, 2019
    Configuration menu
    Copy the full SHA
    5cd4ea9 View commit details
    Browse the repository at this point in the history

  6. Unit tests file for parse_sasview_data.py 

    A script to test the modules in `parse_sasview_data.py` has been added. A set of mock problem files has also been added.
    @AtomAnu
    AtomAnu committed Aug 22, 2019
    Configuration menu
    Copy the full SHA
    260eb4b View commit details
    Browse the repository at this point in the history

  7. Temporary condition statement added in test_parse_sasview_data.py t… 

    …o check if sasmodels is installed
    @AtomAnu
    AtomAnu committed Aug 22, 2019
    Configuration menu
    Copy the full SHA
    bcb1df4 View commit details
    Browse the repository at this point in the history

  8. Add sasview/tests/test_prepare_data.py 

    This is a unit test file for `sasview/prepare_data.py`
    @AtomAnu
    AtomAnu committed Aug 22, 2019
    Configuration menu
    Copy the full SHA
    5d1f847 View commit details
    Browse the repository at this point in the history

  9. Update setup.py to install bumps and sasmodels 

    This will be remove once bumps and sasmodels can be installed by `python setup.py install`.
    @AtomAnu
    AtomAnu committed Aug 22, 2019
    Configuration menu
    Copy the full SHA
    be5c5e3 View commit details
    Browse the repository at this point in the history

  10. Update setup.py to install lxml 

    lxml is required by sasmodels
    @AtomAnu
    AtomAnu committed Aug 22, 2019
    Configuration menu
    Copy the full SHA
    70fcfd6 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2019

  1. Update README.md 

    Co-Authored-By: Anders Markvardsen <anders.markvardsen@stfc.ac.uk>
    @AtomAnu @Anders-Markvardsen
    AtomAnu and Anders-Markvardsen committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    dc84f6a View commit details
    Browse the repository at this point in the history

  2. Minor changes for modules inside sasview/func_def.py

    @AtomAnu
    AtomAnu committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    6253144 View commit details
    Browse the repository at this point in the history

  3. Update example_runScripts.py

    @AtomAnu
    AtomAnu committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    5a47874 View commit details
    Browse the repository at this point in the history

  4. Update README.md

    @AtomAnu
    AtomAnu committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    36c482f View commit details
    Browse the repository at this point in the history

  5. Create README.md for sas/sascalc

    @AtomAnu
    AtomAnu committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    623c019 View commit details
    Browse the repository at this point in the history

  6. Update README.md

    @AtomAnu
    AtomAnu committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    1ba97e0 View commit details
    Browse the repository at this point in the history

  7. Update README.md

    @AtomAnu
    AtomAnu committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    d3d74af View commit details
    Browse the repository at this point in the history

  8. Change the log messages sent when fits fail

    @AtomAnu
    AtomAnu committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    103387c View commit details
    Browse the repository at this point in the history

  9. Change the name of folders inside fitbenchmarking/benchmark_problems

    @AtomAnu
    AtomAnu committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    06f2ac5 View commit details
    Browse the repository at this point in the history

  10. Delete .DS_Store

    @AtomAnu
    AtomAnu committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    00439a4 View commit details
    Browse the repository at this point in the history

  11. Delete .DS_Store

    @AtomAnu
    AtomAnu committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    c6beacb View commit details
    Browse the repository at this point in the history

  12. Update test_misc.py

    @AtomAnu
    AtomAnu committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    ae14f0f View commit details
    Browse the repository at this point in the history

  13. Merge branch 'integratingSasView' of https://github.com/fitbenchmarki… 

    …ng/fitbenchmarking into integratingSasView
    @AtomAnu
    AtomAnu committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    0b1f77f View commit details
    Browse the repository at this point in the history

  14. Update test_parse_sasview_data.py

    @AtomAnu
    AtomAnu committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    4d41c51 View commit details
    Browse the repository at this point in the history

  15. Update test_parse_sasview_data.py

    @AtomAnu
    AtomAnu committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    64ad54c View commit details
    Browse the repository at this point in the history

  16. Added a unit test file for sasview/func_def.py

    @AtomAnu
    AtomAnu committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    9b74b7e View commit details
    Browse the repository at this point in the history

  17. Update test_parse_sasview_data.py

    @AtomAnu
    AtomAnu committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    4e623bf View commit details
    Browse the repository at this point in the history

  18. Update fitbenchmark_data_functions.py

    @AtomAnu
    AtomAnu committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    eedf076 View commit details
    Browse the repository at this point in the history

  19. Change to def description

    @Anders-Markvardsen
    Anders-Markvardsen committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    049cc5e View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2019

  1. Minor fixes 

    These fixes were done as discussed in the Pull Request
    @AtomAnu
    AtomAnu committed Aug 26, 2019
    Configuration menu
    Copy the full SHA
    6caf380 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'integratingSasView' of https://github.com/fitbenchmarki… 

    …ng/fitbenchmarking into integratingSasView
    @AtomAnu
    AtomAnu committed Aug 26, 2019
    Configuration menu
    Copy the full SHA
    8c83520 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2019

  1. remove some unused imports

    @Anders-Markvardsen
    Anders-Markvardsen committed Aug 29, 2019
    Configuration menu
    Copy the full SHA
    9d9eb18 View commit details
    Browse the repository at this point in the history

  2. updated doc for two of the example script, incluidng using [] to show… 

    … that can specify multiple software
    @Anders-Markvardsen
    Anders-Markvardsen committed Aug 29, 2019
    Configuration menu
    Copy the full SHA
    328b657 View commit details
    Browse the repository at this point in the history

  3. added more clear doc utility nist and fitbenchmarking files

    @Anders-Markvardsen
    Anders-Markvardsen committed Aug 29, 2019
    Configuration menu
    Copy the full SHA
    85d7d9a View commit details
    Browse the repository at this point in the history

  4. update doc for sasview example file

    @Anders-Markvardsen
    Anders-Markvardsen committed Aug 29, 2019
    Configuration menu
    Copy the full SHA
    92834a9 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2019

  1. fix tests

    @Anders-Markvardsen
    Anders-Markvardsen committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    2875c80 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2019

  1. More doc update and remove file 

    Remove SasView_example.py (not obvious what purpose it has)
    @Anders-Markvardsen
    Anders-Markvardsen committed Sep 1, 2019
    Configuration menu
    Copy the full SHA
    845f9db View commit details
    Browse the repository at this point in the history

  2. Describe new sasview format and give description of all problem folders

    @Anders-Markvardsen
    Anders-Markvardsen committed Sep 1, 2019
    Configuration menu
    Copy the full SHA
    6a3e68b View commit details
    Browse the repository at this point in the history