Changeset 12827 for branches/HeuristicLab.Problems.GrammaticalOptimization

Timestamp:

08/02/15 13:13:25 (9 years ago)

Author:

aballeit

Message:

#2283 added TreeInfos to MCTS excel export

Location:

branches/HeuristicLab.Problems.GrammaticalOptimization

Files:

• Evaluation/MainWindow.xaml.cs (modified) (1 diff)
• HeuristicLab.Algorithms.GeneticProgramming/StandardGP.cs (modified) (1 diff)
• HeuristicLab.Algorithms.MonteCarloTreeSearch/MonteCarloTreeSearch.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.MonteCarloTreeSearch/MonteCarloTreeSearch_PruneLeaves.cs (modified) (2 diffs)

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

@@ -396 +396 @@
         {
             StringBuilder tableExport = new StringBuilder();
-            tableExport.AppendLine(
+            tableExport.Append(
                 "Run\tMaxIterations\tEvaluations\tBestKnownQuality\tQuality\tQuality %\tFoundAt\tTotalTime\tSolutionTime\tEvaluationsPerSecond\tSolution");
+            if (ListViewRuns.Items.Count > 0 && ((Run) ListViewRuns.Items[0]).TreeInfos != null)
+            {
+                tableExport.Append("\tTotalNodes\tUnexpandedNodes\tExpandedNodes\tLeaveNodes\tDeepestLevel");
+            }
+            tableExport.AppendLine();
             for (int i = 0; i < ListViewRuns.Items.Count; i++)
             {
                 Run run = (Run)ListViewRuns.Items[i];
-                tableExport.AppendLine(string.Format("{0}\t{1}\t{2}\t{3}\t{4}\t{5}\t{6}\t{7}\t{8}\t{9}\t{10}", run.RunNumber,
+                tableExport.Append(string.Format("{0}\t{1}\t{2}\t{3}\t{4}\t{5}\t{6}\t{7}\t{8}\t{9}\t{10}", run.RunNumber,
                     run.MaxIterations, run.Evaluations, run.BestKnownQuality, run.BestQuality,
                     run.BestQuality / run.BestKnownQuality, run.BestSolutionFoundAt, run.TotalTime, run.BestSolutionTime,
                     run.EvaluationsPerSecond, run.BestSolution));
+
+                if (run.TreeInfos != null)
+                {
+                    tableExport.Append(string.Format("\t{0}\t{1}\t{2}\t{3}\t{4}", run.TreeInfos.TotalNodes,
+                        run.TreeInfos.UnexpandedNodes, run.TreeInfos.ExpandedNodes, run.TreeInfos.LeaveNodes,
+                        run.TreeInfos.DeepestLevel));
+                }
+
+                tableExport.AppendLine();
             }
             Clipboard.SetData(DataFormats.Text, tableExport.ToString());

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

@@ -31 +31 @@
       TournamentGroupSize = 4;
       MutationRate = 0.15;
-      MaxSolutionSize = 30;
+      MaxSolutionSize = 40;
       MaxSolutionDepth = 17;
       this.saveAlg = saveAlg;

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

@@ -97 +97 @@
                         currentNode.GetChildActionInfos());
                     currentNode = currentNode.children[currentActionIndex];
-                    selections++;
-                    CheckSelection(currentNode, selections);
+                    //selections++;
+                    //CheckSelection(currentNode, selections);
                 }
 
@@ -109 +109 @@
                         currentNode.children[behaviourPolicy.SelectAction(random, currentNode.GetChildActionInfos())
                             ];
-                    selections++;
-                    CheckSelection(currentNode, selections);
+                    //selections++;
+                    //CheckSelection(currentNode, selections);
                 }
                 if (currentNode.phrase.Length <= maxLen)

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

@@ -38 +38 @@
                         currentNode.GetChildActionInfos());
                     currentNode = currentNode.children[currentActionIndex];
-                    selections++;
-                    CheckSelection(currentNode, selections);
+                    //selections++;
+                    //CheckSelection(currentNode, selections);
                 }
 
@@ -59 +59 @@
                             currentNode.children[behaviourPolicy.SelectAction(random, currentNode.GetChildActionInfos())
                                 ];
-                        selections++;
-                        CheckSelection(currentNode, selections);
+                        //selections++;
+                        //CheckSelection(currentNode, selections);
                     }
                     else