Housekeeping; 2005->2006, remove "notes for 2.6"

[lilypond.git] / lily / beam-quanting.cc

diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc
index 6ce2b7736ae9cc23affef172efb6fd93a24cc32c..e4cec84364b670b23da5f15980d5c498ae0a1999 100644 (file)
--- a/lily/beam-quanting.cc
+++ b/lily/beam-quanting.cc
@@ -12,12 +12,14 @@
 #include <algorithm>
 using namespace std;
 
 #include <algorithm>
 using namespace std;
 

-#include "warn.hh"
-#include "staff-symbol-referencer.hh"
-#include "stem.hh"
+#include "align-interface.hh"
+#include "international.hh"

 #include "output-def.hh"
 #include "pointer-group-interface.hh"
 #include "output-def.hh"
 #include "pointer-group-interface.hh"

-#include "align-interface.hh"
+#include "staff-symbol-referencer.hh"
+#include "stem.hh"
+#include "warn.hh"
+#include "main.hh"

 
 Real
 get_detail (SCM alist, SCM sym, Real def)
 
 Real
 get_detail (SCM alist, SCM sym, Real def)


@@ -60,8 +62,8 @@ struct Quant_score
   Real yr;
   Real demerits;
 
   Real yr;
   Real demerits;
 

-#if DEBUG_QUANTING
-  String score_card_;
+#if DEBUG_BEAM_SCORING
+  string score_card_;

 #endif
 };
 
 #endif
 };
 


@@ -77,11 +79,11 @@ struct Quant_score
 */
 
 int
 */
 
 int

-best_quant_score_idx (Array<Quant_score> const &qscores)
+best_quant_score_idx (vector<Quant_score> const &qscores)

 {
   Real best = 1e6;
   int best_idx = -1;
 {
   Real best = 1e6;
   int best_idx = -1;

-  for (int i = qscores.size (); i--;)
+  for (vsize i = qscores.size (); i--;)

     {
       if (qscores[i].demerits < best)
        {
     {
       if (qscores[i].demerits < best)
        {


@@ -122,8 +124,8 @@ Beam::quanting (SCM smob, SCM posns)
   Real quants [] = {straddle, sit, inter, hang };
 
   int num_quants = int (sizeof (quants) / sizeof (Real));
   Real quants [] = {straddle, sit, inter, hang };
 
   int num_quants = int (sizeof (quants) / sizeof (Real));

-  Array<Real> quantsl;
-  Array<Real> quantsr;
+  vector<Real> quantsl;
+  vector<Real> quantsr;

 
   /*
     going to REGION_SIZE == 2, yields another 0.6 second with
 
   /*
     going to REGION_SIZE == 2, yields another 0.6 second with


@@ -138,11 +140,11 @@ Beam::quanting (SCM smob, SCM posns)
     Do stem computations.  These depend on YL and YR linearly, so we can
     precompute for every stem 2 factors.
   */
     Do stem computations.  These depend on YL and YR linearly, so we can
     precompute for every stem 2 factors.
   */

-  Link_array<Grob> stems
+  vector<Grob*> stems

     = extract_grob_array (me, "stems");
     = extract_grob_array (me, "stems");

-  Array<Stem_info> stem_infos;
-  Array<Real> base_lengths;
-  Array<Real> stem_xposns;
+  vector<Stem_info> stem_infos;
+  vector<Real> base_lengths;
+  vector<Real> stem_xposns;

 
   Drul_array<bool> dirs_found (0, 0);
   Grob *common[2];
 
   Drul_array<bool> dirs_found (0, 0);
   Grob *common[2];


@@ -162,21 +164,21 @@ Beam::quanting (SCM smob, SCM posns)
     stem_y != 0.0, when we're cross staff.
 
   */
     stem_y != 0.0, when we're cross staff.
 
   */

-  for (int i = 0; i < stems.size (); i++)
+  for (vsize i = 0; i < stems.size (); i++)

     {
       Grob *s = stems[i];
 
       Stem_info si (Stem::get_stem_info (s));
       si.scale (1 / ss);
     {
       Grob *s = stems[i];
 
       Stem_info si (Stem::get_stem_info (s));
       si.scale (1 / ss);

-      stem_infos.push (si);
-      dirs_found[stem_infos.top ().dir_] = true;
+      stem_infos.push_back (si);
+      dirs_found[stem_infos.back ().dir_] = true;

 
       bool f = to_boolean (s->get_property ("french-beaming"))
        && s != lvs && s != fvs;
 
 
       bool f = to_boolean (s->get_property ("french-beaming"))
        && s != lvs && s != fvs;
 

-      base_lengths.push (calc_stem_y (me, s, common, xl, xr,
+      base_lengths.push_back (calc_stem_y (me, s, common, xl, xr,

                                      Interval (0, 0), f) / ss);
                                      Interval (0, 0), f) / ss);

-      stem_xposns.push (s->relative_coordinate (common[X_AXIS], X_AXIS));
+      stem_xposns.push_back (s->relative_coordinate (common[X_AXIS], X_AXIS));

     }
 
   bool xstaff = false;
     }
 
   bool xstaff = false;


@@ -187,7 +189,7 @@ Beam::quanting (SCM smob, SCM posns)
     }
 
   Direction ldir = Direction (stem_infos[0].dir_);
     }
 
   Direction ldir = Direction (stem_infos[0].dir_);

-  Direction rdir = Direction (stem_infos.top ().dir_);
+  Direction rdir = Direction (stem_infos.back ().dir_);

   bool is_knee = dirs_found[LEFT] && dirs_found[RIGHT];
 
   int region_size = (int) parameters.REGION_SIZE;
   bool is_knee = dirs_found[LEFT] && dirs_found[RIGHT];
 
   int region_size = (int) parameters.REGION_SIZE;


@@ -204,28 +206,28 @@ Beam::quanting (SCM smob, SCM posns)
   for (int i = -region_size; i < region_size; i++)
     for (int j = 0; j < num_quants; j++)
       {
   for (int i = -region_size; i < region_size; i++)
     for (int j = 0; j < num_quants; j++)
       {

-       quantsl.push (i + quants[j] + int (yl));
-       quantsr.push (i + quants[j] + int (yr));
+       quantsl.push_back (i + quants[j] + int (yl));
+       quantsr.push_back (i + quants[j] + int (yr));

       }
 
       }
 

-  Array<Quant_score> qscores;
+  vector<Quant_score> qscores;

 
 

-  for (int l = 0; l < quantsl.size (); l++)
-    for (int r = 0; r < quantsr.size (); r++)
+  for (vsize l = 0; l < quantsl.size (); l++)
+    for (vsize r = 0; r < quantsr.size (); r++)

       {
        Quant_score qs;
        qs.yl = quantsl[l];
        qs.yr = quantsr[r];
        qs.demerits = 0.0;
 
       {
        Quant_score qs;
        qs.yl = quantsl[l];
        qs.yr = quantsr[r];
        qs.demerits = 0.0;
 

-       qscores.push (qs);
+       qscores.push_back (qs);

       }
 
   /* This is a longish function, but we don't separate this out into
      neat modular separate subfunctions, as the subfunctions would be
      called for many values of YL, YR. By precomputing various
      parameters outside of the loop, we can save a lot of time. */
       }
 
   /* This is a longish function, but we don't separate this out into
      neat modular separate subfunctions, as the subfunctions would be
      called for many values of YL, YR. By precomputing various
      parameters outside of the loop, we can save a lot of time. */

-  for (int i = qscores.size (); i--;)
+  for (vsize i = qscores.size (); i--;)

     {
       Real d = score_slopes_dy (qscores[i].yl, qscores[i].yr,
                                dy_mus, yr- yl,
     {
       Real d = score_slopes_dy (qscores[i].yl, qscores[i].yr,
                                dy_mus, yr- yl,


@@ -233,7 +235,7 @@ Beam::quanting (SCM smob, SCM posns)
                                xstaff, &parameters);
       qscores[i].demerits += d;
 
                                xstaff, &parameters);
       qscores[i].demerits += d;
 

-#if DEBUG_QUANTING
+#if DEBUG_BEAM_SCORING

       qscores[i].score_card_ += to_string ("S%.2f", d);
 #endif
     }
       qscores[i].score_card_ += to_string ("S%.2f", d);
 #endif
     }


@@ -241,12 +243,12 @@ Beam::quanting (SCM smob, SCM posns)
   Real rad = Staff_symbol_referencer::staff_radius (me);
   Drul_array<int> edge_beam_counts
     (Stem::beam_multiplicity (stems[0]).length () + 1,
   Real rad = Staff_symbol_referencer::staff_radius (me);
   Drul_array<int> edge_beam_counts
     (Stem::beam_multiplicity (stems[0]).length () + 1,

-     Stem::beam_multiplicity (stems.top ()).length () + 1);
+     Stem::beam_multiplicity (stems.back ()).length () + 1);

 
   Real beam_translation = get_beam_translation (me) / ss;
 
   Real reasonable_score = (is_knee) ? 200000 : 100;
 
   Real beam_translation = get_beam_translation (me) / ss;
 
   Real reasonable_score = (is_knee) ? 200000 : 100;

-  for (int i = qscores.size (); i--;)
+  for (vsize i = qscores.size (); i--;)

     if (qscores[i].demerits < reasonable_score)
       {
        Real d = score_forbidden_quants (qscores[i].yl, qscores[i].yr,
     if (qscores[i].demerits < reasonable_score)
       {
        Real d = score_forbidden_quants (qscores[i].yl, qscores[i].yr,


@@ -254,12 +256,12 @@ Beam::quanting (SCM smob, SCM posns)
                                         edge_beam_counts, ldir, rdir, &parameters);
        qscores[i].demerits += d;
 
                                         edge_beam_counts, ldir, rdir, &parameters);
        qscores[i].demerits += d;
 

-#if DEBUG_QUANTING
+#if DEBUG_BEAM_SCORING

        qscores[i].score_card_ += to_string (" F %.2f", d);
 #endif
       }
 
        qscores[i].score_card_ += to_string (" F %.2f", d);
 #endif
       }
 

-  for (int i = qscores.size (); i--;)
+  for (vsize i = qscores.size (); i--;)

     if (qscores[i].demerits < reasonable_score)
       {
        Real d = score_stem_lengths (stems, stem_infos,
     if (qscores[i].demerits < reasonable_score)
       {
        Real d = score_stem_lengths (stems, stem_infos,


@@ -269,24 +271,22 @@ Beam::quanting (SCM smob, SCM posns)
                                     qscores[i].yl, qscores[i].yr, &parameters);
        qscores[i].demerits += d;
 
                                     qscores[i].yl, qscores[i].yr, &parameters);
        qscores[i].demerits += d;
 

-#if DEBUG_QUANTING
+#if DEBUG_BEAM_SCORING

        qscores[i].score_card_ += to_string (" L %.2f", d);
 #endif
       }
 
   int best_idx = best_quant_score_idx (qscores);
 
        qscores[i].score_card_ += to_string (" L %.2f", d);
 #endif
       }
 
   int best_idx = best_quant_score_idx (qscores);
 

-#if DEBUG_QUANTING
+#if DEBUG_BEAM_SCORING

   SCM inspect_quants = me->get_property ("inspect-quants");
   SCM inspect_quants = me->get_property ("inspect-quants");

-  if (to_boolean (me->layout ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting")))
+  if (to_boolean (me->layout ()->lookup_variable (ly_symbol2scm ("debug-beam-scoring")))

       && scm_is_pair (inspect_quants))
     {
       Drul_array<Real> ins = ly_scm2interval (inspect_quants);
 
       && scm_is_pair (inspect_quants))
     {
       Drul_array<Real> ins = ly_scm2interval (inspect_quants);
 

-      int i = 0;
-

       Real mindist = 1e6;
       Real mindist = 1e6;

-      for (; i < qscores.size (); i++)
+      for (vsize i = 0; i < qscores.size (); i++)

        {
          Real d = fabs (qscores[i].yl- ins[LEFT]) + fabs (qscores[i].yr - ins[RIGHT]);
          if (d < mindist)
        {
          Real d = fabs (qscores[i].yl- ins[LEFT]) + fabs (qscores[i].yr - ins[RIGHT]);
          if (d < mindist)


@@ -312,9 +312,9 @@ Beam::quanting (SCM smob, SCM posns)
                                          qscores[best_idx].yr);
     }
   
                                          qscores[best_idx].yr);
     }
   

-#if DEBUG_QUANTING
+#if DEBUG_BEAM_SCORING

   if (best_idx >= 0
   if (best_idx >= 0

-      && to_boolean (me->layout ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting"))))
+      && to_boolean (me->layout ()->lookup_variable (ly_symbol2scm ("debug-beam-scoring"))))

     {
       qscores[best_idx].score_card_ += to_string ("i%d", best_idx);
 
     {
       qscores[best_idx].score_card_ += to_string ("i%d", best_idx);
 


@@ -328,10 +328,10 @@ Beam::quanting (SCM smob, SCM posns)
 }
 
 Real
 }
 
 Real

-Beam::score_stem_lengths (Link_array<Grob> const &stems,
-                         Array<Stem_info> const &stem_infos,
-                         Array<Real> const &base_stem_ys,
-                         Array<Real> const &stem_xs,
+Beam::score_stem_lengths (vector<Grob*> const &stems,
+                         vector<Stem_info> const &stem_infos,
+                         vector<Real> const &base_stem_ys,
+                         vector<Real> const &stem_xs,

                          Real xl, Real xr,
                          bool knee,
                          Real yl, Real yr,
                          Real xl, Real xr,
                          bool knee,
                          Real yl, Real yr,


@@ -342,7 +342,7 @@ Beam::score_stem_lengths (Link_array<Grob> const &stems,
   Drul_array<Real> score (0, 0);
   Drul_array<int> count (0, 0);
 
   Drul_array<Real> score (0, 0);
   Drul_array<int> count (0, 0);
 

-  for (int i = 0; i < stems.size (); i++)
+  for (vsize i = 0; i < stems.size (); i++)

     {
       Grob *s = stems[i];
       if (Stem::is_invisible (s))
     {
       Grob *s = stems[i];
       if (Stem::is_invisible (s))