Updated memory, newer plots

RoboticsLabURJC · Oct 10, 2023 · 3e4fc7c · 3e4fc7c
1 parent 47f670a
commit 3e4fc7c
Show file tree

Hide file tree

Showing 34 changed files with 216 additions and 136 deletions.
diff --git a/memoria/capitulos/capitulo4.tex b/memoria/capitulos/capitulo4.tex
diff --git a/memoria/figs/diseno/lane_comparisons/laptimes.pdf b/memoria/figs/diseno/lane_comparisons/laptimes.pdf
diff --git a/memoria/figs/diseno/rl_comparisons/all_CPU_usage.png b/memoria/figs/diseno/rl_comparisons/all_CPU_usage.png
diff --git a/memoria/figs/diseno/rl_comparisons/all_laptimes.pdf b/memoria/figs/diseno/rl_comparisons/all_laptimes.pdf
diff --git a/memoria/figs/diseno/rl_comparisons/all_memory_usage.png b/memoria/figs/diseno/rl_comparisons/all_memory_usage.png
diff --git a/memoria/figs/diseno/rl_comparisons/all_tracks_described.pdf b/memoria/figs/diseno/rl_comparisons/all_tracks_described.pdf
diff --git a/memoria/figs/diseno/rl_comparisons/dir_comps.png b/memoria/figs/diseno/rl_comparisons/dir_comps.png
diff --git a/memoria/figs/diseno/rl_comparisons/directions.pdf b/memoria/figs/diseno/rl_comparisons/directions.pdf
diff --git a/memoria/figs/diseno/rl_comparisons/ecdf.png b/memoria/figs/diseno/rl_comparisons/ecdf.png
diff --git a/memoria/figs/diseno/rl_comparisons/laptimes.png b/memoria/figs/diseno/rl_comparisons/laptimes.png
diff --git a/memoria/figs/diseno/rl_comparisons/racing_speed.pdf b/memoria/figs/diseno/rl_comparisons/racing_speed.pdf
diff --git a/memoria/figs/diseno/rl_comparisons/track.png b/memoria/figs/diseno/rl_comparisons/track.png
diff --git a/memoria/figs/diseno/rl_comparisons/tracks.pdf b/memoria/figs/diseno/rl_comparisons/tracks.pdf
diff --git a/memoria/memoria.pdf b/memoria/memoria.pdf
diff --git a/qlearning_trainings/plot_train_result.py b/qlearning_trainings/plot_train_result.py
@@ -2,7 +2,7 @@
 import matplotlib.animation as animation
 import scienceplots
 
-from PyQt5.QtWidgets import QApplication, QWidget, QVBoxLayout, QListWidget, QPushButton
+# from PyQt5.QtWidgets import QApplication, QWidget, QVBoxLayout, QListWidget, QPushButton
 import os
 import sys
 
@@ -13,7 +13,7 @@
 laptopRoute = "/home/chuismi/Desktop/robotica/cuarto/tfg/2022-tfg-luismiguel-lopez/qlearning_trainings/"
 pcRoute = "/home/luismi/Desktop/tfg/2022-tfg-luismiguel-lopez/qlearning_trainings/"
 
-USING_ROUTE = laptopRoute
+USING_ROUTE = "/home/fcasdev/tfglm/2022-tfg-luismiguel-lopez/qlearning_trainings/"
 
 EPISODE_N = 0
 EPISODE_ITS = 1
@@ -22,48 +22,48 @@
 DECAY_FACTOR = 4
 
 
-class CsvPicker(QWidget):
-    def __init__(self, path):
-        super(CsvPicker, self).__init__()
+# class CsvPicker(QWidget):
+#     def __init__(self, path):
+#         super(CsvPicker, self).__init__()
 
-        self.path = path
-        self.file = None
+#         self.path = path
+#         self.file = None
 
-        self.initUI()
+#         self.initUI()
 
-    def initUI(self):
-        self.setWindowTitle("File Chooser")
-        layout = QVBoxLayout()
+#     def initUI(self):
+#         self.setWindowTitle("File Chooser")
+#         layout = QVBoxLayout()
 
-        self.list_widget = QListWidget()
+#         self.list_widget = QListWidget()
 
-        # Add files to the list widget
-        for file_name in os.listdir(self.path):
-            if os.path.isfile(os.path.join(self.path, file_name)):
-                if "_results.csv" in file_name:
-                    self.list_widget.addItem(file_name)
+#         # Add files to the list widget
+#         for file_name in os.listdir(self.path):
+#             if os.path.isfile(os.path.join(self.path, file_name)):
+#                 if "_results.csv" in file_name:
+#                     self.list_widget.addItem(file_name)
 
-        layout.addWidget(self.list_widget)
+#         layout.addWidget(self.list_widget)
 
-        selectCSV = QPushButton("Select")
-        selectCSV.clicked.connect(self.fileSelected)
-        layout.addWidget(selectCSV)
+#         selectCSV = QPushButton("Select")
+#         selectCSV.clicked.connect(self.fileSelected)
+#         layout.addWidget(selectCSV)
 
-        self.setLayout(layout)
+#         self.setLayout(layout)
 
-    def fileSelected(self):
-        selected_item = self.list_widget.currentItem()
-        if selected_item:
-            self.file = selected_item.text()
-            self.close()
+#     def fileSelected(self):
+#         selected_item = self.list_widget.currentItem()
+#         if selected_item:
+#             self.file = selected_item.text()
+#             self.close()
 
-    def closeEvent(self, event):
-        if self.file is None:
-            self.file = ""
+#     def closeEvent(self, event):
+#         if self.file is None:
+#             self.file = ""
 
-        global csvFileRoute
-        csvFileRoute = os.path.join(self.path, self.file)
-        super(CsvPicker, self).closeEvent(event)
+#         global csvFileRoute
+#         csvFileRoute = os.path.join(self.path, self.file)
+#         super(CsvPicker, self).closeEvent(event)
 
 
 def getCSVdata(name, column):
@@ -125,6 +125,24 @@ def iterationsNumber(episodes, iterations):
     # Save the plot as a PNG image
     plt.savefig(csvFileRoute.replace(".csv", "") + "_iterations.png")
 
+def plotDataInSubplot(episodes, iterations, reward, decayf):
+    print("pepe")
+    fig, ax = plt.subplots(1, 3, figsize=(18, 5))
+    ax[0].plot(episodes, iterations)
+    ax[0].set_title('Número de iteraciones por episodios')
+    ax[0].set_ylabel('Iteraciones')
+    ax[0].set_xlabel('Episodios')
+    ax[1].plot(episodes, decayf)
+    ax[1].set_title('Variación de Epsilon durante el entrenamiento')
+    ax[1].set_ylabel('Epsilon')
+    ax[1].set_xlabel('Episodios')
+    ax[2].plot(episodes, reward)
+    ax[2].set_title('Evolución de la recompensa acumulada por episodio')
+    ax[2].set_ylabel('Recompensa acumulada')
+    ax[2].set_xlabel('Episodios')
+    for axis in ax:
+        axis.autoscale()
+    plt.savefig(csvFileRoute.replace(".csv", "") + "_training.pdf")
 
 def plotAll():
     episodes = getCSVdata(csvFileRoute, EPISODE_N)
@@ -133,17 +151,21 @@ def plotAll():
     sense = getCSVdata(csvFileRoute, SENSE)
     decayFactor = getCSVdata(csvFileRoute, DECAY_FACTOR)
 
-    rewardAccum(episodes, reward)
-    episodeEpsilon(episodes, decayFactor)
-    iterationsNumber(episodes, episodeIts)
+    # rewardAccum(episodes, reward)
+    # episodeEpsilon(episodes, decayFactor)
+    # iterationsNumber(episodes, episodeIts)
+    plotDataInSubplot(episodes, episodeIts, reward, decayFactor)
 
 
 def main():
-    path = USING_ROUTE
-    app = QApplication(sys.argv)
-    csvPicker = CsvPicker(path)
-    csvPicker.show()
-    app.exec_()
+    path = USING_ROUTE + "racing_bunch_actions_results.csv"
+    global csvFileRoute
+    csvFileRoute = path
+
+    # app = QApplication(sys.argv)
+    # csvPicker = CsvPicker(path)
+    # csvPicker.show()
+    # app.exec_()
 
     plotAll()
 

diff --git a/vision_measures/ace_speedway_bg.png b/vision_measures/ace_speedway_bg.png
diff --git a/vision_measures/all_CPU_usage.png b/vision_measures/all_CPU_usage.png
diff --git a/vision_measures/all_controller_value.png b/vision_measures/all_controller_value.png
diff --git a/vision_measures/all_direction_changes.pdf b/vision_measures/all_direction_changes.pdf
diff --git a/vision_measures/all_direction_changes.png b/vision_measures/all_direction_changes.png
diff --git a/vision_measures/all_laptimes.png b/vision_measures/all_laptimes.png
diff --git a/vision_measures/all_memory_usage.png b/vision_measures/all_memory_usage.png
diff --git a/vision_measures/all_tracks_described.pdf b/vision_measures/all_tracks_described.pdf
diff --git a/vision_measures/all_tracks_described.png b/vision_measures/all_tracks_described.png
diff --git a/...ollower_results/default_track_results.csv → ...efault_track_rl_lane_follower_results.csv b/...ollower_results/default_track_results.csv → ...efault_track_rl_lane_follower_results.csv
diff --git a/.../fastest_racing_lane_follower_results.csv → .../fastest_racing_lane_follower_results.csv b/.../fastest_racing_lane_follower_results.csv → .../fastest_racing_lane_follower_results.csv
diff --git a/.../rl_comparisons/all_direction_changes.pdf → ..._lane_follower_results/direction_data.pdf b/.../rl_comparisons/all_direction_changes.pdf → ..._lane_follower_results/direction_data.pdf
diff --git a/vision_measures/fastest_racing_lane_follower_results/ecdf.pdf b/vision_measures/fastest_racing_lane_follower_results/ecdf.pdf
diff --git a/vision_measures/fastest_racing_lane_follower_results/track.pdf b/vision_measures/fastest_racing_lane_follower_results/track.pdf