From 976247c4011acd4e91117038608d6e133459bd02 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 27 Jan 2006 23:56:20 +0000 Subject: [PATCH] (get_best_curve): handle opt_idx < 0 case. --- ChangeLog | 4 ++++ lily/slur-scoring.cc | 14 +++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a92df34669..8cf5660fc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-01-28 Han-Wen Nienhuys + + * lily/slur-scoring.cc (get_best_curve): handle opt_idx < 0 case. + 2006-01-27 Jan Nieuwenhuizen * lily/main.cc (main): Debugging aid: catch exceptions. diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc index d842abfc09..769f84f633 100644 --- a/lily/slur-scoring.cc +++ b/lily/slur-scoring.cc @@ -430,9 +430,17 @@ Slur_score_state::get_best_curve () } #if DEBUG_SLUR_SCORING - configurations_[opt_idx]->score_card_ += to_string ("=%.2f", opt); - configurations_[opt_idx]->score_card_ += to_string ("i%d", opt_idx); - + if (opt_idx >= 0) + { + configurations_[opt_idx]->score_card_ += to_string ("=%.2f", opt); + configurations_[opt_idx]->score_card_ += to_string ("i%d", opt_idx); + } + else + { + programming_error ("No optimal slur found. Guessing 0."); + opt_idx = 0; + } + // debug quanting slur_->set_property ("quant-score", scm_makfrom0str (configurations_[opt_idx]->score_card_.c_str ())); -- 2.39.2