Merge pull request #92 from cirKITers/entangling_capability

Entangling Capability and Expressibility

.vscode/launch.json

@@ -4,6 +4,14 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "name": "Test",
+            "type": "python",
+            "request": "launch",
+            "module": "pytest",
+            "console": "integratedTerminal",
+            "justMyCode": true
+        },
         {
             "name": "Default",
             "type": "python",

conf/base/catalog.yml

@@ -29,13 +29,22 @@ qasm_circuits: # example to save results to multiple partitions
   path: data/03_qasm_circuits/
   filename_suffix: ".txt"
 
+measures: # example to save results to multiple partitions
+  type: PartitionedDataSet
+  dataset:
+    type: pandas.CSVDataSet
+    # save_args:
+    #   index: False
+  path: data/04_measures/
+  filename_suffix: ".csv"
+
 execution_results: # example to save results to multiple partitions
   type: PartitionedDataSet
   dataset:
     type: pandas.CSVDataSet
     # save_args:
     #   index: False
-  path: data/04_execution_results/
+  path: data/05_execution_results/
   filename_suffix: ".csv"
 
 execution_durations: # example to save results to multiple partitions
@@ -44,23 +53,23 @@ execution_durations: # example to save results to multiple partitions
     type: pandas.CSVDataSet
     # save_args:
     #   index: False
-  path: data/05_execution_durations/
+  path: data/06_execution_durations/
   filename_suffix: ".csv"
 
 
 evaluations_combined:
   type: pandas.CSVDataSet
-  filepath: data/06_evaluations_combined/evaluations_combined.csv
+  filepath: data/07_evaluations_combined/evaluations_combined.csv
   # save_args:
   #   index: False
   versioned: true
 
 dummy_versioned_dataset: # example to save results to multiple 
   type: pandas.CSVDataSet
-  filepath: data/07_reporting/dummy.csv
+  filepath: data/08_reporting/dummy.csv
   versioned: true
 
 # numpy_fw_depth_1: # example to save results to multiple 
 #   type: plotly.JSONDataSet
-#   filepath: data/07_reporting/numpy_fw_depth_1.json
+#   filepath: data/08_reporting/numpy_fw_depth_1.json
 #   versioned: true

conf/base/parameters/data_generation.yml

@@ -2,6 +2,9 @@
 
 data_generation:
   seed: 1111
+  # samples for calculating the expressibility and entangling capability
+  samples_per_parameter: 20
+  haar_samples_per_qubit: 60
 
   min_qubits: 1
   max_qubits: 16
@@ -26,6 +29,10 @@ data_generation:
 
 # data_generation:
 #   seed: 1111
+#   samples for calculating the expressibility and entangling capability
+#   samples_per_parameter: 20
+#   haar_samples_per_qubit: 20
+
 
 #   min_qubits: 1
 #   max_qubits: 12
@@ -50,6 +57,9 @@ data_generation:
 
 # data_generation:
 #   seed: 1111
+#   samples for calculating the expressibility and entangling capability
+#   samples_per_parameter: 20
+#   haar_samples_per_qubit: 20
 
 #   min_qubits: 1
 #   max_qubits: 5
@@ -74,6 +84,9 @@ data_generation:
 
 # data_generation:
 #   seed: 1111
+#   samples for calculating the expressibility and entangling capability
+#   samples_per_parameter: 20
+#   haar_samples_per_qubit: 20
 
 #   min_qubits: 1
 #   max_qubits: 3
@@ -98,18 +111,21 @@ data_generation:
 
 # data_generation:
 #   seed: 1111
+#   # samples for calculating the expressibility and entangling capability
+#   samples_per_parameter: 20
+#   haar_samples_per_qubit: 20
 
-#   min_qubits: 1
-#   max_qubits: 4
+#   min_qubits: 15
+#   max_qubits: 16
 #   qubits_increment: 1
 #   qubits_type: "linear"
 
-#   min_depth: 0
-#   max_depth: 5
+#   min_depth: 9
+#   max_depth: 10
 #   depth_increment: 1
 #   depth_type: "exp2"
 
-#   min_shots: 0
+#   min_shots: 5
 #   max_shots: 5
 #   shots_increment: 1
 #   shots_type: "exp2"

conf/base/parameters/visualization.yml

@@ -1,4 +1,4 @@
 visualization:
   additional_figures: []
   skip_frameworks: [] #numpy_fw
-  output_folder: "data/08_print"
+  output_folder: "data/09_print"