New upstream version 16.9

1 files changed, 28 insertions, 27 deletions

diff --git a/peak-phases.scm b/peak-phases.scm
index 5209a76..b6a3271 100644
--- a/peak-phases.scm
+++ b/peak-phases.scm
@@ -1762,35 +1762,39 @@
 (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)
+     5.554944 #(0.000000 0.821925 1.149412 0.436869 0.935301 1.352676 0.015414 1.734986 0.256637 1.005075 0.807193 0.669815 1.109111 1.009353 -0.080026 1.547110 0.960552 1.325068 1.277626 -0.461257 0.639054 -0.523486 1.366433 0.893040 0.492473 0.397673 0.220314 0.941114 -0.385517 0.492662 0.047909 1.104691)
+     5.554282 #(0.000000 0.816259 1.135795 0.419505 0.912392 1.329202 -0.011674 1.699095 0.214307 0.958468 0.757524 0.614160 1.049094 0.938482 -0.150346 1.472378 0.880973 1.239494 1.186161 -0.560917 0.537372 -0.630416 1.261165 0.779340 0.375126 0.275636 0.093262 0.807297 -0.527117 0.344669 -0.098528 0.951269)
      )
 
 ;;; 33 odd -------------------------------------------------------------------------------- ; 5.74456
 (vector 33 6.4944429397583 #(0 1 0 0 1 0 1 0 1 1 0 0 1 0 0 1 1 1 1 1 1 1 0 1 1 1 0 0 0 1 1 1 0)
      
      5.602961 #(0.000000 1.602314 1.153414 1.251950 1.483737 0.842898 0.331110 1.775787 1.322292 1.204304 1.308143 0.894156 0.779513 0.992393 1.543652 0.196767 0.377438 0.791269 1.809959 1.067569 0.948715 1.605054 1.761811 1.528262 1.622887 0.603858 1.560497 -0.275070 0.725193 1.894504 0.570411 -0.063928 0.717166)
+     5.600898 #(0.000000 1.565915 1.109943 1.184168 1.378773 0.717596 0.183242 1.605396 1.133788 0.997647 1.072893 0.622377 0.504323 0.695343 1.211677 -0.159322 0.000891 0.374701 1.389316 0.610198 0.476731 1.118406 1.242714 0.986179 1.071299 -0.016109 0.956906 -0.918170 0.056362 -0.800814 -0.129753 -0.803517 -0.055888)
+     5.597136 #(0.000000 1.557449 1.088288 1.150465 1.337871 0.662053 0.113020 1.530031 1.050090 0.909972 0.971771 0.522071 0.385177 0.561017 1.072763 -0.306711 -0.153565 0.216767 1.206455 0.419699 0.268764 0.907465 1.030833 0.764615 0.842050 -0.267857 0.704934 -1.182847 -0.198387 -1.081887 -0.424937 -1.088630 -0.351619)
      )
 
 ;;; 34 odd --------------------------------------------------------------------------------  ; 5.8309518
 (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)
+     5.736524 #(0.000000 1.147547 0.291150 -0.006695 0.331715 0.598656 0.377280 0.313054 0.385030 0.054407 1.121795 0.464840 1.643084 0.588724 1.379213 1.083268 0.685423 0.507435 1.364150 0.564530 0.787739 0.046245 1.602176 0.800707 1.479490 1.714846 0.475118 0.321271 0.414765 1.347014 1.695461 1.159002 1.635795 0.467652)
+     5.735124 #(0.000000 1.151079 0.303275 0.009213 0.352648 0.621401 0.398500 0.340493 0.415657 0.089181 1.158671 0.503098 1.689244 0.630365 1.437198 1.139624 0.747050 0.574490 1.429562 0.636715 0.861565 0.124539 1.677944 0.886280 1.563928 1.805767 0.564016 0.418044 0.516828 1.455556 1.805244 1.274392 1.750370 0.585946)
      )
 
 ;;; 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)
+     5.830949 #(0.000000 0.498937 1.478339 1.602467 0.347616 0.917540 1.301063 1.420209 0.179499 1.261926 0.031275 0.331399 1.875100 1.070562 1.044304 1.606779 0.124432 1.363669 -0.136690 1.213449 0.431774 0.190661 1.701735 1.505925 -0.135468 -0.090922 1.434638 0.184651 1.259885 0.134757 1.603758 0.986421 0.582320 0.983018 0.861243)
+     5.829080 #(0.000000 0.497100 1.491890 1.596922 0.345822 0.905314 1.289198 1.408451 0.175537 1.253647 0.017296 0.308648 1.866063 1.066612 1.036810 1.601555 0.120109 1.362578 -0.137194 1.172758 0.396767 0.181785 1.659182 1.493825 -0.172588 -0.136985 1.413668 0.161393 1.212058 0.116371 1.561298 0.937104 0.534780 0.940796 0.811381)
      )
 
 ;;; 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)
+     5.976745 #(0.000000 -0.073257 1.533876 0.975969 0.478187 1.010858 1.535830 1.689302 1.568605 0.651527 -0.024395 0.862716 1.478779 -0.214334 0.406925 1.426003 0.719408 0.448022 1.710025 0.750736 0.773696 1.092187 1.101088 1.282764 0.068797 1.243309 1.489191 1.468200 0.785508 0.637704 1.113799 0.348302 0.603604 -0.148385 1.352941 -0.104705)
 
 	;; 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)
@@ -1801,7 +1805,8 @@
 (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)
+     5.965981 #(0.000000 0.946897 1.827428 0.945290 -0.021988 0.540080 -0.123305 0.580527 1.169483 0.980574 0.750114 1.389815 0.085629 1.581716 0.027530 0.465083 0.878771 -0.127617 0.862228 0.860062 1.466406 0.296153 0.338466 1.291385 1.455636 1.275017 0.366800 0.086956 1.193795 0.679523 -0.019140 -0.053271 0.411291 0.204468 0.247119 0.080318 -0.153222)
+     5.959431 #(0.000000 0.917251 1.846780 0.915358 -0.021856 0.521783 -0.142997 0.591405 1.163982 0.976796 0.745905 1.382648 0.071937 1.553077 0.022305 0.451986 0.865411 -0.136619 0.852363 0.871696 1.449655 0.285076 0.325361 1.247695 1.415225 1.246701 0.373242 0.070772 1.174626 0.661467 -0.036150 -0.075470 0.390142 0.182855 0.213495 0.048530 -0.173825)
      )
 
 ;;; 38 odd -------------------------------------------------------------------------------- ; 6.1644
@@ -1811,8 +1816,8 @@
 
      ;; 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.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)
+     6.083887 #(0.000000 0.923862 1.611390 0.817918 1.754742 0.426019 -0.073572 0.266086 1.131851 0.939137 0.821284 1.244337 0.020499 1.771350 -0.393124 0.462703 1.202089 0.162178 0.305348 0.967986 1.601121 0.651721 0.401008 1.152776 1.574159 1.381877 0.356957 -0.147015 1.147917 0.879848 0.141473 -0.066297 0.229961 -0.090653 -0.039418 -0.160701 -0.229243 -0.042427)
+     6.071867 #(0.000000 0.944036 1.607201 0.797816 1.718584 0.420065 -0.059045 0.275494 1.154646 0.929597 0.831226 1.201567 0.015578 1.785021 -0.383659 0.450200 1.236941 0.229526 0.311716 0.995680 1.636374 0.653676 0.415881 1.185098 1.583909 1.377065 0.371001 -0.135054 1.163433 0.923979 0.132227 -0.056662 0.272813 -0.091419 -0.074532 -0.117986 -0.224658 -0.054697)
      )
 
 ;;; 39 odd -------------------------------------------------------------------------------- ; 6.2449
@@ -1827,6 +1832,8 @@
 (vector 40 7.5038495063782 #(0 0 0 1 1 1 1 1 1 1 1 1 0 0 0 1 1 0 0 1 1 0 1 1 1 1 0 0 1 0 1 1 0 1 0 1 0 1 1 1)
 
      6.272478 #(0.000000 1.284197 1.055354 1.062168 0.387815 0.825054 0.121504 1.716073 1.070732 1.544312 0.376494 1.037163 0.380448 0.304545 1.428265 0.150454 0.740589 -1.906896 0.496136 -0.130727 1.453974 1.546206 0.424585 1.220704 1.332527 1.409234 0.400583 1.072058 1.397035 -0.550500 0.327899 1.771283 0.928925 0.550551 1.392166 1.184654 1.462753 1.291611 1.910777 1.578007)
+     6.271470 #(0.000000 1.282926 1.057782 1.060351 0.390936 0.827085 0.122713 1.716376 1.073865 1.544429 0.381570 1.039001 0.385845 0.306548 1.430083 0.149941 0.743880 -1.909303 0.500639 -0.136118 1.457188 1.550354 0.423281 1.220278 1.342030 1.413951 0.403331 1.074537 1.403741 -0.553119 0.335170 1.772882 0.932238 0.555171 1.391653 1.184054 1.458853 1.289849 1.914050 1.583854)
+     6.269331 #(0.000000 1.294861 1.141313 1.106097 0.405055 0.791716 0.150416 1.755897 1.078717 1.540848 0.420537 1.081697 0.464806 0.321274 1.347064 0.195720 0.731658 -0.009086 0.519341 -0.124695 1.424567 1.540630 0.338763 1.279036 1.364830 1.454130 0.302572 1.113714 1.404052 -0.565630 0.324138 1.812694 0.904341 0.525469 1.406208 1.209965 1.471676 1.353706 1.903755 1.597218)
      )
 
 ;;; 41 odd -------------------------------------------------------------------------------- ; 6.4031
@@ -4582,6 +4589,14 @@
 	 result)
       (set! result (func (vect i))))))
 
+(define (sum-sines v i x len phs)
+  (do ((val 0.0)
+       (k 0 (+ k 1))
+       (j 1 (+ j 1)))
+      ((= k len)
+       (set! (v i) val))   
+    (set! val (+ val (sin (+ (* j x) (* pi (phs k))))))))
+  
 
 (define (showall len)
   (let ((phs-data (get-best :all len)))
@@ -4595,12 +4610,7 @@
 	 (new-sound)
 	 (float-vector->channel v)
 	 (set! (y-bounds) (list (- mx) mx)))
-      (do ((val 0.0)
-	   (k 0 (+ k 1))
-	   (j 1 (+ j 1)))
-	  ((= k len)
-	   (set! (v i) val))   
-	(set! val (+ val (sin (+ (* j x) (* pi (phs k))))))))))
+      (sum-sines v i x len phs))))
 
 (define (showphases mx phs)
   (do ((v (make-float-vector (ceiling (+ (* pi 2000) 2))))
@@ -4612,12 +4622,7 @@
        (new-sound)
        (float-vector->channel v)
        (set! (y-bounds) (list (- mx) mx)))
-    (do ((val 0.0)
-	 (k 0 (+ k 1))
-	 (j 1 (+ j 1)))
-	((= k len)
-	 (set! (v i) val))
-      (set! val (+ val (sin (+ (* j x) (* pi (phs k)))))))))
+    (sum-sines v i x len phs)))
 
 (define (showodd len)
   (let ((phs-data (get-best :odd len)))
@@ -4631,12 +4636,7 @@
 	 (new-sound)
 	 (float-vector->channel v)
 	 (set! (y-bounds) (list (- mx) mx)))
-      (do ((val 0.0)
-	   (k 0 (+ k 1))
-	   (j 1 (+ j 2)))
-	  ((= k len)
-	   (set! (v i) val))
-	(set! val (+ val (sin (+ (* j x) (* pi (phs k))))))))))
+      (sum-sines v i x len phs))))
 
 (define (showdiff n1 n2)
   (let ((len (length n1)))
@@ -4869,9 +4869,10 @@
 ;; 1-Jul 4150.466
 ;; 1-Aug 4150.332
 ;; 1-Sep 4150.229
+;; 1-Oct 4150.134
 
 ;    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.8655
+;    odd 0.4820 (11) to 0.5000 (112), dist: 0.0000, 8.9603
 ;    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