Skip to content

Enable adding iterators of objects too #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mmghannam merged 2 commits into from
Jan 27, 2025
Merged

Enable adding iterators of objects too #201

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72b2cda
Enable adding iterators of objects too
mmghannam Jan 26, 2025
793983a
Merge branch 'main' into var-builder
mmghannam Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 44 additions & 2 deletions src/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,18 @@ pub trait CanBeAddedToModel {
/// The return type after adding to the model (e.g. `Variable` / `Constraint` ).
type Return;
/// How to add the value to the model.
fn add(&self, model: &mut Model<ProblemCreated>) -> Self::Return;
fn add(self, model: &mut Model<ProblemCreated>) -> Self::Return;
}

impl<T, I> CanBeAddedToModel for I
where
T: CanBeAddedToModel,
I: IntoIterator<Item = T>,
{
type Return = Vec<T::Return>;
fn add(self, model: &mut Model<ProblemCreated>) -> Self::Return {
self.into_iter().map(|x| x.add(model)).collect()
}
}

/// A builder for variables.
Expand Down Expand Up @@ -77,7 +88,7 @@ impl VarBuilder {

impl CanBeAddedToModel for VarBuilder {
type Return = Variable;
fn add(&self, model: &mut Model<ProblemCreated>) -> Variable {
fn add(self, model: &mut Model<ProblemCreated>) -> Variable {
let name = self.name.clone().unwrap_or_else(|| {
let n_vars = model.n_vars();
format!("x{}", n_vars)
Expand Down Expand Up @@ -124,4 +135,35 @@ mod tests {
assert_eq!(solved.status(), crate::Status::Optimal);
assert_eq!(solved.obj_val(), 1.0);
}

#[test]
fn test_var_add_all() {
let mut model = Model::default().set_obj_sense(crate::ObjSense::Maximize);
let vars = vec![
VarBuilder::default()
.name("1".to_string())
.obj(1.0)
.continuous(0.0, 1.0),
VarBuilder::default()
.name("2".to_string())
.obj(1.0)
.continuous(0.0, 1.0),
VarBuilder::default()
.name("3".to_string())
.obj(1.0)
.continuous(0.0, 1.0),
];

let vars = model.add(vars);
for (i, var) in vars.iter().enumerate() {
assert_eq!(var.name(), (i + 1).to_string());
assert_eq!(var.obj(), 1.0);
assert_eq!(var.lb(), 0.0);
assert_eq!(var.ub(), 1.0);
}

let solved = model.solve();
assert_eq!(solved.status(), crate::Status::Optimal);
assert_eq!(solved.obj_val(), 3.0);
}
}
Loading