X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspring.cc;h=312b2ed00f49644598966832b50d1598396eae3b;hb=ee5f21d7ed3b985913194699aa1d412e4bced562;hp=761ef2467bf0773c770b70a6410b7a2541de2ca1;hpb=733d98665372b815cac635f48f1a20d65f50d25a;p=lilypond.git

diff --git a/lily/spring.cc b/lily/spring.cc
index 761ef2467b..312b2ed00f 100644
--- a/lily/spring.cc
+++ b/lily/spring.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2007--2010 Joe Neeman <joeneeman@gmail.com>
+  Copyright (C) 2007--2012 Joe Neeman <joeneeman@gmail.com>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -45,23 +45,27 @@ Spring::Spring (Real dist, Real min_dist)
 void
 Spring::update_blocking_force ()
 {
+  // blocking_force_ is the value of force
+  //   below which length(force) is constant, and
+  //   above which length(force) varies according to inverse_*_strength.
+  // Simple_spacer::compress_line() depends on the condition above.
+  // We assume inverse_*_strength are non-negative.
   if (min_distance_ > distance_)
-    blocking_force_ = (min_distance_ - distance_) / inverse_stretch_strength_;
-  else
+    if (inverse_stretch_strength_ > 0.0)
+      blocking_force_ = (min_distance_ - distance_) / inverse_stretch_strength_;
+    else
+      // Conceptually, this should be +inf, but 0.0 meets the requirements
+      //  of Simple_spacer and creates fewer cases of 0.0*inf to handle.
+      blocking_force_ = 0.0;
+  else if (inverse_compress_strength_ > 0.0)
     blocking_force_ = (min_distance_ - distance_) / inverse_compress_strength_;
-
-  // If the spring is fixed, it's not clear what the natural value
-  // of blocking_force_ would be. -infinity_f works fine for now.
-  if (isnan (blocking_force_) || blocking_force_ == infinity_f)
-    blocking_force_ = -infinity_f;
-
-  if (blocking_force_ >= 0)
-    inverse_compress_strength_ = 0;
+  else
+    blocking_force_ = 0.0;
 }
 
 /* scale a spring, but in a way that doesn't violate min_distance */
 void
-Spring::operator*= (Real r)
+Spring::operator *= (Real r)
 {
   distance_ = max (min_distance_, distance_ * r);
   inverse_compress_strength_ = max (0.0, distance_ - min_distance_);
@@ -70,7 +74,7 @@ Spring::operator*= (Real r)
 }
 
 bool
-Spring::operator> (Spring const &other) const
+Spring::operator > (Spring const &other) const
 {
   return blocking_force_ > other.blocking_force_;
 }
@@ -93,9 +97,9 @@ merge_springs (vector<Spring> const &springs)
       min_distance = max (springs[i].min_distance (), min_distance);
     }
 
-  avg_stretch /= springs.size ();
-  avg_compress /= springs.size ();
-  avg_distance /= springs.size ();
+  avg_stretch /= Real (springs.size ());
+  avg_compress /= Real (springs.size ());
+  avg_distance /= Real (springs.size ());
   avg_distance = max (min_distance + 0.3, avg_distance);
 
   Spring ret = Spring (avg_distance, min_distance);
@@ -198,7 +202,7 @@ Spring::length (Real f) const
   Real force = max (f, blocking_force_);
   Real inv_k = force < 0.0 ? inverse_compress_strength_ : inverse_stretch_strength_;
 
-  if (force == infinity_f)
+  if (isinf (force))
     {
       programming_error ("cruelty to springs");
       force = 0.0;