Skip to content

Commit

Permalink
Fix lints
Browse files Browse the repository at this point in the history
  • Loading branch information
@jasonrhansen
jasonrhansen committed Feb 26, 2023
1 parent 8e48b86 commit 10722c6
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
14 changes: 7 additions & 7 deletions src/guillotine.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ impl Bin for GuillotineBin {
.iter()
.fold(0, |acc, fr| acc + fr.width as u64 * fr.length as u64) as f64;

(used_area / (used_area + free_area) as f64).powf(2.0 + self.free_rects.len() as f64 * 0.01)
(used_area / (used_area + free_area)).powf(2.0 + self.free_rects.len() as f64 * 0.01)
}

fn price(&self) -> usize {
Expand Down Expand Up @@ -511,12 +511,12 @@ impl GuillotineBin {

// Use the given heuristic to decide which choice to make.
let split_horizontal = match method {
SplitHeuristic::ShorterLeftoverAxis => (w <= h),
SplitHeuristic::LongerLeftoverAxis => (w > h),
SplitHeuristic::MinimizeArea => (rect.width as u64 * h > w * rect.length as u64),
SplitHeuristic::MaximizeArea => (rect.width as u64 * h <= w * rect.length as u64),
SplitHeuristic::ShorterAxis => (free_rect.width as u64 <= free_rect.length as u64),
SplitHeuristic::LongerAxis => (free_rect.width as u64 > free_rect.length as u64),
SplitHeuristic::ShorterLeftoverAxis => w <= h,
SplitHeuristic::LongerLeftoverAxis => w > h,
SplitHeuristic::MinimizeArea => rect.width as u64 * h > w * rect.length as u64,
SplitHeuristic::MaximizeArea => rect.width as u64 * h <= w * rect.length as u64,
SplitHeuristic::ShorterAxis => free_rect.width as u64 <= free_rect.length as u64,
SplitHeuristic::LongerAxis => free_rect.width as u64 > free_rect.length as u64,
};

let split_axis = if split_horizontal {
Expand Down
8 changes: 4 additions & 4 deletions src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -669,10 +669,10 @@ where

// Create a new unit with the bins of `self` and some of the bins of `other` injected in.
let mut new_unit = OptimizerUnit {
bins: (&self.bins[..cross_dest])
bins: (self.bins[..cross_dest])
.iter()
.chain((&other.bins[cross_src_start..cross_src_end]).iter())
.chain((&self.bins[cross_dest..]).iter())
.chain((other.bins[cross_src_start..cross_src_end]).iter())
.chain((self.bins[cross_dest..]).iter())
.cloned()
.collect(),
possible_stock_pieces: self.possible_stock_pieces,
Expand Down Expand Up @@ -715,7 +715,7 @@ where
.available_stock_pieces
.iter_mut()
.find(|sp| sp.quantity != Some(0) && bin.matches_stock_piece(sp));
let injected_cut_pieces = (&other.bins[cross_src_start..cross_src_end])
let injected_cut_pieces = (other.bins[cross_src_start..cross_src_end])
.iter()
.flat_map(Bin::cut_pieces);
let num_removed_cut_pieces = bin.remove_cut_pieces(injected_cut_pieces);
Expand Down
24 changes: 12 additions & 12 deletions src/maxrects.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,9 +320,9 @@ impl MaxRectsBin {
let fit = free_rect.fit_cut_piece(self.pattern_direction, cut_piece, prefer_rotated);
if fit.is_upright() {
let leftover_horiz =
(free_rect.width as isize - cut_piece.width as isize).abs() as usize;
(free_rect.width as isize - cut_piece.width as isize).unsigned_abs();
let leftover_vert =
(free_rect.length as isize - cut_piece.length as isize).abs() as usize;
(free_rect.length as isize - cut_piece.length as isize).unsigned_abs();
let short_side_fit = cmp::min(leftover_horiz, leftover_vert);
let long_side_fit = cmp::max(leftover_horiz, leftover_vert);

Expand All @@ -339,9 +339,9 @@ impl MaxRectsBin {
}
} else if fit.is_rotated() {
let leftover_horiz =
(free_rect.width as isize - cut_piece.length as isize).abs() as usize;
(free_rect.width as isize - cut_piece.length as isize).unsigned_abs();
let leftover_vert =
(free_rect.length as isize - cut_piece.width as isize).abs() as usize;
(free_rect.length as isize - cut_piece.width as isize).unsigned_abs();
let short_side_fit = cmp::min(leftover_horiz, leftover_vert);
let long_side_fit = cmp::max(leftover_horiz, leftover_vert);

Expand Down Expand Up @@ -380,9 +380,9 @@ impl MaxRectsBin {
let fit = free_rect.fit_cut_piece(self.pattern_direction, cut_piece, prefer_rotated);
if fit.is_upright() {
let leftover_horiz =
(free_rect.width as isize - cut_piece.width as isize).abs() as usize;
(free_rect.width as isize - cut_piece.width as isize).unsigned_abs();
let leftover_vert =
(free_rect.length as isize - cut_piece.length as isize).abs() as usize;
(free_rect.length as isize - cut_piece.length as isize).unsigned_abs();
let short_side_fit = cmp::min(leftover_horiz, leftover_vert);
let long_side_fit = cmp::max(leftover_horiz, leftover_vert);

Expand All @@ -399,9 +399,9 @@ impl MaxRectsBin {
}
} else if fit.is_rotated() {
let leftover_horiz =
(free_rect.width as isize - cut_piece.length as isize).abs() as usize;
(free_rect.width as isize - cut_piece.length as isize).unsigned_abs();
let leftover_vert =
(free_rect.length as isize - cut_piece.width as isize).abs() as usize;
(free_rect.length as isize - cut_piece.width as isize).unsigned_abs();
let short_side_fit = cmp::min(leftover_horiz, leftover_vert);
let long_side_fit = cmp::max(leftover_horiz, leftover_vert);

Expand Down Expand Up @@ -448,9 +448,9 @@ impl MaxRectsBin {

let fit = free_rect.fit_cut_piece(self.pattern_direction, cut_piece, prefer_rotated);
if fit.is_upright() {
let leftover_horiz = (free_rect.width as i64 - cut_piece.width as i64).abs() as u64;
let leftover_horiz = (free_rect.width as i64 - cut_piece.width as i64).unsigned_abs();
let leftover_vert =
(free_rect.length as i64 - cut_piece.length as i64).abs() as u64;
(free_rect.length as i64 - cut_piece.length as i64).unsigned_abs();
let short_side_fit = cmp::min(leftover_horiz, leftover_vert);

if area_fit < best_area_fit
Expand All @@ -466,8 +466,8 @@ impl MaxRectsBin {
}
} else if fit.is_rotated() {
let leftover_horiz =
(free_rect.width as i64 - cut_piece.length as i64).abs() as u64;
let leftover_vert = (free_rect.length as i64 - cut_piece.width as i64).abs() as u64;
(free_rect.width as i64 - cut_piece.length as i64).unsigned_abs();
let leftover_vert = (free_rect.length as i64 - cut_piece.width as i64).unsigned_abs();
let short_side_fit = cmp::min(leftover_horiz, leftover_vert);

if area_fit < best_area_fit
Expand Down

0 comments on commit 10722c6

Please sign in to comment.