rename to pyprima

Author: nbelakovski

primapy/.gitignore pyprima/.gitignoreprimapy/.gitignore renamed to pyprima/.gitignore

@@ -15,7 +15,7 @@
     'rhoend' : 3.14*1.0e-4,
 }
 
-def get_primapy_options(n, f0):
+def get_pyprima_options(n, f0):
     if os.environ.get('NONDEFAULT_PRIMAPY') == 'True':
         options = nondefault_options(n, f0)
         # Change the option name
@@ -30,8 +30,8 @@ def get_python_options(n, f0):
     return {}
 
 
-def primapy_cobyla(fun, x0, lb, ub, a_ub, b_ub, a_eq, b_eq, c_ub, c_eq):
-    from primapy import minimize, Bounds, LinearConstraint, NonlinearConstraint
+def pyprima_cobyla(fun, x0, lb, ub, a_ub, b_ub, a_eq, b_eq, c_ub, c_eq):
+    from pyprima import minimize, Bounds, LinearConstraint, NonlinearConstraint
 
     f0 = fun.__self__._fun(x0)
     bounds = Bounds(lb, ub)
@@ -46,7 +46,7 @@ def primapy_cobyla(fun, x0, lb, ub, a_ub, b_ub, a_eq, b_eq, c_ub, c_eq):
     c_eq_x0 = c_eq(x0)
     if c_eq_x0.size > 0:
         constraints.append(NonlinearConstraint(c_eq, np.zeros_like(c_eq_x0), np.zeros_like(c_eq_x0)))
-    options = get_primapy_options(len(x0), f0)
+    options = get_pyprima_options(len(x0), f0)
     if 'npt' in options:
         del options['npt']
     result = minimize(fun, x0, method='cobyla', bounds=bounds, constraints=constraints, options=options)
@@ -90,7 +90,7 @@ def get_problems(description):
     args = parser.parse_args()
 
 
-    def run_three_benchmarks(primapy_fun, python_fun, algorithm, cutest_problem_names, default_only, n_jobs):
+    def run_three_benchmarks(pyprima_fun, python_fun, algorithm, cutest_problem_names, default_only, n_jobs):
         '''
         Proper validation of both default and nondefault options requires 3 runs: Both default, both nondefault, and
         one default one nondefault. The first two should look identical, and so the third run confirms that our
@@ -104,19 +104,19 @@ def run_three_benchmarks(primapy_fun, python_fun, algorithm, cutest_problem_name
         project_x0 = algorithm == 'lincoa'
         os.environ['NONDEFAULT_PRIMAPY'] = "False"
         os.environ['NONDEFAULT_PYTHON'] = "False"
-        run_benchmark([primapy_fun, python_fun], [f'PyPRIMA-{ALGORITHM}', f'Python-{ALGORITHM}'], cutest_problem_names, benchmark_id=f'{algorithm}_default_options', n_jobs=n_jobs, project_x0=project_x0)
+        run_benchmark([pyprima_fun, python_fun], [f'PyPRIMA-{ALGORITHM}', f'Python-{ALGORITHM}'], cutest_problem_names, benchmark_id=f'{algorithm}_default_options', n_jobs=n_jobs, project_x0=project_x0)
         if not default_only:
             os.environ['NONDEFAULT_PRIMAPY'] = "True"
             os.environ['NONDEFAULT_PYTHON'] = "True"
-            run_benchmark([primapy_fun, python_fun], [f'PyPRIMA-{ALGORITHM}', f'Python-{ALGORITHM}'], cutest_problem_names, benchmark_id=f'{algorithm}_nondefault_options', n_jobs=n_jobs, project_x0=project_x0)
+            run_benchmark([pyprima_fun, python_fun], [f'PyPRIMA-{ALGORITHM}', f'Python-{ALGORITHM}'], cutest_problem_names, benchmark_id=f'{algorithm}_nondefault_options', n_jobs=n_jobs, project_x0=project_x0)
             os.environ['NONDEFAULT_PRIMAPY'] = "True"
             os.environ['NONDEFAULT_PYTHON'] = "False"
-            run_benchmark([primapy_fun, python_fun], [f'PyPRIMA-{ALGORITHM}', f'Python-{ALGORITHM}'], cutest_problem_names, benchmark_id=f'{algorithm}_different_options', n_jobs=n_jobs, project_x0=project_x0)
+            run_benchmark([pyprima_fun, python_fun], [f'PyPRIMA-{ALGORITHM}', f'Python-{ALGORITHM}'], cutest_problem_names, benchmark_id=f'{algorithm}_different_options', n_jobs=n_jobs, project_x0=project_x0)
 
     start = time()
     print("Running profiles for COBYLA")
     with open('cobyla.txt') as f:
         cutest_problem_names = f.read().splitlines()
     cutest_problem_names = list(filter(lambda x: x not in excludelist('cobyla'), cutest_problem_names))
-    run_three_benchmarks(primapy_cobyla, python_cobyla, 'cobyla', cutest_problem_names, args.default_only, args.n_jobs)
+    run_three_benchmarks(pyprima_cobyla, python_cobyla, 'cobyla', cutest_problem_names, args.default_only, args.n_jobs)
     print(f'Completed COBYLA profile in {time() - start:.2f} seconds')