Merge branch 'dev' into hotfix_pip_install

entropicalabs · Feb 27, 2024 · dda5917 · dda5917
2 parents e07a2c3 + 0eee27b
commit dda5917
Show file tree

Hide file tree

Showing 39 changed files with 1,286 additions and 3,355 deletions.
diff --git a/examples/01_workflows_example.ipynb b/examples/01_workflows_example.ipynb
diff --git a/examples/02_simulators_comparison.ipynb b/examples/02_simulators_comparison.ipynb
diff --git a/examples/04_qaoa_variational_parameters.ipynb b/examples/04_qaoa_variational_parameters.ipynb
@@ -165,9 +165,9 @@
    "source": [
     "For instance, for a depth-2 circuit the corresponding unitary operator would then become:\n",
     "\n",
-    "\\begin{multline}\n",
-    "U(\\beta ,\\gamma ,\\Gamma )=exp(i\\sum_j\\beta^{(2)}_jX_j)exp(−i\\sum_{j∈s}\\gamma^{(2)}_jh_jZ_j− \\\\ (i/2)\\sum_{j,k∈\\Pi}\\Gamma^{(2)}_{jk}g_{jk}Z_jZ_k)exp(i\\sum_j\\beta^{(1)}_jX_j) \\\\ exp(−i\\sum_{j∈s}\\gamma^{(1)}_jh_jZ_j−(i/2)\\sum_{j,k∈\\Pi}\\Gamma^{(1)}_{jk}g_{jk}Z_jZ_k)\n",
-    "\\end{multline}"
+    "\\begin{align*}\n",
+    "U(\\beta ,\\gamma ,\\Gamma )=&\\text{exp}{\\Big(i\\sum_j\\beta^{(2)}_jX_j\\Big)}\\cdot \\text{exp}{\\Bigg(−i\\sum_{j∈s}\\gamma^{(2)}_jh_jZ_j− (i/2)\\sum_{j,k∈\\Pi}\\Gamma^{(2)}_{jk}g_{jk}Z_jZ_k\\Bigg)} \\\\ &\\qquad\\qquad\\qquad\\cdot\\text{exp}{\\Big(i\\sum_j\\beta^{(1)}_jX_j\\Big)}\\cdot\\text{exp}{\\Bigg(−i\\sum_{j∈s}\\gamma^{(1)}_jh_jZ_j−(i/2)\\sum_{j,k∈\\Pi}\\Gamma^{(1)}_{jk}g_{jk}Z_jZ_k\\Bigg)}\n",
+    "\\end{align*}"
    ]
   },
   {
@@ -254,8 +254,8 @@
        "Standard Parameterisation:\n",
        "\tp: 1\n",
        "Variational Parameters:\n",
-       "\tbetas: [0.67825497]\n",
-       "\tgammas: [1.33848011]"
+       "\tbetas: [0.76515737]\n",
+       "\tgammas: [2.96213888]"
       ]
      },
      "execution_count": 4,
@@ -309,10 +309,10 @@
        "Extended Parameterisation:\n",
        "\tp: 1\n",
        "Parameters:\n",
-       "\tbetas_singles: [[1.93258376 1.75922895 2.027917  ]]\n",
+       "\tbetas_singles: [[2.95554443 1.63009578 2.5532    ]]\n",
        "\tbetas_pairs: []\n",
-       "\tgammas_singles: [[0.79981656]]\n",
-       "\tgammas_pairs: [[1.25608449 2.33059942]]"
+       "\tgammas_singles: [[2.19785279]]\n",
+       "\tgammas_pairs: [[0.92556918 1.88298698]]"
       ]
      },
      "execution_count": 5,
@@ -687,9 +687,9 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "fix_qiskit_and_deprecations",
    "language": "python",
-   "name": "oq_reviews"
+   "name": "fix_qiskit_and_deprecations"
   },
   "language_info": {
    "codemirror_mode": {
@@ -701,7 +701,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.6"
+   "version": "3.10.13"
   },
   "vscode": {
    "interpreter": {

diff --git a/examples/05_advanced_parameterization.ipynb b/examples/05_advanced_parameterization.ipynb
diff --git a/examples/06_fast_qaoa_simulator.ipynb b/examples/06_fast_qaoa_simulator.ipynb
diff --git a/examples/07_cost_landscapes_w_manual_mode.ipynb b/examples/07_cost_landscapes_w_manual_mode.ipynb
diff --git a/examples/08_results_example.ipynb b/examples/08_results_example.ipynb
diff --git a/examples/10_workflows_on_Amazon_braket.ipynb b/examples/10_workflows_on_Amazon_braket.ipynb
diff --git a/examples/11_Mixer_example.ipynb b/examples/11_Mixer_example.ipynb
diff --git a/examples/12_testing_azure.ipynb b/examples/12_testing_azure.ipynb
diff --git a/examples/13_optimizers.ipynb b/examples/13_optimizers.ipynb
diff --git a/examples/community_tutorials/01_tutorial_quantum_approximate_optimization_algorithm.ipynb b/examples/community_tutorials/01_tutorial_quantum_approximate_optimization_algorithm.ipynb
@@ -603,7 +603,7 @@
     }
    ],
    "source": [
-    "q.result.plot_cost()"
+    "fig, ax = q.result.plot_cost()"
    ]
   },
   {
-Original file line number
+Diff line change
@@ Expand Up / @@ -603,7 +603,7 @@ @@
         }
        ],
        "source": [
-        "q.result.plot_cost()"
+        "fig, ax = q.result.plot_cost()"
        ]
       },
       {
@@ Expand Down @@