Fixed 'model' error

PandapowrTR · Jan 18, 2024 · 82964ad · 82964ad
1 parent 056b367
commit 82964ad
Showing 1 changed file with 47 additions and 29 deletions.
diff --git a/Training/__init__.py b/Training/__init__.py
@@ -403,12 +403,24 @@ def __saveParams(
 
         values = {
             "modelTrainValues": GridSearchTrain.__cleanDictForJson(modelTrainValues),
-            "modelSaveMethodValues": GridSearchTrain.__cleanDictForJson(modelSaveMethodValues),
-            "modelLoadMethodValues": GridSearchTrain.__cleanDictForJson(modelLoadMethodValues),
-            "hardwareSetupmethodValues": GridSearchTrain.__cleanDictForJson(hardwareSetupmethodValues),
-            "loadDatamethodValues": GridSearchTrain.__cleanDictForJson(loadDatamethodValues),
-            "splitDatamethodValues": GridSearchTrain.__cleanDictForJson(splitDatamethodValues),
-            "modelTestmethodValues": GridSearchTrain.__cleanDictForJson(modelTestmethodValues),
+            "modelSaveMethodValues": GridSearchTrain.__cleanDictForJson(
+                modelSaveMethodValues
+            ),
+            "modelLoadMethodValues": GridSearchTrain.__cleanDictForJson(
+                modelLoadMethodValues
+            ),
+            "hardwareSetupmethodValues": GridSearchTrain.__cleanDictForJson(
+                hardwareSetupmethodValues
+            ),
+            "loadDatamethodValues": GridSearchTrain.__cleanDictForJson(
+                loadDatamethodValues
+            ),
+            "splitDatamethodValues": GridSearchTrain.__cleanDictForJson(
+                splitDatamethodValues
+            ),
+            "modelTestmethodValues": GridSearchTrain.__cleanDictForJson(
+                modelTestmethodValues
+            ),
         }
         for key, value in values.copy().items():
             try:
@@ -641,19 +653,19 @@ def __gridLoop(
             # save last params
             GridSearchTrain.__saveParams(
                 modelTrainmethod,
-                modelTrainValues,
+                modelTrainValues.copy(),
                 modelSaveMethod,
-                modelSaveMethodValues,
+                modelSaveMethodValues.copy(),
                 modelLoadMethod,
-                modelLoadMethodValues,
+                modelLoadMethodValues.copy(),
                 hardwareSetupmethod,
-                hardwareSetupmethodValues,
+                hardwareSetupmethodValues.copy(),
                 loadDatamethod,
-                loadDatamethodValues,
+                loadDatamethodValues.copy(),
                 splitDatamethod,
-                splitDatamethodValues,
+                splitDatamethodValues.copy(),
                 modelTestmethod,
-                modelTestmethodValues,
+                modelTestmethodValues.copy(),
                 copy.deepcopy(paramsIter),
                 copy.deepcopy(usedParams),
                 copy.deepcopy(data),
@@ -705,7 +717,10 @@ def __gridLoop(
                     modelTrainValues,
                 )
                 modelSaveMethodValues.update(
-                    {"saveToPath": os.path.join(currentSaveFolder, "lastModel.h5")}
+                    {
+                        "saveToPath": os.path.join(currentSaveFolder, "lastModel.h5"),
+                        "model": trainedModel,
+                    }
                 )
                 modelSaveMethod(modelSaveMethodValues)
                 modelTestmethodValues.update({"model": trainedModel})
@@ -714,19 +729,19 @@ def __gridLoop(
                 # save usedParams
                 GridSearchTrain.__saveParams(
                     modelTrainmethod,
-                    modelTrainValues,
+                    modelTrainValues.copy(),
                     modelSaveMethod,
-                    modelSaveMethodValues,
+                    modelSaveMethodValues.copy(),
                     modelLoadMethod,
-                    modelLoadMethodValues,
+                    modelLoadMethodValues.copy(),
                     hardwareSetupmethod,
-                    hardwareSetupmethodValues,
+                    hardwareSetupmethodValues.copy(),
                     loadDatamethod,
-                    loadDatamethodValues,
+                    loadDatamethodValues.copy(),
                     splitDatamethod,
-                    splitDatamethodValues,
+                    splitDatamethodValues.copy(),
                     modelTestmethod,
-                    modelTestmethodValues,
+                    modelTestmethodValues.copy(),
                     copy.deepcopy(paramsIter),
                     copy.deepcopy(usedParams),
                     copy.deepcopy(data),
@@ -781,7 +796,10 @@ def __gridLoop(
                     "log.log",
                 )
                 modelSaveMethodValues.update(
-                    {"saveToPath": os.path.join(saveToPath, "bestModel.h5")}
+                    {
+                        "saveToPath": os.path.join(saveToPath, "bestModel.h5"),
+                        "model": bestModel,
+                    }
                 )
                 modelSaveMethod(modelSaveMethodValues)
             BurobotOther.zipFolder(
@@ -797,19 +815,19 @@ def __gridLoop(
             # save usedParams
             GridSearchTrain.__saveParams(
                 modelTrainmethod,
-                modelTrainValues,
+                modelTrainValues.copy(),
                 modelSaveMethod,
-                modelSaveMethodValues,
+                modelSaveMethodValues.copy(),
                 modelLoadMethod,
-                modelLoadMethodValues,
+                modelLoadMethodValues.copy(),
                 hardwareSetupmethod,
-                hardwareSetupmethodValues,
+                hardwareSetupmethodValues.copy(),
                 loadDatamethod,
-                loadDatamethodValues,
+                loadDatamethodValues.copy(),
                 splitDatamethod,
-                splitDatamethodValues,
+                splitDatamethodValues.copy(),
                 modelTestmethod,
-                modelTestmethodValues,
+                modelTestmethodValues.copy(),
                 copy.deepcopy(paramsIter),
                 copy.deepcopy(usedParams),
                 copy.deepcopy(data),