Renamed |S> initial state to |i>

adgt · Mar 23, 2019 · 631df9b · 631df9b
1 parent 25849af
commit 631df9b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/src/circuit/CircuitDefinition.js b/src/circuit/CircuitDefinition.js
@@ -21,7 +21,7 @@ import {equate_Maps} from "src/base/Equate.js";
 import {Gate} from "src/circuit/Gate.js"
 import {GateColumn} from "src/circuit/GateColumn.js"
 import {GateShaders} from "src/circuit/GateShaders.js"
-import {Gates} from "src/gates/AllGates.js"
+import {Gates, INITIAL_STATES_TO_GATES} from "src/gates/AllGates.js"
 import {Point} from "src/math/Point.js"
 import {seq, Seq} from "src/base/Seq.js"
 import {Util} from "src/base/Util.js"
@@ -147,7 +147,7 @@ class CircuitDefinition {
     withSwitchedInitialStateOn(wire) {
         let m = new Map([...this.customInitialValues.entries()]);
         let v = m.get(wire);
-        let cycle = [undefined, '1', '+', '-', 'S', 'S†'];
+        let cycle = [...INITIAL_STATES_TO_GATES.keys()];
         let newVal = cycle[(cycle.indexOf(v) + 1) % cycle.length];
         if (newVal === undefined) {
             m.delete(wire);
@@ -901,10 +901,10 @@ class CircuitDefinition {
     applyInitialStateOperations(ctx) {
         for (let wire = 0; wire < this.numWires; wire++) {
             let state = this.customInitialValues.get(wire);
-            if (!STATE_TO_GATES.has(state)) {
+            if (!INITIAL_STATES_TO_GATES.has(state)) {
                 throw new DetailedError('Unrecognized initial state.', {state});
             }
-            for (let gate of STATE_TO_GATES.get(state)) {
+            for (let gate of INITIAL_STATES_TO_GATES.get(state)) {
                 GateShaders.applyMatrixOperation(ctx.withRow(ctx.row + wire), gate.knownMatrixAt(ctx.time))
             }
         }
@@ -1117,16 +1117,6 @@ function firstLastMatchInRange(rangeLen, predicate){
     return [first, last];
 }
 
-/** @type {!Map.<undefined|!string, !Array.<!Gate>>} */
-const STATE_TO_GATES = new Map([
-    [undefined, []],
-    ['1', [Gates.HalfTurns.X]],
-    ['+', [Gates.HalfTurns.H]],
-    ['-', [Gates.HalfTurns.H, Gates.HalfTurns.Z]],
-    ['S', [Gates.HalfTurns.H, Gates.QuarterTurns.SqrtZForward]],
-    ['S†', [Gates.HalfTurns.H, Gates.QuarterTurns.SqrtZBackward]]
-]);
-
 CircuitDefinition.EMPTY = new CircuitDefinition(0, []);
 
 export {CircuitDefinition}
diff --git a/src/circuit/Serializer.js b/src/circuit/Serializer.js
@@ -21,7 +21,7 @@ import {DetailedError} from "src/base/DetailedError.js"
 import {Format} from "src/base/Format.js"
 import {Gate, GateBuilder} from "src/circuit/Gate.js"
 import {GateColumn} from "src/circuit/GateColumn.js"
-import {Gates} from "src/gates/AllGates.js"
+import {Gates, INITIAL_STATES_TO_GATES} from "src/gates/AllGates.js"
 import {Matrix} from "src/math/Matrix.js"
 import {Util} from "src/base/Util.js"
 import {notifyAboutRecoveryFromUnexpectedError} from "src/fallback.js"
@@ -428,7 +428,7 @@ function _fromJson_InitialState(json) {
             // 0 is the default. Don't need to do anything.
         } else if (v === 1) {
             result.set(i, '1');
-        } else if (['+', '-', 'S', 'S†'].indexOf(v) !== -1) {
+        } else if (INITIAL_STATES_TO_GATES.has(v)) {
             result.set(i, v);
         } else {
             throw new DetailedError('Unrecognized initial state key.', {v, json});

diff --git a/src/gates/AllGates.js b/src/gates/AllGates.js
@@ -334,4 +334,14 @@ Gates.BottomToolboxGroups = [
     },
 ];
 
-export {Gates}
+/** @type {!Map.<undefined|!string, !Array.<!Gate>>} */
+const INITIAL_STATES_TO_GATES = new Map([
+    [undefined, []],
+    ['1', [Gates.HalfTurns.X]],
+    ['+', [Gates.HalfTurns.H]],
+    ['-', [Gates.HalfTurns.H, Gates.HalfTurns.Z]],
+    ['i', [Gates.HalfTurns.H, Gates.QuarterTurns.SqrtZForward]],
+    ['-i', [Gates.HalfTurns.H, Gates.QuarterTurns.SqrtZBackward]]
+]);
+
+export {Gates, INITIAL_STATES_TO_GATES}
diff --git a/test/circuit/CircuitStats.test.js b/test/circuit/CircuitStats.test.js
@@ -355,7 +355,7 @@ suite.testUsingWebGL('classical-bit-rotate-with-classical-control-does-fire', ()
 
 suite.testUsingWebGL("initial_states", () => {
     let circuit = Serializer.fromJson(CircuitDefinition, {
-        init: [0, 1, '+', '-', 'S', 'S†'],
+        init: [0, 1, '+', '-', 'i', '-i'],
         cols: [],
     });
     let stats = CircuitStats.fromCircuitAtTime(circuit, 0);