Skip to content

Commit

Permalink
Merge remote-tracking branch 'github/dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Strilanc committed Sep 19, 2017
2 parents 125055c + 8a9b16a commit 2d12e1a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion html/quirk.template.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
 
 
 
<span style="color:#BBB">Version 2.0</span>
<span style="color:#BBB">Version 2.1</span>
</div>

<!-- Circuit drawing area -->
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"title": "Quirk",
"description": "A drag-and-drop toy for exploring and understanding small quantum circuits.",
"license": "Apache-2.0",
"version": "2.0.0",
"version": "2.1.0",
"homepage": "https://github.com/Strilanc/Quirk",
"bugs": {
"url": "https://github.com/Strilanc/Quirk/issues"
Expand Down
8 changes: 4 additions & 4 deletions src/gates/PostSelectionGates.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ PostSelectionGates.PostSelectOn = new GateBuilder().
/** @type {!Gate} */
PostSelectionGates.PostSelectAntiX = new GateBuilder().
setSerializedId("|+⟩⟨+|"). // The +/- drawing convention was switched, but the serialized id must stay the same.
setSymbol("|-⟩⟨-|").
setSymbol("|⊖⟩⟨⊖|").
setTitle("Postselect X-Off").
setBlurb("Keeps ON+OFF states, discards/retries ON-OFF states.").
setDrawer(POST_SELECT_DRAWER).
Expand All @@ -65,7 +65,7 @@ PostSelectionGates.PostSelectAntiX = new GateBuilder().
/** @type {!Gate} */
PostSelectionGates.PostSelectX = new GateBuilder().
setSerializedId("|-⟩⟨-|"). // The +/- drawing convention was switched, but the serialized id must stay the same.
setSymbol("|+⟩⟨+|").
setSymbol("|⊕⟩⟨⊕|").
setTitle("Postselect X-On").
setBlurb("Keeps ON-OFF states, discards/retries ON+OFF states.").
setDrawer(POST_SELECT_DRAWER).
Expand All @@ -75,7 +75,7 @@ PostSelectionGates.PostSelectX = new GateBuilder().
/** @type {!Gate} */
PostSelectionGates.PostSelectAntiY = new GateBuilder().
setSerializedId("|X⟩⟨X|"). // The cross/slash convention was switched, but the serialized id must stay the same.
setSymbol("|/⟩⟨/|").
setSymbol("|⊘⟩⟨⊘|").
setTitle("Postselect Y-Off").
setBlurb("Keeps ON+iOFF states, discards ON-iOFF states.").
setDrawer(POST_SELECT_DRAWER).
Expand All @@ -85,7 +85,7 @@ PostSelectionGates.PostSelectAntiY = new GateBuilder().
/** @type {!Gate} */
PostSelectionGates.PostSelectY = new GateBuilder().
setSerializedId("|/⟩⟨/|"). // The cross/slash convention was switched, but the serialized id must stay the same.
setSymbol("|X⟩⟨X|").
setSymbol("|⊗⟩⟨⊗|").
setTitle("Postselect Y-On").
setBlurb("Keeps ON-iOFF states, discards/retries ON+iOFF states.").
setDrawer(POST_SELECT_DRAWER).
Expand Down

0 comments on commit 2d12e1a

Please sign in to comment.