test(opb): simplify constraint initialization

chrjabs · Feb 11, 2025 · 136d9d4 · 136d9d4
1 parent a8adb8b
commit 136d9d4
Showing 1 changed file with 6 additions and 22 deletions.
diff --git a/tests/opb.rs b/tests/opb.rs
@@ -37,17 +37,9 @@ fn opb_opt() {
     let inst: OptInstance =
         OptInstance::from_opb_path("./data/tiny-opt.opb", Options::default()).unwrap();
     let mut true_constr = SatInstance::new();
-    let mut lits = RsHashMap::default();
-    lits.insert(lit![0], 5);
-    lits.insert(lit![1], -3);
-    true_constr.add_pb_constr(PbConstraint::new_lb(lits, 4));
-    let mut lits = RsHashMap::default();
-    lits.insert(lit![2], 5);
-    lits.insert(lit![3], -3);
-    true_constr.add_pb_constr(PbConstraint::new_lb(lits, 2));
-    let mut lits = RsHashMap::default();
-    lits.insert(!lit![3], 5);
-    true_constr.add_pb_constr(PbConstraint::new_lb(lits, 4));
+    true_constr.add_pb_constr(PbConstraint::new_lb([(lit![0], 5), (lit![1], -3)], 4));
+    true_constr.add_pb_constr(PbConstraint::new_lb([(lit![2], 5), (lit![3], -3)], 2));
+    true_constr.add_pb_constr(PbConstraint::new_lb([(!lit![3], 5)], 4));
     let mut true_obj = Objective::new();
     true_obj.increase_soft_lit_int(1, lit![0]);
     true_obj.increase_soft_lit_int(2, lit![1]);
@@ -59,17 +51,9 @@ fn opb_multi_opt() {
     let inst: MultiOptInstance =
         MultiOptInstance::from_opb_path("./data/tiny-opt.opb", Options::default()).unwrap();
     let mut true_constr = SatInstance::new();
-    let mut lits = RsHashMap::default();
-    lits.insert(lit![0], 5);
-    lits.insert(lit![1], -3);
-    true_constr.add_pb_constr(PbConstraint::new_lb(lits, 4));
-    let mut lits = RsHashMap::default();
-    lits.insert(lit![2], 5);
-    lits.insert(lit![3], -3);
-    true_constr.add_pb_constr(PbConstraint::new_lb(lits, 2));
-    let mut lits = RsHashMap::default();
-    lits.insert(!lit![3], 5);
-    true_constr.add_pb_constr(PbConstraint::new_lb(lits, 4));
+    true_constr.add_pb_constr(PbConstraint::new_lb([(lit![0], 5), (lit![1], -3)], 4));
+    true_constr.add_pb_constr(PbConstraint::new_lb([(lit![2], 5), (lit![3], -3)], 2));
+    true_constr.add_pb_constr(PbConstraint::new_lb([(!lit![3], 5)], 4));
     let mut true_obj_1 = Objective::new();
     true_obj_1.increase_soft_lit_int(1, lit![0]);
     true_obj_1.increase_soft_lit_int(2, lit![1]);