From e5c3a7a6f7b28359a407317445846dbe92f571a6 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:31:29 +0000 Subject: [PATCH] lilypond-0.0.31 --- hdr/item.hh | 1 - hdr/key.hh | 4 +++- hdr/keyitem.hh | 2 +- hdr/qlp.hh | 14 ++++++++++---- hdr/qlpsolve.hh | 13 +++++++++++++ 5 files changed, 27 insertions(+), 7 deletions(-) diff --git a/hdr/item.hh b/hdr/item.hh index e934f279f7..a5a9442dc9 100644 --- a/hdr/item.hh +++ b/hdr/item.hh @@ -16,7 +16,6 @@ spacing calculation. */ - struct Item : Staff_elem { /// indirection to the column it is in PCol * pcol_l_; diff --git a/hdr/key.hh b/hdr/key.hh index fa41082fd8..7a755244a8 100644 --- a/hdr/key.hh +++ b/hdr/key.hh @@ -1,5 +1,5 @@ /* - key.hh -- part of LilyPond + key.hh -- declare Key (c) 1996,97 Han-Wen Nienhuys */ @@ -10,6 +10,7 @@ #include "varray.hh" #include "scalar.hh" +/// administration of current key class Key { Array accidentals; @@ -24,6 +25,7 @@ public: int acc(int i) { return accidentals[i]; } }; +/// administration of accidentals struct Local_key { void reset(Key); diff --git a/hdr/keyitem.hh b/hdr/keyitem.hh index 1d1d2e37f0..b882c9551a 100644 --- a/hdr/keyitem.hh +++ b/hdr/keyitem.hh @@ -12,7 +12,7 @@ struct Clef; -/// An item which places accidentals at the start of the line +/// An item which places accidentals at the start of the line struct Keyitem : Item { const char * name() const; Array pitch; diff --git a/hdr/qlp.hh b/hdr/qlp.hh index 6e82aa9c40..7bc667b956 100644 --- a/hdr/qlp.hh +++ b/hdr/qlp.hh @@ -1,3 +1,11 @@ +/* + qlp.hh -- declare Ineq_constrained_qp, Mixed_qp + + source file of the LilyPond music typesetter + + (c) 1997 Han-Wen Nienhuys +*/ + #ifndef QLP_HH #define QLP_HH @@ -18,8 +26,8 @@ public: /** use a KKT method to assert optimality of sol */ - void assert_solution(Vector sol) const; - /// solve the problem using a projected gradient method + void assert_solution(Vector sol) const; + /// solve the problem using a projected gradient method Vector solve(Vector start) const; /** return the number of variables in the problem */ @@ -61,8 +69,6 @@ public: x^T QUAD x /2 + b^T x */ - - class Mixed_qp :public Ineq_constrained_qp { Array eq_cons; Array eq_consrhs; diff --git a/hdr/qlpsolve.hh b/hdr/qlpsolve.hh index aefcc767e7..811556c362 100644 --- a/hdr/qlpsolve.hh +++ b/hdr/qlpsolve.hh @@ -1,3 +1,14 @@ +/* + qlpsolve.hh -- declare Active_constraints, Inactive_iter + + source file of the LilyPond music typesetter + + (c) 1997 Han-Wen Nienhuys +*/ + + +#ifndef QLPSOLVE_HH +#define QLPSOLVE_HH #include "qlp.hh" #include "matrix.hh" @@ -76,3 +87,5 @@ public: Real rhs() const { return ac->rhs(constraint_id()); } bool ok() const { return j < ac->inactive.size(); } }; + +#endif // QLPSOLVE_HH -- 2.39.5