Merge pull request #125 from ilan-tz/master

GKP states
XanaduAI · Jan 21, 2020 · 8b608a8 · 8b608a8
2 parents f227351 + 04cf87a
commit 8b608a8
Show file tree

Hide file tree

Showing 6 changed files with 559 additions and 74 deletions.
diff --git a/.github/ACKNOWLEDGMENTS.md b/.github/ACKNOWLEDGMENTS.md
@@ -29,3 +29,7 @@
 * [Guillaume Thekkadath](https://www2.physics.ox.ac.uk/contacts/people/thekkadath) (University of Oxford) - :smiley_cat: Master cat herder
 
 * [Trevor Vincent](https://github.com/trevor-vincent) (Xanadu) - :apple: master of gravitation
+
+* [Ilan Tzitrin](https://github.com/ilan-tz) (Xanadu, University of Toronto) 🚞 local optimist
+
+* [J. Eli Bourassa](https://github.com/elib20) (Xanadu, University of Toronto) 🏄 GKP surfer
diff --git a/docs/gallery/cubic_circuit.svg b/docs/gallery/cubic_circuit.svg
diff --git a/docs/gallery/gallery.rst b/docs/gallery/gallery.rst
@@ -94,6 +94,11 @@ If you develop a new circuit and measurement scheme to prepare a non-Gaussian st
     :description: :doc:`Four-headed cat states <four_cat>`
     :figure: gallery/four_cat.png
 
+.. customgalleryitem::
+    :tooltip: GKP states
+    :description: :doc:`GKP states <gkp>`
+    :figure: gallery/gkp.png
+
 .. raw:: html
 
         <div style='clear:both'></div>
diff --git a/docs/gallery/gkp.ipynb b/docs/gallery/gkp.ipynb
diff --git a/docs/gallery/gkp.png b/docs/gallery/gkp.png
diff --git a/docs/gallery/gkp_circuit.svg b/docs/gallery/gkp_circuit.svg