From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 20 May 2007 21:07:30 +0000 (-0300)
Subject: fix thinko in computation of average force.
X-Git-Tag: release/2.11.25-1~7
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9c21d283f744d73918c8b1c83904f3b66892b65f;p=lilypond.git

fix thinko in computation of average force.
---

diff --git a/lily/optimal-page-breaking.cc b/lily/optimal-page-breaking.cc
index a0ba883396..f25d75f039 100644
--- a/lily/optimal-page-breaking.cc
+++ b/lily/optimal-page-breaking.cc
@@ -44,9 +44,9 @@ Optimal_page_breaking::solve ()
   message (_ ("Finding the ideal number of pages..."));
   set_to_ideal_line_configuration (0, end);
   
-  Line_division ideal_line_division = current_configuration (0);
   Page_spacing_result best = space_systems_on_best_pages (0, first_page_num);
   vsize page_count = best.systems_per_page_.size ();
+  Line_division ideal_line_division = current_configuration (0);
   Line_division best_division = ideal_line_division;
 
   vsize ideal_sys_count = best.system_count ();
@@ -95,10 +95,12 @@ Optimal_page_breaking::solve ()
       if (best_for_this_sys_count.systems_per_page_.size () < page_count)
 	{
 	  /* if the pages are stretched on average, stop trying to reduce sys_count */
-	  Real avg_f = 0;
+	  Real average_force = 0;
 	  for (vsize i = 0; i < best_for_this_sys_count.systems_per_page_.size (); i++)
-	    avg_f += best_for_this_sys_count.systems_per_page_[i];
-	  if (avg_f > 0)
+	    average_force += best_for_this_sys_count.force_[i];
+
+	  average_force /= best_for_this_sys_count.page_count (); 
+	  if (average_force > 0)
 	    break;
 	}