#include "slur-scoring.hh"
-#include "libc-extension.hh"
-#include "slur-configuration.hh"
+
+#include "accidental-interface.hh"
#include "beam.hh"
#include "directional-element-interface.hh"
-#include "pointer-group-interface.hh"
-#include "slur.hh"
+#include "libc-extension.hh"
+#include "main.hh"
#include "note-column.hh"
#include "output-def.hh"
+#include "paper-column.hh"
#include "pitch.hh"
+#include "pointer-group-interface.hh"
+#include "slur-configuration.hh"
+#include "slur.hh"
#include "spanner.hh"
#include "staff-symbol-referencer.hh"
#include "staff-symbol.hh"
#include "stem.hh"
#include "warn.hh"
-#include "paper-column.hh"
-#include "accidental-interface.hh"
/*
TODO:
junk_pointers (configurations_);
}
-Real
-get_detail (SCM alist, SCM sym)
-{
- SCM entry = scm_assq (sym, alist);
- return robust_scm2double (scm_is_pair (entry)
- ? scm_cdr (entry)
- : SCM_EOL,
- 0.0);
-}
-
-void
-Slur_score_parameters::fill (Grob *me)
-{
- SCM details = me->get_property ("details");
-
- region_size_
- = (int) get_detail (details, ly_symbol2scm ("region-size"));
- head_encompass_penalty_
- = get_detail (details, ly_symbol2scm ("head-encompass-penalty"));
- stem_encompass_penalty_
- = get_detail (details, ly_symbol2scm ("stem-encompass-penalty"));
- closeness_factor_
- = get_detail (details, ly_symbol2scm ("closeness-factor"));
- edge_attraction_factor_
- = get_detail (details, ly_symbol2scm ("edge-attraction-factor"));
- same_slope_penalty_
- = get_detail (details, ly_symbol2scm ("same-slope-penalty"));
- steeper_slope_factor_
- = get_detail (details, ly_symbol2scm ("steeper-slope-factor"));
- non_horizontal_penalty_
- = get_detail (details, ly_symbol2scm ("non-horizontal-penalty"));
- max_slope_
- = get_detail (details, ly_symbol2scm ("max-slope"));
- max_slope_factor_
- = get_detail (details, ly_symbol2scm ("max-slope-factor"));
- free_head_distance_
- = get_detail (details, ly_symbol2scm ("free-head-distance"));
- absolute_closeness_measure_
- = get_detail (details, ly_symbol2scm ("absolute-closeness-measure"));
- extra_object_collision_penalty_
- = get_detail (details, ly_symbol2scm ("extra-object-collision-penalty"));
- accidental_collision_
- = get_detail (details, ly_symbol2scm ("accidental-collision"));
- extra_encompass_free_distance_
- = get_detail (details, ly_symbol2scm ("extra-encompass-free-distance"));
- head_slur_distance_factor_
- = get_detail (details, ly_symbol2scm ("head-slur-distance-factor"));
- head_slur_distance_max_ratio_
- = get_detail (details, ly_symbol2scm ("head-slur-distance-max-ratio"));
- free_slur_distance_
- = get_detail (details, ly_symbol2scm ("free-slur-distance"));
- edge_slope_exponent_
- = get_detail (details, ly_symbol2scm ("edge-slope-exponent"));
-}
-
Real
broken_trend_y (Slur_score_state const &state, Direction hdir)
{
if (Spanner *mother = dynamic_cast<Spanner *> (state.slur_->original ()))
{
vsize k = broken_spanner_index (state.slur_);
- int j = k + hdir;
- if (j < 0 || j >= mother->broken_intos_.size ())
+ int j = int (k) + hdir;
+ if (j < 0 || vsize (j) >= mother->broken_intos_.size ())
return by;
Grob *neighbor = mother->broken_intos_[j];
= broken_spanner_index (dynamic_cast<Spanner *> (state.common_[Y_AXIS]));
int common_j = common_k + hdir;
- if (common_j < 0 || common_j >= common_mother->broken_intos_.size ())
+ if (common_j < 0 || vsize (common_j) >= common_mother->broken_intos_.size ())
return by;
Grob *common_next_system = common_mother->broken_intos_[common_j];
if (Spanner *mother = dynamic_cast<Spanner *> (slur_->original ()))
{
- vsize k = broken_spanner_index (slur_);
- int j = k + 1;
- if (j < 0 || j >= mother->broken_intos_.size ())
+ vsize j = 1 + broken_spanner_index (slur_);
+ if (j >= mother->broken_intos_.size ())
return;
Grob *neighbor = mother->broken_intos_[j];
}
staff_space_ = Staff_symbol_referencer::staff_space (me);
- Real lt = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+ Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
thickness_ = robust_scm2double (me->get_property ("thickness"), 1.0) * lt;
dir_ = get_grob_direction (me);
Real opt = 1e6;
#if DEBUG_SLUR_SCORING
+ bool debug_slurs = to_boolean (slur_->layout ()
+ ->lookup_variable (ly_symbol2scm ("debug-slur-scoring")));
SCM inspect_quants = slur_->get_property ("inspect-quants");
- if (to_boolean (slur_->layout ()
- ->lookup_variable (ly_symbol2scm ("debug-slur-scoring")))
- && scm_is_pair (inspect_quants))
+ SCM inspect_index = slur_->get_property ("inspect-index");
+ if (debug_slurs
+ && scm_is_integer (inspect_index))
+ {
+ opt_idx = scm_to_int (inspect_index);
+ configurations_[opt_idx]->calculate_score (*this);
+ opt = configurations_[opt_idx]->score ();
+ }
+ else if (debug_slurs
+ && scm_is_pair (inspect_quants))
{
opt_idx = get_closest_index (inspect_quants);
- configurations_[opt_idx]->score (*this);
- opt = configurations_[opt_idx]->score_;
+ configurations_[opt_idx]->calculate_score (*this);
+ opt = configurations_[opt_idx]->score ();
}
else
#endif
{
for (vsize i = 0; i < configurations_.size (); i++)
- configurations_[i]->score (*this);
+ configurations_[i]->calculate_score (*this);
for (vsize i = 0; i < configurations_.size (); i++)
{
- if (configurations_[i]->score_ < opt)
+ if (configurations_[i]->score () < opt)
{
- opt = configurations_[i]->score_;
+ opt = configurations_[i]->score ();
opt_idx = i;
}
}
}
#if DEBUG_SLUR_SCORING
- if (opt_idx >= 0)
+ if (debug_slurs)
{
- configurations_[opt_idx]->score_card_ += to_string ("=%.2f", opt);
- configurations_[opt_idx]->score_card_ += to_string ("i%d", opt_idx);
+ string total;
+ if (opt_idx >= 0)
+ {
+ total = configurations_[opt_idx]->card ();
+ total += to_string (" TOTAL=%.2f idx=%d", configurations_[opt_idx]->score (), opt_idx);
+ }
+ else
+ {
+ total = "no sol?";
+ }
+
+ slur_->set_property ("quant-score",
+ scm_makfrom0str (total.c_str ()));
}
- else
+#endif
+
+ if (opt_idx < 0)
{
- programming_error ("No optimal slur found. Guessing 0.");
opt_idx = 0;
+ programming_error ("No optimal slur found. Guessing 0.");
}
- // debug quanting
- slur_->set_property ("quant-score",
- scm_makfrom0str (configurations_[opt_idx]->score_card_.c_str ()));
-
-#endif
-
return configurations_[opt_idx]->curve_;
}
{
Real x, y;
if (d == RIGHT)
- x = extremes_[d].bound_->extent (common_[X_AXIS], X_AXIS)[d];
+ x = robust_relative_extent (extremes_[d].bound_, common_[X_AXIS], X_AXIS)[d];
else
x = slur_->get_broken_left_end_align ();
+
Grob *col = (d == LEFT) ? columns_[0] : columns_.back ();
if (extremes_[-d].bound_ != col)
return y;
}
-std::vector<Offset>
+vector<Offset>
Slur_score_state::generate_avoid_offsets () const
{
- std::vector<Offset> avoid;
- Link_array__Grob_ encompasses = columns_;
+ vector<Offset> avoid;
+ vector<Grob*> encompasses = columns_;
for (vsize i = 0; i < encompasses.size (); i++)
{
Real r_0 = robust_scm2double (slur_->get_property ("ratio"), 0.33);
Real h_inf = staff_space_ * scm_to_double (slur_->get_property ("height-limit"));
- std::vector<Offset> avoid = generate_avoid_offsets ();
+ vector<Offset> avoid = generate_avoid_offsets ();
for (vsize i = 0; i < configurations_.size (); i++)
configurations_[i]->generate_curve (*this, r_0, h_inf, avoid);
}
-Link_array__Slur_configuration_
+vector<Slur_configuration*>
Slur_score_state::enumerate_attachments (Drul_array<Real> end_ys) const
{
- Link_array__Slur_configuration_ scores;
+ vector<Slur_configuration*> scores;
Drul_array<Offset> os;
os[LEFT] = base_attachments_[LEFT];
return scores;
}
-std::vector<Extra_collision_info>
+vector<Extra_collision_info>
Slur_score_state::get_extra_encompass_infos () const
{
extract_grob_set (slur_, "encompass-objects", encompasses);
- std::vector<Extra_collision_info> collision_infos;
+ vector<Extra_collision_info> collision_infos;
for (vsize i = encompasses.size (); i--;)
{
if (Slur::has_interface (encompasses[i]))
for (int k = 0; k < 3; k++)
{
- Direction hdir = Direction (k / 2 - 1);
+ Direction hdir = Direction (k - 1);
/*
Only take bound into account if small slur starts
Interval xext (-1, 1);
xext = xext * (thickness_ * 2) + z[X_AXIS];
Extra_collision_info info (small_slur,
- k - 1.0,
+ hdir,
xext,
yext,
parameters_.extra_object_collision_penalty_);
projects / lilypond.git / blobdiff