X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcolumn-x-positions.cc;h=40e969e7288840472ad3a624559263fcacd43452;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=894844de4502aa4979391ad0a4de7f817132b58c;hpb=d9d9a1b85f7d68dd35fb435c5ca315c6eb793af0;p=lilypond.git

diff --git a/lily/column-x-positions.cc b/lily/column-x-positions.cc
index 894844de45..40e969e728 100644
--- a/lily/column-x-positions.cc
+++ b/lily/column-x-positions.cc
@@ -1,78 +1,15 @@
 /*
-  colhpos.cc -- implement Column_x_positions
+  column-x-positions.cc -- implement Column_x_positions
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "column-x-positions.hh"
-#include "real.hh"
-#include "debug.hh"
-#include "vector.hh"
-#include "line-spacer.hh"
 
-Column_x_positions::Column_x_positions()
+Column_x_positions::Column_x_positions ()
 {
-  energy_f_ = infinity_f;
-  satisfies_constraints_b_ = false;
-  spacer_l_ =0;
+  satisfies_constraints_ = true;
+  force_ = 0;
 }
-
-Column_x_positions::~Column_x_positions()
-{
-
-}
-
-void
-Column_x_positions::add_paper_column (Paper_column*c)
-{
-  cols_.push (c);
-}
-
-void
-Column_x_positions::print() const
-{
-#ifndef NPRINT
-  DOUT << "energy : " << energy_f_ << '\n';
-  DOUT << "line of " << config_.size() << " cols\n";
-  Vector v (config_);
-  DOUT << v;
-#endif
-}
-
-void
-Column_x_positions::OK() const
-{
-#ifndef NDEBUG
-  assert (config_.size() == cols_.size ());
-#endif
-}
-
-void
-Column_x_positions::set_stupid_solution(Vector v)
-{
-  energy_f_ = infinity_f;
-  config_ = v;
-}
-
-void
-Column_x_positions::stupid_solution()
-{
-  set_stupid_solution (spacer_l_->default_solution());
-}
-
-void
-Column_x_positions::solve_line() 
-{
-  spacer_l_->solve (this);
-}
-
-
-void
-Column_x_positions::approximate_solve_line() 
-{
-  spacer_l_->lower_bound_solution (this);
-}
-
-