From 3a14cea15e7bb0ea149956d6f157f1497e52faa5 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 6 Dec 2023 16:11:30 -0800 Subject: [PATCH] fixed entanglement math --- nodes/core.py | 14 ++++++++++++++ nodes/entangled.py | 9 +++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/nodes/core.py b/nodes/core.py index d7e8e0f..8ab167e 100644 --- a/nodes/core.py +++ b/nodes/core.py @@ -602,6 +602,20 @@ class KfSinusoidalGetAmplitude: ################################################################## + +# KfScheduleConditions: +# """ +# Carry curve and cond together for Simplicity +# """ +# CATEGORY = CATEGORY +# FUNCTION = "main" +# RETURN_TYPES = ("COND_SCHEDULE",) + + +# KfCombineWeightedConditions: + +################################################################## + # TODO: 0-1 curves (low frequency oscillators) # --> "1-X" operator diff --git a/nodes/entangled.py b/nodes/entangled.py index 3b93752..6050a0c 100644 --- a/nodes/entangled.py +++ b/nodes/entangled.py @@ -8,9 +8,14 @@ class KfSinusoidalEntangledZeroOne: #RETURN_TYPES = ("KEYFRAMED_CURVE", "SINUSOIDAL_CURVE") def main(self, n, **kargs): - tau = np.pi / 2 + tau = 2*np.pi + floor=.001 # fully zeroing out conditions creates "sharp edges" in the traversal a = 1/n - return [a+kf.SinusoidalCurve(phase=i/tau, amplitude=a, **kargs) for i in range(n)] + amplitude = a - floor/2 + + + #return [a+kf.SinusoidalCurve(phase=i/tau, amplitude=a, **kargs) for i in range(n)] + return [amplitude+kf.SinusoidalCurve(phase=tau*(n-i-1)/n, amplitude=amplitude, **kargs) for i in range(n)] class KfSinusoidalEntangledZeroOneFromWavelength(KfSinusoidalEntangledZeroOne):