X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreak.cc;h=f6c374dce5c88f3cdb745131398adb0190422ba3;hb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;hp=8edb91a8b669785fac6fc04a3396d4e2274a20ae;hpb=6a62932652940f4ac2931f75d48796887fbc5fdc;p=lilypond.git

diff --git a/lily/break.cc b/lily/break.cc
index 8edb91a8b6..f6c374dce5 100644
--- a/lily/break.cc
+++ b/lily/break.cc
@@ -3,179 +3,193 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996,  1997--1998 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)");
-    
-    return s;
+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;
 }
 
 void
-Col_stats::add(Line_of_cols const& line)
+Col_stats::add (Line_of_cols const& line)
 {
-    count_i_++;
-    cols_i_ += line.size();
+  count_i_++;
+  cols_i_ += line.size ();
 }
 
 
-Col_stats::Col_stats()
+Col_stats::Col_stats ()
 {
-    count_i_ =0;
-    cols_i_ =0;
+  count_i_ =0;
+  cols_i_ =0;
 }
 
 /* **************************************************************** */
 
 Line_of_cols
-Break_algorithm::all_cols()const
+Break_algorithm::all_cols () const
 {
-    Line_of_cols retval;
-    for (PCursor<PCol*> c(pscore_l_->col_p_list_.top()); 
-	 c.ok(); c++) {
-	
-	retval.push(c);
+  Line_of_cols retval;
+  for (PCursor<Paper_column*> c (pscore_l_->col_p_list_.top ());
+       c.ok (); c++)
+    {
+
+      retval.push (c);
     }
-    return retval;
+  return retval;
 }
 
-Array<int> 
-Break_algorithm::find_break_indices() const
+Array<int>
+Break_algorithm::find_break_indices () const
 {
-    Line_of_cols all(all_cols());
-    Array<int> retval;
-    
-    for (int i=0; i < all.size(); i++)
-	if (all[i]->breakable_b())
-	    retval.push(i);
-    
-    if ( linelength <=0)
-	while ( retval.size() >2)
-	    retval.del(1);
-
-    return retval;
+  Line_of_cols all (all_cols ());
+  Array<int> retval;
+
+  for (int i=0; i < all.size (); i++)
+    if (all[i]->breakable_b_)
+      retval.push (i);
+
+  if (linelength <=0)
+    while (retval.size () >2)
+      retval.del (1);
+
+  return retval;
 }
 
 ///  return all breakable columns
 Line_of_cols
-Break_algorithm::find_breaks() const
+Break_algorithm::find_breaks () const
 {
-    Line_of_cols all(all_cols());
-    Line_of_cols retval;
-    
-    for (int i=0; i < all.size(); i++)
-	if (all[i]->breakable_b())
-	    retval.push(all[i]);
+  Line_of_cols all (all_cols ());
+  Line_of_cols retval;
+
+  for (int i=0; i < all.size (); i++)
+    if (all[i]->breakable_b_)
+      retval.push (all[i]);
 
 
-    if ( linelength <=0)
-	while ( retval.size() >2)
-	    retval.del(1);
+  if (linelength <=0)
+    while (retval.size () >2)
+      retval.del (1);
 
-    return retval;
+  return retval;
 }
 
 
 
- 
+
 
 Line_spacer*
-Break_algorithm::generate_spacing_problem(Line_of_cols curline)const
+Break_algorithm::generate_spacing_problem (Line_of_cols curline, Interval line) const
 {
-    Line_spacer * sp= (*get_line_spacer)();
+  Spring_spacer * sp= (Spring_spacer*) (*get_line_spacer) (); // ugh
 
-    sp->paper_l_ = pscore_l_->paper_l_;
-    sp->add_column(curline[0], true, 0.0);
-    for (int i=1; i< curline.size()-1; i++)
-	sp->add_column(curline[i]);
+  sp->paper_l_ = pscore_l_->paper_l_;
+  sp->add_column (curline[0], true, line[LEFT]);
+  for (int i=1; i< curline.size ()-1; i++)
+    sp->add_column (curline[i]);
 
-    if ( linelength > 0)
-	sp->add_column(curline.top(), true, linelength);
-    else
-	sp->add_column(curline.top());
+  if (line.length () > 0)
+    {
+      sp->add_column (curline.top (), true, line[RIGHT]);
+      sp->energy_normalisation_f_  = sqr (line.length ());
+    }
+  else
+    sp->add_column (curline.top ());
 
-    sp->prepare();
-    return sp;
+  sp->prepare ();
+  return sp;
 }
 
-Break_algorithm::Break_algorithm()
+Break_algorithm::Break_algorithm ()
 {
-    pscore_l_ = 0;
-    get_line_spacer =0;
-    linelength = 0;
+  pscore_l_ = 0;
+  get_line_spacer =0;
+  linelength = 0;
 }
 
 void
-Break_algorithm::set_pscore(Paper_score*s)
+Break_algorithm::set_pscore (Paper_score*s)
 {
-    pscore_l_ = s;
-    linelength = s->paper_l_->linewidth_f();
-    do_set_pscore();
+  pscore_l_ = s;
+  linelength = s->paper_l_->linewidth_f ();
+  do_set_pscore ();
 }
 
 bool
-Break_algorithm::feasible(Line_of_cols curline) const
+Break_algorithm::feasible (Line_of_cols curline) const
 {
-    if (linelength <=  0)
-	return true;
-    
-    Real l =0;
-    for (int i=0; i < curline.size(); i++)
-	l +=curline[i]->width().length();
-    return l < linelength;    
+  if (linelength <=  0)
+    return true;
+
+  for (int i=0; i < curline.size (); i++)
+    {
+      if (i && i < curline.size () -1
+	  && (((Score_column*)curline[i])->break_penalty_i () >= Break_req::FORCE))
+	return false;
+    }
+  return true;
 }
 
 void
-Break_algorithm::problem_OK() const
+Break_algorithm::problem_OK () const
 {
-    if (!pscore_l_->col_p_list_.size())
-	error("Score does not have any columns");
-    OK();
+  if (!pscore_l_->col_p_list_.size ())
+    error (_("score does not have any columns"));
+  OK ();
 }
 
 void
-Break_algorithm::OK()const
+Break_algorithm::OK () const
 {
 #ifndef NDEBUG
-    iter_top(pscore_l_->col_p_list_,start);
-    PCursor<PCol *> end (pscore_l_->col_p_list_.bottom());
-    
-    assert(start->breakable_b());    
-    assert(end->breakable_b());
+  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>
-Break_algorithm::solve()const
+Array<Column_x_positions>
+Break_algorithm::solve () const
 {
-    return do_solve();
-}
+  Cpu_timer timer;
 
-void
-Break_algorithm::do_set_pscore()
-{
-    
+  Array<Column_x_positions> h= do_solve ();
+
+  if (approx_stats_.count_i_)
+    *mlog << '\n' << _f ("approximated: %s", approx_stats_.str ()) << endl;
+  if (exact_stats_.count_i_)
+    *mlog << _f ("calculated exactly: %s", exact_stats_.str ()) << endl;
+  *mlog << _f ("time: %.2f seconds",  timer.read ()) << endl;
+
+  return h;
 }
 
 void
-Break_algorithm::print_stats()const
+Break_algorithm::do_set_pscore ()
 {
-    if (approx_stats_.count_i_)
-	*mlog << "\nApproximated: " << approx_stats_.str() << "\n";
-    if (exact_stats_.count_i_)
-	*mlog << "Calculated exactly: " << exact_stats_.str() << "\n";
+
 }