testing fix

Kaustuvi · Jun 3, 2019 · b6e17c0 · b6e17c0
1 parent dc6bf6e
commit b6e17c0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/grove/pyqaoa/maxcut_qaoa.py b/grove/pyqaoa/maxcut_qaoa.py
@@ -44,7 +44,7 @@ def maxcut_qaoa(graph, steps=1, rand_seed=None, connection=None, samples=None,
     :param minimizer_kwargs: (Optional. Default=None). Minimizer optional arguments.  If None set to
         ``{'method': 'Nelder-Mead', 'options': {'ftol': 1.0e-2, 'xtol': 1.0e-2, 'disp': False}``
     :param vqe_option: (Optional. Default=None). VQE optional arguments.  If None set to
-        ``vqe_option = {'disp': print_fun, 'return_all': True, 'samples': samples}``
+        ``vqe_option = {'disp': True, 'return_all': True, 'samples': samples}``
 
     """
     if not isinstance(graph, nx.Graph) and isinstance(graph, list):
@@ -68,7 +68,7 @@ def maxcut_qaoa(graph, steps=1, rand_seed=None, connection=None, samples=None,
                             'options': {'ftol': 1.0e-2, 'xtol': 1.0e-2,
                                         'disp': False}}
     if vqe_option is None:
-        vqe_option = {'disp': print, 'return_all': True,
+        vqe_option = {'disp': True, 'return_all': True,
                       'samples': samples}
 
     qaoa_inst = QAOA(connection, list(graph.nodes()), steps=steps, cost_ham=cost_operators,

diff --git a/grove/pyvqe/vqe.py b/grove/pyvqe/vqe.py
@@ -120,7 +120,8 @@ def vqe_run(self, variational_state_evolve, hamiltonian, initial_params,
                                     returned if 'return_all=True' is set as a
                                     vqe_run() option.
         """
-        self._disp_fun = disp if disp is not None else lambda x: None
+        # self._disp_fun = disp if disp is not None else lambda x: None
+        self._disp_fun = lambda x: None if disp is not True else print
         iteration_params = []
         expectation_vals = []
         self._current_expectation = None