Fixed bug with exporting synonime named gates to qasm and qiskit and enabled import by synonyme

Author: perak

lib/qasm_import/QASMImport.js

@@ -366,6 +366,22 @@ QCQASMListener.prototype.enterQop = function(ctx) {
 		var mixedlist = uop.anylist() ? uop.anylist().mixedlist() : null;
 		var explist = uop.explist();
 
+		switch(gateName) {
+			case "CX": gateName = "cx"; break;
+			case "U": gateName = "u3"; break;
+		}
+
+		if(!self.circuit.basicGates[gateName] && !self.circuit.customGates[gateName]) {
+			// find gate by qasm name
+			for(var tmpName in self.circuit.basicGates) {
+				var tmpDef = self.circuit.basicGates[tmpName];
+				if(tmpDef.exportInfo && tmpDef.exportInfo.qasm && tmpDef.exportInfo.qasm.name && tmpDef.exportInfo.qasm.name == gateName) {
+					gateName = tmpName;
+					break;
+				}
+			}
+		}
+
 		var params = {};
 		if(explist && explist.exp()) {
 			var gateDef = self.circuit.basicGates[gateName];
@@ -405,11 +421,6 @@ QCQASMListener.prototype.enterQop = function(ctx) {
 					wires.push(a.bit + self.qregBase(a.reg));
 				});
 
-				switch(gateName) {
-					case "CX": gateName = "cx"; break;
-					case "U": gateName = "u3"; break;
-				}
-
 				if(!self.compatibilityMode) {
 					switch(gateName) {
 						case "rz": {
@@ -448,11 +459,6 @@ QCQASMListener.prototype.enterQop = function(ctx) {
 					wires.push(a.bit + self.qregBase(a.reg));
 				});
 
-				switch(gateName) {
-					case "CX": gateName = "cx"; break;
-					case "U": gateName = "u3"; break;
-				}
-
 				if(!self.compatibilityMode) {
 					switch(gateName) {
 						case "rz": {
@@ -465,6 +471,7 @@ QCQASMListener.prototype.enterQop = function(ctx) {
 					}
 				}
 
+console.log(gateName, wires, options);
 				self.circuit.addGate(gateName, -1, wires, options);
 			}
 		}

lib/quantum-circuit.js

@@ -1439,7 +1439,7 @@ var QuantumCircuit = function(numQubits) {
 			params: ["theta"],
 			drawingInfo: {
 				connectors: ["circle","circle"],
-				label: "X"
+				label: "XX"
 			},
 			exportInfo: {
 				quil: {
@@ -1460,6 +1460,9 @@ var QuantumCircuit = function(numQubits) {
 					//@TODO add function
 					func: "TODO"
 				},
+				qasm: {
+					name: "rxx"
+				},
 				qiskit: {
 					name: "rxx"
 				},
@@ -1490,7 +1493,7 @@ var QuantumCircuit = function(numQubits) {
 			params: ["theta"],
 			drawingInfo: {
 				connectors: ["circle","circle"],
-				label: "Y"
+				label: "YY"
 			},
 			exportInfo: {
 				quil: {
@@ -1519,31 +1522,39 @@ var QuantumCircuit = function(numQubits) {
 					matrix: [["cos(theta)", 0, 0, "i*sin(theta)"],[0, "cos(theta)", "-i*sin(theta)", 0],[0, "-i*sin(theta)", "cos(theta)", 0],["i*sin(theta)", 0, 0, "cos(theta)"]],
 					array: "[[np.cos(p_theta), 0, 0, 1j*np.sin(p_theta)], [0, np.cos(p_theta), -1j*np.sin(p_theta), 0], [0, -1j*np.sin(p_theta), np.cos(p_theta), 0], [1j*np.sin(p_theta), 0, 0, np.cos(p_theta)] ]",
 					params: ["theta"]
+				},
+				qasm: {
+					name: "ryy"
+				},
+				qiskit: {
+					name: "ryy"
 				}
 			}
 		},
-/*
-		xx: {
-			description: "Ising (XX) gate",
-			matrix: [
-				["1/sqrt(2)", 0, 0, "1/sqrt(2) * (-i * pow(e, i * phi))"],
-
-				[0, "1/sqrt(2)", "-i", 0],
 
-				[0, "-i", "1/sqrt(2)", 0],
-
-				["1/sqrt(2) * (-i * pow(e, -i * phi))", 0, 0, "1/sqrt(2)"]
+		zz: {
+			description: "Parametrix 2-qubit rotation about ZZ",
+			matrix: [
+				[ "exp(-i * theta / 2)", 0, 0, 0 ],
+				[ 0, "exp(i * theta / 2)", 0, 0  ],
+				[ 0, 0, "exp(i * theta / 2)", 0  ],
+				[ 0, 0, 0, "exp(-i * theta / 2)" ]
 			],
-			params: ["phi"],
+			params: ["theta"],
 			drawingInfo: {
-				connectors: ["not","not"],
-				label: "XX"
+				connectors: ["circle","circle"],
+				label: "ZZ"
 			},
 			exportInfo: {
-
+				qasm: {
+					name: "rzz"
+				},
+				qiskit: {
+					name: "rzz"
+				}
 			}
 		},
-*/
+
 		cr2: {
 			description: "Controlled PI/2 rotation over Z-axis",
 			matrix: [
@@ -6892,14 +6903,6 @@ QuantumCircuit.prototype.exportToSVG = function(options) {
 						if(connector == "x") {
 							connector = "box";
 						}
-
-						if(gateName == "ms") {
-							gateLabel = "XX";
-						}
-
-						if(gateName == "yy") {
-							gateLabel = "YY";
-						}
 					}
 
 					var uniqStr = gateLabel + "|" + connector;
@@ -8024,10 +8027,11 @@ QuantumCircuit.prototype.exportToQASM = function(options, exportAsGateName, circ
 				}
 
 				if((!qasmReplacement && !qasmEquivalent) || compatibilityMode) {
-					var gateName = compatibilityMode ? gate.name : qasmName;
-
+					var gateName = gate.name;
 					var gateParams = gate.options && gate.options.params ? gate.options.params : {};
-					qasm += gateName;
+
+					qasm += compatibilityMode ? gate.name : qasmName;
+
 					if(gateParams) {
 						var gateDef = this.basicGates[gateName];
 						if(!gateDef) {