From 1d226f30a673159d67573e197af91cd8baad6b34 Mon Sep 17 00:00:00 2001
From: Craig Gidney <craig.gidney@gmail.com>
Date: Mon, 3 Oct 2016 22:41:45 -0400
Subject: [PATCH] Fixed stats being collected after un-setup shaders, breaking
 X/Y-axis controlled displays

---
 src/circuit/CircuitComputeUtil.js | 74 +++++++++++++++----------------
 test/circuit/CircuitStats.test.js |  8 ++++
 2 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/src/circuit/CircuitComputeUtil.js b/src/circuit/CircuitComputeUtil.js
index fea429e7..ab822b9a 100644
--- a/src/circuit/CircuitComputeUtil.js
+++ b/src/circuit/CircuitComputeUtil.js
@@ -60,6 +60,24 @@ function advanceStateWithCircuit(args, circuitDefinition, collectStats) {
             let controls = args.controls.and(circuitDefinition.colControls(col).shift(args.row));
             let controlTex = KetTextureUtil.control(args.wireCount, controls);
 
+            let statsCallback = statArgs => {
+                if (!collectStats) {
+                    return;
+                }
+
+                let {qubitDensities, customGateStats} = _extractStateStatsNeededByCircuitColumn(
+                    statArgs,
+                    circuitDefinition,
+                    col);
+                colQubitDensities.push(qubitDensities);
+                for (let {row, stat} of customGateStats) {
+                    //noinspection JSUnusedAssignment
+                    customStatsMap.push({col, row, out: customStats.length});
+                    //noinspection JSUnusedAssignment
+                    customStats.push(stat);
+                }
+            };
+
             let nextState = _advanceStateWithCircuitDefinitionColumn(
                 args,
                 new CircuitEvalArgs(
@@ -71,28 +89,8 @@ function advanceStateWithCircuit(args, circuitDefinition, collectStats) {
                     inputState,
                     args.customContextFromGates),
                 circuitDefinition,
-                col);
-
-            if (collectStats) {
-                let {qubitDensities, customGateStats} = _extractStateStatsNeededByCircuitColumn(
-                    nextState, // We want to show stats after post-selection, so we use 'next' instead of 'input'.
-                    circuitDefinition,
-                    col,
-                    controls,
-                    controlTex,
-                    args.time);
-                colQubitDensities.push(qubitDensities);
-                for (let {row, stat} of customGateStats) {
-                    //noinspection JSUnusedAssignment
-                    customStatsMap.push({
-                        col,
-                        row,
-                        out: customStats.length
-                    });
-                    //noinspection JSUnusedAssignment
-                    customStats.push(stat);
-                }
-            }
+                col,
+                statsCallback);
 
             KetTextureUtil.doneWithTexture(controlTex, "controlTex in advanceStateWithCircuit");
             return nextState;
@@ -107,42 +105,36 @@ function advanceStateWithCircuit(args, circuitDefinition, collectStats) {
 }
 
 /**
- * @param {!WglTexture} state
+ * @param {!CircuitEvalArgs} args
  * @param {!CircuitDefinition} circuitDefinition
  * @param {!int} col
- * @param {!Controls} controls
- * @param {!WglTexture} controlTex
- * @param {!number} time
  * @private
  * @returns {!{qubitDensities:!WglTexture, customGateStats:!Array.<!{row:!int,stat:!WglTexture}>}}
  */
 function _extractStateStatsNeededByCircuitColumn(
-        state,
+        args,
         circuitDefinition,
-        col,
-        controls,
-        controlTex,
-        time) {
+        col) {
     // Compute custom stats used by display gates.
     let customGateStats = [];
     for (let row of circuitDefinition.customStatRowsInCol(col)) {
         let statArgs = new CircuitEvalArgs(
-            time,
+            args.time,
             row,
             circuitDefinition.numWires,
-            controls,
-            controlTex,
-            state,
+            args.controls,
+            args.controlsTexture,
+            args.stateTexture,
             circuitDefinition.colCustomContextFromGates(col, row));
         let pipeline = circuitDefinition.columns[col].gates[row].customStatPipelineMaker(statArgs);
-        let stat = KetTextureUtil.evaluatePipelineWithIntermediateCleanup(state, pipeline);
+        let stat = KetTextureUtil.evaluatePipelineWithIntermediateCleanup(args.stateTexture, pipeline);
         customGateStats.push({row, stat});
     }
 
     // Compute individual qubit densities, where needed.
     let qubitDensities = KetTextureUtil.superpositionToQubitDensities(
-        state,
-        controls,
+        args.stateTexture,
+        args.controls,
         circuitDefinition.colHasSingleQubitDisplayMask(col));
 
     return {qubitDensities, customGateStats};
@@ -153,6 +145,7 @@ function _extractStateStatsNeededByCircuitColumn(
  * @param {!CircuitEvalArgs} args
  * @param {!CircuitDefinition} circuitDefinition
  * @param {!int} col
+ * @param {!function(!CircuitEvalArgs)} statsCallback
  * @returns {!WglTexture}
  * @private
  */
@@ -160,7 +153,8 @@ function _advanceStateWithCircuitDefinitionColumn(
         outerContextArgs,
         args,
         circuitDefinition,
-        col) {
+        col,
+        statsCallback) {
 
     let colContext = Util.mergeMaps(
         args.customContextFromGates,
@@ -199,6 +193,8 @@ function _advanceStateWithCircuitDefinitionColumn(
         circuitDefinition.textureTransformsInColAt(col, outerContextArgs.row),
         (v, f) => f(colArgsTemplate.withStateTexture(v)));
 
+    statsCallback(colArgsTemplate.withStateTexture(almostAlmostNextState));
+
     // Apply 'after column' un-setup shaders.
     let nextState = KetTextureUtil.aggregateWithReuse(
         almostAlmostNextState,
diff --git a/test/circuit/CircuitStats.test.js b/test/circuit/CircuitStats.test.js
index ffe6c202..df26586d 100644
--- a/test/circuit/CircuitStats.test.js
+++ b/test/circuit/CircuitStats.test.js
@@ -58,3 +58,11 @@ suite.webGlTest("nested-addition-gate", () => {
     assertThat(stats.qubitDensityMatrix(1, Infinity)).isEqualTo(on);
     assertThat(stats.qubitDensityMatrix(2, Infinity)).isEqualTo(off);
 });
+
+suite.webGlTest('controlled-displays', () => {
+    let c = circuit(`-H-•-@@-
+                     ---X-⊕•-`);
+    let stats = CircuitStats.fromCircuitAtTime(c, 0);
+    assertThat(stats.qubitDensityMatrix(0, 5)).isApproximatelyEqualTo(Matrix.square(0.5, 0.5, 0.5, 0.5));
+    assertThat(stats.qubitDensityMatrix(0, 6)).isApproximatelyEqualTo(Matrix.square(0, 0, 0, 1));
+});