X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcolumn-x-positions.cc;h=1615e4a49a4ba4387536af9e2bdcbb5a676941ff;hb=7a9aad3db6fe6ee35bbcda9d9096b5d0df7ef639;hp=988cf4f054e2410d2b5685821dfc57026726b70c;hpb=998986bbd15afaafb24904a777e8be9ba1233799;p=lilypond.git

diff --git a/lily/column-x-positions.cc b/lily/column-x-positions.cc
index 988cf4f054..1615e4a49a 100644
--- a/lily/column-x-positions.cc
+++ b/lily/column-x-positions.cc
@@ -3,76 +3,24 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.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()
-{
-  energy_f_ = infinity_f;
-  satisfies_constraints_b_ = false;
-  spacer_l_ =0;
-}
-
-Column_x_positions::~Column_x_positions()
-{
 
-}
-
-void
-Column_x_positions::add_paper_column (Paper_column*c)
+Column_x_positions::Column_x_positions ()
 {
-  cols_.push (c);
+  satisfies_constraints_b_ = false;
+  force_ = 0;
 }
 
-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);
-}