redo lerping and sineing

1 files changed, 8 insertions, 8 deletions

diff --git a/inversion/live.py b/inversion/live.py
index 6a01eae..a04799e 100644
--- a/inversion/live.py
+++ b/inversion/live.py
@@ -88,7 +88,7 @@ class SinParam:
   def __init__(self, name, shape, type="noise"):
     noise = LerpParam(name + '_noise', shape, type=type)
     orbit_radius = InterpolatorParam(name=name + '_radius', value=0.1)
-    orbit_speed = InterpolatorParam(name=name + '_speed', value=0.1)
+    orbit_speed = InterpolatorParam(name=name + '_speed', value=1.0)
     orbit_time = InterpolatorParam(name=name + '_time', value=0.0)
     output = tf.math.sin(orbit_time.variable + noise.output) * orbit_radius.variable
     interpolator.sin_params[name] = self
@@ -135,11 +135,11 @@ class LerpParam:
 # --------------------------
 
 class InterpolatorParam:
-  def __init__(self, name, dtype=tf.float32, shape=(), value=None, type="noise"):
+  def __init__(self, name, dtype=tf.float32, shape=(), value=None, type=float):
     self.scalar = shape == ()
     self.shape = shape
     self.type = type
-    self.value = value if value is not None else np.zeros(shape)
+    self.value = value if type != float else np.zeros(shape)
     self.variable = tf.placeholder(dtype=dtype, shape=shape)
     interpolator.opts[name] = self
 
@@ -179,9 +179,9 @@ class Interpolator:
     gen_in['y'] = lerp_label.output
     self.gen_img = generator(gen_in, signature=gen_signature)
 
-    sys.stderr.write("Sin params: {}".format(", ".join(self.sin_params.keys())))
-    sys.stderr.write("Lerp params: {}".format(", ".join(self.lerp_params.keys())))
-    sys.stderr.write("Opts: {}".format(", ".join(self.opts.keys())))
+    sys.stderr.write("Sin params: {}\n".format(", ".join(self.sin_params.keys())))
+    sys.stderr.write("Lerp params: {}\n".format(", ".join(self.lerp_params.keys())))
+    sys.stderr.write("Opts: {}\n".format(", ".join(self.opts.keys())))
 
     # Convert generated image to channels_first.
     # self.gen_img = tf.transpose(gen_img, [0, 3, 1, 2])
@@ -255,14 +255,14 @@ class Listener:
     self.rpc_client.send_status('processing', True)
     dt = 1 / FPS
     for i in range(99999):
-      if (i % 100) == 0:
+      if (i % 100) == 0 or i == 1:
         print("Step {}".format(i))
       gen_time = time.time()
       gen_images = interpolator.on_step(i, dt, self.sess)
       if gen_images is None:
         print("Exiting...")
         break
-      if (i % 100) == 0:
+      if (i % 100) == 0 or i == 1:
         print(gen_images.shape)
         print("Generation time: {:.1f}s".format(time.time() - gen_time))
       out_img = vs.data2pil(gen_images[0])