Issue #167: Rename minimizers_list_defaults.json to fitbenchmarking_d…

…efault_options.json
fitbenchmarking · Sep 4, 2019 · 3040567 · 3040567
1 parent 9c6d969
commit 3040567
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/example_scripts/README.md b/example_scripts/README.md
@@ -8,7 +8,7 @@ Here is the list of all the example scripts and the difference between them:
 3. `example_runScripts_expert.py` is designed to be run once Mantid and SasView (future development) are installed. This script will benchmark all the minimizers from different softwares against various type of problem definition files.
 ### Example usage
 
-For default minimizers use (which loads minimizers_list_defaults.json):
+For default minimizers use (which loads fitbenchmarking_default_options.json):
 `mantidpython example_runScripts.py`
 
 Can also change the `minimizers` variable within `example_runScripts.py` to customize the minimization (see example script)

diff --git a/example_scripts/example_runScripts.py b/example_scripts/example_runScripts.py
@@ -44,7 +44,7 @@
   software_options['minimizer_options'] = custom_minimizers
 else:
   # Using default minimizers from
-  # fitbenchmarking/fitbenchmarking/minimizers_list_default.json
+  # fitbenchmarking/fitbenchmarking/fitbenchmarking_default_options.json
   software_options['minimizer_options'] = None
 
 # Benchmark problem directories

diff --git a/example_scripts/example_runScripts_SasView.py b/example_scripts/example_runScripts_SasView.py
@@ -70,7 +70,7 @@
   software_options['minimizer_options'] = custom_minimizers
 else:
   # Using default minimizers from
-  # fitbenchmarking/fitbenchmarking/minimizers_list_default.json
+  # fitbenchmarking/fitbenchmarking/fitbenchmarking_default_options.json
   software_options['minimizer_options'] = None
 
 

diff --git a/example_scripts/example_runScripts_expert.py b/example_scripts/example_runScripts_expert.py
@@ -49,7 +49,7 @@
     software_options['minimizer_options'] = custom_minimizers
 else:
     # Using default minimizers from
-    # fitbenchmarking/fitbenchmarking/minimizers_list_default.json
+    # fitbenchmarking/fitbenchmarking/fitbenchmarking_default_options.json
     software_options['minimizer_options'] = None
 
 # Benchmark problem directories

diff --git a/example_scripts/example_runScripts_mantid.py b/example_scripts/example_runScripts_mantid.py
@@ -55,7 +55,7 @@
   software_options['minimizer_options'] = custom_minimizers
 else:
   # Using default minimizers from
-  # fitbenchmarking/fitbenchmarking/minimizers_list_default.json
+  # fitbenchmarking/fitbenchmarking/fitbenchmarking_default_options.json
   software_options['minimizer_options'] = None
 
 # Benchmark problem directories

diff --git a/fitbenchmarking/minimizers_list_default.json → ...king/fitbenchmarking_default_options.json b/fitbenchmarking/minimizers_list_default.json → ...king/fitbenchmarking_default_options.json
diff --git a/fitbenchmarking/utils/misc.py b/fitbenchmarking/utils/misc.py
@@ -51,7 +51,7 @@ def get_minimizers(software_options):
                 current_path = os.path.dirname(os.path.realpath(__file__))
                 fitbm_path = os.path.abspath(os.path.join(current_path, os.pardir))
                 minimizer_file = os.path.join(fitbm_path,
-                                              "minimizers_list_default.json")
+                                              "fitbenchmarking_default_options.json")
                 minimizers_list = json.load(open(minimizer_file))
             elif isinstance(minimizer_options, str):
                 minimizers_list = json.load(open(minimizer_options))

diff --git a/fitbenchmarking/utils/tests/test_misc.py b/fitbenchmarking/utils/tests/test_misc.py
@@ -74,7 +74,7 @@ def get_minimizers_file(self):
     utils_path = os.path.abspath(os.path.join(current_path, os.pardir))
     fitbm_path = os.path.abspath(os.path.join(utils_path, os.pardir))
     minimizer_json = os.path.join(fitbm_path,
-                                  "minimizers_list_default.json")
+                                  "fitbenchmarking_default_options.json")
     return str(minimizer_json)
 
   def test_getMinimizers_load_correct_minimizers_mantid_default(self):