release: 1.0.1

[lilypond.git] / lily / colhpos.cc

diff --git a/lily/colhpos.cc b/lily/colhpos.cc
index aade26ac49beb35a2888ddaf98bcb650611540dd..8e37871558d60de740afe0d684898cd19a39b6ef 100644 (file)
--- a/lily/colhpos.cc
+++ b/lily/colhpos.cc
@@ -1,9 +1,9 @@
 /*
-  colhpos.cc -- implement Col_hpositions
+  colhpos.cc -- implement Column_x_positions
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "colhpos.hh"
@@ -12,63 +12,69 @@
 #include "vector.hh"
 #include "line-spacer.hh"
 
-Col_hpositions::Col_hpositions()
+Column_x_positions::Column_x_positions()
 {
-    energy_f_ = infinity_f;
-    ugh_b_ = false;
-    satisfies_constraints_b_ = false;
-    spacer_l_ =0;
+  energy_f_ = infinity_f;
+  ugh_b_ = false;
+  satisfies_constraints_b_ = false;
+  spacer_l_ =0;
 }
 
-Col_hpositions::~Col_hpositions()
+Column_x_positions::~Column_x_positions()
 {
 
 }
 
 void
-Col_hpositions::add( PCol*c)
+Column_x_positions::add_paper_column (Paper_column*c)
 {
-    cols.push(c);
+  cols.push (c);
 }
 
 void
-Col_hpositions::print() const
+Column_x_positions::print() const
 {
 #ifndef NPRINT
-    mtor << "energy : " << energy_f_ << '\n';
-    mtor << "line of " << config.size() << " cols\n";
-    Vector v(config);
-    mtor << v;
+  DOUT << "energy : " << energy_f_ << '\n';
+  DOUT << "line of " << config.size() << " cols\n";
+  Vector v (config);
+  DOUT << v;
 #endif
 }
 
 void
-Col_hpositions::OK()const
+Column_x_positions::OK() const
 {
 #ifndef NDEBUG
-    assert(config.size() == cols.size());
+  assert (config.size() == cols.size ());
 #endif
 }
 
 void
-Col_hpositions::stupid_solution()
+Column_x_positions::set_stupid_solution(Vector v)
 {
-    energy_f_ = infinity_f;
-    ugh_b_ = true;
-    config = spacer_l_->default_solution();
+  energy_f_ = infinity_f;
+  ugh_b_ = true;
+  config = v;
 }
 
 void
-Col_hpositions::solve_line() 
+Column_x_positions::stupid_solution()
 {
-    spacer_l_->solve(this);
+  set_stupid_solution (spacer_l_->default_solution());
+}
+
+void
+Column_x_positions::solve_line() 
+{
+  spacer_l_->solve (this);
 }
 
 
 void
-Col_hpositions::approximate_solve_line() 
+Column_x_positions::approximate_solve_line() 
 {
-    spacer_l_->lower_bound_solution(this);
+  spacer_l_->lower_bound_solution (this);
 }