github/powdr
1
1
Fork 0
mirror of https://github.com/powdr-labs/powdr.git synced 2026-01-09 14:48:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename extract_boolean to try_extract_boolean (#3110)

Browse Source 
It can fail and returns an Option, so `try_` seems appropriate.
This commit is contained in:
Thibaut Schaeffer
2025-07-29 14:26:23 +02:00
committed by GitHub
parent 83cd1ecc3e
commit 4700c1815f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
constraint-solver/src/boolean_extractor.rs
View File

@@ -18,7 +18,7 @@ use powdr_number::FieldElement;
/// @param constraint The quadratic constraint to transform.
/// @param var_dispenser A function that returns a new variable that is assumed to be boolean-constrained.
/// It will only be called if the transformation is performed.
pub fn extract_boolean<T: RuntimeConstant, V: Ord + Clone + Hash + Eq>(
pub fn try_extract_boolean<T: RuntimeConstant, V: Ord + Clone + Hash + Eq>(
constraint: &GroupedExpression<T, V>,
mut var_dispenser: impl FnMut() -> V,
) -> Option<GroupedExpression<T, V>> {
@@ -63,7 +63,7 @@ where
.into_iter()
.map(|constr| {
let constr = constr.transform_var_type(&mut |v| v.into());
extract_boolean(&constr, &mut var_dispenser).unwrap_or(constr)
try_extract_boolean(&constr, &mut var_dispenser).unwrap_or(constr)
})
.collect_vec()
}
@@ -134,7 +134,7 @@ mod tests {
fn test_extract_boolean() {
let mut var_dispenser = || "z";
let expr = (var("a") + var("b")) * (var("a") + var("b") + constant(10));
let result = extract_boolean(&expr, &mut var_dispenser);
let result = try_extract_boolean(&expr, &mut var_dispenser);
assert!(result.is_some());
let result = result.unwrap();
assert_eq!(result.to_string(), "a + b - 10 * z + 10");