Add maximize to minimize converter

qiskit_optimization/algorithms/admm_optimizer.py

@@ -29,9 +29,9 @@
 from .slsqp_optimizer import SlsqpOptimizer
 from ..problems.constraint import Constraint
 from ..problems.linear_constraint import LinearConstraint
-from ..problems.quadratic_objective import QuadraticObjective
 from ..problems.quadratic_program import QuadraticProgram
 from ..problems.variable import VarType, Variable
+from ..converters import MaximizeToMinimize
 
 UPDATE_RHO_BY_TEN_PERCENT = 0
 UPDATE_RHO_BY_RESIDUALS = 1
@@ -300,12 +300,10 @@ def solve(self, problem: QuadraticProgram) -> ADMMOptimizationResult:
         # map integer variables to binary variables
         from ..converters.integer_to_binary import IntegerToBinary
 
-        int2bin = IntegerToBinary()
-        original_problem = problem
-        problem = int2bin.convert(problem)
-
         # we deal with minimization in the optimizer, so turn the problem to minimization
-        problem, sense = self._turn_to_minimization(problem)
+        converters = [IntegerToBinary(), MaximizeToMinimize()]
+        original_problem = problem
+        problem = self._convert(problem, converters)
 
         # create our computation state.
         self._state = ADMMState(problem, self._params.rho_initial)
@@ -394,53 +392,23 @@ def solve(self, problem: QuadraticProgram) -> ADMMOptimizationResult:
         binary_vars, continuous_vars, objective_value = self._get_best_merit_solution()
         solution = self._revert_solution_indexes(binary_vars, continuous_vars)
 
-        # flip the objective sign again if required
-        objective_value = objective_value * sense
-
         self._log.debug(
-            "solution=%s, objective=%s at iteration=%s",
-            solution,
-            objective_value,
-            iteration,
+            "solution=%s, objective=%s at iteration=%s", solution, objective_value, iteration
         )
 
-        # convert back integer to binary
+        # convert back integer to binary and eventually minimization to maximization
         # `state` is our internal state of computations.
         return cast(
             ADMMOptimizationResult,
             self._interpret(
                 x=solution,
-                converters=int2bin,
+                converters=converters,
                 problem=original_problem,
                 result_class=ADMMOptimizationResult,
                 state=self._state,
             ),
         )
 
-    @staticmethod
-    def _turn_to_minimization(
-        problem: QuadraticProgram,
-    ) -> Tuple[QuadraticProgram, float]:
-        """
-        Turns the problem to `ObjSense.MINIMIZE` by flipping the sign of the objective function
-        if initially it is `ObjSense.MAXIMIZE`. Otherwise returns the original problem.
-
-        Args:
-            problem: a problem to turn to minimization.
-
-        Returns:
-            A copy of the problem if sign flip is required, otherwise the original problem and
-            the original sense of the problem in the numerical representation.
-        """
-        sense = problem.objective.sense.value
-        if problem.objective.sense == QuadraticObjective.Sense.MAXIMIZE:
-            problem = copy.deepcopy(problem)
-            problem.objective.sense = QuadraticObjective.Sense.MINIMIZE
-            problem.objective.constant = (-1) * problem.objective.constant
-            problem.objective.linear = (-1) * problem.objective.linear.coefficients
-            problem.objective.quadratic = (-1) * problem.objective.quadratic.coefficients
-        return problem, sense
-
     @staticmethod
     def _get_variable_indices(op: QuadraticProgram, var_type: VarType) -> List[int]:
         """Returns a list of indices of the variables of the specified type.

qiskit_optimization/algorithms/cobyla_optimizer.py

@@ -23,6 +23,7 @@
 from ..infinity import INFINITY
 from ..problems.constraint import Constraint
 from ..problems.quadratic_program import QuadraticProgram
+from ..converters import MaximizeToMinimize
 
 
 class CobylaOptimizer(MultiStartOptimizer):
@@ -117,9 +118,14 @@ def solve(self, problem: QuadraticProgram) -> OptimizationResult:
         """
         self._verify_compatibility(problem)
 
+        # we deal with minimization in the optimizer, so turn the problem to minimization
+        max2min = MaximizeToMinimize()
+        original_problem = problem
+        problem = self._convert(problem, max2min)
+
         # construct quadratic objective function
         def objective(x):
-            return problem.objective.sense.value * problem.objective.evaluate(x)
+            return problem.objective.evaluate(x)
 
         # initialize constraints list
         constraints = []
@@ -175,4 +181,8 @@ def _minimize(x_0: np.ndarray) -> Tuple[np.ndarray, Any]:
             )
             return x, None
 
-        return self.multi_start_solve(_minimize, problem)
+        result = self.multi_start_solve(_minimize, problem)
+        # eventually convert back minimization to maximization
+        return self._interpret(
+            x=result.x, problem=original_problem, converters=max2min, raw_results=result.raw_results
+        )

qiskit_optimization/algorithms/grover_optimizer.py

@@ -172,19 +172,11 @@ def solve(self, problem: QuadraticProgram) -> OptimizationResult:
 
         self._verify_compatibility(problem)
 
-        # convert problem to QUBO
+        # convert problem to minimization QUBO problem
         problem_ = self._convert(problem, self._converters)
         problem_init = deepcopy(problem_)
 
-        # convert to minimization problem
-        if problem_.objective.sense == problem_.objective.Sense.MAXIMIZE:
-            problem_.objective.sense = problem_.objective.Sense.MINIMIZE
-            problem_.objective.constant = -problem_.objective.constant
-            for i, val in problem_.objective.linear.to_dict().items():
-                problem_.objective.linear[i] = -val
-            for (i, j), val in problem_.objective.quadratic.to_dict().items():
-                problem_.objective.quadratic[i, j] = -val
-        self._num_key_qubits = len(problem_.objective.linear.to_array())
+        self._num_key_qubits = len(problem_.objective.linear.to_array())  # type: ignore
 
         # Variables for tracking the optimum.
         optimum_found = False
@@ -268,7 +260,7 @@ def solve(self, problem: QuadraticProgram) -> OptimizationResult:
                     raw_samples = self._eigenvector_to_solutions(
                         self._circuit_results, problem_init
                     )
-                    raw_samples.sort(key=lambda x: problem_.objective.sense.value * x.fval)
+                    raw_samples.sort(key=lambda x: x.fval)
                     samples = self._interpret_samples(problem, raw_samples, self._converters)
                 else:
                     # Using Durr and Hoyer method, increase m.
@@ -299,10 +291,10 @@ def solve(self, problem: QuadraticProgram) -> OptimizationResult:
             optimum_key = 0
 
         opt_x = np.array([1 if s == "1" else 0 for s in ("{0:%sb}" % n_key).format(optimum_key)])
-        # Compute function value
+        # Compute function value of minimization QUBO
         fval = problem_init.objective.evaluate(opt_x)
 
-        # cast binaries back to integers
+        # cast binaries back to integers and eventually minimization to maximization
         return cast(
             GroverOptimizationResult,
             self._interpret(
@@ -386,14 +378,14 @@ def __init__(
             operation_counts: The counts of each operation performed per iteration.
             n_input_qubits: The number of qubits used to represent the input.
             n_output_qubits: The number of qubits used to represent the output.
-            intermediate_fval: The intermediate value of the objective function of the solution,
-                that is expected to be identical with ``fval``.
+            intermediate_fval: The intermediate value of the objective function of the
+                minimization qubo solution, that is expected to be consistent to ``fval``.
             threshold: The threshold of Grover algorithm.
             status: the termination status of the optimization algorithm.
             samples: the x values, the objective function value of the original problem,
                 the probability, and the status of sampling.
-            raw_samples: the x values of the QUBO, the objective function value of the QUBO,
-                and the probability of sampling.
+            raw_samples: the x values of the QUBO, the objective function value of the
+                minimization QUBO, and the probability of sampling.
         """
         super().__init__(
             x=x,

qiskit_optimization/algorithms/minimum_eigen_optimizer.py

@@ -188,7 +188,7 @@ def solve(self, problem: QuadraticProgram) -> MinimumEigenOptimizationResult:
         """
         self._verify_compatibility(problem)
 
-        # convert problem to QUBO
+        # convert problem to QUBO minimization problem
         problem_ = self._convert(problem, self._converters)
 
         # construct operator and offset
@@ -219,7 +219,7 @@ def _solve_internal(
                 raw_samples = self._eigenvector_to_solutions(
                     eigen_result.eigenstate, converted_problem
                 )
-                raw_samples.sort(key=lambda x: converted_problem.objective.sense.value * x.fval)
+                raw_samples.sort(key=lambda x: x.fval)
                 x = raw_samples[0].x
                 fval = raw_samples[0].fval
 
@@ -241,7 +241,8 @@ def _solve_internal(
                 raw_samples=None,
                 min_eigen_solver_result=eigen_result,
             )
-        # translate result back to integers
+
+        # translate result back to integers and eventually maximization
         samples = self._interpret_samples(original_problem, raw_samples, self._converters)
         return cast(
             MinimumEigenOptimizationResult,

qiskit_optimization/algorithms/multistart_optimizer.py

@@ -17,14 +17,15 @@
 import logging
 import time
 from abc import ABC
-from typing import Optional, Callable, Tuple, Any
+from typing import Callable, Tuple, Any, Optional
 
 import numpy as np
 from scipy.stats import uniform
 
 from ..problems.quadratic_program import QuadraticProgram
 from ..infinity import INFINITY
 from .optimization_algorithm import OptimizationAlgorithm, OptimizationResult
+from ..converters import MaximizeToMinimize
 
 logger = logging.getLogger(__name__)
 
@@ -73,6 +74,11 @@ def multi_start_solve(
         x_sol: Optional[np.ndarray] = None
         rest_sol: Optional[Tuple] = None
 
+        # we deal with minimization in the optimizer, so turn the problem to minimization
+        max2min = MaximizeToMinimize()
+        original_problem = problem
+        problem = self._convert(problem, max2min)
+
         # Implementation of multi-start optimizer
         for trial in range(self._trials):
             x_0 = np.zeros(problem.get_num_vars())
@@ -86,21 +92,15 @@ def multi_start_solve(
             x, rest = minimize(x_0)
             logger.debug("minimize done in: %s seconds", str(time.time() - t_0))
 
-            # we minimize, to get actual objective value we must multiply by the sense value
-            fval = problem.objective.evaluate(x) * problem.objective.sense.value
+            fval = problem.objective.evaluate(x)
             # we minimize the objective
             if fval < fval_sol:
-                # here we get back to the original sense of the problem
-                fval_sol = fval * problem.objective.sense.value
+                fval_sol = fval
                 x_sol = x
                 rest_sol = rest
-
-        return OptimizationResult(
-            x=x_sol,
-            fval=fval_sol,
-            variables=problem.variables,
-            status=self._get_feasibility_status(problem, x_sol),
-            raw_results=rest_sol,
+        # eventually convert back minimization to maximization
+        return self._interpret(
+            x_sol, problem=original_problem, converters=max2min, raw_results=rest_sol
         )
 
     @property

qiskit_optimization/algorithms/optimization_algorithm.py

@@ -22,10 +22,7 @@
 
 from qiskit.opflow import StateFn, DictStateFn
 from ..exceptions import QiskitOptimizationError
-from ..converters.quadratic_program_to_qubo import (
-    QuadraticProgramToQubo,
-    QuadraticProgramConverter,
-)
+from ..converters.quadratic_program_to_qubo import QuadraticProgramToQubo, QuadraticProgramConverter
 from ..problems.quadratic_program import QuadraticProgram, Variable
 
 

qiskit_optimization/algorithms/slsqp_optimizer.py

@@ -23,6 +23,7 @@
 from ..problems import Variable
 from ..problems.constraint import Constraint
 from ..problems.quadratic_program import QuadraticProgram
+from ..converters import MaximizeToMinimize
 
 logger = logging.getLogger(__name__)
 
@@ -183,13 +184,17 @@ def solve(self, problem: QuadraticProgram) -> OptimizationResult:
             QiskitOptimizationError: If the problem is incompatible with the optimizer.
         """
         self._verify_compatibility(problem)
+        # we deal with minimization in the optimizer, so turn the problem to minimization
+        max2min = MaximizeToMinimize()
+        original_problem = problem
+        problem = self._convert(problem, max2min)
 
         # construct quadratic objective function
         def _objective(x):
-            return problem.objective.sense.value * problem.objective.evaluate(x)
+            return problem.objective.evaluate(x)
 
         def _objective_gradient(x):
-            return problem.objective.sense.value * problem.objective.evaluate_gradient(x)
+            return problem.objective.evaluate_gradient(x)
 
         # initialize constraints and bounds
         slsqp_bounds = []
@@ -241,6 +246,10 @@ def _minimize(x_0: np.ndarray) -> Tuple[np.ndarray, Any]:
 
         # actual optimization goes here
         result = self.multi_start_solve(_minimize, problem)
+        # eventually convert back minimization to maximization
+        result = self._interpret(
+            x=result.x, problem=original_problem, converters=max2min, raw_results=result.raw_results
+        )
 
         if self._full_output:
             return SlsqpOptimizationResult(

qiskit_optimization/algorithms/warm_start_qaoa_optimizer.py

@@ -297,7 +297,7 @@ def solve(self, problem: QuadraticProgram) -> MinimumEigenOptimizationResult:
         if len(message) > 0:
             raise QiskitOptimizationError(f"Incompatible problem: {message}")
 
-        # convert problem to QUBO or another form if converters are specified
+        # convert problem to minimization QUBO or another form if converters are specified
         converted_problem = self._convert(problem, self._converters)
 
         # if the pre-solver can't solve the problem then it should be relaxed.
@@ -336,7 +336,7 @@ def solve(self, problem: QuadraticProgram) -> MinimumEigenOptimizationResult:
             return results[0]
         else:
             samples = self._aggregator.aggregate(results)
-            samples.sort(key=lambda sample: converted_problem.objective.sense.value * sample.fval)
+            samples.sort(key=lambda sample: problem.objective.sense.value * sample.fval)
 
             # translate result back to the original variables
             return cast(

qiskit_optimization/converters/__init__.py

@@ -40,20 +40,23 @@
    InequalityToEquality
    IntegerToBinary
    LinearEqualityToPenalty
+   MaximizeToMinimize
    QuadraticProgramToQubo
 
 """
 
 from .integer_to_binary import IntegerToBinary
 from .inequality_to_equality import InequalityToEquality
 from .linear_equality_to_penalty import LinearEqualityToPenalty
+from .maximize_to_minimize import MaximizeToMinimize
 from .quadratic_program_to_qubo import QuadraticProgramToQubo
 from .quadratic_program_converter import QuadraticProgramConverter
 
 __all__ = [
     "InequalityToEquality",
     "IntegerToBinary",
     "LinearEqualityToPenalty",
+    "MaximizeToMinimize",
     "QuadraticProgramConverter",
     "QuadraticProgramToQubo",
 ]