release: 1.2.9

[lilypond.git] / lily / gourlay-breaking.cc

diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc
index c8dbf35e499c565af2c3318a6882b35e608bcb32..de9da6836d6a0e02cd5067e7a1b057a3adef0e56 100644 (file)
--- a/lily/gourlay-breaking.cc
+++ b/lily/gourlay-breaking.cc
@@ -7,11 +7,11 @@
 */
 
 #include "gourlay-breaking.hh"
-#include "colhpos.hh"
+#include "column-x-positions.hh"
 #include "spring-spacer.hh"
 #include "debug.hh"
-#include "p-col.hh"
-#include "p-score.hh"
+#include "paper-column.hh"
+#include "paper-score.hh"
 #include "paper-def.hh"
 
 #include "killing-cons.tcc"
@@ -28,9 +28,14 @@ struct Break_node {
     
     */
   int prev_break_i_;
+  /**
+     Which system number so far?
+   */
   int line_i_;
+
   Real energy_f_;
   Column_x_positions line_config_;
+  
   Break_node () 
   {
     prev_break_i_ = -1;
@@ -40,9 +45,7 @@ struct Break_node {
 
 /**
   This algorithms is adapted from the OSU Tech report on breaking lines.
-  
  */
-
 Array<Column_x_positions>
 Gourlay_breaking::do_solve () const
 {
@@ -60,7 +63,6 @@ Gourlay_breaking::do_solve () const
   optimal_paths[0] = first_node; 
   int break_idx=1;
 
-  
   for (; break_idx< breaks.size (); break_idx++) 
     {
       Array<int> candidates;
@@ -78,32 +80,31 @@ Gourlay_breaking::do_solve () const
 
          if (optimal_paths[start_idx].prev_break_i_ < 0
              && optimal_paths[start_idx].line_config_.energy_f_)
-               
            continue;
-           
-         Line_of_cols line = all.slice (breaks[start_idx], breaks[break_idx]+1);
 
-         line[0] = line[0]->postbreak_l ();
-         line.top () = line.top ()->prebreak_l ();
+
+         
+         Line_of_cols line = all.slice (breaks[start_idx], breaks[break_idx]+1);
+  
+         line[0] = dynamic_cast<Paper_column*>(line[0]->find_broken_piece (RIGHT));
+         line.top () =  dynamic_cast<Paper_column*>(line.top ()->find_broken_piece (LEFT));
            
          if (!feasible (line))
            break;
            
          Column_x_positions approx;
-         approx.cols = line;
+         approx.cols_ = line;
            
          approx.spacer_l_ = generate_spacing_problem (line, 
            pscore_l_->paper_l_->line_dimensions_int (optimal_paths[start_idx].line_i_));
          spacer_p_list.append (new Killing_cons<Line_spacer> (approx.spacer_l_,0));
 
-         ( (Break_algorithm*)this)->approx_stats_.add (approx.cols);
          approx.approximate_solve_line ();
            
          if  (approx.energy_f_  > energy_bound_f_)
            {
              continue;
            }
-
            
          // this is a likely candidate. Store it.
          candidate_lines.push (approx);
@@ -124,7 +125,6 @@ Gourlay_breaking::do_solve () const
          if (!candidate_lines[j].satisfies_constraints_b_) 
            {
              candidate_lines[j].solve_line ();
-             ( (Break_algorithm*)this)->exact_stats_.add (candidate_lines[j].cols);
            }
            
          Real this_energy 
@@ -158,7 +158,9 @@ Gourlay_breaking::do_solve () const
     }
 
   if  (break_idx % HAPPY_DOTS_I) 
-    *mlog << "[" << break_idx << "]" << flush;
+    *mlog << "[" << break_idx << "]";
+
+  *mlog << endl;
 
   Array<int> final_breaks;
 
@@ -171,7 +173,7 @@ Gourlay_breaking::do_solve () const
       assert (i > optimal_paths[i].prev_break_i_);
 
       // there was no "feasible path"
-      if (!optimal_paths[i].line_config_.config.size ()) {
+      if (!optimal_paths[i].line_config_.config_.size ()) {
        final_breaks.set_size (0);
        break;
       }
@@ -188,7 +190,6 @@ Gourlay_breaking::do_solve () const
 
 Gourlay_breaking::Gourlay_breaking ()
 {
-  get_line_spacer = Spring_spacer::constructor;
   energy_bound_f_ = infinity_f;
   max_measures_i_ = INT_MAX;
 }