release: 1.1.52

[lilypond.git] / lily / break.cc

diff --git a/lily/break.cc b/lily/break.cc
index 8475f79db4aa4f73f55d3c860bd8292841a782a2..f362ef5ff1f773df9a4dbd30828431aab8b86824 100644 (file)
--- a/lily/break.cc
+++ b/lily/break.cc
@@ -3,26 +3,31 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996,  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "score-column.hh"
 #include "break.hh"
 #include "paper-def.hh"
-#include "line-spacer.hh"
+#include "spring-spacer.hh"
 #include "debug.hh"
-#include "scoreline.hh"
+#include "line-of-score.hh"
 #include "p-score.hh"
 #include "p-col.hh"
 #include "cpu-timer.hh"
+#include "command-request.hh"
 
 String
-Col_stats::str () const {
-  String s (count_i_);
-  s += _ (" lines");
-  if  (count_i_)
-    s += String (Real (cols_i_)/count_i_, _(", (with an average of %.1f columns)"));
-
+Col_stats::str () const
+{
+  String s;
+  if (!count_i_)
+    s = _ ("0 lines");
+  else if (count_i_ == 1)
+    s = _f ("1 line (of %.0f columns)", (Real)cols_i_/count_i_);
+  else
+    s = _f ("%d lines (with an average of %.1f columns)", 
+      count_i_, (Real)cols_i_/count_i_);
   return s;
 }
 
@@ -42,27 +47,15 @@ Col_stats::Col_stats ()
 
 /* **************************************************************** */
 
-Line_of_cols
-Break_algorithm::all_cols () const
-{
-  Line_of_cols retval;
-  for (PCursor<Paper_column*> c (pscore_l_->col_p_list_.top ());
-       c.ok (); c++)
-    {
-
-      retval.push (c);
-    }
-  return retval;
-}
 
 Array<int>
 Break_algorithm::find_break_indices () const
 {
-  Line_of_cols all (all_cols ());
+  Line_of_cols all (pscore_l_->col_l_arr_);
   Array<int> retval;
 
   for (int i=0; i < all.size (); i++)
-    if (all[i]->breakable_b_)
+    if (all[i]->breakable_b ())
       retval.push (i);
 
   if (linelength <=0)
@@ -72,15 +65,15 @@ Break_algorithm::find_break_indices () const
   return retval;
 }
 
-///  return all breakable columns
+
 Line_of_cols
 Break_algorithm::find_breaks () const
 {
-  Line_of_cols all (all_cols ());
+  Line_of_cols all (pscore_l_->col_l_arr_);
   Line_of_cols retval;
 
   for (int i=0; i < all.size (); i++)
-    if (all[i]->breakable_b_)
+    if (all[i]->breakable_b ())
       retval.push (all[i]);
 
 
@@ -98,15 +91,19 @@ Break_algorithm::find_breaks () const
 Line_spacer*
 Break_algorithm::generate_spacing_problem (Line_of_cols curline, Interval line) const
 {
-  Line_spacer * sp= (*get_line_spacer) ();
+  // ugh
+  Spring_spacer * sp= dynamic_cast<Spring_spacer*> ((*get_line_spacer) ());
 
   sp->paper_l_ = pscore_l_->paper_l_;
-  sp->add_column (curline[0], true, line.min ());
+  sp->add_column (curline[0], true, line[LEFT]);
   for (int i=1; i< curline.size ()-1; i++)
     sp->add_column (curline[i]);
 
   if (line.length () > 0)
-    sp->add_column (curline.top (), true, line.max ());
+    {
+      sp->add_column (curline.top (), true, line[RIGHT]);
+      sp->energy_normalisation_f_  = sqr (line.length ());
+    }
   else
     sp->add_column (curline.top ());
 
@@ -135,50 +132,40 @@ Break_algorithm::feasible (Line_of_cols curline) const
   if (linelength <=  0)
     return true;
 
-  Real l =0;
   for (int i=0; i < curline.size (); i++)
     {
       if (i && i < curline.size () -1
-         && ((Score_column*)curline[i])->forced_break_b ())
+         && ((dynamic_cast<Score_column*>(curline[i]))->break_penalty_i () >= Break_req::FORCE))
        return false;
-      
-      l +=curline[i]->width ().length ();
     }
-  return l < linelength;
+  return true;
 }
 
 void
 Break_algorithm::problem_OK () const
 {
-  if (!pscore_l_->col_p_list_.size ())
-    error (_("Score does not have any columns"));
+  if (pscore_l_->col_l_arr_.empty ())
+    error (_("score does not have any columns"));
   OK ();
 }
 
 void
 Break_algorithm::OK () const
 {
-#ifndef NDEBUG
-  iter_top (pscore_l_->col_p_list_,start);
-  PCursor<Paper_column *> end (pscore_l_->col_p_list_.bottom ());
-
-  assert (start->breakable_b_);
-  assert (end->breakable_b_);
-#endif
 }
 
-Array<Col_hpositions>
+Array<Column_x_positions>
 Break_algorithm::solve () const
 {
   Cpu_timer timer;
 
-  Array<Col_hpositions> h= do_solve ();
+  Array<Column_x_positions> h= do_solve ();
 
   if (approx_stats_.count_i_)
-    *mlog << _ ("\nApproximated: ") << approx_stats_.str () << "\n";
+    *mlog << '\n' << _f ("approximated %s", approx_stats_.str ()) << endl;
   if (exact_stats_.count_i_)
-    *mlog << _ ("Calculated exactly: ") << exact_stats_.str () << "\n";
-  *mlog << _ ("Time: ") << String (timer.read (), "%.2f") << _ (" seconds\n");
+    *mlog << _f ("calculated %s exactly", exact_stats_.str ()) << endl;
+  *mlog << _f ("elapsed time %.2f seconds",  timer.read ()) << endl;
 
   return h;
 }