X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-quanting.cc;h=417fca00d27104642a7c9dbc62e15da6bfb76a89;hb=d3e963c18f2e5958797018191abb9b861ac09bda;hp=a3197932f69089bc663223039a5652f3b10f416e;hpb=029ae298e4c56984889a7fe47dbbc58f6c7055f4;p=lilypond.git diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc index a3197932f6..417fca00d2 100644 --- a/lily/beam-quanting.cc +++ b/lily/beam-quanting.cc @@ -1,38 +1,52 @@ /* beam-quanting.cc -- implement Beam quanting functions - + source file of the GNU LilyPond music typesetter - - (c) 1997--2005 Han-Wen Nienhuys + + (c) 1997--2005 Han-Wen Nienhuys Jan Nieuwenhuizen - */ -#include +#include "beam.hh" + +#include +using namespace std; #include "warn.hh" #include "staff-symbol-referencer.hh" -#include "beam.hh" #include "stem.hh" #include "output-def.hh" -#include "group-interface.hh" +#include "pointer-group-interface.hh" #include "align-interface.hh" -const int INTER_QUANT_PENALTY = 1000; -const Real SECONDARY_BEAM_DEMERIT = 10.0; -const int STEM_LENGTH_DEMERIT_FACTOR = 5; +Real +get_detail (SCM alist, SCM sym, Real def) +{ + SCM entry = scm_assq (sym, alist); -/* - threshold to combat rounding errors. - */ -const Real BEAM_EPS = 1e-3; + 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_DIRECTION_PENALTY = 800; -const int MUSICAL_DIRECTION_FACTOR = 400; -const int IDEAL_SLOPE_FACTOR = 10; -const Real ROUND_TO_ZERO_SLOPE = 0.02; +void +Beam_quant_parameters::fill (Grob *him) +{ + SCM details = him->get_property ("details"); + + 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); + + // possibly ridiculous, but too short stems just won't do + 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); + 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, Real fac) @@ -40,7 +54,6 @@ shrink_extra_weight (Real x, Real fac) return fabs (x) * ((x < 0) ? fac : 1.0); } - struct Quant_score { Real yl; @@ -52,21 +65,19 @@ struct Quant_score #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) +best_quant_score_idx (Array const &qscores) { Real best = 1e6; int best_idx = -1; @@ -74,39 +85,33 @@ best_quant_score_idx (Array const & qscores) { if (qscores[i].demerits < best) { - best = qscores [i].demerits ; + best = qscores [i].demerits; best_idx = i; } } - if (best_idx < 0) - { - programming_error ("Huh? No best beam quant score?"); - best_idx = 0; - } - - 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_property ("positions"); - Real yl = scm_to_double (scm_car (s)); - Real yr = scm_to_double (scm_cdr (s)); + Beam_quant_parameters parameters; + parameters.fill (me); + 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. - - */ + + */ Real ss = Staff_symbol_referencer::staff_space (me); - Real thickness = Beam::get_thickness (me) / ss ; + 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); @@ -116,9 +121,7 @@ Beam::quanting (SCM smob) Real hang = 1.0 - (thickness - slt) / 2; Real quants [] = {straddle, sit, inter, hang }; - - - int num_quants = int (sizeof (quants)/sizeof (Real)); + int num_quants = int (sizeof (quants) / sizeof (Real)); Array quantsl; Array quantsr; @@ -127,28 +130,26 @@ Beam::quanting (SCM smob) 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 = - extract_grob_array (me, ly_symbol2scm ("stems")); + */ + Link_array stems + = extract_grob_array (me, "stems"); Array stem_infos; Array base_lengths; - Array stem_xposns; + Array stem_xposns; Drul_array dirs_found (0, 0); Grob *common[2]; for (int a = 2; a--;) common[a] = common_refpoint_of_array (stems, me, Axis (a)); - Grob * fvs = first_visible_stem (me); + Grob *fvs = first_visible_stem (me); Grob *lvs = last_visible_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; @@ -159,11 +160,11 @@ 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. - - */ + + */ for (int i = 0; i < stems.size (); i++) { - Grob*s = stems[i]; + Grob *s = stems[i]; Stem_info si (Stem::get_stem_info (s)); si.scale (1 / ss); @@ -171,7 +172,7 @@ Beam::quanting (SCM smob) dirs_found[stem_infos.top ().dir_] = true; bool f = to_boolean (s->get_property ("french-beaming")) - && s != lvs && s != fvs; + && s != lvs && s != fvs; base_lengths.push (calc_stem_y (me, s, common, xl, xr, Interval (0, 0), f) / ss); @@ -184,23 +185,23 @@ Beam::quanting (SCM smob) 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 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. - */ + Knees are harder, lets try some more possibilities for knees. + */ if (is_knee) region_size += 2; /* Asymetry ? should run to <= region_size ? - */ - for (int i = -region_size ; i < region_size; i++) + */ + for (int i = -region_size; i < region_size; i++) for (int j = 0; j < num_quants; j++) { quantsl.push (i + quants[j] + int (yl)); @@ -208,15 +209,15 @@ Beam::quanting (SCM smob) } Array qscores; - - for (int l = 0; l < quantsl.size (); l++) + + for (int l = 0; l < quantsl.size (); l++) for (int r = 0; r < quantsr.size (); r++) { Quant_score qs; qs.yl = quantsl[l]; qs.yr = quantsr[r]; qs.demerits = 0.0; - + qscores.push (qs); } @@ -226,10 +227,10 @@ Beam::quanting (SCM smob) parameters outside of the loop, we can save a lot of time. */ for (int i = qscores.size (); i--;) { - Real d = score_slopes_dy (qscores[i].yl, qscores[i].yr, - dy_mus, yr- yl, - xr - xl, - 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_QUANTING @@ -239,9 +240,9 @@ Beam::quanting (SCM smob) Real rad = Staff_symbol_referencer::staff_radius (me); Drul_array edge_beam_counts - (Stem::beam_multiplicity (stems[0]).length () + 1, - Stem::beam_multiplicity (stems.top ()).length () + 1); - + (Stem::beam_multiplicity (stems[0]).length () + 1, + Stem::beam_multiplicity (stems.top ()).length () + 1); + Real beam_translation = get_beam_translation (me) / ss; Real reasonable_score = (is_knee) ? 200000 : 100; @@ -250,7 +251,7 @@ Beam::quanting (SCM smob) { Real d = score_forbidden_quants (qscores[i].yl, qscores[i].yr, rad, slt, thickness, beam_translation, - edge_beam_counts, ldir, rdir); + edge_beam_counts, ldir, rdir, ¶meters); qscores[i].demerits += d; #if DEBUG_QUANTING @@ -262,11 +263,11 @@ Beam::quanting (SCM smob) if (qscores[i].demerits < reasonable_score) { Real d = score_stem_lengths (stems, stem_infos, - base_lengths, stem_xposns, - xl, xr, - is_knee, - qscores[i].yl, qscores[i].yr); - qscores[i].demerits += d; + base_lengths, stem_xposns, + xl, xr, + is_knee, + qscores[i].yl, qscores[i].yr, ¶meters); + qscores[i].demerits += d; #if DEBUG_QUANTING qscores[i].score_card_ += to_string (" L %.2f", d); @@ -277,7 +278,7 @@ Beam::quanting (SCM smob) #if DEBUG_QUANTING SCM inspect_quants = me->get_property ("inspect-quants"); - if (to_boolean (me->get_layout ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting"))) + if (to_boolean (me->layout ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting"))) && scm_is_pair (inspect_quants)) { Drul_array ins = ly_scm2interval (inspect_quants); @@ -285,7 +286,7 @@ Beam::quanting (SCM smob) int i = 0; Real mindist = 1e6; - for (; i < qscores.size (); i ++) + for (; i < qscores.size (); i++) { Real d = fabs (qscores[i].yl- ins[LEFT]) + fabs (qscores[i].yr - ins[RIGHT]); if (d < mindist) @@ -295,25 +296,35 @@ Beam::quanting (SCM smob) } } if (mindist > 1e5) - programming_error ("Could not find quant."); + programming_error ("can't find quant"); } #endif + + 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); + } - me->set_property ("positions", - ly_interval2scm (Drul_array (qscores[best_idx].yl, - qscores[best_idx].yr))); #if DEBUG_QUANTING - if (to_boolean (me->get_layout ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting")))) + if (best_idx >= 0 + && to_boolean (me->layout ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting")))) { qscores[best_idx].score_card_ += to_string ("i%d", best_idx); - + // debug quanting me->set_property ("quant-score", scm_makfrom0str (qscores[best_idx].score_card_.to_str0 ())); } #endif - return SCM_UNSPECIFIED; + return ly_interval2scm (final_positions); } Real @@ -321,60 +332,63 @@ Beam::score_stem_lengths (Link_array const &stems, Array const &stem_infos, Array const &base_stem_ys, Array const &stem_xs, - Real xl, Real xr, - bool knee, - Real yl, Real yr) + Real xl, Real xr, + bool knee, + Real yl, Real yr, + + Beam_quant_parameters const *parameters) { - Real limit_penalty = 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++) { - Grob* s = stems[i]; + Grob *s = stems[i]; if (Stem::is_invisible (s)) continue; Real x = stem_xs[i]; - Real dx = xr-xl; - Real beam_y = dx ? yr *(x - xl)/dx + yl * ( xr - x)/dx : (yr + yl)/2; + 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 = STEM_LENGTH_DEMERIT_FACTOR; - + Real length_pen = parameters->STEM_LENGTH_DEMERIT_FACTOR; + Stem_info info = stem_infos[i]; Direction d = info.dir_; - score[d] += limit_penalty * (0 >? (d * (info.shortest_y_ - current_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); - + /* 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] ++; + count[d]++; } Direction d = DOWN; do - { - score[d] /= (count[d] >? 1); - } - while (flip (&d) != DOWN); + score[d] /= max (count[d], 1); + while (flip (&d) != DOWN) + ; - return score[LEFT]+score[RIGHT]; + return score[LEFT] + score[RIGHT]; } Real Beam::score_slopes_dy (Real yl, Real yr, Real dy_mus, Real dy_damp, Real dx, - bool xstaff) + bool xstaff, + + Beam_quant_parameters const *parameters) { Real dy = yr - yl; Real dem = 0.0; @@ -385,42 +399,38 @@ Beam::score_slopes_dy (Real yl, Real yr, TODO: find a way to incorporate the complexity of the beam in this penalty. - */ - if (fabs (dy/dx) > ROUND_TO_ZERO_SLOPE + */ + if (fabs (dy / dx) > parameters->ROUND_TO_ZERO_SLOPE && sign (dy_damp) != sign (dy)) - { - dem += DAMPING_DIRECTION_PENALTY; - } + dem += parameters->DAMPING_DIRECTION_PENALTY; - dem += MUSICAL_DIRECTION_FACTOR * (0 >? (fabs (dy) - fabs (dy_mus))); + dem += parameters->MUSICAL_DIRECTION_FACTOR + * max (0.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; - /* 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; - - return dem; + return dem; } - static Real 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. + because for 32nd and 64th beams the forbidden quants are relatively + more important than stem lengths. */ Real Beam::score_forbidden_quants (Real yl, Real yr, @@ -428,17 +438,19 @@ Beam::score_forbidden_quants (Real yl, Real yr, Real slt, Real thickness, Real beam_translation, Drul_array beam_counts, - Direction ldir, Direction rdir) + 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 = SECONDARY_BEAM_DEMERIT / (beam_counts[LEFT] >? beam_counts[RIGHT]); + + Real extra_demerit = parameters->SECONDARY_BEAM_DEMERIT / (max (beam_counts[LEFT], beam_counts[RIGHT])); Direction d = LEFT; Real dem = 0.0; - + Real eps = parameters->BEAM_EPS; do { @@ -452,72 +464,69 @@ Beam::score_forbidden_quants (Real yl, Real yr, 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); + 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 + BEAM_EPS; k += 1.0) + for (Real k = -radius; + k <= radius + eps; k += 1.0) if (gap.contains (k)) { - Real dist = fabs (gap[UP]-k) ? beam_counts[RIGHT]) >= 2) + 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; - Direction d = LEFT; do { if (beam_counts[d] >= 2 && fabs (y[d] - dirs[d] * beam_translation) < radius + inter) { - if (dirs[d] == UP && dy <= BEAM_EPS - && fabs (my_modf (y[d]) - sit) < BEAM_EPS) + if (dirs[d] == UP && dy <= eps + && fabs (my_modf (y[d]) - sit) < eps) dem += extra_demerit; - - if (dirs[d] == DOWN && dy >= BEAM_EPS - && fabs (my_modf (y[d]) - hang) < BEAM_EPS) + + 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 (dirs[d] == UP && dy <= BEAM_EPS - && fabs (my_modf (y[d]) - straddle) < BEAM_EPS) + if (dirs[d] == UP && dy <= eps + && fabs (my_modf (y[d]) - straddle) < eps) dem += extra_demerit; - - if (dirs[d] == DOWN && dy >= BEAM_EPS - && fabs (my_modf (y[d]) - straddle) < BEAM_EPS) + + if (dirs[d] == DOWN && dy >= eps + && fabs (my_modf (y[d]) - straddle) < eps) dem += extra_demerit; } } while (flip (&d) != LEFT); } - + return dem; } -