From b6e17c0dcdd4d616afc527d58802208fb6c1a671 Mon Sep 17 00:00:00 2001 From: Kaustuvi Date: Mon, 3 Jun 2019 23:21:12 +0530 Subject: [PATCH 1/2] testing fix --- grove/pyqaoa/maxcut_qaoa.py | 4 ++-- grove/pyvqe/vqe.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/grove/pyqaoa/maxcut_qaoa.py b/grove/pyqaoa/maxcut_qaoa.py index 0654ccf..4103dfa 100644 --- 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 index fdad79e..20559b2 100644 --- 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 From 58433b04c5a15e8cf96b26ca579713851de7991b Mon Sep 17 00:00:00 2001 From: Kaustuvi Date: Mon, 3 Jun 2019 23:45:23 +0530 Subject: [PATCH 2/2] fixes #205 --- grove/pyvqe/vqe.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/grove/pyvqe/vqe.py b/grove/pyvqe/vqe.py index 20559b2..1e93028 100644 --- a/grove/pyvqe/vqe.py +++ b/grove/pyvqe/vqe.py @@ -120,8 +120,7 @@ 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 = lambda x: None if disp is not True else print + self._disp_fun = print if disp is True else lambda x: None iteration_params = [] expectation_vals = [] self._current_expectation = None