X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbreak-algorithm.cc;h=d784b594f48c68de45340575485c7d7709f35508;hb=3d8dbaf926ecdf3b417fc45d1050f4de1cc07d40;hp=6674d5bcf0e8c1b130a3fb1a2050bbf7845748d4;hpb=998986bbd15afaafb24904a777e8be9ba1233799;p=lilypond.git

diff --git a/lily/break-algorithm.cc b/lily/break-algorithm.cc
index 6674d5bcf0..d784b594f4 100644
--- a/lily/break-algorithm.cc
+++ b/lily/break-algorithm.cc
@@ -3,182 +3,38 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996,  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "score-column.hh"
-#include "break.hh"
-#include "paper-def.hh"
-#include "spring-spacer.hh"
-#include "debug.hh"
-#include "line-of-score.hh"
+#include "break-algorithm.hh"
+#include "paper-column.hh"
+#include "output-def.hh"
+#include "system.hh"
 #include "paper-score.hh"
 #include "paper-column.hh"
 #include "cpu-timer.hh"
-#include "command-request.hh"
-#include "spring-spacer.hh"
 #include "simple-spacer.hh"
 
-
-String
-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)
-{
-  count_i_++;
-  cols_i_ += line.size ();
-}
-
-
-Col_stats::Col_stats ()
-{
-  count_i_ =0;
-  cols_i_ =0;
-}
-
-/* **************************************************************** */
-
-
-Array<int>
-Break_algorithm::find_break_indices () const
-{
-  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 ())
-      retval.push (i);
-
-  if (linelength <=0)
-    while (retval.size () >2)
-      retval.del (1);
-
-  return retval;
-}
-
-
-Line_of_cols
-Break_algorithm::find_breaks () const
-{
-  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 ())
-      retval.push (all[i]);
-
-  if (linelength <=0)
-    while (retval.size () >2)
-      retval.del (1);
-
-  return retval;
-}
-
-
-Line_spacer*
-Break_algorithm::generate_spacing_problem (Line_of_cols curline, Interval line) const
-{
-  Real r = pscore_l_->paper_l_->get_var ("simple_spacing_solver");
-    
-  Line_spacer * sp = 0;
-  if (r)
-    sp = new Simple_spacer;
-  else
-    sp = new Spring_spacer;
-  
-  sp->default_space_f_ = pscore_l_->paper_l_->get_var ("loose_column_distance");
-
-  sp->indent_f_ = line[LEFT];
-
-  /*
-    sort out how interfacing this should work;
-   */
-  if (line.empty_b())
-    {
-     sp->line_len_f_ = -1;
-    }
-  else
-    sp->line_len_f_ = line.length ();
-  
-  sp->add_columns (curline);
-  sp->prepare ();
-
-  return sp;
-}
-
 Break_algorithm::Break_algorithm ()
 {
-  pscore_l_ = 0;
-  get_line_spacer =0;
-  linelength = 0;
-}
-
-void
-Break_algorithm::set_pscore (Paper_score*s)
-{
-  pscore_l_ = s;
-  linelength = s->paper_l_->linewidth_f ();
-  do_set_pscore ();
-}
-
-bool
-Break_algorithm::feasible (Line_of_cols curline) const
-{
-  if (linelength <=  0)
-    return true;
-
-  for (int i=0; i < curline.size (); i++)
-    {
-      if (i && i < curline.size () -1
-	  && ((dynamic_cast<Score_column*>(curline[i]))->break_penalty_i () >= Break_req::FORCE))
-	return false;
-    }
-  return true;
+  pscore_ = 0;
+  linewidth_ = 0;
 }
 
 void
-Break_algorithm::problem_OK () const
+Break_algorithm::set_pscore (Paper_score *s)
 {
-  if (pscore_l_->col_l_arr_.empty ())
-    error (_("score does not have any columns"));
-  OK ();
+  pscore_ = s;
+  linewidth_ = s->layout ()->get_dimension (ly_symbol2scm ("line-width"));
 }
 
-void
-Break_algorithm::OK () const
+vector<Column_x_positions>
+Break_algorithm::solve () 
 {
-}
-
-Array<Column_x_positions>
-Break_algorithm::solve () const
-{
-  Cpu_timer timer;
-
-  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 %s exactly", exact_stats_.str ()) << endl;
-  *mlog << _f ("elapsed time %.2f seconds",  timer.read ()) << endl;
-
+  vector<Column_x_positions> h;
   return h;
 }
 
-void
-Break_algorithm::do_set_pscore ()
+Break_algorithm::~Break_algorithm ()
 {
-
 }