Add LoadStudy method to Study class and use it in Visualize class

hrntsm · Feb 24, 2024 · dead5e0 · dead5e0
1 parent f659b53
commit dead5e0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/Optuna/Study/Study.cs b/Optuna/Study/Study.cs
@@ -146,5 +146,10 @@ public static dynamic CreateStudy(dynamic optuna, string studyName, dynamic samp
                 load_if_exists: loadIfExists
             );
         }
+
+        public static dynamic LoadStudy(dynamic optuna, dynamic storage, string studyName)
+        {
+            return optuna.load_study(storage: storage, study_name: studyName);
+        }
     }
 }
diff --git a/Tunny/Solver/Visualize.cs b/Tunny/Solver/Visualize.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Windows.Forms;
 
+using Optuna.Study;
 using Optuna.Visualization;
 
 using Python.Runtime;
@@ -24,20 +25,6 @@ public Visualize(TSettings settings, bool hasConstraint)
             _hasConstraint = hasConstraint;
         }
 
-        private static dynamic LoadStudy(dynamic optuna, dynamic storage, string studyName)
-        {
-            TLog.MethodStart();
-            try
-            {
-                return optuna.load_study(storage: storage, study_name: studyName);
-            }
-            catch (Exception e)
-            {
-                TunnyMessageBox.Show(e.Message, "Tunny", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return null;
-            }
-        }
-
         public void Plot(Plot pSettings)
         {
             TLog.MethodStart();
@@ -46,7 +33,7 @@ public void Plot(Plot pSettings)
             {
                 dynamic optuna = Py.Import("optuna");
                 dynamic storage = _settings.Storage.CreateNewOptunaStorage(false);
-                dynamic study = LoadStudy(optuna, storage, pSettings.TargetStudyName);
+                dynamic study = Study.LoadStudy(optuna, storage, pSettings.TargetStudyName);
                 if (study == null)
                 {
                     return;