Added conversion from stream to specific stream

alemazzo · alemazzo · commit 53efe5ce11bc · 2021-03-06T10:28:02.000+01:00
diff --git a/stream/__init__.py b/stream/__init__.py
@@ -1,2 +1,2 @@
 from .stream import Stream
-from .intstream import IntStream
+from .numbers import NumberStream
diff --git a/stream/booleans.py b/stream/booleans.py
@@ -1,4 +1,4 @@
-from .stream import Stream
+from stream import Stream
 import random
 
 
diff --git a/stream/numbers.py b/stream/numbers.py
@@ -77,12 +77,36 @@ def random():
         '''
         return NumberStream(Stream.generate(random.random))
 
+    @staticmethod
+    def range(start, end, step=1):
+        return NumberStream(Stream.iterate(start, lambda i: i + step).takeWhile(lambda x: x <= end))
+
     def __init__(self, _stream):
         if isinstance(_stream, Stream):
             self.iterable = _stream.iterable
         else:
             self.iterable = _stream
 
+    def average(self):
+        _sum = 0
+        _count = 0
+        for elem in self:
+            _sum += elem
+            _count += 1
+        return _sum / _count
+
+    def takeWhileSmallerThan(self, maximum):
+        return self.takeWhile(lambda x: x < maximum)
+
+    def takeWhileSmallerOrEqualThan(self, maximum):
+        return self.takeWhile(lambda x: x <= maximum)
+
+    def takeWhileGreaterThan(self, minimum):
+        return self.takeWhile(lambda x: x > minimum)
+
+    def takeWhileGreaterOrEqualThan(self, minimum):
+        return self.takeWhile(lambda x: x >= minimum)
+
     def smallerThan(self, maximum):
         return self.filter(lambda x: x < maximum)
 
@@ -112,3 +136,9 @@ def sqrt(self):
 
     def log(self):
         return self.map(math.log)
+
+    def sin(self):
+        return self.map(math.sin)
+
+    def cos(self):
+        return self.map(math.cos)
diff --git a/stream/stream.py b/stream/stream.py
@@ -345,6 +345,14 @@ def toSet(self):
         '''
         return set(self.iterable)
 
+    def toNumberStream(self):
+        from .numbers import NumberStream
+        return NumberStream(self)
+
+    def toBooleanStream(self):
+        from .booleans import BooleanStream
+        return BooleanStream(self)
+
     def __iter__(self):
         '''
         Returns an iterator over the elements in this stream.

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`from .stream import Stream`
`2`		`-from .intstream import IntStream`
	`2`	`+from .numbers import NumberStream`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from .stream import Stream`
	`1`	`+from stream import Stream`
`2`	`2`	`import random`
`3`	`3`
`4`	`4`