X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftie-formatting-problem.hh;h=830ced2960b824847a49f3ffbb7b0490f4088251;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=3325d5338043c44914c7190289b5bbed800f8d79;hpb=7e33691750a97e1b66192cb484f479a173390132;p=lilypond.git

diff --git a/lily/include/tie-formatting-problem.hh b/lily/include/tie-formatting-problem.hh
index 3325d53380..830ced2960 100644
--- a/lily/include/tie-formatting-problem.hh
+++ b/lily/include/tie-formatting-problem.hh
@@ -1,9 +1,9 @@
 /*
-  tie-formatting-problem.hh -- declare
+  tie-formatting-problem.hh -- declare Tie_formatting_problem
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
@@ -11,105 +11,92 @@
 #define TIE_FORMATTING_PROBLEM_HH
 
 #include "drul-array.hh"
-#include "parray.hh"
 #include "skyline.hh"
-#include "lily-proto.hh"
 #include "tie-configuration.hh"
+#include "tie-details.hh"
+#include "tie-specification.hh"
+#include "tuple.hh"
 
 #include <map>
 #include <set>
 
-struct Tie_details
-{
-  Real height_limit_;
-  Real ratio_;
-  Real staff_space_;
-  Real x_gap_;
-  Real between_length_limit_;
-  Real wrong_direction_offset_penalty_;
-  Real distance_penalty_factor_;
-  Real length_penalty_factor_;
-  Real min_length_;
-  Real staff_line_clearance_;
-  Real staff_line_collision_penalty_;
-  Real dot_collision_clearance_;
-  Real dot_collision_penalty_;
-  Real tie_column_monotonicity_penalty_;
-  Real tie_tie_collision_penalty_;
-  Real tie_tie_collision_distance_;
-  
-  Grob *staff_symbol_referencer_;
-  
-  Tie_details ();
-  void from_grob (Grob *);
-};
-
-
-typedef map< pair<int, int>, Tie_configuration *> Tie_configuration_map;
-
-struct Tie_specification
-{
-  int position_;
-  Drul_array<Grob*> note_head_drul_;
-  
-  bool has_manual_position_;
-  bool has_manual_dir_;
-  
-  Real manual_position_;
-  Direction manual_dir_;
-  
-  Tie_specification ();
-};
+typedef map< Tuple<int,4>, Tie_configuration *> Tie_configuration_map;
 
 struct Tie_configuration_variation
 {
-  int index_;
-  Tie_configuration *suggestion_;
-  Tie_configuration_variation ();
+  vector<pair<int, Tie_configuration *> > index_suggestion_pairs_;
+  void add_suggestion(int index, Tie_configuration* suggestion)
+  {
+    index_suggestion_pairs_.push_back (make_pair (index, suggestion));
+  }
 };
 
+typedef map < Tuple<int, 2>, Skyline> Chord_outline_map;
+typedef map < Tuple<int, 2>, Box> Column_extent_map;
+typedef map <int, Slice> Position_extent_map;
+
 class Tie_formatting_problem
 {
-  Drul_array< Array<Skyline_entry> > chord_outlines_;
+  Chord_outline_map chord_outlines_;
+  Column_extent_map stem_extents_;
+  Column_extent_map head_extents_;
+  Position_extent_map head_positions_;
+  
   set<int> dot_positions_;
   Interval dot_x_;
-  Array<Tie_specification> specifications_;
+  vector<Tie_specification> specifications_;
+  bool use_horizontal_spacing_;
   
   Tie_configuration_map possibilities_;
 
   Grob *x_refpoint_;
+  Grob *y_refpoint_;
+
+  
+  Tie_configuration *get_configuration (int position, Direction dir, Drul_array<int> cols, bool tune_y) const;
+  Tie_configuration *generate_configuration (int position, Direction dir, Drul_array<int> cols, bool tune_y) const;
 
+  vector<Tie_configuration_variation> generate_collision_variations (Ties_configuration const &ties) const;
+  vector<Tie_configuration_variation> generate_extremal_tie_variations (Ties_configuration const &ties) const;
+  vector<Tie_configuration_variation> generate_single_tie_variations (Ties_configuration const &ties) const;
   
-  Tie_configuration *get_configuration (int position, Direction dir);
-  Tie_configuration *generate_configuration (int position, Direction dir) const;
-  Array<Tie_configuration_variation> get_variations (Ties_configuration const &ties);
-
-  Real score_configuration (Tie_configuration const &) const;
-  Real score_aptitude (Tie_configuration const &, Tie_specification const &) const;
-  Real score_ties_aptitude (Ties_configuration const &ties) const;
-  Real score_ties_configuration (Ties_configuration const &ties) const;
+  void score_configuration (Tie_configuration *) const;
+  Real score_aptitude (Tie_configuration *, Tie_specification const &,
+		       Ties_configuration *, int) const;
+  void score_ties_aptitude (Ties_configuration *ties) const;
+  void score_ties_configuration (Ties_configuration *ties) const;
   void set_ties_config_standard_directions (Ties_configuration *tie_configs_ptr);
-  Real score_ties (Ties_configuration const&) const;
-  Ties_configuration generate_base_chord_configuration ();
+  void score_ties (Ties_configuration *) const;
   
+  Slice head_positions_slice (int) const;
+  Ties_configuration generate_base_chord_configuration ();
+  Ties_configuration find_best_variation (Ties_configuration const &base,
+					  vector<Tie_configuration_variation> const &vars);
+
 public:
   Tie_details details_;
+  void print_ties_configuration (Ties_configuration const *);
 
+  Interval get_stem_extent (int, Direction, Axis) const; 
+  Interval get_head_extent (int, Direction, Axis) const; 
+  
 public:
   Tie_formatting_problem ();
   ~Tie_formatting_problem ();
 
   Tie_specification get_tie_specification (int) const;
-  Ties_configuration generate_optimal_chord_configuration ();
+  Ties_configuration generate_optimal_configuration ();
   Ties_configuration generate_ties_configuration (Ties_configuration const &);
-  Tie_configuration find_optimal_tie_configuration (Tie_specification const &) const;
-  void from_ties (Link_array<Grob> const &ties);
+
+  void from_ties (vector<Grob*> const &ties);
   void from_tie (Grob *tie);
-  void from_lv_ties (Link_array<Grob> const &);
-  void set_chord_outline (Link_array<Item>, Direction);
+  void from_semi_ties (vector<Grob*> const &, Direction head_dir);
+  void set_chord_outline (vector<Item*>, Direction);
+  void set_column_chord_outline (vector<Item*>, Direction, int rank);
   void set_manual_tie_configuration (SCM);
-  Interval get_attachment (Real) const;
+  Interval get_attachment (Real, Drul_array<int>) const;
   Grob *common_x_refpoint () const;
+  void set_debug_scoring (Ties_configuration const &);
 };
 
 #endif /* TIE_FORMATTING_PROBLEM_HH */