X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-quanting.cc;h=0338ecd7ecccc6b1caccfa26f0905385790ed06e;hb=9e1dc8e44017d472fda6533cc749a8918f5b72a6;hp=efe670738a40e2986bfd61e9de616f3050f6fd3f;hpb=429ffff9f8f480eb0e1ad1e19f55dfa699aff612;p=lilypond.git diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc index efe670738a..0338ecd7ec 100644 --- a/lily/beam-quanting.cc +++ b/lily/beam-quanting.cc @@ -1,123 +1,161 @@ -#include +/* + beam-quanting.cc -- implement Beam quanting functions + + source file of the GNU LilyPond music typesetter + + (c) 1997--2006 Han-Wen Nienhuys + Jan Nieuwenhuizen +*/ + +#include "beam.hh" + +#include +using namespace std; #include "grob.hh" +#include "align-interface.hh" +#include "international.hh" +#include "output-def.hh" +#include "pointer-group-interface.hh" #include "staff-symbol-referencer.hh" -#include "beam.hh" #include "stem.hh" -#include "paper-def.hh" -#include "group-interface.hh" -#include "align-interface.hh" +#include "warn.hh" +#include "main.hh" + +Real +get_detail (SCM alist, SCM sym, Real def) +{ + SCM entry = scm_assq (sym, alist); -const int INTER_QUANT_PENALTY = 1000; -const int SECONDARY_BEAM_DEMERIT = 15; -const int STEM_LENGTH_DEMERIT_FACTOR = 5; + if (scm_is_pair (entry)) + return robust_scm2double (scm_cdr (entry), def); + return def; +} -// possibly ridiculous, but too short stems just won't do -const int STEM_LENGTH_LIMIT_PENALTY = 5000; -const int DAMPING_DIRECTIION_PENALTY = 800; -const int MUSICAL_DIRECTION_FACTOR = 400; -const int IDEAL_SLOPE_FACTOR = 10; +void +Beam_quant_parameters::fill (Grob *him) +{ + SCM details = him->get_property ("details"); + /* + TODO: put in define-grobs.scm + */ + INTER_QUANT_PENALTY = get_detail (details, ly_symbol2scm ("inter-quant-penalty"), 1000.0); + SECONDARY_BEAM_DEMERIT = get_detail (details, ly_symbol2scm ("secondary-beam-demerit"), 10.0); + STEM_LENGTH_DEMERIT_FACTOR = get_detail (details, ly_symbol2scm ("stem-length-demerit-factor"), 5); + REGION_SIZE = get_detail (details, ly_symbol2scm ("region-size"), 2); + BEAM_EPS = get_detail (details, ly_symbol2scm ("beam-eps"), 1e-3); + STEM_LENGTH_LIMIT_PENALTY = get_detail (details, ly_symbol2scm ("stem-length-limit-penalty"), 5000); + DAMPING_DIRECTION_PENALTY = get_detail (details, ly_symbol2scm ("damping-direction-penalty"), 800); + HINT_DIRECTION_PENALTY = get_detail (details, ly_symbol2scm ("hint-direction-penalty"), 20); + MUSICAL_DIRECTION_FACTOR = get_detail (details, ly_symbol2scm ("musical-direction-factor"), 400); + IDEAL_SLOPE_FACTOR = get_detail (details, ly_symbol2scm ("ideal-slope-factor"), 10); + ROUND_TO_ZERO_SLOPE = get_detail (details, ly_symbol2scm ("round-to-zero-slope"), 0.02); +} static Real -shrink_extra_weight (Real x) +shrink_extra_weight (Real x, Real fac) { - return fabs (x) * ((x < 0) ? 1.5 : 1.0); + return fabs (x) * ((x < 0) ? fac : 1.0); } - struct Quant_score { Real yl; Real yr; Real demerits; -}; +#if DEBUG_BEAM_SCORING + string score_card_; +#endif +}; /* TODO: - - - Make all demerits customisable - - One sensible check per demerit (what's this --hwn) + - Make all demerits customisable - - Add demerits for quants per se, as to forbid a specific quant - entirely + - One sensible check per demerit (what's this --hwn) + - Add demerits for quants per se, as to forbid a specific quant + entirely */ -int best_quant_score_idx (Array const & qscores) +int +best_quant_score_idx (vector const &qscores) { Real best = 1e6; int best_idx = -1; - for (int i = qscores.size (); i--;) + for (vsize i = qscores.size (); i--;) { if (qscores[i].demerits < best) { - best = qscores [i].demerits ; + best = qscores [i].demerits; best_idx = i; } } return best_idx; } - -MAKE_SCHEME_CALLBACK (Beam, quanting, 1); + +MAKE_SCHEME_CALLBACK (Beam, quanting, 2); SCM -Beam::quanting (SCM smob) +Beam::quanting (SCM smob, SCM posns) { Grob *me = unsmob_grob (smob); - SCM s = me->get_grob_property ("positions"); - Real yl = gh_scm2double (gh_car (s)); - Real yr = gh_scm2double (gh_cdr (s)); + Beam_quant_parameters parameters; + parameters.fill (me); - Real ss = Staff_symbol_referencer::staff_space (me); - Real thickness = gh_scm2double (me->get_grob_property ("thickness")) / ss; - Real slt = me->paper_l ()->get_var ("linethickness") / ss; + Real yl = scm_to_double (scm_car (posns)); + Real yr = scm_to_double (scm_cdr (posns)); + /* + Calculations are relative to a unit-scaled staff, i.e. the quants are + divided by the current staff_space. - SCM sdy = me->get_grob_property ("least-squares-dy"); - Real dy_mus = gh_number_p (sdy) ? gh_scm2double (sdy) : 0.0; - + */ + Real ss = Staff_symbol_referencer::staff_space (me); + Real thickness = Beam::get_thickness (me) / ss; + Real slt = Staff_symbol_referencer::line_thickness (me) / ss; + + Real dy_mus = robust_scm2double (me->get_property ("least-squares-dy"), 0); Real straddle = 0.0; Real sit = (thickness - slt) / 2; Real inter = 0.5; Real hang = 1.0 - (thickness - slt) / 2; Real quants [] = {straddle, sit, inter, hang }; - - int num_quants = int (sizeof (quants)/sizeof (Real)); - Array quantsl; - Array quantsr; + + int num_quants = int (sizeof (quants) / sizeof (Real)); + vector quantsl; + vector quantsr; /* going to REGION_SIZE == 2, yields another 0.6 second with wtk1-fugue2. - (result indexes between 70 and 575) ? --hwn. + (result indexes between 70 and 575) ? --hwn. */ - - /* Do stem computations. These depend on YL and YR linearly, so we can precompute for every stem 2 factors. - */ - Link_array stems= - Pointer_group_interface__extract_grobs (me, (Grob*)0, "stems"); - Array stem_infos; - Array base_lengths; - Array stem_xposns; + */ + vector stems + = extract_grob_array (me, "stems"); + vector stem_infos; + vector base_lengths; + vector stem_xposns; - Drul_array dirs_found(0,0); + Drul_array dirs_found (0, 0); Grob *common[2]; for (int a = 2; a--;) - common[a] = common_refpoint_of_array (stems, me, Axis(a)); + common[a] = common_refpoint_of_array (stems, me, Axis (a)); - Grob * fvs = first_visible_stem (me); - Grob *lvs = last_visible_stem (me); + Grob *fvs = first_normal_stem (me); + Grob *lvs = last_normal_stem (me); Real xl = fvs ? fvs->relative_coordinate (common[X_AXIS], X_AXIS) : 0.0; Real xr = fvs ? lvs->relative_coordinate (common[X_AXIS], X_AXIS) : 0.0; @@ -127,193 +165,272 @@ Beam::quanting (SCM smob) Sometimes my head is screwed on backwards. The stemlength are AFFINE linear in YL and YR. If YL == YR == 0, then we might have stem_y != 0.0, when we're cross staff. - - */ - bool french = to_boolean (me->get_grob_property ("french-beaming")); - for (int i= 0; i < stems.size(); i++) + + */ + for (vsize i = 0; i < stems.size (); i++) { - Grob*s = stems[i]; - stem_infos.push (Stem::calc_stem_info (s)); - dirs_found[stem_infos.top ().dir_] = true; - - bool f = french && i > 0&& (i < stems.size () -1); - base_lengths.push (calc_stem_y (me, s, common, xl, xr, - Interval (0,0), f)); - stem_xposns.push (s->relative_coordinate (common[X_AXIS], X_AXIS)); + Grob *s = stems[i]; + + Stem_info si (Stem::get_stem_info (s)); + si.scale (1 / ss); + stem_infos.push_back (si); + dirs_found[stem_infos.back ().dir_] = true; + + bool f = to_boolean (s->get_property ("french-beaming")) + && s != lvs && s != fvs; + + base_lengths.push_back (calc_stem_y (me, s, common, xl, xr, + Interval (0, 0), f) / ss); + stem_xposns.push_back (s->relative_coordinate (common[X_AXIS], X_AXIS)); } - bool xstaff= false; + bool xstaff = false; if (lvs && fvs) { Grob *commony = fvs->common_refpoint (lvs, Y_AXIS); xstaff = Align_interface::has_interface (commony); } - + Direction ldir = Direction (stem_infos[0].dir_); - Direction rdir = Direction (stem_infos.top ().dir_); - bool knee_b = dirs_found[LEFT] && dirs_found[RIGHT]; + Direction rdir = Direction (stem_infos.back ().dir_); + bool is_knee = dirs_found[LEFT] && dirs_found[RIGHT]; + int region_size = (int) parameters.REGION_SIZE; - int region_size = REGION_SIZE; /* - Knees are harder, lets try some more possibilities for knees. - */ - if (knee_b) + Knees are harder, lets try some more possibilities for knees. + */ + if (is_knee) region_size += 2; - - for (int i = -region_size ; i < region_size; i++) + + /* + Asymetry ? should run to <= region_size ? + */ + for (int i = -region_size; i < region_size; i++) for (int j = 0; j < num_quants; j++) { - quantsl.push (i + quants[j] + int (yl)); - quantsr.push (i + quants[j] + int (yr)); + quantsl.push_back (i + quants[j] + int (yl)); + quantsr.push_back (i + quants[j] + int (yr)); } - Array qscores; - - for (int l =0; l < quantsl.size (); l++) - for (int r =0; r < quantsr.size (); r++) + vector qscores; + + for (vsize l = 0; l < quantsl.size (); l++) + for (vsize r = 0; r < quantsr.size (); r++) { Quant_score qs; qs.yl = quantsl[l]; qs.yr = quantsr[r]; qs.demerits = 0.0; - - qscores.push (qs); - } - /* - This is a longish function, but we don't separate this out into - neat modular separate subfunctions, as the subfunctions would be - called for many values of YL, YR. By precomputing various - parameters outside of the loop, we can save a lot of time. - */ + qscores.push_back (qs); + } - for (int i = qscores.size (); i--;) + /* This is a longish function, but we don't separate this out into + neat modular separate subfunctions, as the subfunctions would be + called for many values of YL, YR. By precomputing various + parameters outside of the loop, we can save a lot of time. */ + for (vsize i = qscores.size (); i--;) { - qscores[i].demerits - += score_slopes_dy (me, qscores[i].yl, qscores[i].yr, - dy_mus, yr- yl, xstaff); + Real d = score_slopes_dy (qscores[i].yl, qscores[i].yr, + dy_mus, yr- yl, + xr - xl, + xstaff, ¶meters); + qscores[i].demerits += d; + +#if DEBUG_BEAM_SCORING + qscores[i].score_card_ += to_string ("S%.2f", d); +#endif } Real rad = Staff_symbol_referencer::staff_radius (me); - int beam_count = get_beam_count (me); - Real beam_translation = beam_count < 4 - ? (2*ss + slt - thickness) / 2.0 - : (3*ss + slt - thickness) / 3.0; + Drul_array edge_beam_counts + (Stem::beam_multiplicity (stems[0]).length () + 1, + Stem::beam_multiplicity (stems.back ()).length () + 1); - Real reasonable_score = (knee_b) ? 200000 : 100; - for (int i = qscores.size (); i--;) + Real beam_translation = get_beam_translation (me) / ss; + + Real reasonable_score = (is_knee) ? 200000 : 100; + for (vsize i = qscores.size (); i--;) if (qscores[i].demerits < reasonable_score) { - qscores[i].demerits - += score_forbidden_quants (me, qscores[i].yl, qscores[i].yr, - rad, slt, thickness, beam_translation, - beam_count, ldir, rdir); - } + Real d = score_forbidden_quants (qscores[i].yl, qscores[i].yr, + rad, slt, thickness, beam_translation, + edge_beam_counts, ldir, rdir, ¶meters); + qscores[i].demerits += d; +#if DEBUG_BEAM_SCORING + qscores[i].score_card_ += to_string (" F %.2f", d); +#endif + } - for (int i = qscores.size (); i--;) + for (vsize i = qscores.size (); i--;) if (qscores[i].demerits < reasonable_score) { - qscores[i].demerits - += score_stem_lengths (stems, stem_infos, - base_lengths, stem_xposns, - xl, xr, - knee_b, - me, qscores[i].yl, qscores[i].yr); + Real d = score_stem_lengths (stems, stem_infos, + base_lengths, stem_xposns, + xl, xr, + is_knee, + qscores[i].yl, qscores[i].yr, ¶meters); + qscores[i].demerits += d; + +#if DEBUG_BEAM_SCORING + qscores[i].score_card_ += to_string (" L %.2f", d); +#endif } - int best_idx = best_quant_score_idx (qscores); - me->set_grob_property ("positions", - gh_cons (gh_double2scm (qscores[best_idx].yl), - gh_double2scm (qscores[best_idx].yr)) - ); -#if DEBUG_QUANTING +#if DEBUG_BEAM_SCORING + SCM inspect_quants = me->get_property ("inspect-quants"); + if (to_boolean (me->layout ()->lookup_variable (ly_symbol2scm ("debug-beam-scoring"))) + && scm_is_pair (inspect_quants)) + { + Drul_array ins = ly_scm2interval (inspect_quants); + + Real mindist = 1e6; + for (vsize i = 0; i < qscores.size (); i++) + { + Real d = fabs (qscores[i].yl- ins[LEFT]) + fabs (qscores[i].yr - ins[RIGHT]); + if (d < mindist) + { + best_idx = i; + mindist = d; + } + } + if (mindist > 1e5) + programming_error ("cannot find quant"); + } +#endif - // debug quanting - me->set_grob_property ("quant-score", - gh_double2scm (qscores[best_idx].demerits)); - me->set_grob_property ("best-idx", gh_int2scm (best_idx)); + Interval final_positions; + if (best_idx < 0) + { + warning (_ ("no feasible beam position")); + final_positions = Interval (0, 0); + } + else + { + final_positions = Drul_array (qscores[best_idx].yl, + qscores[best_idx].yr); + } + +#if DEBUG_BEAM_SCORING + if (best_idx >= 0 + && to_boolean (me->layout ()->lookup_variable (ly_symbol2scm ("debug-beam-scoring")))) + { + qscores[best_idx].score_card_ += to_string ("i%d", best_idx); + + // debug quanting + me->set_property ("quant-score", + ly_string2scm (qscores[best_idx].score_card_)); + } #endif - return SCM_UNSPECIFIED; + return ly_interval2scm (final_positions); } Real -Beam::score_stem_lengths (Link_arraystems, - Array stem_infos, - Array base_stem_ys, - Array stem_xs, - Real xl, Real xr, - bool knee, - Grob*me, - Real yl, Real yr) +Beam::score_stem_lengths (vector const &stems, + vector const &stem_infos, + vector const &base_stem_ys, + vector const &stem_xs, + Real xl, Real xr, + bool knee, + Real yl, Real yr, + + Beam_quant_parameters const *parameters) { - Real pen = STEM_LENGTH_LIMIT_PENALTY; - + Real limit_penalty = parameters->STEM_LENGTH_LIMIT_PENALTY; Drul_array score (0, 0); Drul_array count (0, 0); - for (int i=0; i < stems.size (); i++) + + for (vsize i = 0; i < stems.size (); i++) { - Grob* s = stems[i]; - if (Stem::invisible_b (s)) + Grob *s = stems[i]; + if (Stem::is_invisible (s)) continue; Real x = stem_xs[i]; - Real dx = xr-xl; - Real beam_y = yr *(x - xl)/dx + yl * ( xr - x)/dx; + Real dx = xr - xl; + Real beam_y = dx ? yr * (x - xl) / dx + yl * (xr - x) / dx : (yr + yl) / 2; Real current_y = beam_y + base_stem_ys[i]; - + Real length_pen = parameters->STEM_LENGTH_DEMERIT_FACTOR; + Stem_info info = stem_infos[i]; Direction d = info.dir_; - score[d] += pen - * (0 >? (info.dir_ * (info.shortest_y_ - current_y))); - - score[d] += STEM_LENGTH_DEMERIT_FACTOR - * shrink_extra_weight (d * current_y - info.dir_ * info.ideal_y_); + score[d] += limit_penalty * max (0.0, (d * (info.shortest_y_ - current_y))); + + Real ideal_diff = d * (current_y - info.ideal_y_); + Real ideal_score = shrink_extra_weight (ideal_diff, 1.5); - count[d] ++; + /* We introduce a power, to make the scoring strictly + convex. Otherwise a symmetric knee beam (up/down/up/down) + does not have an optimum in the middle. */ + if (knee) + ideal_score = pow (ideal_score, 1.1); + + score[d] += length_pen * ideal_score; + + count[d]++; } - - if(count[LEFT]) - score[LEFT] /= count[LEFT]; - if(count[RIGHT]) - score[RIGHT] /= count[RIGHT]; - return score[LEFT]+score[RIGHT]; + Direction d = DOWN; + do + score[d] /= max (count[d], 1); + while (flip (&d) != DOWN) + ; + + return score[LEFT] + score[RIGHT]; } Real -Beam::score_slopes_dy (Grob *me, - Real yl, Real yr, +Beam::score_slopes_dy (Real yl, Real yr, Real dy_mus, Real dy_damp, - bool xstaff) + Real dx, + bool xstaff, + + Beam_quant_parameters const *parameters) { Real dy = yr - yl; - Real dem = 0.0; + + /* + DAMPING_DIRECTION_PENALTY is a very harsh measure, while for + complex beaming patterns, horizontal is often a good choice. + + TODO: find a way to incorporate the complexity of the beam in this + penalty. + */ if (sign (dy_damp) != sign (dy)) { - dem += DAMPING_DIRECTIION_PENALTY; + if (!dy) + { + if (fabs (dy_damp / dx) > parameters->ROUND_TO_ZERO_SLOPE) + dem += parameters->DAMPING_DIRECTION_PENALTY; + else + dem += parameters->HINT_DIRECTION_PENALTY; + } + else + dem += parameters->DAMPING_DIRECTION_PENALTY; } + + dem += parameters->MUSICAL_DIRECTION_FACTOR + * max (0.0, (fabs (dy) - fabs (dy_mus))); - dem += MUSICAL_DIRECTION_FACTOR * (0 >? (fabs (dy) - fabs (dy_mus))); - + Real slope_penalty = parameters->IDEAL_SLOPE_FACTOR; - Real slope_penalty = IDEAL_SLOPE_FACTOR; + /* Xstaff beams tend to use extreme slopes to get short stems. We + put in a penalty here. */ + if (xstaff) + slope_penalty *= 10; - /* - Xstaff beams tend to use extreme slopes to get short stems. We - put in a penalty here. - */ - if (xstaff) - slope_penalty *= 10; + /* Huh, why would a too steep beam be better than a too flat one ? */ + dem += shrink_extra_weight (fabs (dy_damp) - fabs (dy), 1.5) + * slope_penalty; - dem += shrink_extra_weight (fabs (dy_damp) - fabs (dy))* slope_penalty; - return dem; + return dem; } static Real @@ -322,102 +439,106 @@ my_modf (Real x) return x - floor (x); } +/* + TODO: The fixed value SECONDARY_BEAM_DEMERIT is probably flawed: + because for 32nd and 64th beams the forbidden quants are relatively + more important than stem lengths. +*/ Real -Beam::score_forbidden_quants (Grob*me, - Real yl, Real yr, - Real rad, +Beam::score_forbidden_quants (Real yl, Real yr, + Real radius, Real slt, Real thickness, Real beam_translation, - int beam_count, - Direction ldir, Direction rdir) + Drul_array beam_counts, + Direction ldir, Direction rdir, + + Beam_quant_parameters const *parameters) { Real dy = yr - yl; + Drul_array y (yl, yr); + Drul_array dirs (ldir, rdir); + + Real extra_demerit = parameters->SECONDARY_BEAM_DEMERIT / (max (beam_counts[LEFT], beam_counts[RIGHT])); + Direction d = LEFT; Real dem = 0.0; - if (fabs (yl) < rad && fabs ( my_modf (yl) - 0.5) < 1e-3) - dem += INTER_QUANT_PENALTY; - if (fabs (yr) < rad && fabs ( my_modf (yr) - 0.5) < 1e-3) - dem += INTER_QUANT_PENALTY; + Real eps = parameters->BEAM_EPS; - // todo: use beam_count of outer stems. - if (beam_count >= 2) + do + { + for (int j = 1; j <= beam_counts[d]; j++) + { + Direction stem_dir = dirs[d]; + + /* + The 2.2 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. + */ + Real gap1 = y[d] - stem_dir * ((j - 1) * beam_translation + thickness / 2 - slt / 2.2); + Real gap2 = y[d] - stem_dir * (j * beam_translation - thickness / 2 + slt / 2.2); + + Interval gap; + gap.add_point (gap1); + gap.add_point (gap2); + + for (Real k = -radius; + k <= radius + eps; k += 1.0) + if (gap.contains (k)) + { + Real dist = min (fabs (gap[UP] - k), fabs (gap[DOWN] - k)); + + /* + this parameter is tuned to grace-stem-length.ly + */ + Real fixed_demerit = 0.4; + + dem += extra_demerit + * (fixed_demerit + + (1 - fixed_demerit) * (dist / gap.length ()) * 2); + } + } + } + while ((flip (&d)) != LEFT); + + if (max (beam_counts[LEFT], beam_counts[RIGHT]) >= 2) { - Real straddle = 0.0; Real sit = (thickness - slt) / 2; Real inter = 0.5; Real hang = 1.0 - (thickness - slt) / 2; - - - if (fabs (yl - ldir * beam_translation) < rad - && fabs (my_modf (yl) - inter) < 1e-3) - dem += SECONDARY_BEAM_DEMERIT; - if (fabs (yr - rdir * beam_translation) < rad - && fabs (my_modf (yr) - inter) < 1e-3) - dem += SECONDARY_BEAM_DEMERIT; - - Real eps = 1e-3; - - /* - Can't we simply compute the distance between the nearest - staffline and the secondary beam? That would get rid of the - silly case analysis here (which is probably not when we have - different beam-thicknesses.) - --hwn - */ - - - // hmm, without Interval/Drul_array, you get ~ 4x same code... - if (fabs (yl - ldir * beam_translation) < rad + inter) - { - if (ldir == UP && dy <= eps - && fabs (my_modf (yl) - sit) < eps) - dem += SECONDARY_BEAM_DEMERIT; - - if (ldir == DOWN && dy >= eps - && fabs (my_modf (yl) - hang) < eps) - dem += SECONDARY_BEAM_DEMERIT; - } - - if (fabs (yr - rdir * beam_translation) < rad + inter) - { - if (rdir == UP && dy >= eps - && fabs (my_modf (yr) - sit) < eps) - dem += SECONDARY_BEAM_DEMERIT; - - if (rdir == DOWN && dy <= eps - && fabs (my_modf (yr) - hang) < eps) - dem += SECONDARY_BEAM_DEMERIT; - } - - if (beam_count >= 3) + Direction d = LEFT; + do { - if (fabs (yl - 2 * ldir * beam_translation) < rad + inter) + if (beam_counts[d] >= 2 + && fabs (y[d] - dirs[d] * beam_translation) < radius + inter) { - if (ldir == UP && dy <= eps - && fabs (my_modf (yl) - straddle) < eps) - dem += SECONDARY_BEAM_DEMERIT; - - if (ldir == DOWN && dy >= eps - && fabs (my_modf (yl) - straddle) < eps) - dem += SECONDARY_BEAM_DEMERIT; - } - - if (fabs (yr - 2 * rdir * beam_translation) < rad + inter) + if (dirs[d] == UP && dy <= eps + && fabs (my_modf (y[d]) - sit) < eps) + dem += extra_demerit; + + if (dirs[d] == DOWN && dy >= eps + && fabs (my_modf (y[d]) - hang) < eps) + dem += extra_demerit; + } + + if (beam_counts[d] >= 3 + && fabs (y[d] - 2 * dirs[d] * beam_translation) < radius + inter) { - if (rdir == UP && dy >= eps - && fabs (my_modf (yr) - straddle) < eps) - dem += SECONDARY_BEAM_DEMERIT; - - if (rdir == DOWN && dy <= eps - && fabs (my_modf (yr) - straddle) < eps) - dem += SECONDARY_BEAM_DEMERIT; + if (dirs[d] == UP && dy <= eps + && fabs (my_modf (y[d]) - straddle) < eps) + dem += extra_demerit; + + if (dirs[d] == DOWN && dy >= eps + && fabs (my_modf (y[d]) - straddle) < eps) + dem += extra_demerit; } } + while (flip (&d) != LEFT); } - + return dem; } -