partial: 0.0.39-1.jcn

[lilypond.git] / src / break.cc

diff --git a/src/break.cc b/src/break.cc
index 2a0586edff2b0e0775029ba4dcf5074b787c1b04..7d219186372aa1ed179bea4fc310bc3e988c3c64 100644 (file)
--- a/src/break.cc
+++ b/src/break.cc
@@ -1,9 +1,8 @@
 /*
-    do calculations for breaking problem
-    
+    do calculations for breaking problem    
     */
 #include "break.hh"
-#include "paper.hh"
+#include "paper-def.hh"
 #include "linespace.hh"
 #include "debug.hh"
 #include "scoreline.hh"
@@ -13,19 +12,19 @@
 /*
   return all breakable columns
  */
-Array<PCol *>
+Line_of_cols
 Break_algorithm::find_breaks() const
 {
-    Array<PCol *> retval;
+    Line_of_cols retval;
     for (iter_top(pscore_.cols,c); c.ok(); c++)
-       if (c->breakable())
-           retval.add(c);
-
+       if (c->breakable_b())
+           retval.push(c);
+    assert(retval.top() == pscore_.cols.bottom().ptr());
     return retval;
 }
 
 // construct an appropriate Spacing_problem and solve it. 
-Array<Real>
+Col_hpositions
 Break_algorithm::solve_line(Line_of_cols curline) const
 {
    Spacing_problem sp;
@@ -33,14 +32,19 @@ Break_algorithm::solve_line(Line_of_cols curline) const
    sp.add_column(curline[0], true, 0.0);
    for (int i=1; i< curline.size()-1; i++)
        sp.add_column(curline[i]);
-   sp.add_column(curline.last(), true, linelength);
+   sp.add_column(curline.top(), true, linelength);
 
    // misschien  moeven uit Spacing_problem? 
    for (iter_top(pscore_.suz,i); i.ok(); i++) {
        sp.add_ideal(i);
    }
    Array<Real> the_sol=sp.solve();
-   return the_sol;
+   Col_hpositions col_hpos;
+   col_hpos.cols = curline;
+   col_hpos.energy = the_sol.pop();
+   col_hpos.config = the_sol;
+   col_hpos.OK();
+   return col_hpos;
 }
 
 Break_algorithm::Break_algorithm(PScore&s)
@@ -67,44 +71,7 @@ Break_algorithm::problem_OK() const
     iter_top(pscore_.cols,start);
     PCursor<PCol *> end (pscore_.cols.bottom());
     
-    assert(start->breakable());    
-    assert(end->breakable());
-#endif
-}
-
-/****************/
-
-Col_configuration::Col_configuration()
-{
-    energy = INFTY;
-}
-
-void
-Col_configuration::add( PCol*c)
-{
-    cols.add(c);
-}
-
-void
-Col_configuration::setsol(Array<Real> sol)
-{
-    config = sol;
-    energy = config.last();
-    config.pop();
-}
-
-void
-Col_configuration::print() const
-{
-#ifndef NPRINT
-    mtor << "energy : " << energy << '\n';
-    mtor << "line of " << config.size() << " cols\n";
-#endif
-}
-void
-Col_configuration::OK()const
-{
-#ifndef NDEBUG
-    assert(config.size() == cols.size());
+    assert(start->breakable_b());    
+    assert(end->breakable_b());
 #endif
 }