Merge fival version of branch 'interactions'

This reflects the way the FireStar sits on the ground.

firestar.py

@@ -77,7 +77,7 @@ def runsimple(ss):
             b.set_light([edges[e].light_id for e in subs[i]], thiscmd)
         time.sleep((transition_to + hold_time)/10)
 
-#runsimple(intro)
+runsimple(intro)
 
 # The most symmetric five-coloring of edges
 fivecs = [];
@@ -126,12 +126,62 @@ fivecolors = [vb(c) for c in ['R', 'Y', 'G', 'B', 'K']]
 
 # Nick's coloring (NC) "0"
 fivetour = [(fivecs[0], fivecolors)]
-# Step NC "0" to NC "1"
+# 1: Step NC "0" to NC "1"
 fivetour.append(([[3,21,26],[4,19,28]], [vb('K'),vb('Y')]))
-# Step NC "1" to NC "0"
+# 2: Step NC "1" to NC "0"
 fivetour.append(([[3,21,26],[4,19,28]], [vb('Y'),vb('K')]))
+# 3: Step NC "1" to NC "2"
+fivetour.append(([[0,12,25],[1,10,27]], [vb('G'),vb('R')]))
+# 4: Step NC "2" to NC "1"
+fivetour.append(([[0,12,25],[1,10,27]], [vb('R'),vb('G')]))
+# 5: Step NC "2" to NC "3"
+fivetour.append(([[1,22],[3,24]], [vb('K'),vb('R')]))
+# 6: Step NC "3" to NC "2"
+fivetour.append(([[1,22],[3,24]], [vb('R'),vb('K')]))
+# 7: Step NC "3" to NC "4"
+fivetour.append(([[12,20],[11,19]], [vb('Y'),vb('G')]))
+# 8: Step NC "4" to NC "3"
+fivetour.append(([[12,20],[11,19]], [vb('G'),vb('Y')]))
+# 9: Step NC "4" to NC "5"
+fivetour.append(([[0,15,19],[3,9,27]], [vb('R'),vb('G')]))
+# 10: Step NC "5" to NC "4"
+fivetour.append(([[0,15,19],[3,9,27]], [vb('G'),vb('R')]))
+# 11: Step NC "5" to NC "6"
+fivetour.append(([[4,12,16],[1,6,26]], [vb('K'),vb('Y')]))
+# 12: Step NC "6" to NC "5"
+fivetour.append(([[4,12,16],[1,6,26]], [vb('K'),vb('Y')]))
+# 13: Step NC "4" to NC "7"
+fivetour.append(([[0,19,25],[1,21,26]], [vb('K'),vb('G')]))
+# 14: Step NC "7" to NC "4"
+fivetour.append(([[0,19,25],[1,21,26]], [vb('K'),vb('G')]))
 
-tour5show = (fivetour, [(0,30,20),(1,5,5),(2,5,5),(1,5,5),(2,5,5),(1,5,30)])
+# Would need to add asymmetric colorings here, but no time :-(
 
-runsimple(interlude)
-runsimple(tour5show)
+tour5show = (fivetour, [(0,30,20),
+                        (1,5,5),(2,5,5),(1,5,5),(2,5,5),(1,5,30),
+                        (3,5,5),(4,5,5),(3,5,5),(4,5,5),(3,5,30),
+                        (5,5,5),(6,5,5),(5,5,5),(6,5,5),(5,5,30),
+                        (7,5,5),(8,5,5),(7,5,5),(8,5,5),(7,5,30),
+                        (9,5,5),(10,5,5),(9,5,5),(10,5,5),(9,5,30),
+                        (11,5,5),(12,5,5),(11,5,5),(12,5,5),(11,5,100),
+                        (12,5,5),(11,5,5),(12,5,5),(11,5,5),(12,5,30),
+                        (10,5,5),(9,5,5),(10,5,5),(9,5,5),(10,5,30),
+                        (13,5,5),(14,5,5),(13,5,5),(14,5,5),(13,5,100),
+                        (14,5,5),(13,5,5),(14,5,5),(13,5,5),(14,5,30),
+                        (8,5,5),(7,5,5),(8,5,5),(7,5,5),(8,5,30),
+                        (6,5,5),(5,5,5),(6,5,5),(5,5,5),(6,5,30),
+                        (4,5,5),(3,5,5),(4,5,5),(3,5,5),(4,5,30),
+                        (2,5,5),(1,5,5),(2,5,5),(1,5,5),(2,5,100),
+])
+
+while True:
+    runsimple(interlude)
+    runsimple(jmsshow1)
+    runsimple(interlude)
+    runsimple(jmsshow2)
+    
+    runsimple(interlude)
+    runsimple(starshow)
+
+    runsimple(interlude)
+    runsimple(tour5show)

interactions.py

@@ -10,7 +10,7 @@ import phue, pygame, colorsys
 viewsize = 600
 shrink = 0.9
 vertices = [(viewsize*(1 + shrink*x)/2, viewsize*(1 + shrink*y)/2) for x, y in
-  [(0, 0)] + [(cos(-n*pi/5), sin(-n*pi/5)) for n in range(10)] + [(0, 0)]
+  [(0, 0)] + [(sin(n*pi/5), -cos(n*pi/5)) for n in range(10)] + [(0, 0)]
 ]
 
 # edges as vertex pairs. FireStar will rest on vertices 6 (A), 5 (B), 7 (C)
@@ -72,7 +72,10 @@ lasthue = 65535
 fullbright = 254
 fullsat = 254
 
-# --- control methods
+# --- control methods and diagnostics
+
+updates = 0
+new_updates = 0
 
 def set_light_hsv(e, color, hit_bridge):
   command = {
@@ -80,14 +83,54 @@ def set_light_hsv(e, color, hit_bridge):
     'bri' : int(color[2]*fullbright),
     'sat' : int(color[1]*fullsat)
   }
-  if hit_bridge and b != None:
-    b.set_light(edges[e].light_id, command)
+  if hit_bridge:
+    if b != None:
+      b.set_light(edges[e].light_id, command)
+    global new_updates
+    new_updates += 1
   rgb_color = tuple(255*c for c in colorsys.hsv_to_rgb(*color))
   pygame.draw.aaline(screen, rgb_color, vertices[vertex_adj[e][0]], vertices[vertex_adj[e][1]])
 
+# === messages and mode selection ===
+
+mode = 0
+
+# data labels
+updates_label = font.render('updates', True, (255, 255, 255))
+energy_label = font.render('energy', True, (255, 255, 255))
+position_label = [
+  font.render('temp[0]', True, (255, 255, 255)),
+  font.render('charge[0]', True, (255, 255, 255))
+]
+
+# instructions
+mode_inds = [
+  [
+    font.render('[d] heat', True, (255, 255, 255)),
+    font.render('[f] wave', True, (150, 150, 150))
+  ],
+  [
+    font.render('[d] heat', True, (150, 150, 150)),
+    font.render('[f] wave', True, (255, 255, 255))
+  ]
+]
+bop_instr = [
+  font.render('press [j] to bop', True, (255, 255, 255)),
+  font.render('press [j] or [k] to bop', True, (255, 255, 255))
+]
+drain_instr = font.render('hold [space] to drain', True, (255, 255, 255))
+
+# set up background
+background = pygame.Surface(screen.get_size()).convert()
+background.fill((32, 32, 32))
+background.blit(drain_instr, (340, 60 + viewsize))
+
 # === interaction parameters ===
 
-frame_rate = 24
+# these frame rate and threshold settings are untested, but the exponential
+# moving average update frequency suggests they should be just barely in bounds
+frame_rate = 10
+ema_weight = 2/(frame_rate+1)
 
 inductance = 0.001
 
@@ -106,8 +149,8 @@ new_temp = 30*[0]
 charge = 12*[0]
 current = 30*[0]
 
-last_litness = 30*[float("inf")]
-change_threshold = 0.05
+litness = 30*[float("inf")]
+change_threshold = 0.15
 
 # === main loop ===
 
@@ -136,29 +179,33 @@ def wave_evolution():
       charge[v] *= 1 - drain_rate
 
 def set_heat_light(e, i):
-  litness = 1 - exp(-2*i)
-  if abs(litness - last_litness[e]) > change_threshold:
+  new_litness = 1 - exp(-2*i)
+  if abs(new_litness - litness[e]) > change_threshold:
     hit_bridge = True
-    last_litness[e] = litness
+    litness[e] = new_litness
   else:
     hit_bridge = False
-  set_light_hsv(e, (0.167*last_litness[e], 1 - 0.5*last_litness[e]*last_litness[e], last_litness[e]), hit_bridge)
+  set_light_hsv(e, (0.167*litness[e], 1 - 0.5*litness[e]*litness[e], litness[e]), hit_bridge)
 
 def set_wave_light(e, i):
-  litness = 1 - exp(-2*i*i)
-  hit_bridge = abs(litness - last_litness[e]) > change_threshold
-  set_light_hsv(e, (0.45 + litness*0.25, 1 - 0.5*litness*litness, litness), hit_bridge)
-  if hit_bridge:
-    last_litness[e] = litness
+  new_litness = 1 - exp(-2*i*i)
+  if abs(new_litness - litness[e]) > change_threshold:
+    hit_bridge = True
+    litness[e] = new_litness
+  else:
+    hit_bridge = False
+  set_light_hsv(e, (0.45 + litness[e]*0.25, 1 - 0.5*litness[e]*litness[e], litness[e]), hit_bridge)
 
 def handle_heat_events():
-  global drain
+  global drain, mode
   for event in pygame.event.get():
     if event.type == pygame.KEYDOWN:
       if event.key == pygame.K_j:
         new_temp[0] += 10
       elif event.key == pygame.K_SPACE:
         drain = True
+      elif event.key == pygame.K_f:
+        mode = 1
     elif event.type == pygame.KEYUP:
       if event.key == pygame.K_SPACE:
         drain = False
@@ -166,7 +213,7 @@ def handle_heat_events():
       quit()
 
 def handle_wave_events():
-  global drain
+  global drain, mode
   for event in pygame.event.get():
     if event.type == pygame.KEYDOWN:
       if event.key == pygame.K_j:
@@ -177,6 +224,8 @@ def handle_wave_events():
         charge[7] -= 100
       elif event.key == pygame.K_SPACE:
         drain = True
+      elif event.key == pygame.K_d:
+        mode = 0
     elif event.type == pygame.KEYUP:
       if event.key == pygame.K_SPACE:
         drain = False
@@ -184,46 +233,60 @@ def handle_wave_events():
       quit()
 
 def show_data(screen):
-  energy = sum(temp)
-  text = font.render('energy', True, (255, 255, 255))
-  screen.blit(text, (20, viewsize))
-  text = font.render(str(energy), True, (255, 255, 255))
-  screen.blit(text, (120, viewsize))
-  text = font.render('temp[0]', True, (255, 255, 255))
-  screen.blit(text, (20, 30 + viewsize))
-  text = font.render(str(temp[0]), True, (255, 255, 255))
-  screen.blit(text, (120, 30 + viewsize))
+  # light updates
+  global updates, new_updates
+  updates = ema_weight*new_updates + (1 - ema_weight)*updates
+  new_updates = 0
+  updates_value = font.render(str(frame_rate * updates), True, (255, 255, 255))
+  screen.blit(updates_label, (20, viewsize))
+  screen.blit(updates_value, (120, viewsize))
+  
+  # energy
+  if mode == 0:
+    energy = sum(temp)
+  elif mode == 1:
+    energy = 0.5*(sum(q*q for q in charge) + inductance*sum(i*i for i in current))
+  energy_value = font.render(str(energy), True, (255, 255, 255))
+  screen.blit(energy_label, (20, 30 + viewsize))
+  screen.blit(energy_value, (120, 30 + viewsize))
+  
+  # a position
+  ##position_value = None
+  if mode == 0:
+    position_value = font.render(str(temp[0]), True, (255, 255, 255))
+  elif mode == 1:
+    position_value = font.render(str(charge[0]), True, (255, 255, 255))
+  screen.blit(position_label[mode], (20, 60 + viewsize))
+  screen.blit(position_value, (120, 60 + viewsize))
+  
+  # instructions
+  screen.blit(mode_inds[mode][0], (340, viewsize))
+  screen.blit(mode_inds[mode][1], (420, viewsize))
+  screen.blit(bop_instr[mode], (340, 30 + viewsize))
 
 if __name__ == '__main__':
-  # set up background
-  background = pygame.Surface(screen.get_size()).convert()
-  background.fill((32, 32, 32))
-  ##text = font.render('press [j] or [k] to pluck', True, (255, 255, 255))
-  text = font.render('press [j] to pluck', True, (255, 255, 255))
-  background.blit(text, (340, viewsize))
-  text = font.render('hold [space] to drain', True, (255, 255, 255))
-  background.blit(text, (340, 30 + viewsize))
-  
-  to_light = 0
   while True:
     # handle events
-    ##handle_wave_events()
-    handle_heat_events()
+    if mode == 0:
+      handle_heat_events()
+    elif mode == 1:
+      handle_wave_events()
     
     # clear screen
     screen.blit(background, (0, 0))
     
-    # show data
+    # show data and instructions
     show_data(screen)
     
-    # show state
-    for e in range(30):
-      ##set_wave_light(e, current[e])
-      set_heat_light(e, temp[e])
-    
-    # evolve state
-    ##wave_evolution()
-    heat_evolution()
+    # show state and evolve state
+    if mode == 0:
+      for e in range(30):
+        set_heat_light(e, temp[e])
+      heat_evolution()
+    elif mode == 1:
+      for e in range(30):
+        set_wave_light(e, current[e])
+      wave_evolution()
     
     # step
     pygame.display.flip()