X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-quanting.cc;h=f3505772f1a70940c4deb9014d400b9158e485a2;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=c064b9d9337359844836aaf05836723125a202a3;hpb=bb8aa1aed52c49e6e3de8c6c70a876598b11b4a8;p=lilypond.git diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc index c064b9d933..f3505772f1 100644 --- a/lily/beam-quanting.cc +++ b/lily/beam-quanting.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify @@ -33,6 +33,7 @@ using namespace std; #include "grob-array.hh" #include "item.hh" #include "international.hh" +#include "interval-minefield.hh" #include "least-squares.hh" #include "libc-extension.hh" #include "main.hh" @@ -44,6 +45,7 @@ using namespace std; #include "stencil.hh" #include "stem.hh" #include "warn.hh" +#include "string-convert.hh" Real get_detail (SCM alist, SCM sym, Real def) @@ -65,7 +67,10 @@ Beam_quant_parameters::fill (Grob *him) REGION_SIZE = get_detail (details, ly_symbol2scm ("region-size"), 2); // forbidden quants - SECONDARY_BEAM_DEMERIT = get_detail (details, ly_symbol2scm ("secondary-beam-demerit"), 10.0); + SECONDARY_BEAM_DEMERIT = get_detail (details, ly_symbol2scm ("secondary-beam-demerit"), 10.0) + // For stems that are non-standard, the forbidden beam quanting + // doesn't really work, so decrease their importance. + * exp(- 8*fabs (1.0 - robust_scm2double(him->get_property ("length-fraction"), 1.0))); STEM_LENGTH_DEMERIT_FACTOR = get_detail (details, ly_symbol2scm ("stem-length-demerit-factor"), 5); HORIZONTAL_INTER_QUANT_PENALTY = get_detail (details, ly_symbol2scm ("horizontal-inter-quant"), 500); @@ -78,7 +83,14 @@ Beam_quant_parameters::fill (Grob *him) // Collisions COLLISION_PENALTY = get_detail (details, ly_symbol2scm ("collision-penalty"), 500); - COLLISION_PADDING = get_detail (details, ly_symbol2scm ("collision-padding"), 0.5); + + /* For grace notes, beams get scaled down to 80%, but glyphs go down + to 63% (magstep -4 for accidentals). To make the padding + commensurate with glyph size for grace notes, we take the square + of the length fraction, yielding a 64% decrease. + */ + COLLISION_PADDING = get_detail (details, ly_symbol2scm ("collision-padding"), 0.5) + * sqr (robust_scm2double(him->get_property ("length-fraction"), 1.0)); STEM_COLLISION_FACTOR = get_detail (details, ly_symbol2scm ("stem-collision-factor"), 0.1); } @@ -181,27 +193,55 @@ void Beam_scoring_problem::add_collision (Real x, Interval y, collisions_.push_back (c); } -void Beam_scoring_problem::init_stems () +void Beam_scoring_problem::init_instance_variables (Grob *me, Drul_array ys, bool align_broken_intos) { + beam_ = dynamic_cast (me); + unquanted_y_ = ys; + + /* + If 'ys' are finite, use them as starting points for y-positions of the + ends of the beam, instead of the best-fit through the natural ends of + the stems. Otherwise, we want to do initial slope calculations. + */ + do_initial_slope_calculations_ = false; + for (LEFT_and_RIGHT (d)) + do_initial_slope_calculations_ |= isinf (unquanted_y_[d]) || isnan (unquanted_y_[d]); + + /* + Calculations are relative to a unit-scaled staff, i.e. the quants are + divided by the current staff_space_. + */ + staff_space_ = Staff_symbol_referencer::staff_space (beam_); + beam_thickness_ = Beam::get_beam_thickness (beam_) / staff_space_; + line_thickness_ = Staff_symbol_referencer::line_thickness (beam_) / staff_space_; + + // This is the least-squares DY, corrected for concave beams. + musical_dy_ = robust_scm2double (beam_->get_property ("least-squares-dy"), 0); + vector beams; - if (consistent_broken_slope_) + align_broken_intos_ = align_broken_intos; + if (align_broken_intos_) { Spanner *orig = dynamic_cast (beam_->original ()); if (!orig) - consistent_broken_slope_ = false; + align_broken_intos_ = false; else if (!orig->broken_intos_.size ()) - consistent_broken_slope_ = false; + align_broken_intos_ = false; else beams.insert (beams.end (), orig->broken_intos_.begin (), orig->broken_intos_.end ()); } - if (!consistent_broken_slope_) + if (!align_broken_intos_) beams.push_back (beam_); + /* + x_span_ is a single scalar, cumulatively summing the length of all the + segments the parent beam was broken-into. + */ x_span_ = 0.0; + is_knee_ = false; normal_stem_count_ = 0; for (vsize i = 0; i < beams.size (); i++) { - Interval local_x_span; extract_grob_set (beams[i], "stems", stems); extract_grob_set (beams[i], "covered-grobs", fake_collisions); vector collisions; @@ -214,20 +254,21 @@ void Beam_scoring_problem::init_stems () for (int a = 2; a--;) common[a] = common_refpoint_of_array (stems, beams[i], Axis (a)); - Real x_left = beams[i]->relative_coordinate(common[X_AXIS], X_AXIS); + for (LEFT_and_RIGHT (d)) + common[X_AXIS] = beams[i]->get_bound (d)->common_refpoint (common[X_AXIS], X_AXIS); + + // positions of the endpoints of this beam segment, including any overhangs + const Interval x_pos = robust_scm2interval (beams[i]->get_property ("X-positions"), + Interval (0.0, 0.0)); Drul_array edge_stems (Beam::first_normal_stem (beams[i]), Beam::last_normal_stem (beams[i])); - Direction d = LEFT; - do - local_x_span[d] = edge_stems[d] ? edge_stems[d]->relative_coordinate (common[X_AXIS], X_AXIS) : 0.0; - while (flip (&d) != LEFT); Drul_array dirs_found (0, 0); Real my_y = beams[i]->relative_coordinate (common[Y_AXIS], Y_AXIS); - Interval beam_width (-1.0,-1.0); + Interval beam_width (-1.0, -1.0); for (vsize j = 0; j < stems.size (); j++) { Grob *s = stems[j]; @@ -244,11 +285,12 @@ void Beam_scoring_problem::init_stems () bool f = to_boolean (s->get_property ("french-beaming")) && s != edge_stems[LEFT] && s != edge_stems[RIGHT]; - Real y = Beam::calc_stem_y (beams[i], s, common, local_x_span[LEFT], local_x_span[RIGHT], CENTER, + Real y = Beam::calc_stem_y (beams[i], s, common, x_pos[LEFT], x_pos[RIGHT], CENTER, Interval (0, 0), f); base_lengths_.push_back (y / staff_space_); - stem_xpositions_.push_back (s->relative_coordinate (common[X_AXIS], X_AXIS) - x_left + x_span_); + stem_xpositions_.push_back (s->relative_coordinate (common[X_AXIS], X_AXIS) - x_pos[LEFT] + x_span_); stem_ypositions_.push_back (s->relative_coordinate (common[Y_AXIS], Y_AXIS) - my_y); + if (is_normal_.back ()) { if (beam_width[LEFT] == -1.0) @@ -263,19 +305,18 @@ void Beam_scoring_problem::init_stems () edge_dirs_ = Drul_array (stem_infos_[0].dir_, stem_infos_.back ().dir_); - is_xstaff_ = Align_interface::has_interface (common[Y_AXIS]); - is_knee_ = dirs_found[LEFT] && dirs_found[RIGHT]; + is_xstaff_ = has_interface (common[Y_AXIS]); + is_knee_ |= dirs_found[DOWN] && dirs_found[UP]; staff_radius_ = Staff_symbol_referencer::staff_radius (beams[i]); edge_beam_counts_ = Drul_array - (Stem::beam_multiplicity (stems[0]).length () + 1, - Stem::beam_multiplicity (stems.back ()).length () + 1); + (Stem::beam_multiplicity (stems[0]).length () + 1, + Stem::beam_multiplicity (stems.back ()).length () + 1); // TODO - why are we dividing by staff_space_? beam_translation_ = Beam::get_beam_translation (beams[i]) / staff_space_; - d = LEFT; - do + for (LEFT_and_RIGHT (d)) { quant_range_[d].set_full (); if (!edge_stems[d]) @@ -290,12 +331,11 @@ void Beam_scoring_problem::init_stems () + (edge_beam_counts_[d] - 1) * beam_translation_ + beam_thickness_ * .5); quant_range_[d][-ed] = heads[ed] + stem_offset; } - while (flip (&d) != LEFT); - Grob *common_x = NULL; - segments_ = Beam::get_beam_segments (beams[i], &common_x); + + segments_ = Beam::get_beam_segments (beams[i]); vector_sort (segments_, beam_segment_less); for (vsize j = 0; j < segments_.size (); j++) - segments_[j].horizontal_ += (x_span_ - x_left); + segments_[j].horizontal_ += (x_span_ - x_pos[LEFT]); set colliding_stems; for (vsize j = 0; j < collisions.size (); j++) @@ -303,27 +343,28 @@ void Beam_scoring_problem::init_stems () if (!collisions[j]->is_live ()) continue; - if (Beam::has_interface (collisions[j]) && Beam::is_cross_staff (collisions[j])) + if (has_interface (collisions[j]) && Beam::is_cross_staff (collisions[j])) continue; Box b; for (Axis a = X_AXIS; a < NO_AXES; incr (a)) b[a] = collisions[j]->extent (common[a], a); + if (b[X_AXIS][RIGHT] < x_pos[LEFT] || b[X_AXIS][LEFT] > x_pos[RIGHT]) + continue; if (b[X_AXIS].is_empty () || b[Y_AXIS].is_empty ()) continue; - b[X_AXIS] += (x_span_ - x_left); + b[X_AXIS] += (x_span_ - x_pos[LEFT]); + b[Y_AXIS] -= my_y; Real width = b[X_AXIS].length (); Real width_factor = sqrt (width / staff_space_); - Direction d = LEFT; - do + for (LEFT_and_RIGHT (d)) add_collision (b[X_AXIS][d], b[Y_AXIS], width_factor); - while (flip (&d) != LEFT); - Grob *stem = unsmob_grob (collisions[j]->get_object ("stem")); - if (stem && Stem::has_interface (stem) && Stem::is_normal_stem (stem)) + Grob *stem = unsmob (collisions[j]->get_object ("stem")); + if (has_interface (stem) && Stem::is_normal_stem (stem)) { colliding_stems.insert (stem); } @@ -332,69 +373,37 @@ void Beam_scoring_problem::init_stems () for (set::const_iterator it (colliding_stems.begin ()); it != colliding_stems.end (); it++) { Grob *s = *it; - Real x = (s->extent (common[X_AXIS], X_AXIS) - x_left + x_span_).center (); + Real x = (robust_relative_extent (s, common[X_AXIS], X_AXIS) - x_pos[LEFT] + x_span_).center (); Direction stem_dir = get_grob_direction (*it); Interval y; y.set_full (); y[-stem_dir] = Stem::chord_start_y (*it) + (*it)->relative_coordinate (common[Y_AXIS], Y_AXIS) - - beams[i]->relative_coordinate (common[Y_AXIS], Y_AXIS); + - my_y; Real factor = parameters_.STEM_COLLISION_FACTOR; - if (!unsmob_grob (s->get_object ("beam"))) + if (!unsmob (s->get_object ("beam"))) factor = 1.0; add_collision (x, y, factor); } x_span_ += beams[i]->spanner_length (); } - - /* - Here, we eliminate all extremal hangover, be it from non-normal stems - (like stemlets) or broken beams (if we're not calculating consistent - slope). - */ - if (normal_stem_count_) - { - Interval trimmings (0.0, 0.0); - Direction d = LEFT; - - do - { - vsize idx = d == LEFT ? first_normal_index () : last_normal_index (); - trimmings[d] = d * ((d == LEFT ? 0 : x_span_) - stem_xpositions_[idx]); - } - while (flip (&d) != LEFT); - - do - x_span_ -= trimmings[d]; - while (flip (&d) != LEFT); - - for (vsize i = 0; i < stem_xpositions_.size (); i++) - stem_xpositions_[i] -= trimmings[LEFT]; - } } -Beam_scoring_problem::Beam_scoring_problem (Grob *me, Drul_array ys) +Beam_scoring_problem::Beam_scoring_problem (Grob *me, Drul_array ys, bool align_broken_intos) { beam_ = dynamic_cast (me); unquanted_y_ = ys; - consistent_broken_slope_ = to_boolean (me->get_property ("consistent-broken-slope")); - /* - Calculations are relative to a unit-scaled staff, i.e. the quants are - divided by the current staff_space_. - */ - staff_space_ = Staff_symbol_referencer::staff_space (me); - beam_thickness_ = Beam::get_beam_thickness (me) / staff_space_; - line_thickness_ = Staff_symbol_referencer::line_thickness (me) / staff_space_; - - // This is the least-squares DY, corrected for concave beams. - musical_dy_ = robust_scm2double (me->get_property ("least-squares-dy"), 0); + align_broken_intos_ = align_broken_intos; parameters_.fill (me); - init_stems (); - least_squares_positions (); - slope_damping (); - shift_region_to_valid (); + init_instance_variables (me, ys, align_broken_intos); + if (do_initial_slope_calculations_) + { + least_squares_positions (); + slope_damping (); + shift_region_to_valid (); + } } // Assuming V is not empty, pick a 'reasonable' point inside V. @@ -536,11 +545,6 @@ Beam_scoring_problem::least_squares_positions () else unquanted_y_ = ideal; - /* - For broken beams this doesn't work well. In this case, the - slope esp. of the first part of a broken beam should predict - where the second part goes. - */ ldy = unquanted_y_[RIGHT] - unquanted_y_[LEFT]; } else @@ -563,6 +567,142 @@ Beam_scoring_problem::least_squares_positions () } musical_dy_ = ldy; + beam_->set_property ("least-squares-dy", scm_from_double (musical_dy_)); +} + +/* + Determine whether a beam is concave. + + A beam is concave when the middle notes get closer to the + beam than the left and right edge notes. + + This is determined in two ways: by looking at the positions of the + middle notes, or by looking at the deviation of the inside notes + compared to the line connecting first and last. + + The tricky thing is what to do with beams with chords. There are no + real guidelines in this case. +*/ + +bool +is_concave_single_notes (vector const &positions, Direction beam_dir) +{ + Interval covering; + covering.add_point (positions[0]); + covering.add_point (positions.back ()); + + bool above = false; + bool below = false; + bool concave = false; + + /* + notes above and below the interval covered by 1st and last note. + */ + for (vsize i = 1; i + 1 < positions.size (); i++) + { + above = above || (positions[i] > covering[UP]); + below = below || (positions[i] < covering[DOWN]); + } + + concave = concave || (above && below); + /* + A note as close or closer to the beam than begin and end, but the + note is reached in the opposite direction as the last-first dy + */ + int dy = positions.back () - positions[0]; + int closest = max (beam_dir * positions.back (), beam_dir * positions[0]); + for (vsize i = 2; !concave && i + 1 < positions.size (); i++) + { + int inner_dy = positions[i] - positions[i - 1]; + if (sign (inner_dy) != sign (dy) + && (beam_dir * positions[i] >= closest + || beam_dir * positions[i - 1] >= closest)) + concave = true; + } + + bool all_closer = true; + for (vsize i = 1; all_closer && i + 1 < positions.size (); i++) + { + all_closer = all_closer + && (beam_dir * positions[i] > closest); + } + + concave = concave || all_closer; + return concave; +} + +Real +calc_positions_concaveness (vector const &positions, Direction beam_dir) +{ + Real dy = positions.back () - positions[0]; + Real slope = dy / Real (positions.size () - 1); + Real concaveness = 0.0; + for (vsize i = 1; i + 1 < positions.size (); i++) + { + Real line_y = slope * i + positions[0]; + + concaveness += max (beam_dir * (positions[i] - line_y), 0.0); + } + + concaveness /= positions.size (); + + /* + Normalize. For dy = 0, the slope ends up as 0 anyway, so the + scaling of concaveness doesn't matter much. + */ + if (dy) + concaveness /= fabs (dy); + return concaveness; +} + +Real +Beam_scoring_problem::calc_concaveness () +{ + SCM conc = beam_->get_property ("concaveness"); + if (scm_is_number (conc)) + return scm_to_double (conc); + + if (is_knee_ || is_xstaff_) + return 0.0; + + Direction beam_dir = CENTER; + for (vsize i = is_normal_.size (); i--;) + if (is_normal_[i] && stem_infos_[i].dir_) + beam_dir = stem_infos_[i].dir_; + + if (normal_stem_count_ <= 2) + return 0.0; + + vector close_positions; + vector far_positions; + for (vsize i = 0; i < is_normal_.size (); i++) + if (is_normal_[i]) + { + /* + For chords, we take the note head that is closest to the beam. + + Hmmm.. wait, for the beams in the last measure of morgenlied, + this doesn't look so good. Let's try the heads farthest from + the beam. + */ + + close_positions.push_back ((int) rint (head_positions_[i][beam_dir])); + far_positions.push_back ((int) rint (head_positions_[i][-beam_dir])); + } + + Real concaveness = 0.0; + + if (is_concave_single_notes (beam_dir == UP ? close_positions : far_positions, beam_dir)) + { + concaveness = 10000; + } + else + { + concaveness = (calc_positions_concaveness (far_positions, beam_dir) + + calc_positions_concaveness (close_positions, beam_dir)) / 2; + } + + return concaveness; } void @@ -573,7 +713,7 @@ Beam_scoring_problem::slope_damping () SCM s = beam_->get_property ("damping"); Real damping = scm_to_double (s); - Real concaveness = robust_scm2double (beam_->get_property ("concaveness"), 0.0); + Real concaveness = calc_concaveness (); if (concaveness >= 10000) { unquanted_y_[LEFT] = unquanted_y_[RIGHT]; @@ -657,72 +797,38 @@ Beam_scoring_problem::shift_region_to_valid () if (collisions_[i].y_.length () < min_y_size) continue; - Direction d = LEFT; - do + for (LEFT_and_RIGHT (d)) { Real dy = slope * collisions_[i].x_; - Direction yd = DOWN; Interval disallowed; - do + for (DOWN_and_UP (yd)) { Real left_y = collisions_[i].y_[yd] - dy; disallowed[yd] = left_y; } - while (flip (&yd) != DOWN); forbidden_intervals.push_back (disallowed); } - while (flip (&d) != LEFT); } vector_sort (forbidden_intervals, Interval::left_less); - Real epsilon = 1.0e-10; Real beam_left_y = unquanted_y_[LEFT]; Interval feasible_beam_placements (beam_left_y, beam_left_y); - /* - forbidden_intervals contains a vector of intervals in which - the beam cannot start. it iterates through these intervals, - pushing feasible_beam_placements epsilon over or epsilon under a - collision. when this type of change happens, the loop is marked - as "dirty" and re-iterated. - - TODO: figure out a faster ways that this loop can happen via - a better search algorithm and/or OOP. - */ - - bool dirty = false; - do - { - dirty = false; - for (vsize i = 0; i < forbidden_intervals.size (); i++) - { - Direction d = DOWN; - do - { - if (forbidden_intervals[i][d] == d * infinity_f) - feasible_beam_placements[d] = d * infinity_f; - else if (forbidden_intervals[i].contains (feasible_beam_placements[d])) - { - feasible_beam_placements[d] = d * epsilon + forbidden_intervals[i][d]; - dirty = true; - } - } - while (flip (&d) != DOWN); - } - } - while (dirty); + Interval_minefield minefield (feasible_beam_placements, 0.0); + for (vsize i = 0; i < forbidden_intervals.size (); i++) + minefield.add_forbidden_interval (forbidden_intervals[i]); + minefield.solve (); + feasible_beam_placements = minefield.feasible_placements (); // if the beam placement falls out of the feasible region, we push it // to infinity so that it can never be a feasible candidate below - Direction d = DOWN; - do + for (DOWN_and_UP (d)) { if (!feasible_left_point.contains (feasible_beam_placements[d])) feasible_beam_placements[d] = d * infinity_f; } - while (flip (&d) != DOWN); if ((feasible_beam_placements[UP] == infinity_f && feasible_beam_placements[DOWN] == -infinity_f) && !feasible_left_point.is_empty ()) { @@ -783,8 +889,7 @@ Beam_scoring_problem::generate_quants (vector *scores) con Interval (unshifted_quants[i], unshifted_quants[j])); - Direction d = LEFT; - do + for (LEFT_and_RIGHT (d)) { if (!quant_range_[d].contains (c->y[d])) { @@ -793,7 +898,6 @@ Beam_scoring_problem::generate_quants (vector *scores) con break; } } - while (flip (&d) != LEFT); if (c) scores->push_back (c); } @@ -938,7 +1042,7 @@ Beam_scoring_problem::solve () const #endif junk_pointers (configs); - if (consistent_broken_slope_) + if (align_broken_intos_) { Interval normalized_endpoints = robust_scm2interval (beam_->get_property ("normalized-endpoints"), Interval (0, 1)); Real y_length = final_positions[RIGHT] - final_positions[LEFT]; @@ -989,10 +1093,18 @@ Beam_scoring_problem::score_stem_lengths (Beam_configuration *config) const } /* Divide by number of stems, to make the measure scale-free. */ - Direction d = DOWN; - do + for (DOWN_and_UP (d)) score[d] /= max (count[d], 1); - while (flip (&d) != DOWN); + + /* + sometimes, two perfectly symmetric kneed beams will have the same score + and can either be quanted up or down. + + we choose the quanting in the direction of the slope so that the first stem + always seems longer, reaching to the second, rather than squashed. + */ + if (is_knee_ && count[LEFT] == count[RIGHT] && count[LEFT] == 1 && unquanted_y_.delta ()) + score[Direction (sign (unquanted_y_.delta ()))] += score[Direction (sign (unquanted_y_.delta ()))] < 1.0 ? 0.01 : 0.0; config->add (score[LEFT] + score[RIGHT], "L"); } @@ -1089,27 +1201,29 @@ Beam_scoring_problem::score_forbidden_quants (Beam_configuration *config) const { Real dy = config->y.delta (); - Real extra_demerit = parameters_.SECONDARY_BEAM_DEMERIT - / max (edge_beam_counts_[LEFT], edge_beam_counts_[RIGHT]); - - Direction d = LEFT; + Real extra_demerit = + parameters_.SECONDARY_BEAM_DEMERIT + / max (edge_beam_counts_[LEFT], edge_beam_counts_[RIGHT]); + Real dem = 0.0; Real eps = parameters_.BEAM_EPS; - do + for (LEFT_and_RIGHT (d)) { for (int j = 1; j <= edge_beam_counts_[d]; j++) { Direction stem_dir = edge_dirs_[d]; /* - The 2.2 factor is to provide a little leniency for + The fudge_factor is to provide a little leniency for borderline cases. If we do 2.0, then the upper outer line will be in the gap of the (2, sit) quant, leading to a - false demerit. + false demerit. By increasing the fudge factor to 2.2, we + fix this case. */ - Real gap1 = config->y[d] - stem_dir * ((j - 1) * beam_translation_ + beam_thickness_ / 2 - line_thickness_ / 2.2); - Real gap2 = config->y[d] - stem_dir * (j * beam_translation_ - beam_thickness_ / 2 + line_thickness_ / 2.2); + Real fudge_factor = 2.2; + Real gap1 = config->y[d] - stem_dir * ((j - 1) * beam_translation_ + beam_thickness_ / 2 - line_thickness_ / fudge_factor); + Real gap2 = config->y[d] - stem_dir * (j * beam_translation_ - beam_thickness_ / 2 + line_thickness_ / fudge_factor); Interval gap; gap.add_point (gap1); @@ -1123,8 +1237,15 @@ Beam_scoring_problem::score_forbidden_quants (Beam_configuration *config) const /* this parameter is tuned to grace-stem-length.ly + retuned from 0.40 to 0.39 by MS because of slight increases + in gap.length () resulting from measuring beams at real ends + instead of from the middle of stems. + + TODO: + This function needs better comments so we know what is forbidden + and why. */ - Real fixed_demerit = 0.4; + Real fixed_demerit = 0.39; dem += extra_demerit * (fixed_demerit @@ -1132,8 +1253,9 @@ Beam_scoring_problem::score_forbidden_quants (Beam_configuration *config) const } } } - while ((flip (&d)) != LEFT); + config->add (dem, "Fl"); + dem = 0.0; if (max (edge_beam_counts_[LEFT], edge_beam_counts_[RIGHT]) >= 2) { Real straddle = 0.0; @@ -1141,8 +1263,7 @@ Beam_scoring_problem::score_forbidden_quants (Beam_configuration *config) const Real inter = 0.5; Real hang = 1.0 - (beam_thickness_ - line_thickness_) / 2; - Direction d = LEFT; - do + for (LEFT_and_RIGHT (d)) { if (edge_beam_counts_[d] >= 2 && fabs (config->y[d] - edge_dirs_[d] * beam_translation_) < staff_radius_ + inter) @@ -1170,10 +1291,9 @@ Beam_scoring_problem::score_forbidden_quants (Beam_configuration *config) const dem += extra_demerit; } } - while (flip (&d) != LEFT); } - config->add (dem, "F"); + config->add (dem, "Fs"); } void @@ -1191,16 +1311,20 @@ Beam_scoring_problem::score_collisions (Beam_configuration *config) const Real dist = infinity_f; if (!intersection (beam_y, collision_y).is_empty ()) dist = 0.0; - else + else dist = min (beam_y.distance (collision_y[DOWN]), beam_y.distance (collision_y[UP])); + Real scale_free - = max (parameters_.COLLISION_PADDING - dist, 0.0) / - parameters_.COLLISION_PADDING; - demerits - += collisions_[i].base_penalty_ * + = max (parameters_.COLLISION_PADDING - dist, 0.0) + / parameters_.COLLISION_PADDING; + Real collision_demerit = collisions_[i].base_penalty_ * pow (scale_free, 3) * parameters_.COLLISION_PENALTY; + + if (collision_demerit > 0) { + demerits += collision_demerit; + } } config->add (demerits, "C");