Changeset 13492

Timestamp:

01/10/16 17:13:27 (9 years ago)

Author:

aballeit

Message:

#2283 UCT parameter c

Location:

branches/HeuristicLab.Problems.GrammaticalOptimization

Files:

• Evaluation/MainWindow.xaml (modified) (2 diffs)
• Evaluation/MainWindow.xaml.cs (modified) (4 diffs)
• HeuristicLab.Algorithms.Bandits/Policies/UCTPolicy.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.GeneticProgramming/StandardGP.cs (modified) (1 diff)
• HeuristicLab.Algorithms.MonteCarloTreeSearch/Base/TreeNode.cs (modified) (1 diff)
• HeuristicLab.Algorithms.MonteCarloTreeSearch/MonteCarloTreeSearch.cs (modified) (5 diffs)
• HeuristicLab.Algorithms.MonteCarloTreeSearch/MonteCarloTreeSearch_PruneLeaves.cs (modified) (2 diffs)

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

@@ -115 +115 @@
                                         <d3:Header Content="Quality-Chart"/>
                                         <d3:VerticalAxisTitle Content="Qualität" />
-                                        <d3:HorizontalAxisTitle Content="Evaluierungen"/>
+                                        <d3:HorizontalAxisTitle Content="Iterationen"/>
                                     </d3:ChartPlotter>
                                 </Grid>
@@ -130 +130 @@
                                     <d3:ChartPlotter Grid.Column="1" x:Name="SelectionChartPlotter" LegendVisible="False" EnableSmoothPanningForNumericAxes="True" >
                                         <d3:VerticalAxisTitle Content="Qualität" />
-                                        <d3:HorizontalAxisTitle Content="Evaluierungen"/>
+                                        <d3:HorizontalAxisTitle Content="Iterationen"/>
                                     </d3:ChartPlotter>
                                 </Grid>

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

@@ -142 +142 @@
                     run.TreeInfos = mctsSolver.GetTreeInfos();
 
-                    //byte[] output = mctsSolver.GenerateSvg();
-                    //if (output != null && output.Length > 0)
-                    //{
-                    //    run.SvgFile = string.Format("MCTS_SVG_#{0}_{1}.svg", run.RunNumber, DateTime.Now.Ticks);
-                    //    File.WriteAllBytes(run.SvgFile, mctsSolver.GenerateSvg());
-                    //}
+                    byte[] output = mctsSolver.GenerateSvg();
+                    if (output != null && output.Length > 0)
+                    {
+                        run.SvgFile = string.Format("MCTS_SVG_#{0}_{1}.svg", run.RunNumber, DateTime.Now.Ticks);
+                        File.WriteAllBytes(run.SvgFile, mctsSolver.GenerateSvg());
+                    }
                     mctsSolver.FreeAll();
                 }
@@ -192 +192 @@
             if (policy == typeof(UCTPolicy))
             {
-                policyInstance = new UCTPolicy();
+                policyInstance = new UCTPolicy(vm.Epsylon);
             }
             else if (policy == typeof(ThresholdAscentPolicy))
@@ -457 +457 @@
             {
                 TextBoxEpsylon.Visibility = Visibility.Visible;
+                TextBoxEpsylon.Text = Math.Sqrt(1).ToString();
+                TextBlockEpsylon.Text = "Epsylon";
+                TextBlockEpsylon.Visibility = Visibility.Visible;
+            }
+            else if (vm.SelectedPolicy == typeof (UCTPolicy))
+            {
+                TextBoxEpsylon.Visibility = Visibility.Visible;
+                TextBoxEpsylon.Text = Math.Sqrt(2).ToString();
+                TextBlockEpsylon.Text = "c";
                 TextBlockEpsylon.Visibility = Visibility.Visible;
             }
@@ -468 +477 @@
         private void Selector_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (ChartSelector.SelectedItem == TabSelectionIndicator)
-            {
-                if (vm.SelectedRun != null)
-                {
-                    if (vm.SelectedRun.RunState == RunState.Finished)
-                    {
-                        ClearSelectionChart();
-                        DrawSelectionChart(vm.SelectedRun);
-                    }
-                }
-            }
-            else if (ChartSelector.SelectedItem == TabQualityChart)
-            {
-                if (vm.SelectedRun != null)
-                {
-                    if (vm.SelectedRun.RunState == RunState.Finished)
-                    {
-                        ClearQualityChart();
-                        DrawQualityChart(vm.SelectedRun);
-                    }
+            if (vm.SelectedRun != null && vm.SelectedRun.RunState == RunState.Finished)
+            {
+
+                if (ChartSelector.SelectedItem == TabSelectionIndicator)
+                {
+
+                    ClearSelectionChart();
+                    DrawSelectionChart(vm.SelectedRun);
+                }
+                else if (ChartSelector.SelectedItem == TabQualityChart)
+                {
+
+                    ClearQualityChart();
+                    DrawQualityChart(vm.SelectedRun);
+                }
+                else if (ChartSelector.SelectedItem == TabItemTree)
+                {
+                    DrawTreeChart(vm.SelectedRun);
                 }
             }

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.Bandits/Policies/UCTPolicy.cs

@@ -12 +12 @@
     private readonly double c;
 
-    public UCTPolicy(double c = 1.0) {
+      // c = sqrt(2)
+    public UCTPolicy(double c = 1.41421356237)
+    {
       this.c = c;
     }
@@ -30 +32 @@
           q = double.PositiveInfinity;
         } else {
-            q = aInfo.SumReward / aInfo.Tries + 2.0 * c * Math.Sqrt(Math.Log(totalTries) / aInfo.Tries);
+            q = aInfo.SumReward / aInfo.Tries + c * Math.Sqrt(Math.Log(totalTries) / aInfo.Tries);
         }
         if (q > bestQ) {

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GeneticProgramming/StandardGP.cs

@@ -30 +30 @@
       PopulationSize = 1000;
       TournamentGroupSize = 4;
-      MutationRate = 0.15;
-      MaxSolutionSize = 201;
+      MutationRate = 0.05;
+      MaxSolutionSize = 40;
       MaxSolutionDepth = 17;
       this.saveAlg = saveAlg;

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.MonteCarloTreeSearch/Base/TreeNode.cs

@@ -1 @@
-using System;
+using HeuristicLab.Algorithms.Bandits;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using HeuristicLab.Algorithms.Bandits;
-using HeuristicLab.Algorithms.Bandits.BanditPolicies;
-using HeuristicLab.Problems.GrammaticalOptimization;
 
 namespace HeuristicLab.Algorithms.MonteCarloTreeSearch.Base

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.MonteCarloTreeSearch/MonteCarloTreeSearch.cs

@@ -86 +86 @@
                         currentNode.GetChildActionInfos());
                     currentNode = currentNode.children[currentActionIndex];
-                    selections++;
-                    CheckSelection(currentNode, selections);
+                    //selections++;
+                    //CheckSelection(currentNode, selections);
                 }
 
@@ -98 +98 @@
                         currentNode.children[behaviourPolicy.SelectAction(random, currentNode.GetChildActionInfos())
                             ];
-                    selections++;
-                    CheckSelection(currentNode, selections);
+                    //selections++;
+                    //CheckSelection(currentNode, selections);
                 }
                 if (currentNode.phrase.Length <= maxLen)
@@ -223 +223 @@
         public byte[] GenerateSvg()
         {
-            if (GetTreeInfos().TotalNodes < 1000)
+            if (GetTreeInfos().TotalNodes < 6000)
             {
                 IGetStartProcessQuery getStartProcessQuery = new GetStartProcessQuery();
@@ -233 +233 @@
                     getProcessStartInfoQuery,
                     registerLayoutPluginCommand);
-                wrapper.GraphvizPath = @"../../../Graphviz2.38/bin";
+                wrapper.GraphvizPath = @"../../../../Graphviz2.38/bin";
                 StringBuilder dotFile = new StringBuilder("digraph {");
                 dotFile.AppendLine();
@@ -279 +279 @@
                         foreach (TreeNode childNode in currentNode.children)
                         {
-                            toDoNodes.Add(childNode);
-                            // declare node
-
-                            string hexColor = GetHexNodeColor(Color.White, Color.OrangeRed, childNode.actionInfo.Value);
-                            dotFile.AppendLine(
-                                string.Format("{0} [label=\"{1}\\n{2:0.00}/{3}\", style=filled, fillcolor=\"{4}\"]",
-                                    childNode.GetHashCode(),
-                                    childNode.phrase, childNode.actionInfo.Value, childNode.actionInfo.Tries, hexColor));
-                            // add edge
-                            dotFile.AppendLine(string.Format("{0} -> {1}", currentNode.GetHashCode(),
-                                childNode.GetHashCode()));
+                            if (childNode.actionInfo.Tries > 1)
+                            {
+                                toDoNodes.Add(childNode);
+                                // declare node
+
+                                string hexColor = GetHexNodeColor(Color.White, Color.OrangeRed,
+                                    childNode.actionInfo.Value);
+                                dotFile.AppendLine(
+                                    string.Format("{0} [label=\"{1}\\n{2:0.00}/{3}\", style=filled, fillcolor=\"{4}\"]",
+                                        childNode.GetHashCode(),
+                                        childNode.phrase, childNode.actionInfo.Value, childNode.actionInfo.Tries,
+                                        hexColor));
+                                // add edge
+                                dotFile.AppendLine(string.Format("{0} -> {1}", currentNode.GetHashCode(),
+                                    childNode.GetHashCode()));
+                            }
                         }
                     }

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.MonteCarloTreeSearch/MonteCarloTreeSearch_PruneLeaves.cs

@@ -48 +48 @@
                         // already removed all child nodes so remove it too..
                         currentNode.parent.RemoveChildren(currentNode);
+                        i--;
                         continue;
                     }
@@ -75 +76 @@
                     Propagate(currentNode, quality);
                 }
+                else
+                {
+                    i--;
+
+                }
             }
         }