Refactor chemistry

manoelmarques · manoelmarques · commit bc9e2c5529e7 · 2019-10-17T11:58:17.000-04:00
diff --git a/chemistry/LiH_with_qubit_tapering_and_uccsd.ipynb b/chemistry/LiH_with_qubit_tapering_and_uccsd.ipynb
@@ -33,8 +33,8 @@
     "\n",
     "from qiskit.chemistry.drivers import PySCFDriver, UnitsType\n",
     "from qiskit.chemistry.core import Hamiltonian, TransformationType, QubitMappingType \n",
-    "from qiskit.chemistry.aqua_extensions.components.variational_forms import UCCSD\n",
-    "from qiskit.chemistry.aqua_extensions.components.initial_states import HartreeFock\n",
+    "from qiskit.chemistry.components.variational_forms import UCCSD\n",
+    "from qiskit.chemistry.components.initial_states import HartreeFock\n",
     "\n",
     "# set_qiskit_aqua_logging(logging.INFO)"
    ]
diff --git a/chemistry/QSE_pytket.ipynb b/chemistry/QSE_pytket.ipynb
@@ -143,8 +143,8 @@
     "# Qiskit Aqua, for chemistry\n",
     "from qiskit.chemistry.drivers import PySCFDriver, UnitsType\n",
     "from qiskit.chemistry import FermionicOperator\n",
-    "from qiskit.chemistry.aqua_extensions.components.initial_states import HartreeFock\n",
-    "from qiskit.chemistry.aqua_extensions.components.variational_forms import UCCSD"
+    "from qiskit.chemistry.components.initial_states import HartreeFock\n",
+    "from qiskit.chemistry.components.variational_forms import UCCSD"
    ]
   },
   {
diff --git a/chemistry/h2_iqpe.ipynb b/chemistry/h2_iqpe.ipynb
@@ -30,7 +30,7 @@
     "from qiskit.aqua.algorithms.single_sample import IQPE\n",
     "from qiskit.aqua.algorithms.classical import ExactEigensolver\n",
     "from qiskit.chemistry import FermionicOperator\n",
-    "from qiskit.chemistry.aqua_extensions.components.initial_states import HartreeFock\n",
+    "from qiskit.chemistry.components.initial_states import HartreeFock\n",
     "from qiskit.chemistry.drivers import PySCFDriver, UnitsType\n",
     "\n",
     "def compute_energy(i, distance, algorithm):\n",
diff --git a/chemistry/h2_qpe.ipynb b/chemistry/h2_qpe.ipynb
@@ -38,7 +38,7 @@
     "from qiskit.aqua.components.iqfts import Standard\n",
     "from qiskit.chemistry import FermionicOperator\n",
     "from qiskit.chemistry import QiskitChemistry\n",
-    "from qiskit.chemistry.aqua_extensions.components.initial_states import HartreeFock\n",
+    "from qiskit.chemistry.components.initial_states import HartreeFock\n",
     "from qiskit.chemistry.drivers import PySCFDriver, UnitsType\n",
     "\n",
     "distance = 0.735\n",
diff --git a/chemistry/h2o.ipynb b/chemistry/h2o.ipynb
@@ -38,8 +38,8 @@
     "\n",
     "from qiskit.chemistry.drivers import PySCFDriver, UnitsType\n",
     "from qiskit.chemistry.core import Hamiltonian, TransformationType, QubitMappingType \n",
-    "from qiskit.chemistry.aqua_extensions.components.variational_forms import UCCSD\n",
-    "from qiskit.chemistry.aqua_extensions.components.initial_states import HartreeFock"
+    "from qiskit.chemistry.components.variational_forms import UCCSD\n",
+    "from qiskit.chemistry.components.initial_states import HartreeFock"
    ]
   },
   {

Original file line number	Diff line number	Diff line change
`@@ -143,8 +143,8 @@`
`143`	`143`	`"# Qiskit Aqua, for chemistry\n",`
`144`	`144`	`"from qiskit.chemistry.drivers import PySCFDriver, UnitsType\n",`
`145`	`145`	`"from qiskit.chemistry import FermionicOperator\n",`
`146`		`- "from qiskit.chemistry.aqua_extensions.components.initial_states import HartreeFock\n",`
`147`		`- "from qiskit.chemistry.aqua_extensions.components.variational_forms import UCCSD"`
	`146`	`+ "from qiskit.chemistry.components.initial_states import HartreeFock\n",`
	`147`	`+ "from qiskit.chemistry.components.variational_forms import UCCSD"`
`148`	`148`	`]`
`149`	`149`	`},`
`150`	`150`	`{`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@`
`38`	`38`	`"\n",`
`39`	`39`	`"from qiskit.chemistry.drivers import PySCFDriver, UnitsType\n",`
`40`	`40`	`"from qiskit.chemistry.core import Hamiltonian, TransformationType, QubitMappingType \n",`
`41`		`- "from qiskit.chemistry.aqua_extensions.components.variational_forms import UCCSD\n",`
`42`		`- "from qiskit.chemistry.aqua_extensions.components.initial_states import HartreeFock"`
	`41`	`+ "from qiskit.chemistry.components.variational_forms import UCCSD\n",`
	`42`	`+ "from qiskit.chemistry.components.initial_states import HartreeFock"`
`43`	`43`	`]`
`44`	`44`	`},`
`45`	`45`	`{`