remove operator_mode

manoelmarques · manoelmarques · commit bb2f58d5c1f8 · 2019-09-05T09:32:11.000-04:00
diff --git a/aqua/algorithm_introduction_with_vqe.ipynb b/aqua/algorithm_introduction_with_vqe.ipynb
@@ -158,7 +158,6 @@
     "aqua_cfg_dict = {\n",
     "    'algorithm': {\n",
     "        'name': 'VQE',\n",
-    "        'operator_mode': 'matrix'\n",
     "    },\n",
     "    'variational_form': {\n",
     "        'name': 'RYRZ',\n",
diff --git a/aqua/input_files/H2-0.735.json b/aqua/input_files/H2-0.735.json
@@ -1,8 +1,7 @@
 {
     "algorithm": {
         "initial_point": null,
-        "name": "VQE",
-        "operator_mode": "matrix"
+        "name": "VQE"
     },
     "backend": {
         "provider": "qiskit.BasicAer",
diff --git a/aqua/input_files/eoh.json b/aqua/input_files/eoh.json
@@ -4,8 +4,7 @@
         "expansion_mode": "trotter",
         "expansion_order": 1,
         "name": "EOH",
-        "num_time_slices": 1,
-        "operator_mode": "paulis"
+        "num_time_slices": 1
     },
     "backend": {
         "provider": "qiskit.BasicAer",
diff --git a/aqua/input_files/vqe.json b/aqua/input_files/vqe.json
@@ -1,8 +1,7 @@
 {
     "algorithm": {
         "initial_point": null,
-        "name": "VQE",
-        "operator_mode": "matrix"
+        "name": "VQE"
     },
     "backend": {
         "provider": "qiskit.BasicAer",
diff --git a/chemistry/QSE_pytket.ipynb b/chemistry/QSE_pytket.ipynb
@@ -832,7 +832,7 @@
     "optimizer.set_options(maxfun=1000, factr=10, iprint=10)\n",
     "\n",
     "# setup VQE with operator, variation form, and optimzer\n",
-    "vqe_algorithm = VQE(operator=qubitOp, operator_mode='matrix', \n",
+    "vqe_algorithm = VQE(operator=qubitOp, \n",
     "                    var_form=var_form, optimizer=optimizer, initial_point=amplitudes_0)\n",
     "\n",
     "results = vqe_algorithm.run(quantum_instance)\n",
diff --git a/chemistry/h2_vqe_spsa.ipynb b/chemistry/h2_vqe_spsa.ipynb
@@ -55,7 +55,7 @@
     "    'algorithm': {},\n",
     "}\n",
     "molecule = 'H .0 .0 -{0}; H .0 .0 {0}'\n",
-    "algorithms = [{'name': 'VQE', 'operator_mode': 'paulis'},\n",
+    "algorithms = [{'name': 'VQE'},\n",
     "              {'name': 'ExactEigensolver'}\n",
     "             ]\n",
     "optimizer = {'name': 'SPSA', 'max_trials': 200}\n",
diff --git a/chemistry/input_files/gaussian_h2_0.735_sto-3g.txt b/chemistry/input_files/gaussian_h2_0.735_sto-3g.txt
@@ -25,7 +25,6 @@ H   0.0  0.0  0.3675
 
 &algorithm
    name=VQE
-   operator_mode=matrix
 &end
 
 &optimizer
diff --git a/chemistry/input_files/gaussian_lih_1.6_sto-3g.txt b/chemistry/input_files/gaussian_lih_1.6_sto-3g.txt
@@ -27,7 +27,6 @@ H   0.0  0.0  0.8
 
 &algorithm
    name=VQE
-   operator_mode=matrix
 &end
 
 &optimizer
diff --git a/chemistry/input_files/h2_on_device.txt b/chemistry/input_files/h2_on_device.txt
@@ -22,7 +22,6 @@ Hamiltonian, i.e. the ground state energy.
 
 &algorithm
    name=VQE
-   operator_mode=paulis
 &end
 
 &initial_state
diff --git a/chemistry/input_files/hdf5_h2_0.735_sto-3g.txt b/chemistry/input_files/hdf5_h2_0.735_sto-3g.txt
@@ -17,7 +17,6 @@ HDF5 H2 experiment
 
 &algorithm
    name=VQE
-   operator_mode=matrix
 &end
 
 &optimizer
diff --git a/chemistry/input_files/hdf5_lih_1.6_sto-3g.txt b/chemistry/input_files/hdf5_lih_1.6_sto-3g.txt
@@ -19,7 +19,6 @@ HDF5 LiH experiment
 
 &algorithm
    name=VQE
-   operator_mode=matrix
 &end
 
 &initial_state
diff --git a/chemistry/input_files/input_file_sample.txt b/chemistry/input_files/input_file_sample.txt
@@ -70,7 +70,6 @@ driver installation requirements this will use the HDF5 file driver.
 #
 &algorithm
    name=VQE
-   operator_mode=matrix
 &end
 
 # Below are specific configuration sections that depend on choice of ALGORITHM
diff --git a/chemistry/input_files/psi4_h2_0.735_sto-3g.txt b/chemistry/input_files/psi4_h2_0.735_sto-3g.txt
@@ -26,7 +26,6 @@ set {
 
 &algorithm
    name=VQE
-   operator_mode=matrix
 &end
 
 &optimizer
diff --git a/chemistry/input_files/psi4_lih_1.6_sto-3g.txt b/chemistry/input_files/psi4_lih_1.6_sto-3g.txt
@@ -28,7 +28,6 @@ set {
 
 &algorithm
    name=VQE
-   operator_mode=matrix
 &end
 
 &optimizer
diff --git a/chemistry/input_files/pyquante_h2_0.735_sto-3g.txt b/chemistry/input_files/pyquante_h2_0.735_sto-3g.txt
@@ -21,7 +21,6 @@ PyQuante H2 experiment
 
 &algorithm
    name=VQE
-   operator_mode=matrix
 &end
 
 &optimizer
diff --git a/chemistry/input_files/pyquante_lih_1.6_sto-3g.txt b/chemistry/input_files/pyquante_lih_1.6_sto-3g.txt
@@ -23,7 +23,6 @@ PyQuante LiH experiment
 
 &algorithm
    name=VQE
-   operator_mode=matrix
 &end
 
 &optimizer
diff --git a/chemistry/input_files/pyscf_h2_0.735_sto-3g.txt b/chemistry/input_files/pyscf_h2_0.735_sto-3g.txt
@@ -21,7 +21,6 @@ PySCF H2 experiment
 
 &algorithm
    name=VQE
-   operator_mode=matrix
 &end
 
 &optimizer
diff --git a/chemistry/input_files/pyscf_lih_1.6_sto-3g.txt b/chemistry/input_files/pyscf_lih_1.6_sto-3g.txt
@@ -23,7 +23,6 @@ PySCF LiH experiment
 
 &algorithm
    name=VQE
-   operator_mode=matrix
 &end
 
 &optimizer
diff --git a/chemistry/lih_dissoc.ipynb b/chemistry/lih_dissoc.ipynb
@@ -50,7 +50,7 @@
     "qiskit_chemistry_dict_vqe = {\n",
     "    'driver': {'name': 'PYSCF'},\n",
     "    'PYSCF': {'atom': '', 'basis': 'sto3g'},\n",
-    "    'algorithm': {'name': 'VQE', 'operator_mode': 'matrix'},\n",
+    "    'algorithm': {'name': 'VQE'},\n",
     "    'operator': {'name':'hamiltonian','freeze_core': True, 'orbital_reduction': [-3, -2],\n",
     "                 'qubit_mapping': 'parity', 'two_qubit_reduction': True},\n",
     "    'optimizer': {'name': 'COBYLA', 'maxiter': 20000},\n",
diff --git a/finance/input_files/portfolio.json b/finance/input_files/portfolio.json
@@ -4,8 +4,7 @@
         "random_seed": 50
     },
     "algorithm": {
-        "name": "VQE",
-        "operator_mode": "matrix"
+        "name": "VQE"
     },
     "optimizer": {
         "name": "COBYLA",
diff --git a/optimization/input_files/maxcut.json b/optimization/input_files/maxcut.json
@@ -1,8 +1,7 @@
 {
     "algorithm": {
         "initial_point": null,
-        "name": "VQE",
-        "operator_mode": "matrix"
+        "name": "VQE"
     },
     "backend": {
         "provider": "qiskit.BasicAer",
diff --git a/optimization/max_cut.ipynb b/optimization/max_cut.ipynb
@@ -237,7 +237,6 @@
    "source": [
     "algorithm_cfg = {\n",
     "    'name': 'VQE',\n",
-    "    'operator_mode': 'matrix'\n",
     "}\n",
     "\n",
     "optimizer_cfg = {\n",
diff --git a/optimization/partition.ipynb b/optimization/partition.ipynb
@@ -244,7 +244,6 @@
     "\n",
     "algorithm_cfg = {\n",
     "    'name': 'VQE',\n",
-    "    'operator_mode': 'matrix'\n",
     "}\n",
     "\n",
     "optimizer_cfg = {\n",
diff --git a/optimization/stable_set.ipynb b/optimization/stable_set.ipynb
@@ -236,7 +236,6 @@
    "source": [
     "algorithm_cfg = {\n",
     "    'name': 'VQE',\n",
-    "    'operator_mode': 'matrix'\n",
     "}\n",
     "\n",
     "optimizer_cfg = {\n",
diff --git a/optimization/vertex_cover.ipynb b/optimization/vertex_cover.ipynb
@@ -198,7 +198,7 @@
    "source": [
     "params = {\n",
     "    'problem': {'name': 'ising', 'random_seed': 100},\n",
-    "    'algorithm': {'name': 'VQE', 'operator_mode': 'paulis'},\n",
+    "    'algorithm': {'name': 'VQE'},\n",
     "    'optimizer': {'name': 'SPSA', 'max_trials': 200},\n",
     "    'variational_form': {'name': 'RYRZ', 'depth': 3}\n",
     "}\n",
@@ -242,7 +242,7 @@
     "\n",
     "optimizer = SPSA(max_trials=200)\n",
     "var_form = RYRZ(qubit_op.num_qubits, depth=3)\n",
-    "vqe = VQE(qubit_op, var_form, optimizer, operator_mode='paulis')\n",
+    "vqe = VQE(qubit_op, var_form, optimizer)\n",
     "\n",
     "backend = BasicAer.get_backend('qasm_simulator')\n",
     "result = vqe.run(backend)\n",
