Merge b46a1b9 into e2344b7

QuTech-Delft · May 15, 2019 · 69ce86d · 69ce86d
2 parents e2344b7 + b46a1b9
commit 69ce86d
Show file tree

Hide file tree

Showing 25 changed files with 3,378 additions and 34 deletions.
diff --git a/docs/classifier_example/classification_example1_2_data_points.ipynb b/docs/classifier_example/classification_example1_2_data_points.ipynb
diff --git a/docs/classifier_example/classification_example2_4_data_points.ipynb b/docs/classifier_example/classification_example2_4_data_points.ipynb
diff --git a/docs/classifier_example/classification_example3_4_features.ipynb b/docs/classifier_example/classification_example3_4_features.ipynb
diff --git a/docs/classifier_example/data_plotter.py b/docs/classifier_example/data_plotter.py
diff --git a/docs/classifier_example/images/4pointsclassifier.png b/docs/classifier_example/images/4pointsclassifier.png
diff --git a/docs/classifier_example/images/experimentaltest.png b/docs/classifier_example/images/experimentaltest.png
diff --git a/docs/classifier_example/images/full_circuit.png b/docs/classifier_example/images/full_circuit.png
diff --git a/docs/classifier_example/images/fullalgorithm.png b/docs/classifier_example/images/fullalgorithm.png
diff --git a/docs/classifier_example/images/images4features/rotations.png b/docs/classifier_example/images/images4features/rotations.png
diff --git a/docs/classifier_example/images/images4points/datapoints.png b/docs/classifier_example/images/images4points/datapoints.png
diff --git a/docs/classifier_example/images/images4points/parta.png b/docs/classifier_example/images/images4points/parta.png
diff --git a/docs/classifier_example/images/images4points/partb.png b/docs/classifier_example/images/images4points/partb.png
diff --git a/docs/classifier_example/images/images4points/partc.png b/docs/classifier_example/images/images4points/partc.png
diff --git a/docs/classifier_example/images/images4points/partd.png b/docs/classifier_example/images/images4points/partd.png
diff --git a/docs/classifier_example/images/images4points/parte.png b/docs/classifier_example/images/images4points/parte.png
diff --git a/docs/classifier_example/images/partb.png b/docs/classifier_example/images/partb.png
diff --git a/docs/classifier_example/images/partc.png b/docs/classifier_example/images/partc.png
diff --git a/docs/classifier_example/images/partf.png b/docs/classifier_example/images/partf.png
diff --git a/docs/classifier_example/images/plot.png b/docs/classifier_example/images/plot.png
diff --git a/docs/classifier_example/images/randompoint.png b/docs/classifier_example/images/randompoint.png
diff --git a/docs/classifier_example/images/stateprep.png b/docs/classifier_example/images/stateprep.png
diff --git a/docs/example_projectq.ipynb b/docs/example_projectq.ipynb
@@ -88,14 +88,14 @@
      "output_type": "stream",
      "text": [
       "Measured 0,0,0,0,0\n",
-      "Probabilities: {'10001': 0.490234375, '00000': 0.509765625}\n",
+      "Probabilities: {'00000': 0.5263671875, '10001': 0.4736328125}\n",
       "version 1.0\n",
       "# cQASM generated by Quantum Inspire <class 'quantuminspire.projectq.backend_qx.QIBackend'> class\n",
       "qubits 5\n",
       "\n",
       "\n",
       "h q[0]\n",
-      "CNOT q[0], q[4]\n"
+      "cnot q[0], q[4]\n"
      ]
     }
    ],
@@ -149,25 +149,25 @@
      "output_type": "stream",
      "text": [
       "Measured 1,0,0,0,1\n",
-      "Probabilities: {'00000': 0.4921875, '10001': 0.5078125}\n",
+      "Probabilities: {'00000': 0.517578125, '10001': 0.482421875}\n",
       "version 1.0\n",
       "# cQASM generated by Quantum Inspire <class 'quantuminspire.projectq.backend_qx.QIBackend'> class\n",
       "qubits 5\n",
       "\n",
       "\n",
-      "Rz q[0],3.14159265359\n",
-      "Rz q[1],3.14159265359\n",
-      "Rx q[1],1.5707963268\n",
-      "Rz q[1],1.5707963268\n",
-      "Rx q[1],10.9955742876\n",
-      "Rx q[0],1.5707963268\n",
-      "Rz q[0],1.5707963268\n",
-      "Rx q[0],10.9955742876\n",
-      "CZ q[0], q[1]\n",
-      "Rz q[1],3.14159265359\n",
-      "Rx q[1],1.5707963268\n",
-      "Rz q[1],1.5707963268\n",
-      "Rx q[1],10.9955742876\n"
+      "rz q[0],3.14159265359\n",
+      "rz q[1],3.14159265359\n",
+      "rx q[1],1.5707963268\n",
+      "rz q[1],1.5707963268\n",
+      "rx q[1],10.9955742876\n",
+      "rx q[0],1.5707963268\n",
+      "rz q[0],1.5707963268\n",
+      "rx q[0],10.9955742876\n",
+      "cz q[0], q[1]\n",
+      "rz q[1],3.14159265359\n",
+      "rx q[1],1.5707963268\n",
+      "rz q[1],1.5707963268\n",
+      "rx q[1],10.9955742876\n"
      ]
     }
    ],
@@ -220,6 +220,13 @@
     "for l, p in current_mapping.items():\n",
     "    print('mapping logical qubit %d to physical qubit %d' % (l, p))"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {

diff --git a/docs/grover_algorithm_qi.ipynb b/docs/grover_algorithm_qi.ipynb
diff --git a/docs/qi-performance-test.ipynb b/docs/qi-performance-test.ipynb
diff --git a/setup.py b/setup.py
@@ -47,13 +47,39 @@ def get_long_description():
       author='QuantumInspire',
       python_requires='>=3.6',
       package_dir={'': 'src'},
-      data_files=[('share/doc/quantuminspire/examples', ['docs/example_qiskit_entangle.py',
-                                                         'docs/example_projectq_entangle.py',
-                                                         'docs/example_projectq_grover.py',
-                                                         'docs/example_projectq.ipynb',
-                                                         'docs/grover_algorithm_qi.ipynb',
-                                                         'docs/qi-performance-test.ipynb',
-                                                         'docs/grover-qi.png'])],
+      data_files=[('share/doc/quantuminspire/examples',
+                    ['docs/example_qiskit_entangle.py',
+                     'docs/example_projectq_entangle.py',
+                     'docs/example_projectq_grover.py',
+                     'docs/example_projectq.ipynb',
+                     'docs/grover_algorithm_qi.ipynb',
+                     'docs/qi-performance-test.ipynb',
+                     'docs/grover-qi.png',
+                     'docs/classifier_example/data_plotter.py',
+                     'docs/classifier_example/classification_example1_2_data_points.ipynb',
+                     'docs/classifier_example/classification_example2_4_data_points.ipynb',
+                     'docs/classifier_example/classification_example3_4_features.ipynb']),
+                  ('share/doc/quantuminspire/examples/images',
+                    ['docs/classifier_example/images/4pointsclassifier.png',
+                     'docs/classifier_example/images/experimentaltest.png',
+                     'docs/classifier_example/images/full_circuit.png',
+                     'docs/classifier_example/images/fullalgorithm.png',
+                     'docs/classifier_example/images/partb.png',
+                     'docs/classifier_example/images/partc.png',
+                     'docs/classifier_example/images/partf.png',
+                     'docs/classifier_example/images/plot.png',
+                     'docs/classifier_example/images/randompoint.png',
+                     'docs/classifier_example/images/stateprep.png']),
+                  ('share/doc/quantuminspire/examples/images/images4features',
+                   ['docs/classifier_example/images/images4features/rotations.png']),
+                  ('share/doc/quantuminspire/examples/images/images4points',
+                   ['docs/classifier_example/images/images4points/datapoints.png',
+                    'docs/classifier_example/images/images4points/parta.png',
+                    'docs/classifier_example/images/images4points/partb.png',
+                    'docs/classifier_example/images/images4points/partc.png',
+                    'docs/classifier_example/images/images4points/partd.png',
+                    'docs/classifier_example/images/images4points/parte.png'])
+                 ],
       classifiers=[
           'Development Status :: 4 - Beta',
           'Programming Language :: Python :: 3',
@@ -63,5 +89,5 @@ def get_long_description():
       license='Apache 2.0',
       packages=['quantuminspire', 'quantuminspire.qiskit', 'quantuminspire.projectq'],
       install_requires=['pytest>=3.3.1', 'coverage>=4.5.1', 'matplotlib>=2.1',
-                        'coreapi>=2.3.3', 'numpy', 'jupyter'],
+                        'coreapi>=2.3.3', 'numpy', 'jupyter', 'nbimporter', 'sklearn'],
       extras_require={'qiskit': ["qiskit>=0.9.0"], 'projectq': ["projectq>=0.4"]})