* lily/simple-spacer.cc (LY_DEFINE): ly_solve_spring_rod_problem:

[lilypond.git] / lily / include / simple-spacer.hh

diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh
index 1f6fc479c09714833435adfe94c2441a16f2ec8b..755bdb7008de2879c695f753f3f7fe495694951f 100644 (file)
--- a/lily/include/simple-spacer.hh
+++ b/lily/include/simple-spacer.hh
@@ -1,47 +1,73 @@
 /*   
-  simple-spacer.hh -- declare 
+  simple-spacer.hh -- declare Simple_spacer
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #ifndef SIMPLE_SPACER_HH
 #define SIMPLE_SPACER_HH
 
-#include "real.hh"
-#include "array.hh"
+#include "parray.hh"
 #include "lily-proto.hh"
-#include "list.hh"
-#include "drul-array.hh"
+#include "smobs.hh"
 
-struct Rod_info {
-  Real distance_f_;
-  Drul_array<int> cols_;
+struct Spring_description
+{
+  Real ideal_;
+  Real hooke_;
+  bool is_active_;
+  Real block_force_;
+
+  Real length (Real force) const;
+  Spring_description ();
+
+  bool is_sane () const;
 };
 
-struct Spring_info {
-  /// the ideal distance
-  Real space_f_;
+class Simple_spacer
+{
+public:
+  Array<Spring_description> springs_;
+  Real force_;
+  Real indent_;
+  Real line_len_;
+  Real default_space_;
+  int active_count_;
 
-  /// Hooke's constant: how strong are the "springs" attached to columns
-  Real hooke_f_;
+  Simple_spacer ();
+  
+  
+  void my_solve_linelen ();
+  void my_solve_natural_len ();
+  Real active_springs_stiffness () const;
+  Real range_stiffness (int, int) const;
+  void add_rod (int l, int r, Real dist);
+  void add_spring (Real, Real);
+  Real range_ideal_len (int l, int r) const;
+  Real active_blocking_force ()const;
+  Real configuration_length ()const;
+  void set_active_states ();
+  bool is_active () const;
 
-  Real blocking_stretch_f_;
-  Rod_info * blocking_rod_l_;
-  void set (Idealspacing *);
-  Spring_info();
+  DECLARE_SIMPLE_SMOBS(Simple_spacer, );
 };
 
 
-class Simple_spring_spacer {
-  Array<Spring_info> springs_;
-  Pointer_list<Rod_info*> rods_;
+struct Simple_spacer_wrapper
+{
+  Simple_spacer *spacer_;
+  Link_array<Grob> spaced_cols_;
+  Link_array<Grob> loose_cols_;
 
-  void init ();
-  Array<Real> solve ();
-  
+  Simple_spacer_wrapper ();
+  void add_columns (Link_array<Grob> const &);
+  void solve (Column_x_positions *, bool);
+  ~Simple_spacer_wrapper();
+private:
+  Simple_spacer_wrapper(Simple_spacer_wrapper const&);
 };
 
 #endif /* SIMPLE_SPACER_HH */