X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fconstrained-breaking.cc;h=4d9c5795eea42d6d80b159c8af1804b8c6e03d2f;hb=73c81adad8e53e74a721ef36297b59215eaa8c05;hp=b507c0725df9a1ac27db1b654d5827a5d8bff07a;hpb=ab547077f8c694c8edf882ce58fc6ed63407ccb6;p=lilypond.git diff --git a/lily/constrained-breaking.cc b/lily/constrained-breaking.cc index b507c0725d..4d9c5795ee 100644 --- a/lily/constrained-breaking.cc +++ b/lily/constrained-breaking.cc @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 2006 Han-Wen Nienhuys + (c) 2006 Joe Neeman */ #include "constrained-breaking.hh" @@ -38,7 +38,7 @@ start_.size () different solution arrays. state_[i] is the array for the solution starting at column number start_[i]. - The indicies "start" and "end" refer to the index in the start_ array of the + The indices "start" and "end" refer to the index in the start_ array of the desired starting and ending columns. each solution array looks like @@ -74,43 +74,36 @@ Constrained_breaking::calc_subproblem (vsize start, vsize sys, vsize brk) bool found_something = false; vsize start_col = starting_breakpoints_[start]; - vector &st = state_[start]; - vsize rank = breaks_.size () - start_col; + Matrix &st = state_[start]; vsize max_index = brk - start_col; for (vsize j=sys; j < max_index; j++) { if (0 == sys && j > 0) break; /* the first line cannot have its first break after the beginning */ - Column_x_positions const &cur = cols_[(j + start_col)*cols_rank_ + brk]; - Column_x_positions prev; + Line_details const &cur = lines_.at (brk, j + start_col); + Real prev_f = 0; Real prev_dem = 0; if (sys > 0) { - prev = st[(sys-1) * rank + j].line_config_; - prev_dem = st[(sys-1) * rank + j].demerits_; + prev_f = st.at (j, sys-1).details_.force_; + prev_dem = st.at (j, sys-1).demerits_; } if (isinf (prev_dem)) break; - Real dem; - Real force; - Real pen; - combine_demerits(prev, cur, &force, &pen, &dem); - dem += prev_dem; + Real dem = combine_demerits (cur.force_, prev_f) + prev_dem + cur.break_penalty_; if (isinf (dem)) continue; - int k = sys*rank + max_index; - if (isinf (st[k].demerits_) || dem < st[k].demerits_) + Constrained_break_node &n = st.at (max_index, sys); + if (isinf (n.demerits_) || dem < n.demerits_) { found_something = true; - st[k].demerits_ = dem; - st[k].force_ = force; - st[k].penalty_ = pen; - st[k].prev_ = j; - st[k].line_config_ = cur; + n.demerits_ = dem; + n.details_ = cur; + n.prev_ = j; } } return found_something; @@ -120,10 +113,7 @@ vector Constrained_breaking::solve () { if (!systems_) - { - programming_error (_f ("no system number set in constrained-breaking")); - systems_ = breaks_.size () / 4; - } + return get_best_solution (0, VPOS); resize (systems_); return get_solution(0, VPOS, systems_); @@ -137,23 +127,12 @@ Constrained_breaking::space_line (vsize i, vsize j) Column_x_positions col; vector line (all_.begin () + breaks_[i], - all_.begin() + breaks_[j] + 1); - - line[0] = dynamic_cast (line[0])->find_prebroken_piece (RIGHT); - line.back () = dynamic_cast (line.back ())->find_prebroken_piece (LEFT); - - col.cols_ = line; - - /* we have no idea what line this will be -- only whether it is the first */ + all_.begin() + breaks_[j] + 1); Interval line_dims = line_dimensions_int (pscore_->layout (), i); - Simple_spacer_wrapper *sp = generate_spacing_problem (line, line_dims); - bool last = j == breaks_.size () - 1; bool ragged = ragged_right || (last && ragged_last); - sp->solve (&col, ragged); - delete sp; - return col; + return get_line_configuration (line, line_dims[RIGHT] - line_dims[LEFT], line_dims[LEFT], ragged); } void @@ -163,18 +142,56 @@ Constrained_breaking::resize (vsize systems) if (!breaks_.size () && pscore_) { + Output_def *l = pscore_->layout (); + System *sys = pscore_->root_system (); + Real padding = robust_scm2double (l->c_variable ("between-system-padding"), 0); + Real space = robust_scm2double (l->c_variable ("ideal-system-space"), 0); + bool ragged_right = to_boolean (pscore_->layout ()->c_variable ("ragged-right")); + bool ragged_last = to_boolean (pscore_->layout ()->c_variable ("ragged-last")); + + Interval first_line = line_dimensions_int (pscore_->layout (), 0); + Interval other_lines = line_dimensions_int (pscore_->layout (), 1); /* do all the rod/spring problems */ breaks_ = pscore_->find_break_indices (); - cols_rank_ = breaks_.size (); all_ = pscore_->root_system ()->columns (); - cols_.resize (breaks_.size () * breaks_.size ()); + lines_.resize (breaks_.size (), breaks_.size (), Line_details ()); + vector forces = get_line_forces (all_, + other_lines.length (), + other_lines.length () - first_line.length (), + ragged_right); for (vsize i = 0; i < breaks_.size () - 1; i++) + { + Real max_ext = 0; for (vsize j = i + 1; j < breaks_.size (); j++) { - cols_[i*cols_rank_ + j] = space_line (i, j); - if (!cols_[i*cols_rank_ + j].satisfies_constraints_) - break; + int start = Paper_column::get_rank (all_[breaks_[i]]); + int end = Paper_column::get_rank (all_[breaks_[j]]); + Interval extent = sys->pure_height (sys, start, end); + bool last = j == breaks_.size () - 1; + bool ragged = ragged_right || (last && ragged_last); + Line_details &line = lines_.at (j, i); + + line.force_ = forces[i*breaks_.size () + j]; + if (ragged && last && !isinf (line.force_)) + line.force_ = 0; + if (isinf (line.force_)) + break; + + Grob *c = all_[breaks_[j]]; + line.break_penalty_ = robust_scm2double (c->get_property ("line-break-penalty"), 0); + line.page_penalty_ = robust_scm2double (c->get_property ("page-break-penalty"), 0); + line.turn_penalty_ = robust_scm2double (c->get_property ("page-turn-penalty"), 0); + line.break_permission_ = c->get_property ("line-break-permission"); + line.page_permission_ = c->get_property ("page-break-permission"); + line.turn_permission_ = c->get_property ("page-turn-permission"); + + max_ext = max (max_ext, extent.length ()); + line.extent_ = extent; + line.padding_ = padding; + line.space_ = space; + line.inverse_hooke_ = 1; } + } /* work out all the starting indices */ for (vsize i = 0; i < start_.size (); i++) @@ -191,7 +208,7 @@ Constrained_breaking::resize (vsize systems) if (pscore_ && systems_ > valid_systems_) { for (vsize i = 0; i < state_.size (); i++) - state_[i].resize((breaks_.size () - starting_breakpoints_[i]) * systems_); + state_[i].resize (breaks_.size () - starting_breakpoints_[i], systems_, Constrained_break_node ()); /* fill out the matrices */ for (vsize i = 0; i < state_.size (); i++) @@ -206,11 +223,10 @@ Constrained_breaking::resize (vsize systems) vector Constrained_breaking::get_solution (vsize start, vsize end, vsize sys_count) { - vsize rank; - vsize end_brk; - prepare_solution (start, end, sys_count, &rank, &end_brk); + vsize start_brk = starting_breakpoints_[start]; + vsize end_brk = prepare_solution (start, end, sys_count); - vector const &st = state_[start]; + Matrix const &st = state_[start]; vector ret; /* find the first solution that satisfies constraints */ @@ -218,7 +234,7 @@ Constrained_breaking::get_solution (vsize start, vsize end, vsize sys_count) { for (vsize brk = end_brk; brk != VPOS; brk--) { - if (!isinf (st[sys*rank + brk].force_)) + if (!isinf (st.at (brk, sys).details_.force_)) { if (brk != end_brk) { @@ -228,9 +244,10 @@ Constrained_breaking::get_solution (vsize start, vsize end, vsize sys_count) /* build up the good solution */ for (vsize cur_sys = sys; cur_sys != VPOS; cur_sys--) { + vsize prev_brk = st.at (brk, cur_sys).prev_; assert (brk != VPOS); - ret.push_back( st[cur_sys*rank + brk].line_config_ ); - brk = st[cur_sys*rank + brk].prev_; + ret.push_back (space_line (prev_brk + start_brk, brk + start_brk)); + brk = prev_brk; } reverse (ret); return ret; @@ -243,82 +260,67 @@ Constrained_breaking::get_solution (vsize start, vsize end, vsize sys_count) return ret; } -Real -Constrained_breaking::get_demerits (vsize start, vsize end, vsize sys_count) -{ - vsize rank; - vsize brk; - prepare_solution (start, end, sys_count, &rank, &brk); - - return state_[start][(sys_count-1)*rank + brk].demerits_; -} - -Real -Constrained_breaking::get_force (vsize start, vsize end, vsize sys_count) +vector +Constrained_breaking::get_best_solution (vsize start, vsize end) { - vsize rank; - vsize brk; - prepare_solution (start, end, sys_count, &rank, &brk); - vector const &st = state_[start]; - Real f = 0; + vsize min_systems = get_min_systems (start, end); + vsize max_systems = get_max_systems (start, end); + Real best_demerits = infinity_f; + vector best_so_far; - for (int sys = sys_count-1; sys >= 0 && brk != VPOS; sys--) + for (vsize i = min_systems; i <= max_systems; i++) { - f += fabs (st[sys*rank + brk].force_); - brk = st[sys*rank + brk].prev_; + vsize brk = prepare_solution (start, end, i); + Real dem = state_[start].at (brk, i-1).demerits_; + + if (dem < best_demerits) + { + best_demerits = dem; + best_so_far = get_solution (start, end, i); + } + else + { + vector cur = get_solution (start, end, i); + bool too_many_lines = true; + + for (vsize j = 0; j < cur.size (); j++) + if (cur[j].force_ < 0) + { + too_many_lines = false; + break; + } + if (too_many_lines) + return best_so_far; + } } - if (brk == VPOS) - f = infinity_f; - - return f; -} - -Real -Constrained_breaking::get_penalty (vsize start, vsize end, vsize sys_count) -{ - vsize rank; - vsize brk; - prepare_solution (start, end, sys_count, &rank, &brk); - - return state_[start][(sys_count-1)*rank + brk].penalty_; + if (best_so_far.size ()) + return best_so_far; + return get_solution (start, end, max_systems); } -Real -Constrained_breaking::get_page_penalty (vsize start, vsize end, vsize sys_count, vsize sys_num) +std::vector +Constrained_breaking::get_details (vsize start, vsize end, vsize sys_count) { - vsize rank; - vsize brk; - prepare_solution (start, end, sys_count, &rank, &brk); + vsize brk = prepare_solution (start, end, sys_count); + Matrix const &st = state_[start]; + vector ret; - vsize sys; - for (sys = sys_count-1; sys > sys_num; sys--) - brk = state_[start][sys*rank + brk].prev_; - - if (brk == VPOS) /* we didn't satisfy constraints */ - return 0; - vector &cols = state_[start][sys*rank + brk].line_config_.cols_; - if (cols.empty ()) - return 0; - - Grob *pc = cols.back (); - if (pc->original ()) + for (int sys = sys_count-1; sys >= 0 && brk != VPOS; sys--) { - SCM pen = pc->get_property ("page-penalty"); - if (scm_is_number (pen) && fabs (scm_to_double (pen)) < 10000) - return scm_to_double (pen); + ret.push_back (st.at (brk, sys).details_); + brk = st.at (brk, sys).prev_; } - return 0; + reverse (ret); + return ret; } int Constrained_breaking::get_min_systems (vsize start, vsize end) { - vsize rank; - vsize brk; vsize sys_count; - - prepare_solution (start, end, 1, &rank, &brk); - vector const &st = state_[start]; + vsize brk = prepare_solution (start, end, 1); + vsize rank = breaks_.size () - starting_breakpoints_[start]; + Matrix const &st = state_[start]; /* sys_count < rank : rank is the # of breakpoints, we can't have more systems */ for (sys_count = 0; sys_count < rank; sys_count++) @@ -327,22 +329,22 @@ Constrained_breaking::get_min_systems (vsize start, vsize end) { resize (sys_count + 3); } - if (!isinf (st[sys_count*rank + brk].force_)) + if (!isinf (st.at (brk, sys_count).details_.force_)) return sys_count + 1; } /* no possible breaks satisfy constraints */ - return 0; + return 1; } int Constrained_breaking::get_max_systems (vsize start, vsize end) { - vsize brk = (end >= start_.size ()) ? breaks_.size () - 1 : start_[end]; + vsize brk = (end >= start_.size ()) ? breaks_.size () - 1 : starting_breakpoints_[end]; return brk - starting_breakpoints_[start]; } -void -Constrained_breaking::prepare_solution (vsize start, vsize end, vsize sys_count, vsize *rank, vsize *brk) +vsize +Constrained_breaking::prepare_solution (vsize start, vsize end, vsize sys_count) { assert (start < start_.size () && (end == VPOS || end <= start_.size ())); assert (start < end); @@ -351,9 +353,10 @@ Constrained_breaking::prepare_solution (vsize start, vsize end, vsize sys_count, if (end == start_.size ()) end = VPOS; - *rank = breaks_.size () - starting_breakpoints_[start]; - *brk = end == VPOS ? breaks_.size () - 1 : starting_breakpoints_[end]; - *brk -= starting_breakpoints_[start]; + vsize brk; + brk = end == VPOS ? breaks_.size () - 1 : starting_breakpoints_[end]; + brk -= starting_breakpoints_[start]; + return brk; } Constrained_breaking::Constrained_breaking () @@ -362,35 +365,18 @@ Constrained_breaking::Constrained_breaking () start_.push_back (0); } -Constrained_breaking::Constrained_breaking (vector const &start) +Constrained_breaking::Constrained_breaking (vector const &start) : start_ (start) { valid_systems_ = systems_ = 0; } -void -Constrained_breaking::combine_demerits (Column_x_positions const &prev, - Column_x_positions const &col, - Real *force, - Real *penalty, - Real *demerits) const +Real +Constrained_breaking::combine_demerits (Real force, Real prev_force) { - *penalty = 0; - if (col.cols_.empty () || !col.satisfies_constraints_) - *force = infinity_f; - else - { - *force = col.force_; - - Grob *pc = col.cols_.back (); - if (pc->original ()) - { - SCM pen = pc->get_property ("penalty"); - if (scm_is_number (pen) && fabs (scm_to_double (pen)) < 10000) - *penalty += scm_to_double (pen); - } - } + if (to_boolean (pscore_->layout ()->c_variable ("ragged-right"))) + return force * force; - *demerits = (*force) * (*force) + abs (prev.force_ - *force) + *penalty; + return force * force + (prev_force - force) * (prev_force - force); }