release: 1.2.14

[lilypond.git] / lily / break-algorithm.cc

diff --git a/lily/break-algorithm.cc b/lily/break-algorithm.cc
index 1208f4021a42824ffe90e47049d9fbeea4547072..fd5955fc3845a604f55641acf4e0d33e65a6794d 100644 (file)
--- a/lily/break-algorithm.cc
+++ b/lily/break-algorithm.cc
@@ -7,48 +7,18 @@
 */
 
 #include "score-column.hh"
-#include "break.hh"
+#include "break-algorithm.hh"
 #include "paper-def.hh"
-#include "spring-spacer.hh"
 #include "debug.hh"
 #include "line-of-score.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>
@@ -87,18 +57,13 @@ Break_algorithm::find_breaks () const
 }
 
 
-Line_spacer*
+Simple_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");
+  Simple_spacer * sp =  new Simple_spacer;
+  Paper_def * d = pscore_l_->paper_l_;
+  sp->compression_energy_factor_f_ = d->get_var ("compression_energy_factor");
+  sp->default_space_f_ = d->get_var ("loose_column_distance");
 
   sp->indent_f_ = line[LEFT];
 
@@ -113,7 +78,7 @@ Break_algorithm::generate_spacing_problem (Line_of_cols curline, Interval line)
     sp->line_len_f_ = line.length ();
   
   sp->add_columns (curline);
-  sp->prepare ();
+
 
   return sp;
 }
@@ -121,7 +86,6 @@ Break_algorithm::generate_spacing_problem (Line_of_cols curline, Interval line)
 Break_algorithm::Break_algorithm ()
 {
   pscore_l_ = 0;
-  get_line_spacer =0;
   linelength = 0;
 }
 
@@ -164,16 +128,8 @@ Break_algorithm::OK () const
 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;
-
+  
   return h;
 }