X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fgourlay-breaking.cc;h=c05731f1490ff968492f7e23057f2343cff0da96;hb=df4a7c4a55148e065d878dcc2f7e09ac27ea9c32;hp=85533c517b02ad5b79d122bfa492898fc8d900d5;hpb=1a66290a98e7de8d6d41485b5b71a9f7e1fe35c7;p=lilypond.git

diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc
index 85533c517b..c05731f149 100644
--- a/lily/gourlay-breaking.cc
+++ b/lily/gourlay-breaking.cc
@@ -3,179 +3,191 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
+#include <math.h>		// rint
 
 #include "gourlay-breaking.hh"
-#include "colhpos.hh"
-#include "spring-spacer.hh"
+#include "column-x-positions.hh"
 #include "debug.hh"
-#include "p-col.hh"
-#include "p-score.hh"
+#include "paper-column.hh"
+#include "paper-score.hh"
 #include "paper-def.hh"
+#include "simple-spacer.hh"
+#include "line-of-score.hh"
 
-
-const HAPPY_DOTS_I = 3;
+/// How often to print operator pacification marks?
+const int HAPPY_DOTS_I = 3;
 
 /**
   Helper to trace back an optimal path 
  */
 struct Break_node {
-    /** this was the previous. If negative, this break should not be
-      considered: this path has infinite energy
-      
-     */
-    int prev_break_i_;
-    Real energy_f_;
-    Col_hpositions line_config_;
-    Break_node() {
-	prev_break_i_ = -1;
-    }
+  /** this was the previous. If negative, this break should not be
+    considered: this path has infinite energy
+    
+    */
+  int prev_break_i_;
+  /**
+     Which system number so far?
+   */
+  int line_i_;
+
+  Real demerits_f_;
+  Column_x_positions line_config_;
+  
+  Break_node () 
+  {
+    prev_break_i_ = -1;
+    line_i_ = 0;
+    demerits_f_ = 0;
+  }
 };
 
 /**
-  This algorithms is adapted from 
- */
+  This algorithms is adapted from the OSU Tech report on breaking lines.
 
-Array<Col_hpositions>
-Gourlay_breaking::do_solve()const
+  this function is longish, but not very complicated.
+  
+ */
+Array<Column_x_positions>
+Gourlay_breaking::do_solve () const
 {
+  Array<Break_node> optimal_paths;
+  Link_array<Grob> all =
+    pscore_l_->line_l_->column_l_arr ();
+  
+  Array<int> breaks = find_break_indices ();
+  
+  optimal_paths.set_size (breaks.size ());
 
-    Array<Break_node> optimal_paths;
-    Line_of_cols all = all_cols();
-    Array<int> breaks = find_break_indices();
-    
-    optimal_paths.set_size (breaks.size());
-
-    Break_node first_node ;
-    first_node.prev_break_i_ = -1;
-    first_node.line_config_.energy_f_ = 0;
-    
-    optimal_paths[0] = first_node; 
-    int break_idx=1;
-
+  Break_node first_node ;
   
-    for (; break_idx< breaks.size(); break_idx++) {
-	Array<int> candidates;
-	Array<Col_hpositions> candidate_lines;
-	Pointer_list<Line_spacer*> spacer_p_list;
-	
-	/*
-	  start with a short line, add measures. At some point 
-	  the line becomes infeasible. Then we don't try to add more 
-	 */
-	for (int start_idx = break_idx; start_idx--;){
-	    if  (break_idx - start_idx > max_measures_i_) 
-		break;
-
-	    if (optimal_paths[start_idx].prev_break_i_ < 0
-		&& optimal_paths[start_idx].line_config_.energy_f_)
-		
-		continue;
-	    
-	    Line_of_cols line = all.slice (breaks[start_idx], breaks[break_idx]+1);
-	    
-	    line[0] = line[0]->postbreak_p_;
-	    line.top() = line.top ()->prebreak_p_;
-	    
-	    if (!feasible (line))
-		break;
-	    
-	    Col_hpositions approx;
-	    approx.cols = line;
-	    
-	    approx.spacer_l_ = generate_spacing_problem (line);
-	    spacer_p_list.bottom().add (approx.spacer_l_);
+  optimal_paths[0] = first_node; 
+  int break_idx=1;
+
+  for (; break_idx< breaks.size (); break_idx++) 
+    {
+      /*
+	start with a short line, add measures. At some point 
+	the line becomes infeasible. Then we don't try to add more 
+	*/
+      int minimal_start_idx = -1;
+      Column_x_positions minimal_sol;
+      Column_x_positions backup_sol;
+      
+      Real minimal_demerits = infinity_f;
 
-	    ((Break_algorithm*)this)->approx_stats_.add (approx.cols);
-	    approx.approximate_solve_line();
+      for (int start_idx = break_idx; start_idx--;)
+	{
+	  Link_array<Grob> line = all.slice (breaks[start_idx], breaks[break_idx]+1);
+  
+	  line[0]     = dynamic_cast<Item*> (line[0])    ->find_prebroken_piece (RIGHT);
+	  line.top () = dynamic_cast<Item*> (line.top ())->find_prebroken_piece (LEFT);
 	    
-	    if  (approx.energy_f_  > energy_bound_f_){ 
-		continue;
+	  Column_x_positions cp;
+	  cp.cols_ = line;
+
+	  Interval line_dims
+	    = pscore_l_->paper_l_->line_dimensions_int (optimal_paths[start_idx].line_i_);
+	  Simple_spacer * sp = generate_spacing_problem (line, line_dims);
+	  sp->solve (&cp);
+	  delete sp;
+
+	  if (start_idx == break_idx - 1)
+	    backup_sol = cp;	// in case everything fucks up
+	  if (!cp.satisfies_constraints_b_)
+	    break;
+
+	  
+	  Real this_demerits;
+	  if (optimal_paths[start_idx].demerits_f_ >= infinity_f)
+	    this_demerits = infinity_f;
+	  else
+	    this_demerits = combine_demerits (optimal_paths[start_idx].line_config_, cp)
+	      + optimal_paths[start_idx].demerits_f_;
+
+	  if (this_demerits < minimal_demerits) 
+	    {
+	      minimal_start_idx = start_idx;
+	      minimal_sol = cp;
+	      minimal_demerits = this_demerits;
 	    }
-
-	    
-	    // this is a likely candidate. Store it.
-	    candidate_lines.push (approx);
-	    candidates.push (start_idx);
 	}
 
-	    
-	int minimal_j = -1;
-	Real minimal_energy = infinity_f;
-	for (int j=0; j < candidates.size(); j++) {
-	    int start = candidates[j];
-	    if ( optimal_paths[start].line_config_.energy_f_
-		 + candidate_lines[j].energy_f_  > minimal_energy)
-		
-		continue;
-
-	    if ( !candidate_lines[j].satisfies_constraints_b_) {
-		 candidate_lines[j].solve_line();
-		 ((Break_algorithm*)this)->exact_stats_.add ( candidate_lines[j].cols);
-	    }
-	    
-	    Real this_energy 
-		= optimal_paths[start].line_config_.energy_f_ 
-		+ candidate_lines[j].energy_f_ ;
-	    
-	    if ( this_energy < minimal_energy) {
-		minimal_j = j;
-		minimal_energy = this_energy;
-	    }
+      int prev =break_idx - 1;
+      if (minimal_start_idx < 0) 
+	{
+	  optimal_paths[break_idx].demerits_f_ = infinity_f;
+	  optimal_paths[break_idx].line_config_ = backup_sol;	  
 	}
-
-	if (minimal_j < 0) {
-	    optimal_paths[break_idx].prev_break_i_ = -1;
-	    optimal_paths[break_idx].line_config_.energy_f_ = infinity_f;
-	} else {
-	    optimal_paths[break_idx].prev_break_i_ = candidates[minimal_j];
-	    optimal_paths[break_idx].line_config_ = candidate_lines[minimal_j];
+      else 
+	{
+	  prev = minimal_start_idx;
+	  optimal_paths[break_idx].line_config_ = minimal_sol;
+	  optimal_paths[break_idx].demerits_f_ = minimal_demerits;
 	}
+      optimal_paths[break_idx].prev_break_i_ = prev;
+      optimal_paths[break_idx].line_i_ = optimal_paths[prev].line_i_ + 1;
 
-	if ( !(break_idx % HAPPY_DOTS_I))
-	    *mlog << "[" << break_idx << "]"<<flush;
+      if (! (break_idx % HAPPY_DOTS_I))
+	progress_indication (String ("[") + to_str (break_idx) + "]");
     }
 
-    if  ( break_idx % HAPPY_DOTS_I) 
-	*mlog << "[" << break_idx << "]"<<flush;
-    print_stats();
+  /* do the last one */
+  if  (break_idx % HAPPY_DOTS_I)
+    progress_indication (String ("[") + to_str (break_idx) + "]");    
 
-    
 
-    Array<int> final_breaks;
+  progress_indication ("\n");
 
-    Array<Col_hpositions> lines;
-    /* skip 0-th element, since it is a "dummy" elt*/
-    for (int i = optimal_paths.size()-1; i> 0;) {
-	final_breaks.push ( i);
-	assert ( i > optimal_paths[i].prev_break_i_);
+  Array<int> final_breaks;
+  Array<Column_x_positions> lines;
 
-	// there was no "feasible path"
-	if (!optimal_paths[i].line_config_.config.size())
-	   return lines; 
-	i = optimal_paths[i].prev_break_i_;
+  /* skip 0-th element, since it is a "dummy" elt*/
+  for (int i = optimal_paths.size ()-1; i> 0;) 
+    {
+      final_breaks.push (i);
+      int prev = optimal_paths[i].prev_break_i_;
+      assert (i > prev);
+      i = prev;
     }
 
-    for (int i= final_breaks.size(); i--;) 
-	lines.push ( optimal_paths[final_breaks[i]].line_config_);
-
-    
-    return lines;
+  if (optimal_paths.top ().demerits_f_ >= infinity_f)
+    warning (_ ("No feasible line breaking found"));
+  
+  for (int i= final_breaks.size (); i--;) 
+    lines.push (optimal_paths[final_breaks[i]].line_config_);
+  
+  return lines;
 }
 
 
-Gourlay_breaking::Gourlay_breaking()
+Gourlay_breaking::Gourlay_breaking ()
 {
-    get_line_spacer = Spring_spacer::constructor;
-    energy_bound_f_ = infinity_f;
-    max_measures_i_ = INT_MAX;
 }
 
-void
-Gourlay_breaking::do_set_pscore()
+
+
+/*
+  TODO: uniformity parameter to control rel. importance of spacing differences.
+ */
+Real
+Gourlay_breaking::combine_demerits (Column_x_positions const &prev,
+				    Column_x_positions const &this_one) const
 {
-    energy_bound_f_ = pscore_l_->paper_l_->get_var ("gourlay_energybound");
-    max_measures_i_ =int (rint (pscore_l_->paper_l_->get_var ("gourlay_maxmeasures")));
+  Real break_penalties = 0.0;
+  Grob * pc = this_one.cols_.top ();
+  if (pc->original_l_)
+    {
+      SCM pen = pc->get_grob_property ("penalty");
+      if (gh_number_p (pen))
+	{
+	  break_penalties += gh_scm2double (pen);
+	}
+    }
+
+  return abs (this_one.force_f_) + abs (prev.force_f_ - this_one.force_f_)
+    + break_penalties;
 }