fix append (#112)

Author: doichanj

src/circuit/instruction.hpp

@@ -70,6 +70,8 @@ class Instruction {
  num_clbits_ = other.num_clbits_;
  params_ = other.params_;
  label_ = other.label_;
+ map_ = other.map_;
+ is_standard_gate_ = other.is_standard_gate_;
  }
 
  /// @brief Return name of the instruction
@@ -135,12 +137,12 @@ class Instruction {
  /// @return number of parameters
  virtual uint_t num_params(void) const
  {
- return 0;
+ return params_.size();
  }
 
  /// @brief Return gate enum for Qiskit C-API
  /// @return QkGate enum for this instruciton
- virtual QkGate gate_map(void) const
+ QkGate gate_map(void) const
  {
  return map_;
  }

src/circuit/quantumcircuit_def.hpp

@@ -605,8 +605,8 @@ class QuantumCircuit {
  /// @param op a gate to be added
  /// @param qubits a list of qubits to be mapped
  /// @param params a list of parameters
- void append(const Instruction& op, const reg_t& qubits, const std::vector<double> params);
- void append(const Instruction& op, const std::vector<std::uint32_t>& qubits, const std::vector<double> params);
+ void append(const Instruction& op, const reg_t& qubits);
+ void append(const Instruction& op, const std::vector<std::uint32_t>& qubits);
 
  /// @brief append a gate at the end of the circuit
  /// @param inst an instruction to be added
@@ -615,13 +615,7 @@ class QuantumCircuit {
  void append(const Instruction& op, const uint_t qubit)
  {
  reg_t qubits({qubit});
- std::vector<double> params;
- append(op, qubits, params);
- }
- void append(const Instruction& op, const reg_t& qubits)
- {
- std::vector<double> params;
- append(op, qubits, params);
+ append(op, qubits);
  }
 
 

src/circuit/quantumcircuit_impl.hpp

@@ -933,17 +933,17 @@ void QuantumCircuit::compose(QuantumCircuit& circ, const reg_t& qubits, const re
  }
 }
 
-void QuantumCircuit::append(const Instruction& op, const reg_t& qubits, const std::vector<double> params)
+void QuantumCircuit::append(const Instruction& op, const reg_t& qubits)
 {
- if (op.num_qubits() == qubits.size() && op.num_params() == params.size()) {
+ if (op.num_qubits() == qubits.size()) {
  std::vector<std::uint32_t> vqubits(qubits.size());
  for (int_t i = 0; i< qubits.size(); i++) {
  vqubits[i] = (std::uint32_t)qubits[i];
  }
  pre_add_gate();
  if (op.is_standard_gate()) {
- if (params.size() > 0)
- qk_circuit_gate(rust_circuit_.get(), op.gate_map(), vqubits.data(), params.data());
+ if (op.num_params() > 0)
+ qk_circuit_gate(rust_circuit_.get(), op.gate_map(), vqubits.data(), op.params().data());
  else
  qk_circuit_gate(rust_circuit_.get(), op.gate_map(), vqubits.data(), nullptr);
  } else {
@@ -958,13 +958,13 @@ void QuantumCircuit::append(const Instruction& op, const reg_t& qubits, const st
  }
 }
 
-void QuantumCircuit::append(const Instruction& op, const std::vector<std::uint32_t>& qubits, const std::vector<double> params)
+void QuantumCircuit::append(const Instruction& op, const std::vector<std::uint32_t>& qubits)
 {
- if (op.num_qubits() == qubits.size() && op.num_params() == params.size()) {
+ if (op.num_qubits() == qubits.size()) {
  pre_add_gate();
  if (op.is_standard_gate()) {
- if (params.size() > 0)
- qk_circuit_gate(rust_circuit_.get(), op.gate_map(), qubits.data(), params.data());
+ if (op.num_params() > 0)
+ qk_circuit_gate(rust_circuit_.get(), op.gate_map(), qubits.data(), op.params().data());
  else
  qk_circuit_gate(rust_circuit_.get(), op.gate_map(), qubits.data(), nullptr);
  } else {