Merge branch 'bugfix/error_jun11' of https://github.com/POptUS/IBCDFO …

…into bugfix/error_jun11
POptUS · Jun 12, 2024 · 9ca87a8 · 9ca87a8
2 parents c99026d + 2f8c368
commit 9ca87a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/pounders/py/formquad.py b/pounders/py/formquad.py
@@ -9,7 +9,7 @@
 
 def formquad(X, F, delta, xk_in, np_max, Pars, vf):
     """
-    formquad(X, F, delta, xk_in, np_max, Pars, vf) -> [Mdir, np, valid, G, H, Mind]
+    formquad(X, F, delta, xk_in, np_max, Pars, vf) -> [Mdir, mp, valid, G, H, Mind]
     Computes the parameters for m quadratics
         ### FIX COMMENT Line 15 ###
         Q_i(x) = C(i) + G(:,i)'*x + 0.5*x'*H(:,:,i)*x,  i=1:m
@@ -31,7 +31,7 @@ def formquad(X, F, delta, xk_in, np_max, Pars, vf):
     vf      [log] Flag indicating you just want to check model validity
     --OUTPUTS----------------------------------------------------------------
     Mdir    [dbl] [(n-np+1)-by-n]  Unit directions to improve model
-    np      [int] Number of interpolation points (=length(Mind))
+    mp      [int] Number of interpolation points (=length(Mind))
     valid   [log] Flag saying if model is valid within Pars[2]*delta
     G       [dbl] [n-by-m]  Matrix of model gradients centered at X[xkin]
     H       [dbl] [n-by-n-by-m]  Array of model Hessians centered at X[xkin]

diff --git a/pounders/py/tests/test_showing_error_on_row10.py b/pounders/py/tests/test_showing_error_on_row10.py
@@ -59,5 +59,3 @@ def Ffun(y):
 
     if flag == 0:
         assert evals <= nf_max + nfs, "POUNDERs evaluated more than nf_max evaluations"
-    elif flag != -4:
-        assert evals == nf_max + nfs, "POUNDERs didn't use nf_max evaluations"