CR fixes

Classiq · Feb 5, 2025 · b773cf7 · b773cf7
1 parent 464b9d8
commit b773cf7
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 112 deletions.
diff --git a/algorithms/qaoa/knapsack/qaoa_knapsack.ipynb b/algorithms/qaoa/knapsack/qaoa_knapsack.ipynb
diff --git a/algorithms/qaoa/knapsack/qaoa_knapsack.qmod b/algorithms/qaoa/knapsack/qaoa_knapsack.qmod
@@ -3,16 +3,10 @@ qstruct KnapsackVars {
   b: qnum<2>;
 }
 
-
-
-qfunc eval_constraint(v: KnapsackVars, output aux: qbit) {
-  aux = ((v.a * 2) + (v.b * 3)) <= 12;
-}
-
 qfunc apply_cost(gamma: real, v: KnapsackVars) {
   aux: qbit;
   within {
-    eval_constraint(v, aux);
+    aux = ((v.a * 2) + (v.b * 3)) <= 12;
   } apply {
     control (aux) {
       phase (-((v.a * 3) + (v.b * 5)), gamma);

diff --git a/algorithms/qaoa/knapsack/qaoa_knapsack.synthesis_options.json b/algorithms/qaoa/knapsack/qaoa_knapsack.synthesis_options.json
@@ -7,37 +7,38 @@
     "machine_precision": 8,
     "custom_hardware_settings": {
       "basis_gates": [
-        "x",
-        "p",
-        "tdg",
-        "sx",
-        "rz",
-        "sxdg",
-        "sdg",
-        "ry",
+        "id",
         "cy",
-        "t",
+        "sx",
+        "z",
+        "cx",
+        "u",
+        "rx",
         "y",
-        "s",
+        "r",
+        "t",
         "u1",
+        "tdg",
+        "rz",
         "cz",
-        "z",
-        "rx",
-        "u2",
+        "x",
+        "s",
+        "sxdg",
         "h",
-        "u",
-        "r",
-        "id",
-        "cx"
+        "u2",
+        "sdg",
+        "ry",
+        "p"
       ],
       "is_symmetric_connectivity": true
     },
     "debug_mode": true,
     "synthesize_all_separately": false,
+    "optimization_level": 3,
     "output_format": ["qasm"],
     "pretty_qasm": true,
     "transpilation_option": "auto optimize",
     "timeout_seconds": 300,
-    "random_seed": 3016072189
+    "random_seed": 695440439
   }
 }
diff --git a/tests/resources/timeouts.yaml b/tests/resources/timeouts.yaml
@@ -118,8 +118,8 @@ integer_linear_programming.ipynb: 400
 integer_linear_programming.qmod: 400
 ising_model.ipynb: 300
 ising_model.qmod: 300
-knapsack_integer.ipynb: 116
-knapsack_integer.qmod: 116
+qaoa_knapsack.ipynb: 300
+qaoa_knapsack.qmod: 300
 learning_optimization.ipynb: 80
 linear_combination_of_unitaries.ipynb: 20
 linear_combination_of_unitaries.qmod: 10