Changeset 82:079bc25d8b0e

Timestamp:

06/29/09 18:26:45 (14 months ago)

Author:

turtle@…

Branch:

default

Tags:

tip

Message:

?? ??????? ????????????? ??????.

Files:

• implementation/controller.lisp (modified) (2 diffs)

implementation/controller.lisp

@@ -144 +144 @@
           (for p-radius previous radius)
           (unless (first-iteration-p)
-            (when (funcall (if (< r-1 r-2) '< '>) radius p-radius)
+            (when 
+              (and (< (abs (- r-2 radius)) 1)
+                   (funcall (if (< r-1 r-2) '< '>) radius p-radius))
               (format t "R-1:~a, R-2:~a, R:~a, PR:~a~%" r-1 r-2 radius p-radius)
               (multiple-value-bind (t-x t-y) (tangent-vector (2d-vector-x position) (2d-vector-y position) rotation)
@@ -181 +183 @@
          (orbit-diff (- target-orbit our-orbit))
          (orbit-delta (/ orbit-diff 2)))
-    (hohmann-change-circular-orbit c (+ our-orbit (* orbit-delta 1)))
-    (skip-n-turns c 1000)
-;    (hohmann-change-circular-orbit c (+ our-orbit (* orbit-delta 2)))
-;    (hohmann-change-circular-orbit c (+ our-orbit (* orbit-delta 3)))
-;    (hohmann-change-circular-orbit c (+ our-orbit (* orbit-delta 4)))
-;    (hohmann-change-circular-orbit c (+ our-orbit (* orbit-delta 5)))
-;    (hohmann-change-circular-orbit c (+ our-orbit (* orbit-delta 6)))
-;    (hohmann-change-circular-orbit c (+ our-orbit (* orbit-delta 7)))
-;    (hohmann-change-circular-orbit c (+ our-orbit (* orbit-delta 8)))
-;    (hohmann-change-circular-orbit c (+ our-orbit (* orbit-delta 9)))
+;    (hohmann-change-circular-orbit c (+ our-orbit (* orbit-delta 1)))
     (hohmann-change-circular-orbit c target-orbit))
   (skip-turns c))