X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Ftie-formatting-problem.hh;h=1b8f203608541dc69e9591565c00730093090518;hb=d0ac289571b1621a86918939b098607ca67b75fb;hp=2563e206d6d6fd06e774f403613a83ad0173e12e;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git

diff --git a/lily/include/tie-formatting-problem.hh b/lily/include/tie-formatting-problem.hh
index 2563e206d6..1b8f203608 100644
--- a/lily/include/tie-formatting-problem.hh
+++ b/lily/include/tie-formatting-problem.hh
@@ -1,5 +1,5 @@
 /*
-  tie-formatting-problem.hh -- declare
+  tie-formatting-problem.hh -- declare Tie_formatting_problem
 
   source file of the GNU LilyPond music typesetter
 
@@ -11,52 +11,50 @@
 #define TIE_FORMATTING_PROBLEM_HH
 
 #include "drul-array.hh"
-#include "parray.hh"
+#include "std-vector.hh"
 #include "skyline.hh"
 #include "lily-proto.hh"
 #include "tie-configuration.hh"
+#include "tie-details.hh"
 
 #include <map>
 #include <set>
 
-struct Tie_details
+template<class T, int N>
+struct Tuple
 {
-  Real height_limit_;
-  Real ratio_;
-  Real staff_space_;
-  Real x_gap_;
-  Real stem_gap_; 
-  Real between_length_limit_;
-  Real wrong_direction_offset_penalty_;
-  Real length_penalty_factor_;
-  Real min_length_;
-  Real tip_staff_line_clearance_;
-  Real center_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_;
-  Real horizontal_distance_penalty_factor_;
-  Real vertical_distance_penalty_factor_;
-  Real intra_space_threshold_;
-  Real outer_tie_length_symmetry_penalty_factor_;
-  Real outer_tie_vertical_distance_symmetry_penalty_factor_;
-
-  Grob *staff_symbol_referencer_;
-  
-  Tie_details ();
-  void from_grob (Grob *);
+  T t_array[N];
+  Tuple (T const *src)
+  {
+    for (int i = 0; i < N; i++)
+      t_array[i] = src[i];
+  }
 };
 
+template<class T, int N>
+inline bool
+operator<(Tuple<T, N> const &t1,
+	  Tuple<T, N> const &t2)
+{
+  for (int i = 0; i < N ; i++)
+    {
+      if (t1.t_array[i] > t2.t_array[i])
+	return false;
+      if (t1.t_array[i] < t2.t_array[i])
+	return true;
+    }
+
+  return false;
+}
+
 
-typedef map< pair<int, int>, Tie_configuration *> Tie_configuration_map;
+typedef map< Tuple<int,4>, Tie_configuration *> Tie_configuration_map;
 
 struct Tie_specification
 {
   int position_;
   Drul_array<Grob*> note_head_drul_;
+  Drul_array<int> column_ranks_;
   
   bool has_manual_position_;
   bool has_manual_dir_;
@@ -65,6 +63,7 @@ struct Tie_specification
   Direction manual_dir_;
   
   Tie_specification ();
+  int column_span () const;
 };
 
 struct Tie_configuration_variation
@@ -74,33 +73,41 @@ struct Tie_configuration_variation
   Tie_configuration_variation ();
 };
 
+typedef   map <int, vector<Skyline_entry> > Chord_outline_map ;
 class Tie_formatting_problem
 {
-  Drul_array< std::vector<Skyline_entry> > chord_outlines_;
+  Chord_outline_map chord_outlines_;
   Drul_array< Box > stem_extents_;
+  Drul_array< Box > head_extents_;
   set<int> dot_positions_;
   Interval dot_x_;
-  std::vector<Tie_specification> specifications_;
+  vector<Tie_specification> specifications_;
   
   Tie_configuration_map possibilities_;
 
   Grob *x_refpoint_;
 
   
-  Tie_configuration *get_configuration (int position, Direction dir);
-  Tie_configuration *generate_configuration (int position, Direction dir) const;
-  std::vector<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;
+  Tie_configuration *get_configuration (int position, Direction dir, Drul_array<int> cols) const;
+  Tie_configuration *generate_configuration (int position, Direction dir, Drul_array<int> cols) 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;
+
+  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;
   
+  Ties_configuration generate_base_chord_configuration ();
+  Ties_configuration find_best_variation (Ties_configuration const &base,
+					  vector<Tie_configuration_variation> vars);
+
 public:
   Tie_details details_;
+  void print_ties_configuration (Ties_configuration const *);
 
 public:
   Tie_formatting_problem ();
@@ -110,12 +117,14 @@ public:
   Ties_configuration generate_optimal_chord_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;
 };