Vector
-Spring_spacer::default_solution()const
+Spring_spacer::default_solution() const
{
- return try_initial_solution() ;
+ return try_initial_solution() ;
}
Score_column*
Spring_spacer::scol_l (int i)
{
- return (Score_column*)cols[i].pcol_l_;
+ return (Score_column*)cols[i].pcol_l_;
}
const Real COLFUDGE=1e-3;
template class P<Real>; // ugh.
bool
-Spring_spacer::contains (PCol const *w)
+Spring_spacer::contains (Paper_column const *w)
{
- for (int i=0; i< cols.size(); i++)
- if (cols[i].pcol_l_ == w)
- return true;
- return false;
+ for (int i=0; i< cols.size(); i++)
+ if (cols[i].pcol_l_ == w)
+ return true;
+ return false;
}
Spring_spacer::OK() const
{
#ifndef NDEBUG
- for (int i = 1; i < cols.size(); i++)
- assert (cols[i].rank_i_ > cols[i-1].rank_i_);
- for (int i = 1; i < loose_col_arr_.size(); i++)
- assert (loose_col_arr_[i].rank_i_ > loose_col_arr_[i-1].rank_i_);
+ for (int i = 1; i < cols.size(); i++)
+ assert (cols[i].rank_i_ > cols[i-1].rank_i_);
+ for (int i = 1; i < loose_col_arr_.size(); i++)
+ assert (loose_col_arr_[i].rank_i_ > loose_col_arr_[i-1].rank_i_);
#endif
}
void
Spring_spacer::handle_loose_cols()
{
- Union_find connected (cols.size());
- Array<int> fixed;
- for (PCursor<Idealspacing*> i (ideal_p_list_.top()); i.ok (); i++){
- connected.connect (i->left_i_,i->right_i_);
+ Union_find connected (cols.size());
+ Array<int> fixed;
+ for (PCursor<Idealspacing*> i (ideal_p_list_.top()); i.ok (); i++)
+ {
+ connected.connect (i->left_i_,i->right_i_);
}
- for (int i = 0; i < cols.size(); i++)
- if (cols[i].fixed())
- fixed.push (i);
- for (int i=1; i < fixed.size(); i++)
- connected.connect (fixed[i-1], fixed[i]);
-
- for (int i = cols.size(); i--;) {
- if (! connected.equiv (fixed[0], i)) {
- warning ("unconnected column: " + String (i));
- loosen_column (i);
+ for (int i = 0; i < cols.size(); i++)
+ if (cols[i].fixed())
+ fixed.push (i);
+ for (int i=1; i < fixed.size(); i++)
+ connected.connect (fixed[i-1], fixed[i]);
+
+ for (int i = cols.size(); i--;)
+ {
+ if (! connected.equiv (fixed[0], i))
+ {
+ warning ("unconnected column: " + String (i));
+ loosen_column (i);
}
}
- OK();
+ OK();
}
regular distances from enclosing calced columns
*/
void
-Spring_spacer::position_loose_cols (Vector &sol_vec)const
+Spring_spacer::position_loose_cols (Vector &sol_vec) const
{
- if (!loose_col_arr_.size())
- return ;
- assert (sol_vec.dim());
- Array<bool> fix_b_arr;
- fix_b_arr.set_size (cols.size() + loose_col_arr_.size ());
- Real utter_right_f=-infinity_f;
- Real utter_left_f =infinity_f;
- for (int i=0; i < loose_col_arr_.size(); i++) {
- fix_b_arr[loose_col_arr_[i].rank_i_] = false;
+ if (!loose_col_arr_.size())
+ return ;
+ assert (sol_vec.dim());
+ Array<bool> fix_b_arr;
+ fix_b_arr.set_size (cols.size() + loose_col_arr_.size ());
+ Real utter_right_f=-infinity_f;
+ Real utter_left_f =infinity_f;
+ for (int i=0; i < loose_col_arr_.size(); i++)
+ {
+ fix_b_arr[loose_col_arr_[i].rank_i_] = false;
}
- for (int i=0; i < cols.size(); i++) {
- int r= cols[i].rank_i_;
- fix_b_arr[r] = true;
- utter_right_f = utter_right_f >? sol_vec (i);
- utter_left_f = utter_left_f <? sol_vec (i);
+ for (int i=0; i < cols.size(); i++)
+ {
+ int r= cols[i].rank_i_;
+ fix_b_arr[r] = true;
+ utter_right_f = utter_right_f >? sol_vec (i);
+ utter_left_f = utter_left_f <? sol_vec (i);
}
- Vector v (fix_b_arr.size());
- int j =0;
- int k =0;
- for (int i=0; i < v.dim(); i++) {
- if (fix_b_arr[i]) {
- assert (cols[j].rank_i_ == i);
- v (i) = sol_vec (j++);
- } else {
- Real left_pos_f =
- (j>0) ?sol_vec (j-1) : utter_left_f;
- Real right_pos_f =
- (j < sol_vec.dim()) ? sol_vec (j) : utter_right_f;
- int left_rank = (j>0) ? cols[j-1].rank_i_ : 0;
- int right_rank = (j<sol_vec.dim()) ? cols[j].rank_i_ : sol_vec.dim ();
-
- int d_r = right_rank - left_rank;
- Colinfo loose=loose_col_arr_[k++];
- int r = loose.rank_i_ ;
- assert (r > left_rank && r < right_rank);
-
- v (i) = (r - left_rank)*left_pos_f/ d_r +
- (right_rank - r) *right_pos_f /d_r;
+ Vector v (fix_b_arr.size());
+ int j =0;
+ int k =0;
+ for (int i=0; i < v.dim(); i++)
+ {
+ if (fix_b_arr[i])
+ {
+ assert (cols[j].rank_i_ == i);
+ v (i) = sol_vec (j++);
+ }
+ else
+ {
+ Real left_pos_f =
+ (j>0) ?sol_vec (j-1) : utter_left_f;
+ Real right_pos_f =
+ (j < sol_vec.dim()) ? sol_vec (j) : utter_right_f;
+ int left_rank = (j>0) ? cols[j-1].rank_i_ : 0;
+ int right_rank = (j<sol_vec.dim()) ? cols[j].rank_i_ : sol_vec.dim ();
+
+ int d_r = right_rank - left_rank;
+ Colinfo loose=loose_col_arr_[k++];
+ int r = loose.rank_i_ ;
+ assert (r > left_rank && r < right_rank);
+
+ v (i) = (r - left_rank)*left_pos_f/ d_r +
+ (right_rank - r) *right_pos_f /d_r;
}
}
- sol_vec = v;
+ sol_vec = v;
}
bool
Spring_spacer::check_constraints (Vector v) const
{
- int dim=v.dim();
- assert (dim == cols.size());
-
- for (int i=0; i < dim; i++) {
+ int dim=v.dim();
+ assert (dim == cols.size());
+
+ for (int i=0; i < dim; i++)
+ {
- if (cols[i].fixed()&&
- abs (cols[i].fixed_position() - v (i)) > COLFUDGE)
- return false;
+ if (cols[i].fixed()&&
+ abs (cols[i].fixed_position() - v (i)) > COLFUDGE)
+ return false;
- if (!i)
- continue;
+ if (!i)
+ continue;
- Real mindist=cols[i-1].minright()
- +cols[i].minleft();
+ Real mindist=cols[i-1].width_[RIGHT]
+ -cols[i].width_[LEFT];
- // ugh... compares
- Real dif =v (i) - v (i-1)- mindist;
- bool b = (dif > - COLFUDGE);
+ // ugh... compares
+ Real dif =v (i) - v (i-1)- mindist;
+ bool b = (dif > - COLFUDGE);
- if (!b)
- return false;
+ if (!b)
+ return false;
}
- return true;
+ return true;
}
bool
Spring_spacer::check_feasible() const
{
- Vector sol (try_initial_solution());
- return check_constraints (sol);
+ Vector sol (try_initial_solution());
+ return check_constraints (sol);
}
/// generate a solution which obeys the min distances and fixed positions
Vector
Spring_spacer::try_initial_solution() const
{
- int dim=cols.size();
- Vector initsol (dim);
- for (int i=0; i < dim; i++) {
- if (cols[i].fixed()) {
- initsol (i)=cols[i].fixed_position();
-
- if (i > 0) {
- Real r =initsol (i-1) + cols[i-1].minright();
- if (initsol (i) < r) {
- warning ("overriding fixed position");
- initsol (i) =r;
- }
+ int dim=cols.size();
+ Vector initsol (dim);
+ for (int i=0; i < dim; i++)
+ {
+ if (cols[i].fixed())
+ {
+ initsol (i)=cols[i].fixed_position();
+
+ if (i > 0)
+ {
+ Real r =initsol (i-1) + cols[i-1].width_[RIGHT];
+ if (initsol (i) < r)
+ {
+ warning ("overriding fixed position");
+ initsol (i) =r;
+ }
}
- } else {
- Real mindist=cols[i-1].minright()
- +cols[i].minleft();
- if (mindist < 0.0)
- warning ("Excentric column");
- initsol (i)=initsol (i-1)+mindist;
+ }
+ else
+ {
+ Real mindist=cols[i-1].width_[RIGHT]
+ - cols[i].width_[LEFT];
+ if (mindist < 0.0)
+ warning ("Excentric column");
+ initsol (i)=initsol (i-1)+mindist;
}
}
- return initsol;
+ return initsol;
}
Vector
Spring_spacer::find_initial_solution() const
{
- Vector v (try_initial_solution());
- assert (check_constraints (v));
- return v;
+ Vector v (try_initial_solution());
+ assert (check_constraints (v));
+ return v;
}
// generate the matrices
void
Spring_spacer::make_matrices (Matrix &quad, Vector &lin, Real &c) const
{
- quad.fill (0);
- lin.fill (0);
- c = 0;
-
- for (PCursor<Idealspacing*> i (ideal_p_list_.top()); i.ok (); i++) {
- int l = i->left_i_;
- int r = i->right_i_;
+ quad.fill (0);
+ lin.fill (0);
+ c = 0;
+
+ for (PCursor<Idealspacing*> i (ideal_p_list_.top()); i.ok (); i++)
+ {
+ int l = i->left_i_;
+ int r = i->right_i_;
- quad (r,r) += i->hooke_f_;
- quad (r,l) -= i->hooke_f_;
- quad (l,r) -= i->hooke_f_;
- quad (l,l) += i->hooke_f_;
+ quad (r,r) += i->hooke_f_;
+ quad (r,l) -= i->hooke_f_;
+ quad (l,r) -= i->hooke_f_;
+ quad (l,l) += i->hooke_f_;
- lin (r) -= i->space_f_*i->hooke_f_;
- lin (l) += i->space_f_*i->hooke_f_;
+ lin (r) -= i->space_f_*i->hooke_f_;
+ lin (l) += i->space_f_*i->hooke_f_;
- c += sqr (i->space_f_);
+ c += sqr (i->space_f_);
}
}
void
-Spring_spacer::set_fixed_cols (Mixed_qp &qp)const
+Spring_spacer::set_fixed_cols (Mixed_qp &qp) const
{
- for (int j=0; j < cols.size(); j++)
- if (cols[j].fixed())
- qp.add_fixed_var (j,cols[j].fixed_position());
+ for (int j=0; j < cols.size(); j++)
+ if (cols[j].fixed())
+ qp.add_fixed_var (j,cols[j].fixed_position());
-
+
}
// put the constraints into the LP problem
void
Spring_spacer::make_constraints (Mixed_qp& lp) const
{
- int dim=cols.size();
- for (int j=0; j < dim; j++) {
- Colinfo c=cols[j];
- if (j > 0){
- Vector c1(dim);
+ int dim=cols.size();
+ for (int j=0; j < dim; j++)
+ {
+ Colinfo c=cols[j];
+ if (j > 0)
+ {
+ Vector c1(dim);
- c1(j)=1.0 ;
- c1(j-1)=-1.0 ;
- lp.add_inequality_cons (c1, cols[j-1].minright() +
- cols[j].minleft());
+ c1(j)=1.0 ;
+ c1(j-1)=-1.0 ;
+ lp.add_inequality_cons (c1,
+ cols[j-1].width_[RIGHT] - cols[j].width_[LEFT]);
}
}
}
+
+Real
+Spring_spacer::calculate_energy_f (Vector solution) const
+{
+ Real e = 0.0;
+ for (PCursor<Idealspacing*> i (ideal_p_list_.top()); i.ok(); i++)
+ {
+ e += i->energy_f(solution(i->right_i_) - solution(i->left_i_));
+ }
+
+ return e;
+}
void
-Spring_spacer::lower_bound_solution (Col_hpositions*positions)const
+Spring_spacer::lower_bound_solution (Col_hpositions*positions) const
{
- Mixed_qp lp (cols.size());
- make_matrices (lp.quad,lp.lin, lp.const_term);
- set_fixed_cols (lp);
+ Mixed_qp lp (cols.size());
+ make_matrices (lp.quad,lp.lin, lp.const_term);
+ set_fixed_cols (lp);
- Vector start (cols.size());
- start.fill (0.0);
- Vector solution_vec (lp.solve (start));
+ Vector start (cols.size());
+ start.fill (0.0);
+ Vector solution_vec (lp.solve (start));
- positions->energy_f_ = lp.eval (solution_vec);
- positions->config = solution_vec;
- positions->satisfies_constraints_b_ = check_constraints (solution_vec);
+ positions->energy_f_ = calculate_energy_f (solution_vec);
+ positions->config = solution_vec;
+ positions->satisfies_constraints_b_ = check_constraints (solution_vec);
}
void
Spring_spacer::solve (Col_hpositions*positions) const
{
- assert (check_feasible());
+ assert (check_feasible());
- Mixed_qp lp (cols.size());
- make_matrices (lp.quad,lp.lin, lp.const_term);
- make_constraints (lp);
- set_fixed_cols (lp);
- Vector start=find_initial_solution();
- Vector solution_vec (lp.solve (start));
+ Mixed_qp lp (cols.size());
+ make_matrices (lp.quad,lp.lin, lp.const_term);
+ make_constraints (lp);
+ set_fixed_cols (lp);
+ Vector start=find_initial_solution();
+ Vector solution_vec (lp.solve (start));
- positions->satisfies_constraints_b_ = check_constraints (solution_vec);
- if (!positions->satisfies_constraints_b_) {
- WARN << "solution doesn't satisfy constraints.\n" ;
+ positions->satisfies_constraints_b_ = check_constraints (solution_vec);
+ if (!positions->satisfies_constraints_b_)
+ {
+ WARN << "solution doesn't satisfy constraints.\n" ;
}
- position_loose_cols (solution_vec);
- positions->energy_f_ = lp.eval (solution_vec);
- positions->config = solution_vec;
- positions->error_col_l_arr_ = error_pcol_l_arr();
-
+ position_loose_cols (solution_vec);
+ positions->energy_f_ = calculate_energy_f (solution_vec);
+ positions->config = solution_vec;
+ positions->error_col_l_arr_ = error_pcol_l_arr();
+
}
/**
- add one column to the problem.
+ add one column to the problem.
*/
void
-Spring_spacer::add_column (PCol *col, bool fixed, Real fixpos)
+Spring_spacer::add_column (Paper_column *col, bool fixed, Real fixpos)
{
- Colinfo c (col,(fixed)? &fixpos : 0);
- if (cols.size())
- c.rank_i_ = cols.top().rank_i_+1;
- else
- c.rank_i_ = 0;
- cols.push (c);
+ Colinfo c (col,(fixed)? &fixpos : 0);
+ if (cols.size())
+ c.rank_i_ = cols.top().rank_i_+1;
+ else
+ c.rank_i_ = 0;
+ cols.push (c);
}
Line_of_cols
-Spring_spacer::error_pcol_l_arr()const
+Spring_spacer::error_pcol_l_arr() const
{
- Array<PCol*> retval;
- for (int i=0; i< cols.size(); i++)
- if (cols[i].ugh_b_)
- retval.push (cols[i].pcol_l_);
- for (int i=0; i < loose_col_arr_.size(); i++) {
- retval.push (loose_col_arr_[i].pcol_l_);
+ Array<Paper_column*> retval;
+ for (int i=0; i< cols.size(); i++)
+ if (cols[i].ugh_b_)
+ retval.push (cols[i].pcol_l_);
+ for (int i=0; i < loose_col_arr_.size(); i++)
+ {
+ retval.push (loose_col_arr_[i].pcol_l_);
}
- return retval;
+ return retval;
}
void
Spring_spacer::loosen_column (int i)
{
- Colinfo c=cols.get (i);
- for (PCursor<Idealspacing*> j (ideal_p_list_.top()); j.ok (); j++){
- if (j->left_i_ == i|| j->right_i_ == i)
- j.del();
- else
- j++;
+ Colinfo c=cols.get (i);
+ for (PCursor<Idealspacing*> j (ideal_p_list_.top()); j.ok (); j++)
+ {
+ if (j->left_i_ == i|| j->right_i_ == i)
+ j.del();
+ else
+ j++;
}
- c.ugh_b_ = true;
-
- int j=0;
- for (; j < loose_col_arr_.size(); j++) {
- if (loose_col_arr_[j].rank_i_ > c.rank_i_)
- break;
+ c.ugh_b_ = true;
+
+ int j=0;
+ for (; j < loose_col_arr_.size(); j++)
+ {
+ if (loose_col_arr_[j].rank_i_ > c.rank_i_)
+ break;
}
- loose_col_arr_.insert (c,j);
+ loose_col_arr_.insert (c,j);
}
Spring_spacer::print() const
{
#ifndef NPRINT
- for (int i=0; i < cols.size(); i++) {
- DOUT << "col " << i<<' ';
- cols[i].print();
+ for (int i=0; i < cols.size(); i++)
+ {
+ DOUT << "col " << i<<' ';
+ cols[i].print();
}
- for (PCursor<Idealspacing*> i (ideal_p_list_.top()); i.ok (); i++){
- i->print();
+ for (PCursor<Idealspacing*> i (ideal_p_list_.top()); i.ok (); i++)
+ {
+ i->print();
}
#endif
}
void
Spring_spacer::connect (int i, int j, Real d, Real h)
{
- Idealspacing * s = new Idealspacing;
- s->left_i_ = i;
- s->right_i_ = j;
- s->space_f_ = d;
- s->hooke_f_ = h;
+ assert(d >= 0 && d <= 100 CM);
+ assert(h >=0);
+
+ Idealspacing * s = new Idealspacing;
+ s->left_i_ = i;
+ s->right_i_ = j;
+ s->space_f_ = d;
+ s->hooke_f_ = h;
+
+ ideal_p_list_.bottom().add (s);
+}
+
+
+
+
+void
+Spring_spacer::prepare()
+{
+ calc_idealspacing();
+ handle_loose_cols();
+ print();
+}
+
+Line_spacer*
+Spring_spacer::constructor()
+{
+ return new Spring_spacer;
+}
+
+
+
+/**
+ get the shortest_playing running note at a time. */
+void
+Spring_spacer::get_ruling_durations(Array<Moment> &shortest_playing_arr,
+ Array<Moment> &context_shortest_arr)
+{
+ for (int i=0; i < cols.size(); i++)
+ scol_l (i)->preprocess();
+
+ int start_context_i=0;
+ Moment context_shortest = infinity_mom;
+ context_shortest_arr.set_size(cols.size());
+
+ for (int i=0; i < cols.size(); i++)
+ {
+ Moment now = scol_l (i)->when();
+ Moment shortest_playing = infinity_mom;
+
+ if (scol_l (i)->breakable_b_)
+ {
+ for (int ji=i; ji >= start_context_i; ji--)
+ context_shortest_arr[ji] = context_shortest;
+ start_context_i = i;
+ context_shortest = infinity_mom;
+ }
+ if (scol_l (i)->durations.size())
+ {
+ context_shortest = context_shortest <? scol_l(i)->durations[0];
+ }
+ // ji was j, but triggered ICE
+ for (int ji=i+1; ji --;)
+ {
+ if (scol_l(ji)->durations.size() &&
+ now - scol_l(ji)->when() >= shortest_playing)
+ break;
+
+ for (int k = scol_l (ji)->durations.size();
+ k-- && scol_l(ji)->durations[k] + scol_l(ji)->when() > now;
+ )
+ {
+ shortest_playing = shortest_playing <? scol_l(ji)->durations[k];
+ }
+ }
+ shortest_playing_arr.push(shortest_playing);
+ }
- ideal_p_list_.bottom().add (s);
+#ifndef NPRINT
+ DOUT << "shortest_playing/:[ ";
+ for (int i=0; i < shortest_playing_arr.size(); i++)
+ {
+ DOUT << shortest_playing_arr[i] << " ";
+ DOUT << context_shortest_arr[i] << ", ";
+ }
+ DOUT << "]\n";
+#endif
}
/**
void
Spring_spacer::calc_idealspacing()
{
-
- for (int i=0; i < cols.size(); i++)
- scol_l (i)->preprocess();
-
- /* get the shortest running note at a time. */
- Array<Moment> shortest_arr;
- for (int i=0; i < cols.size(); i++) {
- Moment now = scol_l (i)->when();
- Moment shortest = infinity_mom;
- // ji was j, but triggered ICE
- for (int ji=i+1; ji --; ) {
- if (scol_l(ji)->durations.size() &&
- now - scol_l(ji)->when() >= shortest)
- break;
-
- for (int k = scol_l (ji)->durations.size();
- k-- && scol_l(ji)->durations[k] + scol_l(ji)->when() > now;
- )
- {
- shortest = shortest <? scol_l(ji)->durations[k];
- }
- }
- shortest_arr.push(shortest);
- }
-
-#ifndef NPRINT
- DOUT << "shortest:[ ";
- for (int i=0; i < shortest_arr.size(); i++)
- DOUT << shortest_arr[i] << " ";
- DOUT << "]\n";
-#endif
+ Array<Moment> shortest_playing_arr;
+ Array<Moment> context_shortest_arr;
+ get_ruling_durations(shortest_playing_arr, context_shortest_arr);
+
- Array<Real> ideal_arr_;
- Array<Real> hooke_arr_;
- for (int i=0; i < cols.size(); i++){
- ideal_arr_.push (-1.0);
- hooke_arr_.push (1.0);
- }
+ Array<Real> ideal_arr_;
+ Array<Real> hooke_arr_;
+ for (int i=0; i < cols.size(); i++){
+ ideal_arr_.push (-1.0);
+ hooke_arr_.push (1.0);
+ }
- for (int i=0; i < cols.size(); i++) {
- if ( !scol_l (i)->musical_b()) {
- Real symbol_distance =cols[i].minright() + 2 PT;
- Real durational_distance = 0;
-
- if (i+1 < cols.size()) {
- Moment delta_t = scol_l (i+1)->when() - scol_l (i)->when () ;
- /*
- ugh should use shortest distance
- */
- if (delta_t)
- durational_distance = paper_l()->duration_to_dist (delta_t) ;
- symbol_distance += cols[i+1].minleft();
+ for (int i=0; i < cols.size(); i++)
+ {
+ if (!scol_l (i)->musical_b())
+ {
+ Real symbol_distance =cols[i].width_[RIGHT] + 2 PT;
+ Real durational_distance = 0;
+
+ if (i+1 < cols.size())
+ {
+ Moment delta_t = scol_l (i+1)->when() - scol_l (i)->when () ;
+
+ Real k= paper_l()->arithmetic_constant(context_shortest_arr[i]);
+ /*
+ ugh should use shortest_playing distance
+ */
+ if (delta_t)
+ durational_distance = paper_l()->duration_to_dist (delta_t,k);
+ symbol_distance += -cols[i+1].width_[LEFT];
}
- ideal_arr_[i] = symbol_distance >? durational_distance;
- hooke_arr_[i] = 2.0;
+ ideal_arr_[i] = symbol_distance >? durational_distance;
+ hooke_arr_[i] = 2.0;
}
}
- for (int i=0; i < cols.size(); i++) {
- if (scol_l (i)->musical_b()) {
- Moment shortest_len = shortest_arr[i];
- if ( ! shortest_len) {
- warning ("Can't find a ruling note at "
- +String (scol_l (i)->when()));
- shortest_len = 1;
+ for (int i=0; i < cols.size(); i++)
+ {
+ if (scol_l (i)->musical_b())
+ {
+ Moment shortest_playing_len = shortest_playing_arr[i];
+ Moment context_shortest = context_shortest_arr[i];
+ if (! shortest_playing_len)
+ {
+ warning ("Can't find a ruling note at "
+ +String (scol_l (i)->when()));
+ shortest_playing_len = 1;
}
- Moment delta_t = scol_l (i+1)->when() - scol_l (i)->when ();
- Real dist = paper_l()->duration_to_dist (shortest_len);
- dist *= delta_t / shortest_len;
- if (!scol_l (i+1)->musical_b()) {
-
- Real minimum_dist = cols[i+1].minleft() + 2 PT + cols[i].minright () ;
- if (ideal_arr_[i+1] + minimum_dist < dist) {
- ideal_arr_[i] = dist - ideal_arr_[i+1];
- // hooke_arr_[i+1] =1.0;
+ if (! context_shortest)
+ {
+ warning("No minimum in measure at "
+ + String (scol_l (i)->when()));
+ context_shortest = 1;
+ }
+ Moment delta_t = scol_l (i+1)->when() - scol_l (i)->when ();
+ Real k= paper_l()->arithmetic_constant(context_shortest);
+ Real dist = paper_l()->duration_to_dist (shortest_playing_len, k);
+ dist *= delta_t / shortest_playing_len;
+
+ /* all sorts of ugliness to avoid running into bars/clefs, but not taking
+ extra space if this is not needed */
+ if (!scol_l (i+1)->musical_b())
+ {
+ Real minimum_dist = - cols[i+1].width_[LEFT] + 2 PT + cols[i].width_[RIGHT];
+ if (ideal_arr_[i+1] + minimum_dist < dist)
+ {
+ ideal_arr_[i] = dist - ideal_arr_[i+1];
+ // hooke_arr_[i+1] =1.0;
} else {
- ideal_arr_[i] = minimum_dist;
+ ideal_arr_[i] = minimum_dist;
}
-
+
} else
- ideal_arr_[i] = dist;
+ ideal_arr_[i] = dist;
}
}
- for (int i=0; i < ideal_arr_.size()-1; i++) {
- assert (ideal_arr_[i] >=0 && hooke_arr_[i] >=0);
- connect (i, i+1, ideal_arr_[i], hooke_arr_[i]);
+ for (int i=0; i < ideal_arr_.size()-1; i++)
+ {
+ assert (ideal_arr_[i] >=0 && hooke_arr_[i] >=0);
+ connect (i, i+1, ideal_arr_[i], hooke_arr_[i]);
}
}
-
-
-
-void
-Spring_spacer::prepare()
-{
- calc_idealspacing();
- handle_loose_cols();
- print();
-}
-
-Line_spacer*
-Spring_spacer::constructor()
-{
- return new Spring_spacer;
-}
-
projects / lilypond.git / blobdiff