Changeset 12833

Timestamp:

08/03/15 11:37:49 (9 years ago)

Author:

aballeit

Message:

#2283 EpsGreedy Textbox for Epsylon

Location:

branches/HeuristicLab.Problems.GrammaticalOptimization/Evaluation

Files:

• MainWindow.xaml (modified) (2 diffs)
• MainWindow.xaml.cs (modified) (3 diffs)
• ViewModel/EvaluationViewModel.cs (modified) (1 diff)

branches/HeuristicLab.Problems.GrammaticalOptimization/Evaluation/MainWindow.xaml

@@ -46 +46 @@
                           DisplayMemberPath="Name"
                           SelectedValue="{Binding SelectedPolicy}"
-                          Width="200" Margin="5,0,0,0"></ComboBox>
+                          Width="200" Margin="5,0,0,0"
+                          SelectionChanged="ComboBoxPolicies_OnSelectionChanged"></ComboBox>
+                <TextBlock Name="TextBlockEpsylon" Text="Epsylon:" Visibility="Hidden" Margin="5,0,0,0" VerticalAlignment="Center"></TextBlock>
+                <TextBox Name="TextBoxEpsylon" Text="{Binding Epsylon}" Visibility="Hidden" Margin="5,0,0,0" VerticalAlignment="Center" Width="50"></TextBox>
                 <Button Name="ButtonRun" Margin="5,0,0,0" Click="ButtonRun_OnClick" Height="22" VerticalAlignment="Top">Run</Button>
                 <Button Name="ButtonPause" Margin="5,0,0,0" Click="ButtonPause_OnClick" IsEnabled="False">Pause</Button>
@@ -74 +77 @@
                 <TextBox Name="TextBoxMaxIterations" Margin="2" Grid.Column="1" Grid.Row="1" Width="100" VerticalAlignment="Center" TextAlignment="Right" Text="{Binding MaxIterations}"></TextBox>
                 <TextBlock Margin="2" Grid.Column="2" Grid.Row="1" VerticalAlignment="Center">MaxThreads:</TextBlock>
-                <TextBox Name="MaxThreads" Margin="2" Grid.Column="3" Grid.Row="1" Width="100" VerticalAlignment="Center" TextAlignment="Right" Text="{Binding MaxThreads}"></TextBox>
+                <TextBox Name="TextBoxMaxThreads" Margin="2" Grid.Column="3" Grid.Row="1" Width="100" VerticalAlignment="Center" TextAlignment="Right" Text="{Binding MaxThreads}"></TextBox>
                 <TextBlock Margin="2" Grid.Column="2" Grid.Row="0" VerticalAlignment="Center">MaxLen:</TextBlock>
                 <TextBox Name="TextBoxMaxLen" Margin="2" Grid.Column="3" Grid.Row="0" Width="100" VerticalAlignment="Center" TextAlignment="Right" Text="{Binding MaxLen}"></TextBox>

branches/HeuristicLab.Problems.GrammaticalOptimization/Evaluation/MainWindow.xaml.cs

@@ -156 +156 @@
             TextBoxMaxLen.IsEnabled = true;
             TextBoxRuns.IsEnabled = true;
+            TextBoxMaxThreads.IsEnabled = true;
         }
 
@@ -181 +182 @@
                 policyInstance = new BoltzmannExplorationPolicy(2);
             }
+            else if (policy == typeof (EpsGreedyPolicy))
+            {
+                policyInstance = new EpsGreedyPolicy(vm.Epsylon);
+            }
             else
             {
                 policyInstance = (IBanditPolicy)Activator.CreateInstance(policy);
             }
-
-
 
             for (int i = 0; i < vm.NrRuns; i++)
@@ -428 +431 @@
             Clipboard.SetData(DataFormats.Text, tableExport.ToString());
         }
+
+        private void ComboBoxPolicies_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (vm.SelectedPolicy == typeof (EpsGreedyPolicy))
+            {
+                TextBoxEpsylon.Visibility = Visibility.Visible;
+                TextBlockEpsylon.Visibility = Visibility.Visible;
+            }
+            else
+            {
+                TextBoxEpsylon.Visibility = Visibility.Hidden;
+                TextBlockEpsylon.Visibility = Visibility.Hidden;
+            }
+        }
     }
 }

branches/HeuristicLab.Problems.GrammaticalOptimization/Evaluation/ViewModel/EvaluationViewModel.cs

@@ -119 +119 @@
                 this.maxThreads = value;
                 this.OnPropertyChanged("MaxThreads");
+            }
+        }
+
+        private double epsylon;
+
+        public double Epsylon
+        {
+            get { return this.epsylon; }
+            set
+            {
+                this.epsylon = value;
+                this.OnPropertyChanged("Epsylon");
             }
         }