X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsimple-spacer-scheme.cc;h=db326704fcde0a6783452a7f1fe4cade3f9b0627;hb=fa8f0355e0403afb3190016c9dd11d25ba52a9b7;hp=c38d1e52edc06c77c4029e538dd855232b88efa4;hpb=9d1e56447d21a8a1cfbc751535183916efffe7a0;p=lilypond.git

diff --git a/lily/simple-spacer-scheme.cc b/lily/simple-spacer-scheme.cc
index c38d1e52ed..db326704fc 100644
--- a/lily/simple-spacer-scheme.cc
+++ b/lily/simple-spacer-scheme.cc
@@ -3,13 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <cstdio>
-#include <math.h>
 
-#include "libc-extension.hh"	// isinf
 #include "paper-column.hh"
 #include "spring.hh"
 #include "warn.hh"
@@ -19,7 +17,7 @@ LY_DEFINE (ly_solve_spring_rod_problem, "ly:solve-spring-rod-problem",
 	   4, 1, 0, (SCM springs, SCM rods, SCM length, SCM ragged),
 	   "Solve a spring and rod problem for @var{count} objects, that "
 	   "are connected by @var{count-1} springs, and an arbitrary number of rods "
-	   "Springs have the format (ideal, hooke) and rods (idx1, idx2, distance) "
+	   "Springs have the format (ideal, inverse_hooke) and rods (idx1, idx2, distance) "
 	   "@var{length} is a number, @var{ragged} a boolean "
 	   "Return: a list containing the force (positive for stretching, "
 	   "negative for compressing and #f for non-satisfied constraints) "
@@ -30,18 +28,17 @@ LY_DEFINE (ly_solve_spring_rod_problem, "ly:solve-spring-rod-problem",
     return scm_list_2 (scm_from_double (0.0), scm_from_double (0.0));
 
   SCM_ASSERT_TYPE (len >= 0, springs, SCM_ARG1, __FUNCTION__, "list of springs");
-  SCM_ASSERT_TYPE (scm_ilength (rods) >= 0, rods, SCM_ARG2, __FUNCTION__, "list of rods");
-  SCM_ASSERT_TYPE (scm_is_number (length) || length == SCM_BOOL_F,
-		   length, SCM_ARG3, __FUNCTION__, "number or #f");
+  SCM_ASSERT_TYPE (scm_ilength (rods)  > 0, rods, SCM_ARG1, __FUNCTION__, "list of rods");
+  LY_ASSERT_TYPE (scm_is_number, length, 3);
 
   bool is_ragged = ragged == SCM_BOOL_T;
   Simple_spacer spacer;
   for (SCM s = springs; scm_is_pair (s); s = scm_cdr (s))
     {
       Real ideal = scm_to_double (scm_caar (s));
-      Real hooke = scm_to_double (scm_cadar (s));
+      Real inv_hooke = scm_to_double (scm_cadar (s));
 
-      spacer.add_spring (ideal, 1 / hooke);
+      spacer.add_spring (ideal, inv_hooke);
     }
 
   for (SCM s = rods; scm_is_pair (s); s = scm_cdr (s))
@@ -55,39 +52,15 @@ LY_DEFINE (ly_solve_spring_rod_problem, "ly:solve-spring-rod-problem",
       spacer.add_rod (l, r, distance);
     }
 
-  spacer.line_len_ = scm_to_double (length);
+  spacer.solve (scm_to_double (length), is_ragged);
 
-  if (is_ragged)
-    spacer.my_solve_natural_len ();
-  else
-    spacer.my_solve_linelen ();
+  vector<Real> posns = spacer.spring_positions ();
 
-  Array<Real> posns;
-  posns.push (0.0);
-  for (int i = 0; i < spacer.springs_.size (); i++)
-    {
-      Real l = spacer.springs_[i].length ((is_ragged) ? 0.0 : spacer.force_);
-      posns.push (posns.top () + l);
-    }
-
-  SCM force_return = SCM_BOOL_F;
-  if (!isinf (spacer.force_)
-      && (spacer.is_active () || is_ragged))
-    {
-      force_return = scm_from_double (spacer.force_);
-    }
-
-  if (is_ragged
-      && posns.top () > spacer.line_len_)
-    {
-      force_return = SCM_BOOL_F;
-    }
+  SCM force_return = spacer.fits () ? scm_from_double (spacer.force ()) : SCM_BOOL_F;
 
   SCM retval = SCM_EOL;
-  for (int i = posns.size (); i--;)
-    {
-      retval = scm_cons (scm_from_double (posns[i]), retval);
-    }
+  for (vsize i = posns.size (); i--;)
+    retval = scm_cons (scm_from_double (posns[i]), retval);
 
   retval = scm_cons (force_return, retval);
   return retval;