Refactor and optimizations

app/Services/DatasetReader/LinearOrderDataSetReader.php

@@ -8,7 +8,7 @@ class LinearOrderDataSetReader implements IDataSetReader
 {
     public array $lines = [];
 
-    private array $currentLines = [];
+    private int $currentLineIndex = 0;
 
     private int $lastReadLineIndex = -1;
 
@@ -35,13 +35,13 @@ class LinearOrderDataSetReader implements IDataSetReader
 
     public function getNextLine(): ?array
     {
-        if (! isset($this->currentLines[0])) {
+        if (! isset($this->lines[$this->currentLineIndex])) {
             return null; // No more lines to read
         }
 
-        $this->lastReadLineIndex = array_search($this->currentLines[0], $this->lines, true);
+        $this->lastReadLineIndex = $this->currentLineIndex;
 
-        return array_shift($this->currentLines);
+        return $this->lines[$this->currentLineIndex++];
     }
 
     public function getInputSize(): int
@@ -53,18 +53,20 @@ class LinearOrderDataSetReader implements IDataSetReader
     {
         // Count the number of unique labels in the dataset
         $labels = array_map(fn ($line) => end($line), $this->lines);
+
         return count(array_unique($labels));
     }
 
     public function getLabels(): array
     {
         $labels = array_map(fn ($line) => end($line), $this->lines);
+
         return array_values(array_unique($labels));
     }
 
     public function reset(): void
     {
-        $this->currentLines = $this->lines;
+        $this->currentLineIndex = 0;
     }
 
     public function getLastReadLineIndex(): int

app/Services/DatasetReader/RandomOrderDataSetReader.php

@@ -8,7 +8,9 @@ class RandomOrderDataSetReader implements IDataSetReader
 {
     public array $lines = [];
 
-    private array $currentLines = [];
+    private array $currentLineIndexes = [];
+
+    private int $currentLineIndex = 0;
 
     private int $lastReadLineIndex = -1;
 
@@ -35,19 +37,14 @@ class RandomOrderDataSetReader implements IDataSetReader
 
     public function getNextLine(): ?array
     {
-        if (empty($this->currentLines)) {
+        if (! isset($this->currentLineIndexes[$this->currentLineIndex])) {
             return null; // No more lines to read
         }
-        $randomNumber = array_rand($this->currentLines);
-        $randomLine = $this->currentLines[$randomNumber];
+        $lineIndex = $this->currentLineIndexes[$this->currentLineIndex++];
 
-        // Remove the line from the current lines to avoid repetition
-        unset($this->currentLines[$randomNumber]);
+        $this->lastReadLineIndex = $lineIndex;
 
-        // Remember the index of the last read line in the full list
-        $this->lastReadLineIndex = array_search($randomLine, $this->lines, true);
-
-        return $randomLine;
+        return $this->lines[$lineIndex];
     }
 
     public function getInputSize(): int
@@ -59,18 +56,22 @@ class RandomOrderDataSetReader implements IDataSetReader
     {
         // Count the number of unique labels in the dataset
         $labels = array_map(fn ($line) => end($line), $this->lines);
+
         return count(array_unique($labels));
     }
 
     public function getLabels(): array
     {
         $labels = array_map(fn ($line) => end($line), $this->lines);
+
         return array_values(array_unique($labels));
     }
 
     public function reset(): void
     {
-        $this->currentLines = $this->lines;
+        $this->currentLineIndexes = array_keys($this->lines);
+        shuffle($this->currentLineIndexes);
+        $this->currentLineIndex = 0;
     }
 
     public function getLastReadLineIndex(): int