Merge branch 'quirk-modification' into develop

Author: perak

lib/quantum-circuit.js

@@ -20,7 +20,6 @@ var formatComplex2 = function(re, im, options) {
 	var opt = JSON.parse(JSON.stringify(options));
 	opt.plusChar = "+";
 	var sim = formatFloat(im, opt);
-
 	return sre + sim + (options.iotaChar ? options.iotaChar : "i");
 };
 
@@ -5907,12 +5906,11 @@ QuantumCircuit.prototype.exportQuirk = function(decompose) {
 	}
 
 	// decompose
-	if(decompose) {
-		circuit = new QuantumCircuit();
-		circuit.load(this.save(true));
-	} else {
-		circuit = this;
-	}
+	var obj = this.save(decompose);
+	var circuit = new QuantumCircuit();
+	var tempCircuit = new QuantumCircuit();
+	circuit.load(obj);
+	tempCircuit.load(obj);
 
 	var quirk = {
 		cols: [],
@@ -5926,6 +5924,57 @@ QuantumCircuit.prototype.exportQuirk = function(decompose) {
 	var gateLocations = {};
 	var customGateCircuit = new QuantumCircuit();
 
+	
+	
+	var gatesToBeAdded = [];
+
+	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);
+							}
+
+							if(gateInCustomCircuit){
+								var basicGateInCustomCircuit = customDecomposedCircuit.basicGates[gateInCustomCircuit.name];
+								if(basicGateInCustomCircuit.exportInfo && !basicGateInCustomCircuit.exportInfo.quirk){
+									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 = [];
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	gatesToBeAdded.map(function(gateToAdd){
+		if(gateToAdd){
+			circuit.insertGate(gateToAdd.name, gateToAdd.column, gateToAdd.wires, gateToAdd.options);
+		}
+	});
+
 	var numCols = circuit.numCols();
 	for(var column = 0; column < numCols; column++) {
 		var quirkColumn = [];
@@ -6035,7 +6084,6 @@ QuantumCircuit.prototype.exportQuirk = function(decompose) {
 							}
 							quirkColumn.push(quirkName);
 						} else {
-							// wireRange = range(gate.wires.length);
 							var changeWires = JSON.stringify(gateWires.sort()) == JSON.stringify(wireRange);
 							if(!changeWires && isWireInRange(gate.wire, wireRange)){
 								quirkColumn.push(1);
@@ -6067,6 +6115,7 @@ QuantumCircuit.prototype.exportQuirk = function(decompose) {
 		quirk.cols.push(quirkColumn);
 	}		
 
+	
 	// user defined gates
 	if(!decompose) {
 		var usedGates = circuit.usedGates();