dfs.tidal

@@ -55,7 +55,7 @@ instrument g e
   | p forwardG = "superpwm"
   | p backG = "casio"
   | p crossG = "amencutup"
-  | otherwise = "sn" -- edge is (x,x)
+  | otherwise = "superpiano" -- edge is (x,x)
     where p f = e `elem` (f g)
 --
 -- complete graph
@@ -63,36 +63,31 @@ k n = buildG (1,n) [(u,v)|u <- [1..n],v <- [1..n]]
 
 -- TODO Tiefe
 -- TODO Wurzel betonen
--- TODO Blätter betonen?
 
-g1 = buildG (0,6) [(1,5),(1,2),(1,3),(2,4),(3,6),(4,2),(4,3),(5,1),(5,2),(5,6),(6,0),(0,6)]
+g1 = buildG (0,6) [(1,5),(1,2),(1,3),(2,4),(3,5),(4,2),(4,3),(5,1),(5,2),(5,6),(6,0),(0,6)]
 
 g2 = buildG (0,6) $ id <$> [(0,1),(1,2),(2,3),(3,4),(4,5),(5,6),(2,1)]
 
-t1 = buildG (1,15) [(1,4),(1,12),(4,2),(4,6),(2,8),(2,3),(6,5),(6,7),(12,10),(12,14),(10,9),(10,11),(14,13),(14,15)]
-
-let edgePattern g e = (n $ pure $ toEnum $ snd e) # (s $ pure $ instrument g e)
+let edgePattern g e = (scale "ritusen" $ pure $ snd e) # (s $ pure $ instrument g e)
                                                      # gain 1
-    vertexPattern g v = (scale "ritusen" $ pure $ toEnum (v-10)) # s "supersquare"
-					      # rate 0.1
-					      # resonance 0.2
+                                                     # end 0.2
+    vertexPattern g v = (n $ pure $ toEnum v) # s "juno" -- TODO use a tuned synth instead
                                               # end 0.2
-					      # gain 0.8
-    -- p g = (\(x,y) -> fastcat $ concat $ transpose [(vertexPattern g x):(replicate (length y - 1) (s "~")), (edgePattern g) <$> y]) <$> (nodeEdgePairs2 g 1)
-    p g = map (\(x,y) -> fastcat [vertexPattern g x, cat $ map (edgePattern g) y]) $ nodeEdgePairs g
+                                              # gain 1
+    p g = (\(x,y) -> fastcat $ concat $ transpose [(vertexPattern g x):(replicate (length y - 1) (s "~")), (edgePattern g) <$> y]) <$> (nodeEdgePairs g)
     p' = p g
     g = k 10
 in d1 $ id
       $ qtrigger -- restart at the beginning of the preorder
-      $ fast 4.0 -- depends on maximum degree
+      $ fast 0.4 -- depends on maximum degree
       $ ghost
       $ cat p'
       # size "[0.8|0]"
       # room "[0.7|0]"
       # lpf "[1000|1500|2000]"
       # pan (randcat [-0.5,-0.3,-0.1,0,0.1,0.3,0.5])
-      -- # delay "[0|0.2|0.3|0.4|0.5|0.6|0.7|0.8|0.9|1]"
-      -- # delayfb 0.3
+      # delay "[0|0.2|0.3|0.4|0.5|0.6|0.7|0.8|0.9|1]"
+      # delayfb 0.3
 
 hush