release: 1.1.30

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

diff --git a/lily/include/qlpsolve.hh b/lily/include/qlpsolve.hh
index db985df6c54a83e28ad0bf18f2d66b3a759de3dc..9a342527eec657ea47f33a56af1c6b29988b4aac 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--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -35,6 +35,10 @@ class Active_constraints {
   Ineq_constrained_qp const *opt;
 
 public:
+  
+  /** This counts the number of errors the algorithms makes.  The
+      optimum search should be abandoned if it becomes too high.  */
+  int degenerate_count_i_;
   String status() const;
     
   Vector vec (int k) const { return opt->cons_[k]; }
@@ -45,17 +49,17 @@ public:
     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);