lilypond-0.1.1

diff --git a/lily/include/ineq-constrained-qp.hh b/lily/include/ineq-constrained-qp.hh
index 161bc51f469467d6a3904a746703137e80b19a17..d3cab9322c2c7b85039a127032b179f9f6f6c324 100644 (file)
--- a/lily/include/ineq-constrained-qp.hh
+++ b/lily/include/ineq-constrained-qp.hh
@@ -31,6 +31,10 @@ public:
       */
     void assert_solution(Vector sol) const;
     /// solve the problem using a projected gradient method
+    Vector constraint_solve(Vector)const;
+    /**
+      Solve it. First try it the easy way.
+     */
     Vector solve(Vector start) const;
     
     /**

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index 09ee833db0ed22dc3295e198e1d3daf9c13939b4..25e5f2b63f393d7d38276bb80187513469d27a64 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -29,6 +29,8 @@ void
 Music_iterator::print() const
 {
 #ifndef NPRINT
+    if ( !check_debug)
+       return ;
     mtor << name() << "{";
     mtor << "report to " << 
        report_to_l() << " (" << report_to_l()->name() << ")\n";
@@ -200,8 +202,6 @@ Chord_iterator::process_and_next(Moment until)
            i++;
     }
     Music_iterator::process_and_next(until);
-
-//    assert(!ok() || next_moment() > until);
 }
 
 
@@ -210,7 +210,7 @@ IMPLEMENT_IS_TYPE_B1(Chord_iterator,Music_iterator);
 Moment
 Chord_iterator::next_moment()const
 {
-    Moment next_ = INFTY_f;
+    Moment next_ = infinity_mom;
     for (PCursor<Music_iterator*> i(children_p_list_.top()); i.ok(); i++)
        next_ = next_ <? i->next_moment() ;
     return next_;