pyoptgra 1.2.0__tar.gz → 1.2.2__tar.gz

{pyoptgra-1.2.0 → pyoptgra-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pyoptgra
-Version: 1.2.0
+Version: 1.2.2
 Summary: A python-wrapped version of OPTGRA, an algorithm for constrained optimization
 Author-Email: Johannes Schoenmaekers <johannes.schoenmaekers@esa.int>, Moritz von Looz <moritz.von.looz@esa.int>, Waldemar Martens <waldemar.martens@esa.int>
 License: GPL-3.0 or ESCL-2.4

{pyoptgra-1.2.0 → pyoptgra-1.2.2}/pyoptgra/optgra.py

@@ -62,8 +62,8 @@ def _get_constraint_violation(
     eq_cons = np.array(f[1 : (nec + 1)])
     ineq_cons = np.array(f[(nec + 1) :])
     # extract corresponding tolerances
-    eq_con_tol = con_tol_array[1 : (nec + 1)]
-    ineq_con_tol = con_tol_array[(nec + 1) :]
+    eq_con_tol = con_tol_array[0:nec]
+    ineq_con_tol = con_tol_array[nec:]
 
     # determine maximum constraint violation
     violations = np.concatenate(
@@ -110,7 +110,6 @@ class optgra:
 
     @staticmethod
     def _constraint_types_from_box_bounds(problem):
-
         lb, ub = problem.get_bounds()
         # all box-derived constraints are positive
         finite_lb = sum(isfinite(elem) for elem in lb)
@@ -129,7 +128,6 @@ class optgra:
         lb, ub = problem.get_bounds()
 
         def wrapped_fitness(x):
-
             # we are using vectorisation internally -> convert to ndarray
             x = np.asarray(x, dtype=np.float64)
             _assert_finite(x, "decision vector")  # catch nan values
@@ -169,7 +167,6 @@ class optgra:
         force_bounds=False,
         khanf: Optional[base_khan_function] = None,
     ):
-
         # get the sparsity pattern to index the sparse gradients
         sparsity_pattern = problem.gradient_sparsity()
         f_indices, x_indices = sparsity_pattern.T  # Unpack indices
@@ -178,7 +175,6 @@ class optgra:
         shape = (problem.get_nf(), problem.get_nx())
 
         def wrapped_gradient(x):
-
             # we are using vectorisation internally -> convert to ndarray
             x = np.asarray(x, dtype=np.float64)
             _assert_finite(x, "decision vector")  # catch nan values
@@ -587,6 +583,11 @@ class optgra:
         )
 
         best_x, best_f, finopt = result
+        # FINOPT
+        # -> 1=    MATCHED &     OPTIMAL
+        # -> 2=    MATCHED & NOT OPTIMAL
+        # -> 3=NOT MATCHED & NOT OPTIMAL
+        # -> 4=NOT FEASIBL & NOT OPTIMAL
 
         # if a Khan function is used we first need to convert to pagmo parameters
         if khanf:
@@ -601,13 +602,14 @@ class optgra:
         # pagmo_fitness = [best_f[-1]] + best_f[0 : problem.get_nc()]
         population.set_x(idx, best_x)  # , list(pagmo_fitness))
 
-        # store last result for output
+        # store last result for get_extra_info() method
         self.__last_result = {
             "f": population.champion_f,
             "x": best_x,
             "con_tol": problem.c_tol,
             "nec": problem.get_nec(),
             "has_gradient": problem.has_gradient(),
+            "finopt": finopt,
         }
 
         return population
@@ -869,8 +871,15 @@ class optgra:
                 + "Final objective value .............  {obj}\n"
                 + "Final constraint violation ........  {con_vio}\n"
                 + "Final num. of violated constraints   {num_vio}\n"
-                + "Successful termination: Optimal Solution Found.\n"
             ).format(obj=self.__last_result["f"][0], con_vio=con_vio, num_vio=num_vio)
+            if self.__last_result["finopt"] == 1:
+                result_str += "Successful termination: Optimal Solution Found.\n"
+            elif self.__last_result["finopt"] == 2:
+                result_str += "Successful termination: Constraints matched.\n"
+            elif self.__last_result["finopt"] == 3:
+                result_str += "Not converged.\n"
+            elif self.__last_result["finopt"] == 4:
+                result_str += "Problem appears infeasible.\n"
         else:
             grad_str = ""
             result_str = (

{pyoptgra-1.2.0 → pyoptgra-1.2.2}/pyproject.toml

@@ -10,7 +10,7 @@ license = { text = "GPL-3.0 or ESCL-2.4" }
 name = "pyoptgra"
 readme = "README.rst"
 requires-python = ">=3.9"
-version = "1.2.0"
+version = "1.2.2"
 
 [build-system]
 build-backend = "scikit_build_core.build"