patch::: 1.0.15.jcn3: guilig atoom

[lilypond.git] / lily / include / qlpsolve.hh

diff --git a/lily/include/qlpsolve.hh b/lily/include/qlpsolve.hh
index 6c018c5a9f5e1cacae7debfbae57e542bebe8d87..bf04b55d843de97cd6d7edad9e61bb319e5967d5 100644 (file)
--- a/lily/include/qlpsolve.hh
+++ b/lily/include/qlpsolve.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -35,27 +35,29 @@ class Active_constraints {
   Ineq_constrained_qp const *opt;
 
 public:
+
+  int degenerate_count_i_;
   String status() const;
     
-  Vector vec (int k) const { return opt->cons[k]; }
-  Real rhs (int k) const { return opt->consrhs[k]; }
+  Vector vec (int k) const { return opt->cons_[k]; }
+  Real rhs (int k) const { return opt->consrhs_[k]; }
     
 
   /** drop constraint. drop constraint k from the active set. k is the index of the
     constraint in #active#
     
     */
-  void drop (int k);
+  void drop_constraint (int k);
     
 
   /** add constraint j.
     add constraint j to the active set j is the index of the
     constraint in #inactive#   
     */
-  void add (int j);
+  void add_constraint (int j);
 
   /// exchange in and out.
-  void exchange (int in, int out) { add (in); drop (out); }
+  void exchange (int in, int out) { add_constraint (in); drop_constraint (out); }
     
 
   Vector find_active_optimum (Vector g);