]> git.donarmstrong.com Git - lilypond.git/commitdiff
* lily/tie-formatting-problem.cc (score_ties): new function
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Tue, 13 Dec 2005 16:21:02 +0000 (16:21 +0000)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Tue, 13 Dec 2005 16:21:02 +0000 (16:21 +0000)
(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

index a3d79b31a026d15b64a379e5b664b45c5bffcb6c..0ea0f8c966dfcf37c4258d1adda5ccdc83d5e708 100644 (file)
@@ -237,6 +237,7 @@ Tie_formatting_problem::from_lv_ties (Link_array<Grob> 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_)