From d3ce419548f0159fd704c777e2a8435d2be055ed Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 13 Dec 2005 16:21:02 +0000 Subject: [PATCH] * lily/tie-formatting-problem.cc (score_ties): new function (get_variations): new function. Try flipping dirs for collisions. (generate_optimal_chord_configuration): new function. 1-opt search for better configuration. * lily/tie-formatting-problem.cc (score_ties_aptitude): new function. (score_ties_configuration): new function. (generate_ties_configuration): new function. (generate_base_chord_configuration): new function. (set_ties_config_standard_directions): Move body from tie-column-format.cc (set_manual_tie_configuration): Move body from tie-column-format.cc * lily/tie-formatting-problem.cc (score_configuration): score tie/dot collisions. --- lily/tie-formatting-problem.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lily/tie-formatting-problem.cc b/lily/tie-formatting-problem.cc index a3d79b31a0..0ea0f8c966 100644 --- a/lily/tie-formatting-problem.cc +++ b/lily/tie-formatting-problem.cc @@ -237,6 +237,7 @@ Tie_formatting_problem::from_lv_ties (Link_array const &lv_ties) } heads.push (head); + specifications_.push (spec); } x_refpoint_ = lv_ties [0]; @@ -536,6 +537,8 @@ Ties_configuration Tie_formatting_problem::generate_base_chord_configuration () { Ties_configuration ties_config; + + for (int i = 0; i < specifications_.size (); i ++) { Tie_configuration conf; @@ -593,6 +596,9 @@ Tie_formatting_problem::generate_optimal_chord_configuration () void Tie_formatting_problem::set_ties_config_standard_directions (Ties_configuration *tie_configs) { + if (tie_configs->is_empty ()) + return ; + if (!tie_configs->elem (0).dir_) tie_configs->elem_ref (0).dir_ = DOWN; if (!tie_configs->top().dir_) -- 2.39.5