From 0ff254d87aedf11e5e35f06529a93beffcaa0de3 Mon Sep 17 00:00:00 2001 From: Joe Neeman Date: Thu, 18 Jan 2007 21:32:32 +0200 Subject: [PATCH] method renaming in constrained-breaking --- lily/constrained-breaking.cc | 30 ++++++++++------------------ lily/include/constrained-breaking.hh | 15 +++++++------- lily/page-breaking.cc | 8 ++++---- lily/paper-score.cc | 4 ++-- 4 files changed, 23 insertions(+), 34 deletions(-) diff --git a/lily/constrained-breaking.cc b/lily/constrained-breaking.cc index 5fbc3f7fab..931e4c4cec 100644 --- a/lily/constrained-breaking.cc +++ b/lily/constrained-breaking.cc @@ -109,16 +109,6 @@ Constrained_breaking::calc_subproblem (vsize start, vsize sys, vsize brk) return found_something; } -vector -Constrained_breaking::solve () -{ - if (!systems_) - return get_best_solution (0, VPOS); - - resize (systems_); - return get_solution(0, VPOS, systems_); -} - Column_x_positions Constrained_breaking::space_line (vsize i, vsize j) { @@ -156,7 +146,7 @@ Constrained_breaking::resize (vsize systems) } vector -Constrained_breaking::get_solution (vsize start, vsize end, vsize sys_count) +Constrained_breaking::solve (vsize start, vsize end, vsize sys_count) { vsize start_brk = starting_breakpoints_[start]; vsize end_brk = prepare_solution (start, end, sys_count); @@ -196,10 +186,10 @@ Constrained_breaking::get_solution (vsize start, vsize end, vsize sys_count) } vector -Constrained_breaking::get_best_solution (vsize start, vsize end) +Constrained_breaking::best_solution (vsize start, vsize end) { - vsize min_systems = get_min_systems (start, end); - vsize max_systems = get_max_systems (start, end); + vsize min_systems = min_system_count (start, end); + vsize max_systems = max_system_count (start, end); Real best_demerits = infinity_f; vector best_so_far; @@ -211,11 +201,11 @@ Constrained_breaking::get_best_solution (vsize start, vsize end) if (dem < best_demerits) { best_demerits = dem; - best_so_far = get_solution (start, end, i); + best_so_far = solve (start, end, i); } else { - vector cur = get_solution (start, end, i); + vector cur = solve (start, end, i); bool too_many_lines = true; for (vsize j = 0; j < cur.size (); j++) @@ -230,11 +220,11 @@ Constrained_breaking::get_best_solution (vsize start, vsize end) } if (best_so_far.size ()) return best_so_far; - return get_solution (start, end, max_systems); + return solve (start, end, max_systems); } std::vector -Constrained_breaking::get_details (vsize start, vsize end, vsize sys_count) +Constrained_breaking::line_details (vsize start, vsize end, vsize sys_count) { vsize brk = prepare_solution (start, end, sys_count); Matrix const &st = state_[start]; @@ -250,7 +240,7 @@ Constrained_breaking::get_details (vsize start, vsize end, vsize sys_count) } int -Constrained_breaking::get_min_systems (vsize start, vsize end) +Constrained_breaking::min_system_count (vsize start, vsize end) { vsize sys_count; vsize brk = prepare_solution (start, end, 1); @@ -272,7 +262,7 @@ Constrained_breaking::get_min_systems (vsize start, vsize end) } int -Constrained_breaking::get_max_systems (vsize start, vsize end) +Constrained_breaking::max_system_count (vsize start, vsize end) { vsize brk = (end >= start_.size ()) ? breaks_.size () - 1 : starting_breakpoints_[end]; return brk - starting_breakpoints_[start]; diff --git a/lily/include/constrained-breaking.hh b/lily/include/constrained-breaking.hh index 502e8c234a..2478afcaca 100644 --- a/lily/include/constrained-breaking.hh +++ b/lily/include/constrained-breaking.hh @@ -93,17 +93,15 @@ struct Constrained_break_node class Constrained_breaking { public: - vector solve (); + vector solve (vsize start, vsize end, vsize sys_count); + vector best_solution (vsize start, vsize end); + vector line_details (vsize start, vsize end, vsize sys_count); + Constrained_breaking (Paper_score *ps); Constrained_breaking (Paper_score *ps, vector const &start_col_posns); - vector get_solution (vsize start, vsize end, vsize sys_count); - vector get_best_solution (vsize start, vsize end); - vector get_details (vsize start, vsize end, vsize sys_count); - int get_max_systems (vsize start, vsize end); - int get_min_systems (vsize start, vsize end); - - void resize (vsize systems); + int max_system_count (vsize start, vsize end); + int min_system_count (vsize start, vsize end); private: Paper_score *pscore_; @@ -127,6 +125,7 @@ private: vector breaks_; void initialize (); + void resize (vsize systems); Column_x_positions space_line (vsize start_col, vsize end_col); vsize prepare_solution (vsize start, vsize end, vsize sys_count); diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc index d82b881a21..b5c38293e5 100644 --- a/lily/page-breaking.cc +++ b/lily/page-breaking.cc @@ -86,7 +86,7 @@ Page_breaking::break_into_pieces (vsize start_break, vsize end_break, Line_divis vsize end; line_breaker_args (sys, chunks[i], chunks[i+1], &start, &end); - vector pos = line_breaking_[sys].get_solution (start, end, div[i]); + vector pos = line_breaking_[sys].solve (start, end, div[i]); all_[sys].pscore_->root_system ()->break_into_pieces (pos); } } @@ -130,7 +130,7 @@ Page_breaking::line_details (vsize start_break, vsize end_break, Line_division c vsize end; line_breaker_args (sys, chunks[i], chunks[i+1], &start, &end); - vector details = line_breaking_[sys].get_details (start, end, div[i]); + vector details = line_breaking_[sys].line_details (start, end, div[i]); ret.insert (ret.end (), details.begin (), details.end ()); } else @@ -351,8 +351,8 @@ Page_breaking::system_count_bounds (vector const &chunks, bool m vsize end; line_breaker_args (sys, chunks[i], chunks[i+1], &start, &end); ret[i] = min - ? line_breaking_[sys].get_min_systems (start, end) - : line_breaking_[sys].get_max_systems (start, end); + ? line_breaking_[sys].min_system_count (start, end) + : line_breaking_[sys].max_system_count (start, end); } } diff --git a/lily/paper-score.cc b/lily/paper-score.cc index 0142ef3b92..f91a4cddee 100644 --- a/lily/paper-score.cc +++ b/lily/paper-score.cc @@ -106,9 +106,9 @@ Paper_score::calc_breaking () int system_count = robust_scm2int (layout ()->c_variable ("system-count"), 0); if (system_count) - algorithm.resize (system_count); + return algorithm.solve (0, VPOS, system_count); - return algorithm.solve (); + return algorithm.best_solution (0, VPOS); } void -- 2.39.2