Merge pull request #1438 from sergiomtzlosa/matplotlib-circuit-drawer

Matplotlib drawer: fix bug #1437 and add tests
qiboteam · Sep 19, 2024 · df709ce · df709ce
2 parents 2d4e077 + 51cd75d
commit df709ce
Show file tree

Hide file tree

Showing 28 changed files with 407 additions and 9 deletions.
diff --git a/examples/circuit-draw-mpl/qibo-draw-circuit-matplotlib.ipynb b/examples/circuit-draw-mpl/qibo-draw-circuit-matplotlib.ipynb
@@ -265,7 +265,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 17,
    "id": "916f7b83-1ad7-4984-8573-eb55dfeb125d",
    "metadata": {},
    "outputs": [
@@ -440,7 +440,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "fa46e167",
+   "id": "626f9d58",
    "metadata": {},
    "outputs": [],
    "source": []

diff --git a/src/qibo/ui/mpldrawer.py b/src/qibo/ui/mpldrawer.py
@@ -599,12 +599,10 @@ def _process_gates(array_gates, nqubits):
                     item += ("q_" + str(qbit),)
 
             for qbit in gate._control_qubits:
-                item_add = (
-                    ("q_" + str(qbit[0]),)
-                    if isinstance(qbit, tuple)
-                    else ("q_" + str(qbit),)
-                )
-                item += item_add
+                if type(qbit) is tuple:
+                    item += ("q_" + str(qbit[0]),)
+                else:
+                    item += ("q_" + str(qbit),)
 
             gates_plot.append(item)
 

diff --git a/src/qibo/ui/symbols.json b/src/qibo/ui/symbols.json
@@ -1,6 +1,5 @@
 {
     "NOP": "",
-    "CPHASE": "Z",
     "ID": "I",
     "CX": "X",
     "CZ": "Z",

diff --git a/tests/test_ui_array_images/test_align_gate.npy b/tests/test_ui_array_images/test_align_gate.npy
diff --git a/tests/test_ui_array_images/test_bigger_circuit_gates_3.npy b/tests/test_ui_array_images/test_bigger_circuit_gates_3.npy
diff --git a/tests/test_ui_array_images/test_bigger_circuit_gates_4.npy b/tests/test_ui_array_images/test_bigger_circuit_gates_4.npy
diff --git a/tests/test_ui_array_images/test_bigger_circuit_gates_5.npy b/tests/test_ui_array_images/test_bigger_circuit_gates_5.npy
diff --git a/tests/test_ui_array_images/test_bigger_circuit_gates_6.npy b/tests/test_ui_array_images/test_bigger_circuit_gates_6.npy
diff --git a/tests/test_ui_array_images/test_circuit_entangled_entropy_false.npy b/tests/test_ui_array_images/test_circuit_entangled_entropy_false.npy
diff --git a/tests/test_ui_array_images/test_circuit_entangled_entropy_true.npy b/tests/test_ui_array_images/test_circuit_entangled_entropy_true.npy
diff --git a/tests/test_ui_array_images/test_circuit_fused_gates_false.npy b/tests/test_ui_array_images/test_circuit_fused_gates_false.npy
diff --git a/tests/test_ui_array_images/test_circuit_fused_gates_true.npy b/tests/test_ui_array_images/test_circuit_fused_gates_true.npy
diff --git a/tests/test_ui_array_images/test_circuit_measure_1.npy b/tests/test_ui_array_images/test_circuit_measure_1.npy
diff --git a/tests/test_ui_array_images/test_circuit_measure_2.npy b/tests/test_ui_array_images/test_circuit_measure_2.npy
diff --git a/tests/test_ui_array_images/test_circuit_measure_3.npy b/tests/test_ui_array_images/test_circuit_measure_3.npy
diff --git a/tests/test_ui_array_images/test_complex_circuit_fig1_false.npy b/tests/test_ui_array_images/test_complex_circuit_fig1_false.npy
diff --git a/tests/test_ui_array_images/test_complex_circuit_fig1_true.npy b/tests/test_ui_array_images/test_complex_circuit_fig1_true.npy
diff --git a/tests/test_ui_array_images/test_complex_circuit_fig2_false.npy b/tests/test_ui_array_images/test_complex_circuit_fig2_false.npy
diff --git a/tests/test_ui_array_images/test_complex_circuit_fig2_true.npy b/tests/test_ui_array_images/test_complex_circuit_fig2_true.npy
diff --git a/tests/test_ui_array_images/test_empty_circuit.npy b/tests/test_ui_array_images/test_empty_circuit.npy
diff --git a/tests/test_ui_array_images/test_fuse_cluster.npy b/tests/test_ui_array_images/test_fuse_cluster.npy
diff --git a/tests/test_ui_array_images/test_fused_gates.npy b/tests/test_ui_array_images/test_fused_gates.npy
diff --git a/tests/test_ui_array_images/test_layered_circuit.npy b/tests/test_ui_array_images/test_layered_circuit.npy
diff --git a/tests/test_ui_array_images/test_plot_circuit_2.npy b/tests/test_ui_array_images/test_plot_circuit_2.npy
diff --git a/tests/test_ui_array_images/test_plot_circuit_3.npy b/tests/test_ui_array_images/test_plot_circuit_3.npy
diff --git a/tests/test_ui_array_images/test_plot_circuit_internal_ax1.npy b/tests/test_ui_array_images/test_plot_circuit_internal_ax1.npy
diff --git a/tests/test_ui_array_images/test_plot_circuit_internal_ax2.npy b/tests/test_ui_array_images/test_plot_circuit_internal_ax2.npy