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

diff --git a/lily/simple-spacer-scheme.cc b/lily/simple-spacer-scheme.cc
index c38d1e52ed..cc09da1021 100644
--- a/lily/simple-spacer-scheme.cc
+++ b/lily/simple-spacer-scheme.cc
@@ -1,47 +1,65 @@
 /*
-  simple-spacer-scheme.cc -- implement Simple_spacer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <cstdio>
-#include <math.h>
 
-#include "libc-extension.hh"	// isinf
 #include "paper-column.hh"
 #include "spring.hh"
 #include "warn.hh"
 #include "simple-spacer.hh"
 
 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) "
-	   "@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) "
-	   "followed by the @var{spring-count}+1 positions of the objects. ")
+           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 @var{springs}, and an arbitrary"
+           " number of @var{rods}.  @var{count} is implicitly given by"
+           " @var{springs} and @var{rods}.  The @var{springs} argument has"
+           " the format @code{(ideal, inverse_hook)} and @var{rods} is of"
+           " the form @code{(idx1, idx2, distance)}.\n"
+           "\n"
+           "@var{length} is a number, @var{ragged} a boolean.\n"
+           "\n"
+           "The function returns a list containing the force (positive for"
+           " stretching, negative for compressing and @code{#f} for"
+           " non-satisfied constraints) followed by @var{spring-count}+1"
+           " positions of the objects.")
 {
   int len = scm_ilength (springs);
   if (len == 0)
     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);
+      Spring sp (ideal, 0.0);
+      sp.set_inverse_compress_strength (inv_hooke);
+      sp.set_inverse_stretch_strength (inv_hooke);
+
+      spacer.add_spring (sp);
     }
 
   for (SCM s = rods; scm_is_pair (s); s = scm_cdr (s))
@@ -55,39 +73,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;