in progress

Smoren · Dec 29, 2022 · e4531b8 · e4531b8
1 parent 8dfa4a8
commit e4531b8
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 3 deletions.
diff --git a/src/Interfaces/SequenceInterface.php b/src/Interfaces/SequenceInterface.php
@@ -37,7 +37,7 @@ public function getStartValue();
      * @param T $previousValue
      * @return T
      */
-    //public function getNextValue($previousValue);
+    public function getNextValue($previousValue);
 
     /**
      * @param int|mixed $offset

diff --git a/src/Iterators/FloatSequenceIterator.php b/src/Iterators/FloatSequenceIterator.php
@@ -26,6 +26,10 @@ class FloatSequenceIterator implements SequenceIteratorInterface
      * @var int
      */
     protected int $currentIndex;
+    /**
+     * @var float
+     */
+    protected float $currentValue;
 
     /**
      * @param FloatSequence $range
@@ -34,6 +38,7 @@ public function __construct(FloatSequence $range)
     {
         $this->sequence = $range;
         $this->currentIndex = 0;
+        $this->currentValue = $this->sequence->getStartValue();
     }
 
     /**
@@ -42,6 +47,6 @@ public function __construct(FloatSequence $range)
      */
     public function current(): float
     {
-        return $this->sequence[$this->currentIndex];
+        return $this->currentValue;
     }
 }
diff --git a/src/Iterators/IntSequenceIterator.php b/src/Iterators/IntSequenceIterator.php
@@ -26,6 +26,10 @@ class IntSequenceIterator implements SequenceIteratorInterface
      * @var int
      */
     protected int $currentIndex;
+    /**
+     * @var int
+     */
+    protected int $currentValue;
 
     /**
      * @param IntSequence $range
@@ -42,6 +46,6 @@ public function __construct(IntSequence $range)
      */
     public function current(): int
     {
-        return $this->sequence[$this->currentIndex];
+        return $this->currentValue;
     }
 }
diff --git a/src/Structs/FloatExponential.php b/src/Structs/FloatExponential.php
@@ -29,4 +29,13 @@ public function getStartValue(): float
     {
         return $this->getValueByIndex(0);
     }
+
+    /**
+     * @param float $previousValue
+     * @return float
+     */
+    public function getNextValue($previousValue): float
+    {
+        return $previousValue * $this->step;
+    }
 }
diff --git a/src/Structs/FloatSequence.php b/src/Structs/FloatSequence.php
@@ -54,6 +54,15 @@ public function getStartValue(): float
         return $this->getValueByIndex(0);
     }
 
+    /**
+     * @param float $previousValue
+     * @return float
+     */
+    public function getNextValue($previousValue): float
+    {
+        return $previousValue + $this->step;
+    }
+
     /**
      * {@inheritDoc}
      * @return float

diff --git a/src/Structs/IntExponential.php b/src/Structs/IntExponential.php
@@ -25,4 +25,13 @@ public function getStartValue(): int
     {
         return $this->getValueByIndex(0);
     }
+
+    /**
+     * @param int $previousValue
+     * @return int
+     */
+    public function getNextValue($previousValue): int
+    {
+        return $previousValue * $this->step;
+    }
 }
diff --git a/src/Structs/IntRange.php b/src/Structs/IntRange.php
@@ -29,4 +29,13 @@ public function getStartValue(): int
     {
         return $this->getValueByIndex(0);
     }
+
+    /**
+     * @param int $previousValue
+     * @return int
+     */
+    public function getNextValue($previousValue): int
+    {
+        return $previousValue + $this->step;
+    }
 }
diff --git a/src/Traits/SequenceIteratorTrait.php b/src/Traits/SequenceIteratorTrait.php
@@ -12,6 +12,7 @@
  * @implements SequenceIteratorInterface<T>
  * @property SequenceInterface<T> $sequence
  * @property int $currentIndex
+ * @property T $currentValue
  */
 trait SequenceIteratorTrait
 {
@@ -21,6 +22,7 @@ trait SequenceIteratorTrait
     public function next(): void
     {
         $this->currentIndex++;
+        $this->currentValue = $this->sequence->getNextValue($this->currentValue);
     }
 
     /**
@@ -46,5 +48,6 @@ public function valid(): bool
     public function rewind(): void
     {
         $this->currentIndex = 0;
+        $this->currentValue = $this->sequence->getStartValue();
     }
 }