Skip to content

Commit a8bbd88

Browse files
Merge pull request #41 from Centril/fix-flatten-regression
Fix Itertools::flatten regression soon in nightly.
2 parents 77aac2b + 28946cf commit a8bbd88

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

examples/facility.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ fn main() {
4343
})
4444
.collect();
4545

46-
let expr = Zip::new((open.iter().chain(transport.iter().flatten()),
47-
fixed_costs.iter().chain(trans_costs.iter().flatten())))
46+
let expr = Zip::new((open.iter().chain(Itertools::flatten(transport.iter())),
47+
fixed_costs.iter().chain(Itertools::flatten(trans_costs.iter()))))
4848
.fold(LinExpr::new(), |expr, (x, &c)| expr + c * x);
4949
model.set_objective(expr, Minimize).unwrap();
5050
model.update().unwrap();

examples/workforce/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ pub fn make_model(env: &Env) -> Result<Model> {
5050
try!(model.update());
5151

5252
let objterm = pays.iter().map(|pay| repeat(pay).take(shifts.len()));
53-
let objexpr = Zip::new((x.iter().flatten(), objterm.flatten())).fold(LinExpr::new(), |expr, (x, &c)| expr + c * x);
53+
let objexpr = Zip::new((Itertools::flatten(x.iter()), Itertools::flatten(objterm)))
54+
.fold(LinExpr::new(), |expr, (x, &c)| expr + c * x);
5455
try!(model.set_objective(objexpr, Minimize));
5556

5657
for (s, (shift, &requirement)) in shifts.iter().zip(shift_requirements.iter()).enumerate() {

0 commit comments

Comments
 (0)