/*
- slur-configuration.cc -- implement Slur_configuration
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
+ Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ LilyPond is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
#include "slur-configuration.hh"
Real eps = 0.01;
Interval pext = eps * Interval (-1,1) + p[X_AXIS];
pext.intersect (curve_xext);
- if (pext.is_empty () || pext.length () <= 2.1* eps)
+ if (pext.is_empty () || pext.length () <= 1.999 * eps)
continue;
Real y = curve.get_other_coordinate (X_AXIS, p[X_AXIS]);
index_ = -1;
};
+void
+Slur_configuration::add_score (Real s, string desc)
+{
+ if (s < 0)
+ {
+ programming_error ("Negative demerits found for slur. Ignoring");
+ s = 0.0;
+ }
+
+ if (s)
+ {
+ if (score_card_.length () > 0)
+ score_card_ += ", ";
+ score_card_ += to_string ("%s=%.2f", desc.c_str (), s);
+ score_ += s;
+ }
+}
+
void
Slur_configuration::score_encompass (Slur_score_state const &state)
{
/ state.encompass_infos_.size ();
}
}
-
- Real variance_penalty = 0.0;
-
+ add_score (demerit, "encompass");
+
if (convex_head_distances.size ())
{
Real avg_distance = 0.0;
as penalty.
*/
avg_distance /= n;
- variance_penalty = state.parameters_.head_slur_distance_max_ratio_;
+ Real variance_penalty = state.parameters_.head_slur_distance_max_ratio_;
if (min_dist > 0.0)
variance_penalty
= min ((avg_distance / (min_dist + state.parameters_.absolute_closeness_measure_) - 1.0), variance_penalty);
variance_penalty = max (variance_penalty, 0.0);
variance_penalty *= state.parameters_.head_slur_distance_factor_;
- }
-#if DEBUG_SLUR_SCORING
- score_card_ += to_string ("C%.2f", demerit);
- score_card_ += to_string ("D%.2f", variance_penalty);
-#endif
-
- score_ += demerit + variance_penalty;
+ add_score (variance_penalty, "variance");
+ }
}
void
Slur_configuration::score_extra_encompass (Slur_score_state const &state)
{
- Real demerit = 0.0;
for (vsize j = 0; j < state.extra_encompass_infos_.size (); j++)
{
Drul_array<Offset> attachment = attachment_;
else
programming_error ("unknown avoidance type");
- Real epsilon = 0.1;
- Real factor
- = (1.0 / (max (dist, 0.0) + epsilon * state.parameters_.extra_encompass_free_distance_));
- Real threshold
- = 1.0 / ((1 + epsilon) * state.parameters_.extra_encompass_free_distance_);
+ dist = max (dist, 0.0);
+
+ Real penalty = info.penalty_ * peak_around (0.1 * state.parameters_.extra_encompass_free_distance_,
+ state.parameters_.extra_encompass_free_distance_,
+ dist);
- demerit
- += max (info.penalty_ * (factor - threshold), 0.0);
+ add_score (penalty, "extra");
}
-#if DEBUG_SLUR_SCORING
- score_card_ += to_string ("X%.2f", demerit);
-#endif
-
- score_ += demerit;
}
void
Real demerit = factor * dy;
if (state.extremes_[d].stem_
&& state.extremes_[d].stem_dir_ == state.dir_
+ // TODO - Stem::get_beaming() should be precomputed.
&& !Stem::get_beaming (state.extremes_[d].stem_, -d))
demerit /= 5;
demerit *= exp (state.dir_ * d * slope
* state.parameters_.edge_slope_exponent_);
- score_ += demerit;
-#if DEBUG_SLUR_SCORING
- score_card_ += to_string ("E%.2f", demerit);
-#endif
+
+ string dir_str = d == LEFT ? "L" : "R";
+ add_score (demerit, dir_str + " edge");
}
while (flip (&d) != LEFT);
}
? state.parameters_.same_slope_penalty_ / 10
: state.parameters_.same_slope_penalty_;
-#if DEBUG_SLUR_SCORING
- score_card_ += to_string ("S%.2f", demerit);
-#endif
- score_ += demerit;
+ add_score (demerit, "slope");
+}
+
+
+// This is a temporary hack to see how much we can gain by using a
+// priority queue on the beams to score.
+static int score_count = 0;
+LY_DEFINE (ly_slur_score_count, "ly:slur-score-count", 0, 0, 0,
+ (),
+ "count number of slur scores.") {
+ return scm_from_int (score_count);
}
void
-Slur_configuration::score (Slur_score_state const &state)
+Slur_configuration::run_next_scorer (Slur_score_state const &state)
+{
+ switch (next_scorer_todo) {
+ case EXTRA_ENCOMPASS:
+ score_extra_encompass (state);
+ break;
+ case SLOPE:
+ score_slopes (state);
+ break;
+ case EDGES:
+ score_edges (state);
+ break;
+ case ENCOMPASS:
+ score_encompass (state);
+ break;
+ default:
+ assert (false);
+ }
+ next_scorer_todo++;
+ score_count++;
+}
+
+bool
+Slur_configuration::done () const
+{
+ return next_scorer_todo >= NUM_SCORERS;
+}
+
+Slur_configuration *
+Slur_configuration::new_config (Drul_array<Offset> const &offs, int idx)
{
- score_extra_encompass (state);
- score_slopes (state);
- score_edges (state);
- score_encompass (state);
+ Slur_configuration *conf = new Slur_configuration;
+ conf->attachment_ = offs;
+ conf->index_ = idx;
+ conf->next_scorer_todo = INITIAL_SCORE + 1;
+ return conf;
}