Merge branch 'develop'

Author: perak

lib/quantum-circuit.js

@@ -5994,18 +5994,18 @@ QuantumCircuit.prototype.exportQuirk = function(decompose) {
 									isDecomposeCustomCircuit = true;
 								}
 							}
-			
-							if(isDecomposeCustomCircuit){
-								circuit.gates.map(function(circuitGate, index){
-									circuitGate.map(function(gateToRemove){
-										if(gateToRemove && gateToRemove.name == gate.name){
-											circuit.removeGate(gateToRemove.id);
-										}
-									});														
-								});
-							}else {
-								gatesToBeAdded = [];
-							}
+						}
+
+						if(isDecomposeCustomCircuit){
+							circuit.gates.map(function(circuitGate, index){
+								circuitGate.map(function(gateToRemove){
+									if(gateToRemove && gateToRemove.name == gate.name){
+										circuit.removeGate(gateToRemove.id);
+									}
+								});														
+							});
+						}else {
+							gatesToBeAdded = [];
 						}
 					}
 				}
@@ -6019,6 +6019,26 @@ QuantumCircuit.prototype.exportQuirk = function(decompose) {
 		}
 	});
 
+	var previousColumn = null;
+	var previousGate = null;
+	for(var column = 0; column < numCols; column++) {
+		for(var wire = 0; wire < circuit.numQubits; wire++) {
+			var gate = circuit.getGateAt(column, wire);
+			if(gate){
+				// if(previousGate){
+				// 	console.log(previousGate.name, gate.name, previousGate.connector, previousColumn, column)
+				// }
+				if(previousGate && previousGate.name != gate.name && previousGate.connector != 0 && previousColumn == column){
+					circuit.removeGate(gate.id);
+					circuit.insertGate(gate.name, gate.column + 1, gate.wires, gate.options);
+					// console.log(gate.name, previousColumn, column)
+				}
+				previousGate = gate;
+				previousColumn = column;
+			}
+		}
+	}
+
 	var numCols = circuit.numCols();
 	for(var column = 0; column < numCols; column++) {
 		var quirkColumn = [];
@@ -9291,19 +9311,27 @@ QuantumCircuit.prototype.exportToAQASM = function(options, isExportPyAQASM, expo
 	var hybrid = !!isExportPyAQASM ? options.hybrid : false;
 
 	var circuit = null;
+	var tempCircuit = null;
 
 	shots = shots || 1024;
 
 	if(typeof hybrid == "undefined") {
 		hybrid = this.options ? !!this.options.hybrid : false;
 	}
 
+	var obj = null;
 	// decompose
 	if(decompose) {
 		circuit = new QuantumCircuit();
-		circuit.load(this.save(true));
+		tempCircuit = new QuantumCircuit();
+		obj = this.save(true);
+		circuit.load(obj);
+		tempCircuit.load(obj);
 	} else {
 		circuit = this;
+		obj = this.save(false);
+		tempCircuit = new QuantumCircuit();
+		tempCircuit.load(obj);
 	}
 
 	var mathToStringHandler = function(node, options) {
@@ -9357,6 +9385,44 @@ QuantumCircuit.prototype.exportToAQASM = function(options, isExportPyAQASM, expo
 
 	indentDepth = indentDepth || 0;
 
+	var gatesToBeAdded = [];
+	if(!isExportPyAQASM){
+		if(!decompose) {
+			var numCols = tempCircuit.numCols();
+			for(var column = numCols - 1; column >= 0; column--) {
+				for(var wire = 0; wire < tempCircuit.numQubits; wire++) {
+					var gate = tempCircuit.gates[wire][column];
+					if(gate && gate.connector == 0 && !tempCircuit.basicGates[gate.name]) {
+						customDecomposedCircuit = tempCircuit.decomposeGateAt(column, wire);
+						var isDecomposeCustomCircuit = false;
+						for(var decomposedColumn = 0; decomposedColumn < customDecomposedCircuit.numCols(); decomposedColumn++) {
+							for(var decomposedWire = 0; decomposedWire < customDecomposedCircuit.numQubits; decomposedWire++) {
+								var gateInCustomCircuit = customDecomposedCircuit.getGateAt(decomposedColumn, decomposedWire);
+
+								if(gateInCustomCircuit && gateInCustomCircuit.connector == 0){
+									gatesToBeAdded.push(gateInCustomCircuit);
+								}
+								
+								circuit.gates.map(function(circuitGate, index){
+									circuitGate.map(function(gateToRemove){
+										if(gateToRemove && gateToRemove.name == gate.name){
+											circuit.removeGate(gateToRemove.id);
+										}
+									});														
+								});				
+							}
+						}
+					}
+				}
+			}
+		}
+		gatesToBeAdded.map(function(gateToAdd){
+			if(gateToAdd){
+				circuit.insertGate(gateToAdd.name, gateToAdd.column, gateToAdd.wires, gateToAdd.options);
+			}
+		});
+	}
+
 	var aqasm = "";
 	var indent = getIndent(indentDepth);
 	var usedGates = circuit.usedGates();