Update PWalk input to use values in sequence

Qirky · Jun 23, 2020 · 11a657c · 11a657c
1 parent 0b803c0
commit 11a657c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/FoxDot/lib/.version b/FoxDot/lib/.version
@@ -1 +1 @@
-0.8.8
+0.8.9
diff --git a/FoxDot/lib/Patterns/Generators.py b/FoxDot/lib/Patterns/Generators.py
@@ -29,7 +29,7 @@
 
 from __future__ import absolute_import, division, print_function
 
-from .Main  import GeneratorPattern, Pattern, asStream
+from .Main  import GeneratorPattern, Pattern, asStream, PatternInput
 
 import random
 
@@ -252,7 +252,7 @@ def __init__(self, max=7, step=1, start=0, **kwargs):
         self.max   = abs(max)
         self.min   = self.max * -1
 
-        self.step  = asStream(step).abs()
+        self.step = PatternInput(step).transform(abs)
         self.start = start
 
         self.data = [self.start, self.step, self.max]
@@ -273,7 +273,7 @@ def func(self, index):
                 f = self.directions[0]
             else:
                 f = self.choice(self.directions)
-            self.last_value = f(self.last_value, self.step.choose())
+            self.last_value = f(self.last_value, self.step[index])
         return self.last_value
 
 class PDelta(GeneratorPattern):

diff --git a/FoxDot/lib/Patterns/Main.py b/FoxDot/lib/Patterns/Main.py
@@ -1504,6 +1504,11 @@ def PatternFormat(data):
         return PGroup(data)
     return data
 
+def PatternInput(data):
+    if isinstance(data, GeneratorPattern):
+        return data
+    return asStream(data)
+
 Format = PatternFormat ## TODO - Remove this
 
 def convert_nested_data(data):