From adc9cb57f8ad41d00c8a0ab250b594c12fe6f0ba Mon Sep 17 00:00:00 2001
From: hrntsm <contact@hrntsm.com>
Date: Sat, 8 Feb 2025 14:31:24 +0900
Subject: [PATCH] Add optuna hub force reload

---
 Optuna/Sampler/NSGAIIISampler.cs              |  2 +
 Optuna/Sampler/OptunaHub/AutoSampler.cs       |  4 +-
 Optuna/Sampler/OptunaHub/HubSamplerBase.cs    |  7 ++++
 Optuna/Sampler/OptunaHub/MOEADSampler.cs      |  3 +-
 Optuna/Sampler/OptunaHub/MoCmaEsSampler.cs    |  4 +-
 .../Sampler/{ => OptunaHub}/NSGAIISampler.cs  |  7 ++--
 Tunny/WPF/MainWindow.xaml                     | 38 ++++++++++---------
 Tunny/WPF/ViewModels/MainWindowViewModel.cs   | 11 ++++++
 .../Settings/Sampler/AutoSettingsPage.xaml    | 10 +++++
 .../Settings/Sampler/AutoSettingsPage.xaml.cs |  2 +
 .../Settings/Sampler/MOEADSettingsPage.xaml   |  9 +++++
 .../Sampler/MOEADSettingsPage.xaml.cs         |  5 ++-
 .../Settings/Sampler/MoCmaEsSettingsPage.xaml |  9 +++++
 .../Sampler/MoCmaEsSettingsPage.xaml.cs       |  3 ++
 .../Settings/Sampler/NSGAIISettingsPage.xaml  |  9 +++++
 .../Sampler/NSGAIISettingsPage.xaml.cs        |  7 +++-
 16 files changed, 101 insertions(+), 29 deletions(-)
 create mode 100644 Optuna/Sampler/OptunaHub/HubSamplerBase.cs
 rename Optuna/Sampler/{ => OptunaHub}/NSGAIISampler.cs (91%)

diff --git a/Optuna/Sampler/NSGAIIISampler.cs b/Optuna/Sampler/NSGAIIISampler.cs
index 29533585..a71e62b4 100644
--- a/Optuna/Sampler/NSGAIIISampler.cs
+++ b/Optuna/Sampler/NSGAIIISampler.cs
@@ -1,3 +1,5 @@
+using Optuna.Sampler.OptunaHub;
+
 using Python.Runtime;
 
 namespace Optuna.Sampler
diff --git a/Optuna/Sampler/OptunaHub/AutoSampler.cs b/Optuna/Sampler/OptunaHub/AutoSampler.cs
index e7ad1aea..961dce2e 100644
--- a/Optuna/Sampler/OptunaHub/AutoSampler.cs
+++ b/Optuna/Sampler/OptunaHub/AutoSampler.cs
@@ -5,14 +5,14 @@ namespace Optuna.Sampler.OptunaHub
     /// <summary>
     /// https://hub.optuna.org/samplers/auto_sampler/
     /// </summary>
-    public class AutoSampler : SamplerBase
+    public class AutoSampler : HubSamplerBase
     {
         private const string Package = "samplers/auto_sampler";
 
         public dynamic ToPython()
         {
             dynamic optunahub = Py.Import("optunahub");
-            dynamic module = optunahub.load_module(package: Package);
+            dynamic module = optunahub.load_module(package: Package, force_reload: ForceReload);
             return module.AutoSampler(
                 seed: Seed
             );
diff --git a/Optuna/Sampler/OptunaHub/HubSamplerBase.cs b/Optuna/Sampler/OptunaHub/HubSamplerBase.cs
new file mode 100644
index 00000000..6485ce73
--- /dev/null
+++ b/Optuna/Sampler/OptunaHub/HubSamplerBase.cs
@@ -0,0 +1,7 @@
+namespace Optuna.Sampler.OptunaHub
+{
+    public class HubSamplerBase : SamplerBase
+    {
+        public bool ForceReload { get; set; }
+    }
+}
diff --git a/Optuna/Sampler/OptunaHub/MOEADSampler.cs b/Optuna/Sampler/OptunaHub/MOEADSampler.cs
index 6584df7d..787326bb 100644
--- a/Optuna/Sampler/OptunaHub/MOEADSampler.cs
+++ b/Optuna/Sampler/OptunaHub/MOEADSampler.cs
@@ -15,6 +15,7 @@ public class MOEADSampler : GASamplerBase
         public double SwappingProb { get; set; } = 0.5;
         public ScalarAggregationType ScalarAggregation { get; set; } = ScalarAggregationType.tchebycheff;
         public int NumNeighbors { get; set; } = -1;
+        public bool ForceReload { get; set; }
 
         public dynamic ToPython()
         {
@@ -25,7 +26,7 @@ public dynamic ToPython()
             {
                 NumNeighbors = PopulationSize / 5;
             }
-            dynamic module = optunahub.load_module(package: Package);
+            dynamic module = optunahub.load_module(package: Package, force_reload: ForceReload);
             return module.MOEADSampler(
                 population_size: PopulationSize,
                 mutation_prob: MutationProb,
diff --git a/Optuna/Sampler/OptunaHub/MoCmaEsSampler.cs b/Optuna/Sampler/OptunaHub/MoCmaEsSampler.cs
index 98eee702..8c25347a 100644
--- a/Optuna/Sampler/OptunaHub/MoCmaEsSampler.cs
+++ b/Optuna/Sampler/OptunaHub/MoCmaEsSampler.cs
@@ -2,7 +2,7 @@
 
 namespace Optuna.Sampler.OptunaHub
 {
-    public class MoCmaEsSampler : SamplerBase
+    public class MoCmaEsSampler : HubSamplerBase
     {
         private const string Package = "samplers/mocma";
         public int? PopulationSize { get; set; }
@@ -10,7 +10,7 @@ public class MoCmaEsSampler : SamplerBase
         public dynamic ToPython()
         {
             dynamic optunahub = Py.Import("optunahub");
-            dynamic module = optunahub.load_module(package: Package);
+            dynamic module = optunahub.load_module(package: Package, force_reload: ForceReload);
             return module.MoCmaSampler(
                 popsize: PopulationSize,
                 seed: Seed
diff --git a/Optuna/Sampler/NSGAIISampler.cs b/Optuna/Sampler/OptunaHub/NSGAIISampler.cs
similarity index 91%
rename from Optuna/Sampler/NSGAIISampler.cs
rename to Optuna/Sampler/OptunaHub/NSGAIISampler.cs
index 33d15be4..8de1f58f 100644
--- a/Optuna/Sampler/NSGAIISampler.cs
+++ b/Optuna/Sampler/OptunaHub/NSGAIISampler.cs
@@ -1,8 +1,6 @@
-using System;
-
 using Python.Runtime;
 
-namespace Optuna.Sampler
+namespace Optuna.Sampler.OptunaHub
 {
     ///  <summary>
     /// https://optuna.readthedocs.io/en/stable/reference/generated/optuna.samplers.NSGAIISampler.html
@@ -15,12 +13,13 @@ public class NSGAIISampler : GASamplerBase
         public string Crossover { get; set; } = "BLXAlpha";
         public double CrossoverProb { get; set; } = 0.9;
         public double SwappingProb { get; set; } = 0.5;
+        public bool ForceReload { get; set; }
 
         public dynamic ToPython(bool hasConstraints)
         {
             dynamic optuna = Py.Import("optuna");
             dynamic optunahub = Py.Import("optunahub");
-            dynamic module = optunahub.load_module(package: Package);
+            dynamic module = optunahub.load_module(package: Package, force_reload: ForceReload);
             return module.NSGAIIwITSampler(
                 population_size: PopulationSize,
                 mutation_prob: MutationProb,
diff --git a/Tunny/WPF/MainWindow.xaml b/Tunny/WPF/MainWindow.xaml
index c7f11ef7..6ffec92a 100644
--- a/Tunny/WPF/MainWindow.xaml
+++ b/Tunny/WPF/MainWindow.xaml
@@ -47,6 +47,10 @@
                         Command="{Binding QuickAccessStorageFileOpenCommand}"
                         SmallImageSource="{StaticResource OpenFolderOutline}"
                         ToolTip="Open Optimization Result File" />
+                    <RibbonCheckBox
+                        IsChecked="{Binding ShowTopmost}"
+                        Label="Show Topmost"
+                        ToolTip="Show Topmost" />
                 </RibbonQuickAccessToolBar>
             </Ribbon.QuickAccessToolBar>
 
@@ -92,15 +96,8 @@
                         Label="GP BoTorch"
                         LargeImageSource="{StaticResource Torch}"
                         SmallImageSource="{StaticResource Torch}" />
-                    <RibbonButton
-                        Command="{Binding SelectSamplerCommand}"
-                        CommandParameter="{x:Static common:SelectSamplerType.GpPreferential}"
-                        IsEnabled="False"
-                        Label="GP Preferential"
-                        LargeImageSource="{StaticResource Compare}"
-                        SmallImageSource="{StaticResource Compare}" />
                 </RibbonGroup>
-                <RibbonGroup Header="Genetic Algorithm">
+                <RibbonGroup Header="Evolution Algorithm">
                     <RibbonButton
                         Command="{Binding SelectSamplerCommand}"
                         CommandParameter="{x:Static common:SelectSamplerType.NSGAII}"
@@ -113,6 +110,13 @@
                         Label="NSGA-III"
                         LargeImageSource="{StaticResource EggEaster}"
                         SmallImageSource="{StaticResource EggEaster}" />
+                    <RibbonButton
+                        Command="{Binding SelectSamplerCommand}"
+                        CommandParameter="{x:Static common:SelectSamplerType.MOEAD}"
+                        IsEnabled="{Binding IsMultiObjective}"
+                        Label="MOEA/D"
+                        LargeImageSource="{StaticResource WrapDisabled}"
+                        SmallImageSource="{StaticResource WrapDisabled}" />
                 </RibbonGroup>
                 <RibbonGroup Header="Evolution Strategy">
                     <RibbonButton
@@ -130,15 +134,6 @@
                         LargeImageSource="{StaticResource CircleMultiple}"
                         SmallImageSource="{StaticResource CircleMultiple}" />
                 </RibbonGroup>
-                <RibbonGroup Header="Evolution Algorithm">
-                    <RibbonButton
-                        Command="{Binding SelectSamplerCommand}"
-                        CommandParameter="{x:Static common:SelectSamplerType.MOEAD}"
-                        IsEnabled="{Binding IsMultiObjective}"
-                        Label="MOEA/D"
-                        LargeImageSource="{StaticResource WrapDisabled}"
-                        SmallImageSource="{StaticResource WrapDisabled}" />
-                </RibbonGroup>
                 <RibbonGroup Header="Misc">
                     <RibbonButton
                         Command="{Binding SelectSamplerCommand}"
@@ -159,6 +154,15 @@
                         LargeImageSource="{StaticResource AllInclusiveBox}"
                         SmallImageSource="{StaticResource AllInclusiveBox}" />
                 </RibbonGroup>
+                <RibbonGroup Header="Human in the loop">
+                    <RibbonButton
+                        Command="{Binding SelectSamplerCommand}"
+                        CommandParameter="{x:Static common:SelectSamplerType.GpPreferential}"
+                        IsEnabled="False"
+                        Label="GP Preferential"
+                        LargeImageSource="{StaticResource Compare}"
+                        SmallImageSource="{StaticResource Compare}" />
+                </RibbonGroup>
                 <RibbonGroup Header="Optuna Hub">
                     <RibbonButton
                         Command="{Binding RegisterOptunaHubSamplerCommand}"
diff --git a/Tunny/WPF/ViewModels/MainWindowViewModel.cs b/Tunny/WPF/ViewModels/MainWindowViewModel.cs
index 80cb164d..eab2644d 100644
--- a/Tunny/WPF/ViewModels/MainWindowViewModel.cs
+++ b/Tunny/WPF/ViewModels/MainWindowViewModel.cs
@@ -430,5 +430,16 @@ internal void UpdateExistStudySummaries()
                 viewModel.UpdateExistStudySummaries();
             }
         }
+
+        private bool? _showTopmost;
+        public bool? ShowTopmost
+        {
+            get => _showTopmost;
+            set
+            {
+                SetProperty(ref _showTopmost, value);
+                SharedItems.Instance.TunnyWindow.Topmost = value == true;
+            }
+        }
     }
 }
diff --git a/Tunny/WPF/Views/Pages/Settings/Sampler/AutoSettingsPage.xaml b/Tunny/WPF/Views/Pages/Settings/Sampler/AutoSettingsPage.xaml
index 9ccca58c..93043819 100644
--- a/Tunny/WPF/Views/Pages/Settings/Sampler/AutoSettingsPage.xaml
+++ b/Tunny/WPF/Views/Pages/Settings/Sampler/AutoSettingsPage.xaml
@@ -44,6 +44,16 @@
                 Text="AUTO"
                 TextAlignment="Right" />
 
+            <CheckBox
+                x:Name="AutoForceReloadCheckBox"
+                Grid.Row="8"
+                Grid.Column="0"
+                Margin="5"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                Content="ForceReload"
+                IsChecked="False" />
+
             <Button
                 Grid.Row="8"
                 Grid.Column="1"
diff --git a/Tunny/WPF/Views/Pages/Settings/Sampler/AutoSettingsPage.xaml.cs b/Tunny/WPF/Views/Pages/Settings/Sampler/AutoSettingsPage.xaml.cs
index ab03b1ac..b1ae7d13 100644
--- a/Tunny/WPF/Views/Pages/Settings/Sampler/AutoSettingsPage.xaml.cs
+++ b/Tunny/WPF/Views/Pages/Settings/Sampler/AutoSettingsPage.xaml.cs
@@ -28,6 +28,7 @@ internal AutoSampler ToSettings()
                 Seed = AutoSeedTextBox.Text == "AUTO"
                     ? null
                     : (int?)int.Parse(AutoSeedTextBox.Text, CultureInfo.InvariantCulture),
+                ForceReload = AutoForceReloadCheckBox.IsChecked == true
             };
         }
 
@@ -51,6 +52,7 @@ private void AutoSeedTextBox_LostFocus(object sender, RoutedEventArgs e)
         private void DefaultButton_Click(object sender, RoutedEventArgs e)
         {
             AutoSeedTextBox.Text = "AUTO";
+            AutoForceReloadCheckBox.IsChecked = false;
         }
     }
 }
diff --git a/Tunny/WPF/Views/Pages/Settings/Sampler/MOEADSettingsPage.xaml b/Tunny/WPF/Views/Pages/Settings/Sampler/MOEADSettingsPage.xaml
index 7afc41fb..e5b002de 100644
--- a/Tunny/WPF/Views/Pages/Settings/Sampler/MOEADSettingsPage.xaml
+++ b/Tunny/WPF/Views/Pages/Settings/Sampler/MOEADSettingsPage.xaml
@@ -122,6 +122,15 @@
                 Grid.Column="1"
                 Margin="5" />
 
+            <CheckBox
+                x:Name="MoeadForceReloadCheckBox"
+                Grid.Row="8"
+                Grid.Column="0"
+                Margin="5"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                Content="ForceReload"
+                IsChecked="False" />
             <Button
                 Grid.Row="8"
                 Grid.Column="1"
diff --git a/Tunny/WPF/Views/Pages/Settings/Sampler/MOEADSettingsPage.xaml.cs b/Tunny/WPF/Views/Pages/Settings/Sampler/MOEADSettingsPage.xaml.cs
index 5595ff19..09ca7563 100644
--- a/Tunny/WPF/Views/Pages/Settings/Sampler/MOEADSettingsPage.xaml.cs
+++ b/Tunny/WPF/Views/Pages/Settings/Sampler/MOEADSettingsPage.xaml.cs
@@ -42,7 +42,8 @@ internal MOEADSampler ToSettings()
                 NumNeighbors = MoeadNeighborsTextBox.Text == "AUTO"
                     ? -1
                     : int.Parse(MoeadNeighborsTextBox.Text, CultureInfo.InvariantCulture),
-                ScalarAggregation = (ScalarAggregationType)MoeadScalarAggregationComboBox.SelectedIndex
+                ScalarAggregation = (ScalarAggregationType)MoeadScalarAggregationComboBox.SelectedIndex,
+                ForceReload = MoeadForceReloadCheckBox.IsChecked == true
             };
         }
 
@@ -64,6 +65,7 @@ internal static MOEADSettingsPage FromSettings(TSettings settings)
             page.MoeadNeighborsTextBox.Text = moead.NumNeighbors == -1
                 ? "AUTO"
                 : moead.NumNeighbors.ToString(CultureInfo.InvariantCulture);
+            page.MoeadForceReloadCheckBox.IsChecked = false;
             return page;
         }
 
@@ -111,6 +113,7 @@ private void DefaultButton_Click(object sender, RoutedEventArgs e)
             MoeadCrossoverComboBox.SelectedIndex = 1;
             MoeadNeighborsTextBox.Text = "AUTO";
             MoeadScalarAggregationComboBox.SelectedIndex = 1;
+            MoeadForceReloadCheckBox.IsChecked = false;
         }
     }
 }
diff --git a/Tunny/WPF/Views/Pages/Settings/Sampler/MoCmaEsSettingsPage.xaml b/Tunny/WPF/Views/Pages/Settings/Sampler/MoCmaEsSettingsPage.xaml
index 58350820..8756da3e 100644
--- a/Tunny/WPF/Views/Pages/Settings/Sampler/MoCmaEsSettingsPage.xaml
+++ b/Tunny/WPF/Views/Pages/Settings/Sampler/MoCmaEsSettingsPage.xaml
@@ -58,6 +58,15 @@
                 Text="AUTO"
                 TextAlignment="Right" />
 
+            <CheckBox
+                x:Name="MoCmaEsForceReloadCheckBox"
+                Grid.Row="8"
+                Grid.Column="0"
+                Margin="5"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                Content="ForceReload"
+                IsChecked="False" />
             <Button
                 Grid.Row="8"
                 Grid.Column="1"
diff --git a/Tunny/WPF/Views/Pages/Settings/Sampler/MoCmaEsSettingsPage.xaml.cs b/Tunny/WPF/Views/Pages/Settings/Sampler/MoCmaEsSettingsPage.xaml.cs
index dc4bea5b..8d491393 100644
--- a/Tunny/WPF/Views/Pages/Settings/Sampler/MoCmaEsSettingsPage.xaml.cs
+++ b/Tunny/WPF/Views/Pages/Settings/Sampler/MoCmaEsSettingsPage.xaml.cs
@@ -31,6 +31,7 @@ internal MoCmaEsSampler ToSettings()
                 PopulationSize = MoCmaEsPopulationSizeTextBox.Text == "AUTO"
                     ? null
                     : (int?)int.Parse(MoCmaEsPopulationSizeTextBox.Text, CultureInfo.InvariantCulture),
+                ForceReload = MoCmaEsForceReloadCheckBox.IsChecked == true
             };
         }
 
@@ -44,6 +45,7 @@ internal static MoCmaEsSettingsPage FromSettings(TSettings settings)
             page.MoCmaEsPopulationSizeTextBox.Text = cmaEs.PopulationSize == null
                 ? "AUTO"
                 : cmaEs.PopulationSize?.ToString(CultureInfo.InvariantCulture);
+            page.MoCmaEsForceReloadCheckBox.IsChecked = false;
             return page;
         }
 
@@ -65,6 +67,7 @@ private void DefaultButton_Click(object sender, RoutedEventArgs e)
         {
             MoCmaEsSeedTextBox.Text = "AUTO";
             MoCmaEsPopulationSizeTextBox.Text = "AUTO";
+            MoCmaEsForceReloadCheckBox.IsChecked = false;
         }
     }
 }
diff --git a/Tunny/WPF/Views/Pages/Settings/Sampler/NSGAIISettingsPage.xaml b/Tunny/WPF/Views/Pages/Settings/Sampler/NSGAIISettingsPage.xaml
index 0375fd17..873e57e5 100644
--- a/Tunny/WPF/Views/Pages/Settings/Sampler/NSGAIISettingsPage.xaml
+++ b/Tunny/WPF/Views/Pages/Settings/Sampler/NSGAIISettingsPage.xaml
@@ -97,6 +97,15 @@
                 Grid.Column="1"
                 Margin="5" />
 
+            <CheckBox
+                x:Name="NsgaiiForceReloadCheckBox"
+                Grid.Row="8"
+                Grid.Column="0"
+                Margin="5"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                Content="ForceReload"
+                IsChecked="False" />
             <Button
                 Grid.Row="8"
                 Grid.Column="1"
diff --git a/Tunny/WPF/Views/Pages/Settings/Sampler/NSGAIISettingsPage.xaml.cs b/Tunny/WPF/Views/Pages/Settings/Sampler/NSGAIISettingsPage.xaml.cs
index cae2dddc..c9650ca0 100644
--- a/Tunny/WPF/Views/Pages/Settings/Sampler/NSGAIISettingsPage.xaml.cs
+++ b/Tunny/WPF/Views/Pages/Settings/Sampler/NSGAIISettingsPage.xaml.cs
@@ -2,7 +2,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-using Optuna.Sampler;
+using Optuna.Sampler.OptunaHub;
 
 using Tunny.Core.Input;
 using Tunny.Core.Settings;
@@ -35,7 +35,8 @@ internal NSGAIISampler ToSettings()
                     : (double?)double.Parse(NsgaiiMutationProbabilityTextBox.Text, System.Globalization.CultureInfo.InvariantCulture),
                 CrossoverProb = double.Parse(NsgaiiCrossoverProbabilityTextBox.Text, System.Globalization.CultureInfo.InvariantCulture),
                 SwappingProb = double.Parse(NsgaiiSwappingProbabilityTextBox.Text, System.Globalization.CultureInfo.InvariantCulture),
-                Crossover = ((NsgaCrossoverType)NsgaiiCrossoverComboBox.SelectedIndex).ToString()
+                Crossover = ((NsgaCrossoverType)NsgaiiCrossoverComboBox.SelectedIndex).ToString(),
+                ForceReload = NsgaiiForceReloadCheckBox.IsChecked == true
             };
         }
 
@@ -53,6 +54,7 @@ internal static NSGAIISettingsPage FromSettings(TSettings settings)
             page.NsgaiiSwappingProbabilityTextBox.Text = nsgaii.SwappingProb.ToString(System.Globalization.CultureInfo.InvariantCulture);
             page.NsgaiiCrossoverComboBox.SelectedIndex = string.IsNullOrEmpty(nsgaii.Crossover)
                 ? 0 : (int)Enum.Parse(typeof(NsgaCrossoverType), nsgaii.Crossover);
+            page.NsgaiiForceReloadCheckBox.IsChecked = false;
             return page;
         }
 
@@ -90,6 +92,7 @@ private void DefaultButton_Click(object sender, RoutedEventArgs e)
             NsgaiiCrossoverProbabilityTextBox.Text = "0.9";
             NsgaiiSwappingProbabilityTextBox.Text = "0.5";
             NsgaiiCrossoverComboBox.SelectedIndex = 1;
+            NsgaiiForceReloadCheckBox.IsChecked = false;
         }
     }
 }