New upstream version 16.8

1 files changed, 120 insertions, 104 deletions

diff --git a/peak-phases.scm b/peak-phases.scm
index 4f386f7..5209a76 100644
--- a/peak-phases.scm
+++ b/peak-phases.scm
@@ -1671,8 +1671,8 @@
 (vector 20 5.043 #(0 1 0 1 0 0 0 0 0 0 1 0 1 1 0 0 0 1 1 0)
 
      4.357980 #(0.000000 0.074668 -0.007236 0.182274 -0.090904 0.683075 1.087950 1.620610 1.402047 0.349796 1.096502 -0.498958 0.949574 -0.321894 1.411823 0.831379 -0.654670 0.294879 -0.284984 1.407225)
-     4.301350 #(0.000000 1.462657 0.315046 1.257119 0.218364 -0.229560 0.191266 0.646076 -0.074737 0.182805 -0.095884 0.518081 0.428215 -0.270813 1.227758 1.155049 -0.394507 0.393747 0.491847 -0.074127)
-     4.300696 #(0.000000 1.453960 0.305048 1.243496 0.204325 -0.251563 0.160990 0.613695 -0.108690 0.149379 -0.143222 0.469144 0.382436 -0.318799 1.156560 1.098024 -0.463350 0.326646 0.412158 -0.149696)
+     4.300525 #(0.000000 1.454922 0.306846 1.245703 0.207273 -0.248151 0.165464 0.618585 -0.103207 0.155791 -0.136302 0.476852 0.390970 -0.309608 1.166284 1.108669 -0.452208 0.338277 0.424300 -0.136694)
+     4.300411 #(0.000000 1.455414 0.307661 1.246638 0.208834 -0.246349 0.167594 0.620918 -0.100474 0.159208 -0.133203 0.480470 0.395357 -0.304743 1.170590 1.114440 -0.446663 0.344322 0.430311 -0.130164)
      )
 
 ;;; 21 odd -------------------------------------------------------------------------------- ; 4.5825756
@@ -1687,48 +1687,48 @@
 (vector 22 5.1805551751198 #(0 1 0 1 0 1 0 0 1 0 1 1 0 0 1 1 0 0 0 0 0 0)
 
      4.581017 #(0.000000 0.180996 0.414015 1.937535 0.354831 0.584078 1.521008 1.778595 1.533807 1.338106 -0.034930 1.700610 0.808153 0.348626 1.850606 -0.102689 0.038967 0.664253 1.395687 0.513457 1.627689 0.472162)
-     4.572966 #(0.000000 0.624974 -0.494704 -0.062730 0.437887 0.708437 0.329958 1.081405 -0.318053 -0.503605 0.061743 0.515507 -0.185504 0.100991 -0.057279 1.106734 -1.261148 -0.049536 0.800865 0.581274 0.648500 0.158381)
-     4.564487 #(0.000000 0.576405 -0.579542 -0.156941 0.290094 0.541216 0.112010 0.847419 -0.573063 -0.792734 -0.277370 0.148421 -0.579056 -0.322667 -0.510430 0.613557 -1.772650 -0.608491 0.219823 -0.009843 -0.000061 -0.530362)
+     4.559399 #(0.000000 0.818164 -0.192940 0.348191 -0.389846 0.508891 0.493197 0.093591 -0.504577 -0.897041 -0.065084 0.067843 -0.236861 0.107466 -0.207423 -0.742951 0.106255 0.956224 0.876829 -0.230549 0.370673 0.390286)
+     4.519002 #(0.000000 -0.221397 1.057824 1.492981 -0.263486 0.870091 -0.528249 -0.376750 0.756810 0.176851 -0.090091 1.600251 -0.084632 0.635148 0.821442 1.002126 0.978361 0.034872 -0.759728 0.321190 0.972421 0.245173)
      )
 
 ;;; 23 odd -------------------------------------------------------------------------------- ; 4.7958315
 (vector 23 5.4125407453101 #(0 0 0 1 1 1 1 0 0 1 0 1 0 1 1 1 1 0 1 1 0 0 1)
 
      4.661614 #(0.000000 0.402662 0.143299 -0.307618 -0.213995 0.796949 1.006633 1.285380 1.569840 0.564104 0.342477 0.293161 1.200899 0.723618 0.539973 0.518746 0.907665 0.184015 1.163786 0.995418 -1.860771 1.039418 -0.124574)
-     4.636176 #(0.000000 0.519866 0.374819 -0.030447 0.192370 1.304984 1.571487 -0.066414 0.252962 1.322528 1.209237 1.264494 0.242765 1.907322 1.729898 1.793071 0.231940 1.678090 0.706948 0.606492 1.894338 0.853159 1.787580)
      4.634825 #(0.000000 0.336809 0.806144 -0.062567 0.702047 1.353357 1.333544 1.711363 1.335973 0.156420 1.259722 0.268353 0.775391 0.709193 0.489222 -0.013866 0.215803 1.155224 0.942400 0.393893 0.015582 0.693933 0.411664)
+     4.634407 #(0.000000 0.337913 0.805462 -0.065533 0.702753 1.354327 1.334664 1.709523 1.331667 0.152462 1.257186 0.263947 0.769802 0.707842 0.485157 -0.009174 0.212207 1.154954 0.942106 0.386101 0.011788 0.687978 0.407297)
      )
 
 ;;; 24 odd -------------------------------------------------------------------------------- ; 4.89897948
 (vector 24 5.6193280144865 #(0 1 0 0 1 0 1 0 1 1 0 0 1 0 1 1 0 0 1 1 1 1 1 1)
 
      4.786434 #(0.000000 0.498846 1.191572 1.399155 0.479838 1.497230 -0.058887 0.823598 0.010384 0.864577 0.051220 1.057330 0.998513 1.799328 -0.041050 0.199658 0.646825 0.272218 0.034139 0.159133 0.043804 -0.115906 1.177655 0.690674)
-     4.783551 #(0.000000 0.718903 0.843951 1.646228 0.245318 1.348243 -0.241958 0.553724 -0.135398 0.478801 -0.417787 0.837802 1.118912 1.185206 0.001003 -0.012570 0.249549 -0.381853 -0.460156 -0.067734 -0.098370 -0.601123 0.571496 -0.014893)
      4.783029 #(0.000000 0.726248 0.856709 1.665477 0.271147 1.375734 -0.206610 0.592121 -0.087409 0.530646 -0.360424 0.901293 1.188841 1.262301 0.080781 0.071714 0.339949 -0.286037 -0.360911 0.038946 0.015798 -0.483821 0.695754 0.114401)
+     4.782962 #(0.000000 0.726238 0.856679 1.665577 0.271280 1.375871 -0.206382 0.592175 -0.087179 0.530852 -0.360257 0.901705 1.189234 1.262764 0.081277 0.072171 0.340463 -0.285522 -0.360411 0.039578 0.016656 -0.483158 0.696443 0.115110)
      )
 
 ;;; 25 odd -------------------------------------------------------------------------------- ; 5
 (vector 25 5.7220960914079 #(0 1 0 0 0 0 0 1 0 1 0 0 1 0 1 1 1 0 1 1 0 0 0 1 1)
 
      4.886819 #(0.000000 -0.128793 0.647898 0.792536 -0.285146 0.144218 1.160103 1.183437 -0.004858 -0.239530 1.215352 0.277973 0.699697 1.110172 0.616181 1.458993 0.406636 0.121039 0.182656 -0.085662 1.058149 0.147121 0.546131 0.378165 0.309175)
-     4.865690 #(0.000000 0.049083 0.518359 1.226987 -0.738416 0.540127 0.766518 1.426508 -0.434331 -0.154303 1.590262 0.480087 0.287057 -1.105890 0.346099 -0.140690 0.422510 0.142277 0.052967 -0.203330 -0.865415 -0.068820 0.420811 -0.449472 0.543736)
-     4.862034 #(0.000000 0.010883 0.500081 1.154509 -0.822082 0.447783 0.644746 1.285452 -0.548061 -0.355481 1.403627 0.281321 0.074705 -1.368546 0.081592 -0.437696 0.142447 -0.192640 -0.266326 -0.565494 -1.250657 -0.428908 -0.017603 -0.874024 0.089961)
+     4.833870 #(0.000000 0.682487 0.229329 1.065182 1.133347 0.718396 -0.534947 0.962349 0.109795 -0.506458 1.066135 -0.520472 -0.571394 0.037503 0.493262 0.263583 -0.535314 -0.444645 1.130989 -0.865083 -0.231904 -0.824110 -0.626051 0.420930 0.748241)
+     4.833585 #(0.000000 0.684418 0.231543 1.068448 1.131681 0.716084 -0.543413 0.960963 0.108056 -0.510271 1.064008 -0.527153 -0.574236 0.032340 0.486849 0.263393 -0.542768 -0.456188 1.134973 -0.877871 -0.236595 -0.839653 -0.635589 0.413586 0.738028)
      )
 
 ;;; 26 odd -------------------------------------------------------------------------------- ; 5.0990
 (vector 26 5.8537594936002 #(0 0 0 0 1 1 1 1 0 0 1 0 0 1 0 0 1 1 1 0 1 1 1 1 0 1)
 
      5.006443 #(0.000000 1.694135 1.368613 1.372881 0.625230 0.749494 1.218456 1.691757 1.088538 0.652397 -0.134215 1.088115 0.314540 0.197061 0.715518 1.230349 1.542812 -0.159343 1.427261 1.767442 0.867761 1.850745 0.671024 -0.112496 0.172562 0.147817)
-     4.998313 #(0.000000 1.734366 1.452800 1.481416 0.767178 0.912208 1.420592 -0.092819 1.341912 0.935356 0.173174 1.426025 0.695197 0.600881 1.161029 1.696831 0.036081 0.368394 -0.024124 0.350178 1.493610 0.485227 1.353414 0.593653 0.909305 0.920489)
-     4.997597 #(0.000000 1.738732 1.464944 1.506852 0.793026 0.939307 1.467000 -0.059120 1.386349 0.993314 0.226614 1.492120 0.767958 0.673251 1.262733 1.788242 0.135591 0.470430 0.083411 0.467468 1.606652 0.610267 1.492062 0.741835 1.051515 1.074180)
+     4.996915 #(0.000000 1.742755 1.471776 1.501254 0.794548 0.943595 1.463682 -0.050384 1.394006 0.990276 0.231933 1.492372 0.767814 0.678653 1.249512 1.790068 0.139370 0.475758 0.085016 0.469457 1.614468 0.612558 1.488941 0.735631 1.061318 1.072925)
+     4.996683 #(0.000000 1.740815 1.471360 1.504333 0.793966 0.944959 1.469851 -0.050031 1.395444 0.990928 0.238054 1.493878 0.769155 0.680547 1.256014 1.792102 0.136976 0.478247 0.085153 0.474291 1.616841 0.617611 1.491514 0.741599 1.059794 1.082318)
      )
 
 ;;; 27 odd -------------------------------------------------------------------------------- ; 5.196152
 (vector 27 5.8637111082051 #(0 0 1 1 0 0 1 0 1 0 0 1 0 1 0 0 0 1 0 0 0 0 0 1 1 1 1)
 
      5.088823 #(0.000000 0.108028 1.216984 1.164689 0.975005 -0.022884 0.035464 -0.148996 0.575654 1.005987 1.378471 0.117457 0.956928 1.741009 0.131397 -0.243584 0.873140 0.514628 1.810242 0.918281 0.161062 1.222969 1.595595 1.233298 1.211975 1.332117 1.297417)
-     5.085863 #(0.000000 0.128925 1.251125 1.214764 1.041899 0.057706 0.132363 -0.027871 0.701338 1.157060 1.544495 0.300753 1.157743 -0.045909 0.351461 -0.002752 1.121958 0.779052 0.085933 1.218255 0.473721 1.545898 1.955446 1.591383 1.599506 1.727019 1.708190)
      5.085571 #(0.000000 0.134554 1.259859 1.228144 1.060230 0.079084 0.158344 0.004220 0.734810 1.196702 1.588244 0.348524 1.210515 0.009117 0.409728 0.061105 1.186771 0.849208 0.158894 1.297636 0.556923 1.631224 0.049754 1.687106 1.701477 1.830544 1.814985)
+     5.085376 #(0.000000 0.134436 1.259874 1.228201 1.060157 0.078706 0.158097 0.004323 0.734629 1.196644 1.588020 0.348173 1.210355 0.008907 0.409496 0.060743 1.186070 0.848591 0.158658 1.296780 0.556238 1.631048 0.049386 1.686839 1.701113 1.829904 1.814076)
      )
 
 ;;; 28 odd -------------------------------------------------------------------------------- ; 5.291502
@@ -1741,14 +1741,15 @@
 (vector 29 6.0348020511367 #(0 1 1 1 1 0 0 0 1 1 0 1 0 1 1 0 0 1 0 0 1 1 1 0 1 1 1 1 1)
 
      5.263365 #(0.000000 0.151064 0.558177 0.735081 1.367806 -0.011277 1.649265 0.435302 1.718318 1.203162 0.977127 1.010028 0.703023 1.591655 0.710208 0.371369 0.285721 1.400549 0.654738 0.961707 0.849244 0.833954 0.047113 1.107680 1.103136 1.834278 0.611441 1.521356 0.107658)
-     5.259288 #(0.000000 0.166681 0.583269 0.778340 1.425069 0.059765 1.739046 0.528564 1.829114 1.331524 1.122056 1.160867 0.870985 1.763529 0.904217 0.580915 0.504372 1.635384 0.897463 1.218677 1.129924 1.124231 0.338591 1.419164 1.429852 0.160125 0.961152 1.885698 0.486330)
-     5.258751 #(0.000000 0.171574 0.592319 0.792973 1.446819 0.084857 1.769829 0.564731 1.868550 1.377844 1.173689 1.214525 0.934263 1.825439 0.976268 0.658329 0.582828 1.724114 0.984894 1.311650 1.228345 1.227537 0.450506 1.533849 1.549709 0.281643 1.094059 0.018092 0.627024)
+     5.257572 #(0.000000 0.173145 0.594158 0.795369 1.446698 0.086774 1.773903 0.563415 1.870889 1.380641 1.174997 1.216907 0.933657 1.828478 0.975502 0.657848 0.586415 1.721400 0.987820 1.313934 1.233706 1.234202 0.445482 1.535953 1.550258 0.283390 1.091724 0.021764 0.624654)
+     5.257294 #(0.000000 0.173417 0.594854 0.796262 1.448087 0.088760 1.776024 0.565819 1.873894 1.383720 1.178388 1.220868 0.937816 1.832318 0.979592 0.662513 0.591751 1.726716 0.993575 1.320249 1.240786 1.241192 0.451577 1.543498 1.557502 0.291356 1.099404 0.030228 0.632911)
      )
 
 ;;; 30 odd -------------------------------------------------------------------------------- ; 5.4772255
 (vector 30 6.2357559204102 #(0 1 0 1 0 1 1 0 0 1 1 0 1 1 0 0 0 0 1 1 1 1 0 1 1 1 1 0 1 1)
 
      5.353062 #(0.000000 -0.273797 0.780589 0.428126 1.742006 0.813705 1.826779 0.243133 0.799231 0.444552 0.600071 1.280010 -0.037027 0.801371 0.587721 1.132556 0.784854 1.819749 1.361833 1.646165 1.057885 0.274456 0.188906 0.072120 0.645190 1.511097 1.900389 1.698668 1.288971 1.535352)
+     5.352588 #(0.000000 -0.273931 0.766389 0.417785 1.759969 0.852970 1.831793 0.250419 0.820927 0.459290 0.634623 1.258292 -0.010367 0.819856 0.603568 1.142686 0.772733 1.853850 1.422248 1.684383 1.092051 0.281817 0.215433 0.103401 0.692837 1.549368 1.938793 1.739493 1.350311 1.578167)
      )
 
 ;;; 31 odd -------------------------------------------------------------------------------- ; 5.56776
@@ -1761,6 +1762,8 @@
 (vector 32 6.3532226957365 #(0 1 1 0 0 1 0 1 0 1 1 0 0 1 1 1 0 0 0 0 1 0 1 1 1 1 1 1 0 1 1 1)
 
      5.563263 #(0.000000 0.861343 1.208721 0.520795 1.054113 1.500902 0.176395 1.932292 0.475897 1.249746 1.078677 0.960255 1.432432 1.363500 0.301492 1.951062 1.402695 1.767079 1.762968 0.052405 1.191435 0.031852 1.950934 1.508841 1.124488 1.063642 0.897258 1.672866 0.358501 1.273522 0.844792 1.935288)
+     5.562972 #(0.000000 0.861217 1.206835 0.514668 1.049373 1.493527 0.165833 1.922649 0.463026 1.234869 1.062460 0.942281 1.415945 1.343562 0.279233 1.931459 1.376805 1.743078 1.738289 0.026086 1.157890 -0.002180 1.918803 1.472699 1.091275 1.028581 0.857328 1.631630 0.315548 1.231287 0.799592 1.886286)
+     5.562411 #(0.000000 0.859323 1.190444 0.494012 1.028692 1.469692 0.141558 1.885052 0.424090 1.180902 1.008009 0.895780 1.351886 1.274948 0.207413 1.853283 1.295225 1.657605 1.650700 -0.065848 1.060843 -0.109787 1.811684 1.362896 0.980346 0.908138 0.729852 1.507776 0.172839 1.085598 0.653947 1.738565)
      )
 
 ;;; 33 odd -------------------------------------------------------------------------------- ; 5.74456
@@ -1773,18 +1776,21 @@
 (vector 34 6.5771403312683 #(0 0 1 1 0 1 0 1 0 1 1 1 0 0 1 1 0 1 0 0 1 0 0 0 0 0 0 0 1 1 1 1 0 0)
 
      5.740544 #(0.000000 1.128136 0.272558 -0.038354 0.299624 0.550945 0.313230 0.243494 0.297552 -0.035270 1.018110 0.345979 1.524929 0.448210 1.252682 0.941202 0.533185 0.349491 1.187324 0.383773 0.599245 -0.155984 1.372487 0.578854 1.244062 1.476419 0.215593 0.058496 0.148247 1.077304 1.406503 0.859804 1.327046 0.146527)
+     5.740096 #(0.000000 1.126579 0.274797 -0.036973 0.303383 0.553483 0.314264 0.246856 0.297834 -0.033499 1.019845 0.345774 1.526899 0.447745 1.258364 0.944671 0.535960 0.355266 1.190803 0.389672 0.604320 -0.151880 1.372982 0.583869 1.247701 1.480892 0.216497 0.062583 0.153614 1.084578 1.412571 0.866785 1.333165 0.152476)
      )
 
 ;;; 35 odd -------------------------------------------------------------------------------- ; 5.9160
 (vector 35 6.7392678260803 #(0 1 1 1 1 1 0 0 1 0 0 0 0 1 1 0 0 1 1 0 0 0 1 0 1 1 0 0 0 0 1 0 1 0 0)
      
      5.833275 #(0.000000 0.446552 1.591598 1.665970 0.393066 0.930519 1.356028 1.466278 0.225797 1.216894 0.009583 0.233020 1.866671 1.148796 1.079614 1.602870 0.201424 1.366765 -0.045388 1.214248 0.402056 0.196949 1.726073 1.538289 -0.146596 -0.105825 1.452686 0.350527 1.133547 0.212285 1.683225 0.967867 0.587559 1.049939 0.968758)
+     5.831940 #(0.000000 0.442592 1.595559 1.667149 0.390888 0.932710 1.355699 1.467421 0.225808 1.216274 0.006151 0.229030 1.863501 1.148120 1.076941 1.603023 0.203908 1.367674 -0.048841 1.213555 0.398968 0.193979 1.723886 1.530859 -0.143197 -0.110963 1.445011 0.352490 1.136021 0.209386 1.681224 0.955375 0.584685 1.044680 0.963426)
      )
 
 ;;; 36 odd -------------------------------------------------------------------------------- ; 6
 (vector 36 6.8277182579041 #(0 1 1 0 1 1 0 1 1 1 1 0 0 1 1 0 0 1 1 0 0 0 0 0 1 1 0 1 0 1 0 1 0 0 0 0)
 
      5.977640 #(0.000000 -0.070466 1.538192 0.984355 0.488221 1.019554 1.547512 1.704002 1.584416 0.668394 -0.001385 0.884114 1.504028 -0.187464 0.437132 1.457048 0.752720 0.480053 1.746828 0.789836 0.816665 1.133277 1.144098 1.330854 0.114924 1.293712 1.538716 1.521496 0.841528 0.693020 1.172435 0.408530 0.666143 -0.084621 1.417045 -0.037001)
+     5.976954 #(0.000000 -0.070556 1.536418 0.980505 0.483987 1.015677 1.541485 1.698146 1.578396 0.660292 -0.011221 0.873208 1.492968 -0.199079 0.425437 1.441408 0.737503 0.464140 1.729055 0.774687 0.798932 1.115905 1.126505 1.309834 0.093266 1.273387 1.516076 1.497797 0.815827 0.668525 1.146329 0.381039 0.638332 -0.112948 1.387354 -0.069078)
 
 	;; 35+1
      6.030643 #(0.000000 1.022108 1.134386 0.040000 1.020689 1.082726 -0.154753 1.098409 0.988397 0.898657 1.161207 0.157216 -0.172638 1.251128 1.003109 0.170160 0.036385 0.822058 1.148915 -0.012280 -0.203882 0.002376 0.142366 -0.019253 0.880987 1.211008 -0.244514 0.790432 -0.315814 0.996657 -0.069816 0.913294 0.063655 0.034201 0.148650 -0.048872)
@@ -1795,6 +1801,7 @@
 (vector 37 7.0 #(0 1 0 0 0 1 1 1 0 0 0 1 0 1 0 1 1 1 1 0 1 0 0 0 1 1 0 0 1 0 0 1 0 0 0 0 0)
 
      6.019116 #(0.000000 1.198867 1.849092 0.935330 1.781957 0.496846 0.026335 0.303736 1.089299 1.074310 1.006658 1.377317 0.271438 1.654659 0.071833 0.494433 1.198697 -0.081156 0.936704 0.883271 1.529398 0.425484 0.218240 1.480439 1.569267 1.446099 0.465358 0.265303 1.385278 0.810099 0.212275 0.106695 0.522036 0.380536 0.175723 0.325421 -0.016008)
+     6.017983 #(0.000000 1.196303 1.848565 0.939650 1.786501 0.501068 0.028495 0.309805 1.093071 1.080045 0.999577 1.377779 0.273016 1.658005 0.074466 0.493082 1.197720 -0.080740 0.935043 0.876257 1.528656 0.420990 0.220232 1.480020 1.566042 1.443116 0.463685 0.261601 1.382015 0.812725 0.198582 0.107078 0.513834 0.371234 0.176917 0.320137 -0.019751)
      )
 
 ;;; 38 odd -------------------------------------------------------------------------------- ; 6.1644
@@ -1804,14 +1811,16 @@
 
      ;; 37+1
      6.138688 #(0.000000 1.046261 1.784835 0.956057 1.812170 0.474533 0.170721 0.206638 1.084578 1.210612 0.877325 1.304868 0.216526 1.666615 0.017582 0.377950 1.122637 -0.152317 0.759942 0.908307 1.610556 0.619180 0.252252 1.289240 1.682699 1.456452 0.437125 0.204631 1.313659 1.057657 0.251390 0.015459 0.426277 0.374256 0.211841 0.291412 0.083784 0.055093)
-     6.109073 #(0.000000 0.982171 1.705612 0.986921 1.873378 0.509690 0.102590 0.186755 1.133224 1.164029 0.874124 1.283945 0.138084 1.739224 -0.073147 0.350734 1.013698 -0.141497 0.646696 0.873432 1.551583 0.589738 0.246954 1.196679 1.600352 1.425024 0.430454 0.103410 1.227168 1.077407 0.227980 -0.028101 0.385573 0.330289 0.176030 0.160255 0.005449 0.061254)
-     6.108235 #(0.000000 0.982140 1.705650 0.987359 1.873951 0.509617 0.101844 0.187009 1.133759 1.164160 0.874009 1.284219 0.137756 1.739325 -0.073001 0.350923 1.012778 -0.140699 0.646579 0.873989 1.552501 0.590083 0.247447 1.196795 1.599951 1.425383 0.431367 0.103900 1.228072 1.077985 0.228759 -0.027472 0.386360 0.330507 0.175983 0.160536 0.005039 0.061859)
+     6.087370 #(0.000000 0.962483 1.659153 0.914328 1.849172 0.463645 0.002900 0.259371 1.183040 1.024765 0.911958 1.251368 0.102054 1.776941 -0.148963 0.404605 1.125456 -0.014132 0.657558 0.931281 1.619025 0.584036 0.270146 1.200954 1.580244 1.397448 0.441226 0.047739 1.209421 1.023008 0.216419 -0.079920 0.328466 0.107952 0.198261 0.033021 -0.066955 0.032314)
+     6.086997 #(0.000000 0.953375 1.633071 0.896468 1.836046 0.446251 0.005314 0.261080 1.150812 1.022172 0.925577 1.262013 0.110019 1.780522 -0.172498 0.425767 1.135112 -0.038998 0.639910 0.892046 1.610037 0.590743 0.244804 1.202482 1.560034 1.391559 0.438973 0.040190 1.198091 1.025103 0.198443 -0.088030 0.291908 0.074116 0.167595 -0.010789 -0.085438 -0.008873)
      )
 
 ;;; 39 odd -------------------------------------------------------------------------------- ; 6.2449
 (vector 39 7.2362656593323 #(0 1 1 0 0 1 1 0 0 1 0 0 1 0 1 1 1 0 0 0 0 1 0 1 1 0 1 1 1 0 0 0 1 0 0 0 0 0 0)
 
      6.181539 #(0.000000 0.390214 1.432668 1.784856 0.372658 0.651343 0.590730 1.420862 1.232876 1.274776 1.031604 0.648830 1.314325 1.550338 0.798266 0.829350 0.920173 0.286182 1.175424 0.776791 1.481341 -0.170207 1.810272 0.591377 1.604472 0.287027 1.660006 1.308050 0.895442 0.027306 0.915319 0.337380 0.586293 1.687170 1.285611 1.205943 1.760871 1.039296 0.923977)
+     6.169770 #(0.000000 0.379312 1.457703 1.806417 0.392748 0.695845 0.534025 1.484912 1.216476 1.257505 1.065556 0.592024 1.388763 1.536688 0.712979 0.853274 0.941952 0.200722 1.210757 0.667745 1.526290 -0.208951 1.814930 0.590809 1.623232 0.252350 1.590946 1.293117 0.938100 -0.012345 0.921702 0.427384 0.603131 1.573035 1.298673 1.244575 1.709680 1.074653 0.937276)
+     6.168200 #(0.000000 0.381775 1.454935 1.814403 0.398564 0.697479 0.558864 1.481835 1.237160 1.266386 1.075040 0.611438 1.386693 1.563073 0.754834 0.848982 0.969933 0.242588 1.250658 0.716314 1.559259 -0.161914 1.840309 0.618465 1.616822 0.275923 1.613382 1.346746 0.955815 0.024617 0.939581 0.484552 0.627049 1.599410 1.353605 1.268412 1.756052 1.090300 0.972610)
      )
 
 ;;; 40 odd -------------------------------------------------------------------------------- ; 6.3245
@@ -4442,20 +4451,21 @@
 
 
 (define (tstodd phs)
-  (let ((len (length phs))
-	(incr 0.0001)
-	(mx 0.0)
-	(loc 0.0))
-    (do ((x 0.0 (+ x incr)))
-	((> x (* 2 pi)) (list mx loc))
-      (do ((val 0.0)
-	   (k 0 (+ k 1))
-	   (j 1 (+ j 2)))
-	  ((= k len)
-	   (when (> (abs val) mx)
-	     (set! mx (abs val))
-	     (set! loc x)))
-	(set! val (+ val (sin (+ (* j x) (* pi (phs k))))))))))
+  (do ((len (length phs))
+       (incr 0.0001)
+       (mx 0.0)
+       (loc 0.0)
+       (x 0.0 (+ x incr)))
+      ((> x (* 2 pi)) 
+       (list mx loc))
+    (do ((val 0.0)
+	 (k 0 (+ k 1))
+	 (j 1 (+ j 2)))
+	((= k len)
+	 (when (> (abs val) mx)
+	   (set! mx (abs val))
+	   (set! loc x)))
+      (set! val (+ val (sin (+ (* j x) (* pi (phs k)))))))))
 
 
 (define (tstoddderiv x phs) 
@@ -4469,69 +4479,72 @@
 
 (define* (tstall phs phs1)
   (if (real? phs) (set! phs phs1))
-  (let ((len (length phs))
-	(incr 0.0001)
-	(mx 0.0)
-	(loc 0.0))
-    (do ((x 0.0 (+ x incr)))
-	((> x (* 2 pi)) (list mx loc))
-      (do ((val 0.0)
-	   (k 0 (+ k 1))
-	   (j 1 (+ j 1)))
-	  ((= k len)
-	   (when (> (abs val) mx)
-	     (set! mx (abs val))
-	     (set! loc x)))
-	(set! val (+ val (sin (+ (* j x) (* pi (phs k))))))))))
+  (do ((len (length phs))
+       (incr 0.0001)
+       (mx 0.0)
+       (loc 0.0)
+       (x 0.0 (+ x incr)))
+      ((> x (* 2 pi)) 
+       (list mx loc))
+    (do ((val 0.0)
+	 (k 0 (+ k 1))
+	 (j 1 (+ j 1)))
+	((= k len)
+	 (when (> (abs val) mx)
+	   (set! mx (abs val))
+	   (set! loc x)))
+      (set! val (+ val (sin (+ (* j x) (* pi (phs k)))))))))
 
 (define (tstallf mult phs)
-  (let ((len (length phs))
-	(incr 0.0001)
-	(mx 0.0)
-	(loc 0.0))
-    (do ((x 0.0 (+ x incr)))
-	((> x (* 2 pi)) (list mx loc))
-      (do ((val 0.0)
-	   (k 0 (+ k 1))
-	   (j 1 (+ j 1)))
-	  ((= k len)
-	   (when (> (abs val) mx)
-	     (set! mx (abs val))
-	     (set! loc x)))
-	(set! val (+ val (if (= k (- len 1))
-			     (* mult (sin (+ (* j x) (* pi (phs k)))))
-			     (sin (+ (* j x) (* pi (phs k)))))))))))
+  (do ((len (length phs))
+       (incr 0.0001)
+       (mx 0.0)
+       (loc 0.0)
+       (x 0.0 (+ x incr)))
+      ((> x (* 2 pi)) 
+       (list mx loc))
+    (do ((val 0.0)
+	 (k 0 (+ k 1))
+	 (j 1 (+ j 1)))
+	((= k len)
+	 (when (> (abs val) mx)
+	   (set! mx (abs val))
+	   (set! loc x)))
+      (set! val (+ val (if (= k (- len 1))
+			   (* mult (sin (+ (* j x) (* pi (phs k)))))
+			   (sin (+ (* j x) (* pi (phs k))))))))))
 
 (define (tsteven phs)
-  (let ((len (length phs))
-	(incr 0.0001)
-	(mx 0.0)
-	(loc 0.0))
-    (do ((x 0.0 (+ x incr)))
-	((> x (* 2 pi)) (list mx loc))
-      (do ((val 0.0)
-	   (k 0 (+ k 1)))
-	  ((= k len)
-	   (when (> (abs val) mx)
-	     (set! mx (abs val))
-	     (set! loc x)))
-	(set! val (+ val (sin (+ (* (max (* 2 k) 1) x) (* pi (phs k))))))))))
+  (do ((len (length phs))
+       (incr 0.0001)
+       (mx 0.0)
+       (loc 0.0)
+       (x 0.0 (+ x incr)))
+      ((> x (* 2 pi)) 
+       (list mx loc))
+    (do ((val 0.0)
+	 (k 0 (+ k 1)))
+	((= k len)
+	 (when (> (abs val) mx)
+	   (set! mx (abs val))
+	   (set! loc x)))
+      (set! val (+ val (sin (+ (* (max (* 2 k) 1) x) (* pi (phs k)))))))))
 
 (define (tstprime phs)
-  (let ((len (length phs))
-	(incr 0.0001)
-	(mx 0.0)
-	(loc 0.0))
-    (do ((x 0.0 (+ x incr)))
-	((> x (* 2 pi)) (list mx loc))
-      (let ((val 0.0))
-	(do ((k 0 (+ k 1)))
-	    ((= k len))
-	  (set! val (+ val (sin (+ (* (primes k) x) (* pi (phs k)))))))
-	(if (> (abs val) mx)
-	    (begin
-	      (set! mx (abs val))
-	      (set! loc x)))))))
+  (do ((len (length phs))
+       (incr 0.0001)
+       (mx 0.0)
+       (loc 0.0)
+       (x 0.0 (+ x incr)))
+      ((> x (* 2 pi)) 
+       (list mx loc))
+    (do ((val 0.0)
+	 (k 0 (+ k 1)))
+	((= k len)
+	 (when (> (abs val) mx)
+	   (set! mx (abs val))
+	   (set! loc x)))
+      (set! val (+ val (sin (+ (* (primes k) x) (* pi (phs k)))))))))
 
 (define (tstallderiv x phs) 
   (do ((sum 0.0)
@@ -4562,11 +4575,12 @@
 		((:odd) nodd-min-peak-phases)
 		((:even) neven-min-peak-phases)
 		(else primoid-min-peak-phases))))
-    (let ((len (length vect))
-	  (result #f))
-      (do ((i 0 (+ i 1)))
-	  ((or (= i len) result) result)
-	(set! result (func (vect i)))))))
+    (do ((len (length vect))
+	 (result #f)
+	 (i 0 (+ i 1)))
+	((or (= i len) result) 
+	 result)
+      (set! result (func (vect i))))))
 
 
 (define (showall len)
@@ -4625,17 +4639,17 @@
 	(set! val (+ val (sin (+ (* j x) (* pi (phs k))))))))))
 
 (define (showdiff n1 n2)
-  (let* ((len (length n1))
-	 (data (make-float-vector len)))
-    (do ((i 0 (+ i 1)))
-	((= i len))
+  (let ((len (length n1)))
+    (do ((data (make-float-vector len))
+	 (i 0 (+ i 1)))
+	((= i len)
+	 (new-sound)
+	 (float-vector->channel data))
       (set! (data i) (modulo (- (n1 i) (n2 i)) 2.0))
       (if (> (data i) 1.0)
 	  (set! (data i) (- (data i) 2.0))
 	  (if (< (data i) -1)
-	      (set! (data i) (+ (data i) 2.0)))))
-    (new-sound)
-    (float-vector->channel data)))
+	      (set! (data i) (+ (data i) 2.0)))))))
 
 (define (differ snd) 
   (let ((x 0.0))
@@ -4853,9 +4867,11 @@
 ;; 1 May 4150.665
 ;; 1 Jun 4150.537
 ;; 1-Jul 4150.466
+;; 1-Aug 4150.332
+;; 1-Sep 4150.229
 
 ;    all 0.4860 (20) to 0.4986 (125), dist: 0.0000, 15.0910
-;    odd 0.4820 (11) to 0.5000 (112), dist: 0.0000, 8.6281
+;    odd 0.4820 (11) to 0.5000 (112), dist: 0.0000, 8.8655
 ;    even 0.5085 (115) to 0.5242 (22), dist: 57.6719, 0.0000
 ;    prime 0.5444 (24) to 0.5540 (67), dist: 232.5920, 0.0000
 
@@ -4865,15 +4881,15 @@
 <1> (load "test-phases.scm")
 test-all-phases
 <2> (test-all-phases #f)
-;all peaks... Fri 29-Apr-2016 04:21
+;all peaks... Mon 05-Sep-2016 04:08
 (0.001495737399423547 101)
-;odd peaks... Fri 29-Apr-2016 04:29
+;odd peaks... Mon 05-Sep-2016 04:16
 (0.001687315629258279 125)
-;even peaks... Fri 29-Apr-2016 04:33
+;even peaks... Mon 05-Sep-2016 04:20
 (0.001467169674692848 4)
-;prime peaks... Fri 29-Apr-2016 04:37
+;prime peaks... Mon 05-Sep-2016 04:24
 (0.001975582609148319 2048)
-;all done! Fri 29-Apr-2016 04:43
+;all done! Mon 05-Sep-2016 04:29
 |#
 
 ;;; gad161: clean-up-evens