From d757a1b2b65c5f880af67702f1eaf5fda681724e Mon Sep 17 00:00:00 2001 From: Keith OHara Date: Fri, 19 Jun 2015 21:48:13 -0700 Subject: [PATCH] simple-spacer: inappropriate assert; issue 4448 --- lily/simple-spacer.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc index 271c1521c5..bf64413a8a 100644 --- a/lily/simple-spacer.cc +++ b/lily/simple-spacer.cc @@ -195,7 +195,8 @@ Simple_spacer::expand_line () if (inv_hooke == 0.0) /* avoid division by zero. If springs are infinitely stiff */ inv_hooke = 1e-6; /* then report a very large stretching force */ - assert (cur_len <= line_len_); + if (cur_len > (1 + 1e-6) * line_len_) + programming_error ("misuse of expand_line"); return (line_len_ - cur_len) / inv_hooke + force_; } @@ -219,8 +220,8 @@ Simple_spacer::compress_line () fits_ = true; - assert (line_len_ <= cur_len); - + if (line_len_ > (1 + 1e-6) * cur_len) + programming_error ("misuse of compress_line"); vector sorted_springs = springs_; sort (sorted_springs.begin (), sorted_springs.end (), greater ()); @@ -248,7 +249,9 @@ Simple_spacer::compress_line () /* Paranoia check. */ - assert (fabs (configuration_length (cur_force) - cur_len) < 1e-6); + if (fabs (configuration_length (cur_force) - cur_len) > 1e-6 * cur_len) + programming_error (to_string ("mis-predicted force, %.6f ~= %.6f", + cur_len, configuration_length(cur_force))); return cur_force; } -- 2.39.2