Refactored into folders

app/Models/GradientDescentPerceptronTraining.php

@@ -3,10 +3,9 @@
 namespace App\Models;
 
 use App\Events\PerceptronTrainingEnded;
-use App\Services\DataSetReader;
-use App\Services\IPerceptronIterationEventBuffer;
-use App\Services\ISynapticWeightsProvider;
-use App\Services\PerceptronIterationEventBuffer;
+use App\Services\DatasetReader\IDataSetReader;
+use App\Services\IterationEventBuffer\IPerceptronIterationEventBuffer;
+use App\Services\SynapticWeightsProvider\ISynapticWeightsProvider;
 
 class GradientDescentPerceptronTraining extends NetworkTraining
 {
@@ -17,7 +16,7 @@ class GradientDescentPerceptronTraining extends NetworkTraining
     private float $epochError;
 
     public function __construct(
-        DataSetReader $datasetReader,
+        IDataSetReader $datasetReader,
         protected float $learningRate,
         int $maxEpochs,
         protected ISynapticWeightsProvider $synapticWeightsProvider,
@@ -38,7 +37,7 @@ class GradientDescentPerceptronTraining extends NetworkTraining
             $epochCorrectorPerWeight = [];
             $this->epoch++;
 
-            while ($nextRow = $this->datasetReader->getRandomLine()) {
+            while ($nextRow = $this->datasetReader->getNextLine()) {
                 $inputs = array_slice($nextRow, 0, -1);
                 $correctOutput = (float) end($nextRow);
 
@@ -89,4 +88,9 @@ class GradientDescentPerceptronTraining extends NetworkTraining
 
         return $error;
     }
+
+    public function getSynapticWeights(): array
+    {
+        return [[$this->perceptron->getSynapticWeights()]];
+    }
 }