Remove high relative tolerance on VMCON QPP (#3964)

* Remove high relative tolerance on VMCON QPP

* Allow use of PyVMCON 2.4.*

Author: timothy-nunn

process/solver.py

@@ -217,7 +217,7 @@ def _ineq_cons_satisfied(
                 np.array(self.bndu),
                 max_iter=global_variables.maxcal,
                 epsilon=self.tolerance,
-                qsp_options={"eps_rel": 1e-1, "adaptive_rho_interval": 25},
+                qsp_options={"adaptive_rho_interval": 25},
                 initial_B=bb,
                 callback=_solver_callback,
                 additional_convergence=_ineq_cons_satisfied

setup.py

@@ -30,11 +30,11 @@
     "install_requires": [
         "numpy>=1.23",
         "scipy>=1.10",
-        "cvxpy!=1.3.0,!=1.3.1",
+        "cvxpy~=1.7.3",
         "osqp>=1.0",
         "pandas>=2.0",
         "numba>=0.57",
-        "PyVMCON>=2.3.1,<3.0.0",
+        "PyVMCON>=2.4.0,<2.5.0",
         "CoolProp>=6.4",
         "matplotlib>=2.1.1",
         "seaborn>=0.12.2",

tests/integration/test_vmcon.py

@@ -44,13 +44,15 @@ def __init__(self, name, evaluator):
 
 
 class SolverArgs:
-    def __init__(self):
+    def __init__(self, n=2):
         """Initialise some common arguments to the solver adapter.
 
+        :param n: number of input variables (default 2)
+        :type n: int
+
         These arguments are shared between some of the test cases.
         """
         # No bounds on x values set
-        n = 2
         self.x = np.zeros(n)
         self.ilower = np.zeros(n)
         self.iupper = np.zeros(n)
@@ -564,6 +566,7 @@ def get_case5():
     """
     # Create a case-specific Vmcon object with overridden fcnvmc1 and 2
     case = Case("5", Evaluator5())
+    case.solver_args = SolverArgs(n=1)
 
     # Set up vmcon values for this case
     neqns = 1