Fixed multiple bugs in exportToAQASM

Author: perak

lib/quantum-circuit.js

@@ -4314,6 +4314,13 @@ QuantumCircuit.prototype.convertToCustomGate = function(gateName, decompose, add
 	this.cregs = {};
 
 	var source = this.save(decompose);
+	if(source.options) {
+		source.options.hybrid = false;
+		if(source.options.hybridOptions) {
+			delete source.options.hybridOptions;
+		}
+	}
+
 	this.clear();
 	this.customGates[gateName] = source;
 
@@ -6115,7 +6122,7 @@ QuantumCircuit.prototype.exportSVG = function(embedded, options) {
 	var newOptions = options || {};
 	newOptions.embedded = !!embedded;
 
-	return exportToSVG(newOptions);
+	return this.exportToSVG(newOptions);
 };
 
 QuantumCircuit.prototype.exportToSVG = function(options) {
@@ -8950,9 +8957,17 @@ QuantumCircuit.prototype.exportToQuil = function(options, exportAsGateName) {
 	return quil;
 };
 
-QuantumCircuit.prototype.exportAQASM = function(comment, decompose, isExportPyAQASM, exportAsGateName, asJupyter, shots, hybrid, indentDepth) {
+QuantumCircuit.prototype.exportToAQASM = function(options, isExportPyAQASM, exportAsGateName, indentDepth) {
 	var self = this;
 
+	options = options || {};
+
+	var comment = options.comment;
+	var decompose = options.decompose;
+	var asJupyter = options.asJupyter;
+	var shots = options.shots;
+	var hybrid = !!isExportPyAQASM ? options.hybrid : false;
+
 	var circuit = null;
 
 	shots = shots || 1024;
@@ -9027,7 +9042,7 @@ QuantumCircuit.prototype.exportAQASM = function(comment, decompose, isExportPyAQ
 
 	if(!isExportPyAQASM){
 		aqasm += indent +  "BEGIN\n";
-		aqasm += indent +  "qubits " + numQubits;
+		aqasm += indent +  "qubits " + numQubits + "\n";
 	}else {
 		if(exportAsGateName){
 			var args = "";
@@ -9106,7 +9121,16 @@ QuantumCircuit.prototype.exportAQASM = function(comment, decompose, isExportPyAQ
 					if(customGate) {
 						var customCircuit = new QuantumCircuit();
 						customCircuit.load(customGate);
-						aqasm += customCircuit.exportAQASM("", true, true, usedGateName, false, null, false, indentDepth);
+
+						var newOptions = {
+							comment: "",
+							decompose: true,
+							asJupyter: false,
+							shots: null,
+							hybrid: false
+						};
+
+						aqasm += customCircuit.exportAQASM(newOptions, isExportPyAQASM, usedGateName, indentDepth);
 						submoduleCount++;
 					}
 				}
@@ -9306,13 +9330,13 @@ QuantumCircuit.prototype.exportAQASM = function(comment, decompose, isExportPyAQ
 		}
 	}
 
-	if(exportAsGateName){
+	if(exportAsGateName) {
 		aqasm += indent + "return circuit\n\n";
 	}
 
-	if(!isExportPyAQASM){
+	if(!isExportPyAQASM) {
 		aqasm += "END";
-	}else {
+	} else {
 		if(!exportAsGateName){			
 			aqasm += indent +  "\n";
 			aqasm += indent +  "circuit = program.to_circ()\n";
@@ -9364,14 +9388,63 @@ QuantumCircuit.prototype.exportAQASM = function(comment, decompose, isExportPyAQ
 			}
 		}
 	}
+
+	if(asJupyter && isExportPyAQASM) {
+		var notebook = {
+			metadata: {
+				kernelspec: {
+					display_name: "Python 3",
+					language: "python",
+					name: "python3"
+				}
+			},
+			nbformat: 4,
+			nbformat_minor: 0,
+			cells: [
+				{
+					cell_type: "code",
+					source: aqasm,
+					metadata: {
+
+					},
+					outputs: [],
+					execution_count: null
+				}
+			]
+		};
+		return JSON.stringify(notebook);
+	}
+
 	return aqasm
 };
 
-QuantumCircuit.prototype.exportPyAQASM = function(comment, decompose, exportAsGateName, asJupyter, shots, hybrid){
+QuantumCircuit.prototype.exportAQASM = function(comment, decompose, isExportPyAQASM, exportAsGateName, asJupyter, shots, hybrid, indentDepth) {
+	var options = {
+		comment: comment,
+		decompose: decompose,
+		asJupyter: asJupyter,
+		shots: shots,
+		hybrid: hybrid
+	};
+
+	return this.exportToAQASM(options, isExportPyAQASM, exportAsGateName, indentDepth);
+};
+
 
-	return this.exportAQASM(comment, decompose, true, exportAsGateName, asJupyter, shots, hybrid);
+QuantumCircuit.prototype.exportToPyAQASM = function(options, exportAsGateName) {
+	return this.exportToAQASM(options, true, exportAsGateName);
 };
 
+QuantumCircuit.prototype.exportPyAQASM = function(comment, decompose, exportAsGateName, asJupyter, shots, hybrid) {
+	var options = {
+		comment: comment,
+		decompose: decompose,
+		asJupyter: asJupyter,
+		shots: shots,
+		hybrid: hybrid
+	};
+	return this.exportToPyAQASM(options, exportAsGateName);
+};
 
 QuantumCircuit.prototype.exportToCirq = function(options, exportAsGateName) {
 	options = options || {};