From: fred <fred>
Date: Tue, 10 Dec 1996 00:21:13 +0000 (+0000)
Subject: lilypond-0.0.15
X-Git-Tag: release/1.5.59~6639
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=87a1bbcc74e2caebf5a15903bcbe3dbec8d6c02e;p=lilypond.git

lilypond-0.0.15
---

diff --git a/hdr/grouping.hh b/hdr/grouping.hh
new file mode 100644
index 0000000000..a6e93bf840
--- /dev/null
+++ b/hdr/grouping.hh
@@ -0,0 +1,33 @@
+/*
+  grouping.hh -- part of LilyPond
+
+  (c) 1996 Han-Wen Nienhuys
+*/
+
+#ifndef GROUPING_HH
+#define GROUPING_HH
+
+#include "interval.hh"
+#include "vray.hh"
+
+struct Rhythmic_grouping {
+    Interval t;
+
+    svec<Rhythmic_grouping*> children;
+    /****************/
+    
+    void split_half();
+    Real last();
+    Rhythmic_grouping* sub_grouping(Interval v);
+    void split_grouping(Rhythmic_grouping &initial_grouping);
+    void split_grouping(svec<Real> initial_grouping);
+    svec<Real> get_bounds();
+    Rhythmic_grouping(Interval);
+    Rhythmic_grouping(svec<Interval> notes,
+		      svec<Real> initial_grouping);
+
+    void print() const;
+    ~Rhythmic_grouping();
+};
+
+#endif // GROUPING_HH
diff --git a/src/grouping.cc b/src/grouping.cc
new file mode 100644
index 0000000000..e07de1254a
--- /dev/null
+++ b/src/grouping.cc
@@ -0,0 +1,148 @@
+#include "grouping.hh"
+#include "debug.hh"
+
+Interval
+vec_union(svec<Interval> notes)
+{
+    Interval u;
+    u.set_empty();
+    for (int i =0 ; i < notes.sz() ; i++) {
+	u.unite(notes[i]);
+    }
+    return u;
+}
+
+svec<Real>
+default_bounds(Interval t)
+{
+    svec<Real> bounds;
+    Real dt = t.length();
+    bounds.add(t.min);
+    bounds.add(t.min + dt/2);    
+    return bounds;
+}
+
+svec<Real>
+Rhythmic_grouping::get_bounds()
+{
+    svec<Real> bounds;
+    if (children.sz()) {
+	for (int i=0; i < children.sz(); i++) {
+	    bounds.add(children[i]->t.min);
+	}
+    } else {
+	default_bounds(t);
+    }
+//	bounds.add(t.max );
+    return bounds;
+}
+
+Real
+Rhythmic_grouping::last()
+{
+    return t.max;
+}
+
+void
+Rhythmic_grouping::split_grouping(svec<Real> bounds)
+{
+    int lasti =0;
+    svec<Rhythmic_grouping*> newgrp;
+    for (int i=0, j = 1; i < children.sz() && j < bounds.sz(); ) {
+	if ( children[i]->t.max < bounds[j]) {
+	    i ++;
+	    continue;
+	} else if (children[i]->t.max > bounds[j]) {
+	    j ++;
+	    continue;
+	}
+
+        assert( children[lasti]->t.min == bounds[j-1] );
+	assert( children[i]->t.max == bounds[j] );
+
+	Rhythmic_grouping * n = new Rhythmic_grouping(Interval(
+	    bounds[j-1], bounds[j]));
+	for (int k = lasti ; k < i; k++)
+	    n->children.add(children[k]);
+	newgrp.add(n);
+
+	i = lasti = i+1;
+    }
+    if (newgrp.sz() <= 1) {
+	newgrp[0]->children.set_size(0);
+	delete newgrp[0];
+	return;
+    }
+    children = newgrp;    
+}
+
+void
+Rhythmic_grouping::split_half()
+{
+    svec<Real> bounds = default_bounds(t);
+    bounds.add(t.max);
+    split_grouping(bounds);
+    
+    for (int i=0; i < children.sz(); i++) {
+	if (children[i]->children.sz())
+	    children[i]->split_half();
+    }
+}
+
+Rhythmic_grouping*
+Rhythmic_grouping::sub_grouping(Interval v)
+{
+    return 0;			// todo!
+}
+void
+Rhythmic_grouping::split_grouping(Rhythmic_grouping &initial_grouping)
+{
+    svec<Rhythmic_grouping*> newgrp;
+    svec<Real> bounds = initial_grouping.get_bounds();
+    bounds.add(initial_grouping.last());
+    split_grouping(bounds);
+    for (int i=0; i < children.sz(); i++) {
+	Interval h = children[i]->t;
+	Rhythmic_grouping*r = initial_grouping.sub_grouping(h);
+	if (children[i]->children.sz()) {
+	    if (r)
+		children[i]->split_grouping(*r);
+	    else
+		children[i]->split_half();
+	}
+    }
+}
+
+Rhythmic_grouping::Rhythmic_grouping(Interval i)
+{
+    t=i;
+}
+
+Rhythmic_grouping::Rhythmic_grouping(svec<Interval> notes,
+				svec<Real> initial_grouping)
+{
+    t = vec_union(notes);
+    for (int i=0; i < notes.sz(); i++) {
+	children.add(new Rhythmic_grouping(notes[i]));
+    }
+    split_grouping(initial_grouping);
+}
+
+Rhythmic_grouping::~Rhythmic_grouping()
+{
+    for (int i=0; i < children.sz(); i++) {
+	delete children[i];
+    }
+}
+
+void
+Rhythmic_grouping::print()const    
+{
+    mtor << "{ " << t << "\n";
+    for (int i=0; i < children.sz(); i++) {
+	children[i]->print();
+    }
+    mtor << "}";
+}
+
+