Merge branch 'develop'

Author: perak

lib/quantum-circuit.js

@@ -1546,6 +1546,16 @@ var QuantumCircuit = function(numQubits) {
 				label: "ZZ"
 			},
 			exportInfo: {
+				quil: {
+					name: "zz",
+					params: ["theta"],
+					defgate: "DEFGATE zz(%theta):\n    EXP(-i * %theta / 2), 0, 0, 0\n    0, EXP(i * %theta / 2), 0, 0\n    0, 0, EXP(i * %theta / 2), 0\n    0, 0, 0, EXP(-i * %theta / 2)"
+				},
+				pyquil: {
+					name: "zz",
+					params: ["theta"],
+					array: "[ [ quil_exp(-1j * p_theta / 2), 0, 0, 0 ], [ 0, quil_exp(1j * p_theta / 2), 0, 0], [ 0, 0, quil_exp(1j * p_theta / 2), 0 ], [ 0, 0, 0, quil_exp(-1j * p_theta / 2) ] ]"
+				},
 				qasm: {
 					name: "rzz"
 				},