Changeset 13661

Timestamp:

03/07/16 15:40:51 (9 years ago)

Author:

gkronber

Message:

#2581: updated unit test to compile with r13658

Location:

trunk/sources

Files:

• HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/Policies/EpsGreedy.cs (modified) (1 diff)
• HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/Policies/PolicyBase.cs (modified) (1 diff)
• HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/Policies/Ucb.cs (modified) (1 diff)
• HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/Policies/UcbTuned.cs (modified) (1 diff)
• HeuristicLab.Tests/HeuristicLab.Algorithms.DataAnalysis-3.4/MctsSymbolicRegressionTest.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/Policies/EpsGreedy.cs

@@ -12 +12 @@
 namespace HeuristicLab.Algorithms.DataAnalysis.MctsSymbolicRegression.Policies {
   [Item("EpsilonGreedy", "Epsilon greedy policy with parameter eps to balance between exploitation and exploration")]
-  internal class EpsilonGreedy : PolicyBase {
+  public class EpsilonGreedy : PolicyBase {
     private class ActionStatistics : IActionStatistics {
       public double SumQuality { get; set; }

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/Policies/PolicyBase.cs

@@ -11 +11 @@
 namespace HeuristicLab.Algorithms.DataAnalysis.MctsSymbolicRegression.Policies {
   [StorableClass]
-  internal abstract class PolicyBase : Item, IParameterizedItem, IPolicy {
+  public abstract class PolicyBase : Item, IParameterizedItem, IPolicy {
     [Storable]
     public IKeyedItemCollection<string, IParameter> Parameters { get; private set; }

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/Policies/Ucb.cs

@@ -12 +12 @@
 namespace HeuristicLab.Algorithms.DataAnalysis.MctsSymbolicRegression.Policies {
   [Item("Ucb Policy", "Ucb with parameter c to balance between exploitation and exploration")]
-  internal class Ucb : PolicyBase {
+  public class Ucb : PolicyBase {
     private class ActionStatistics : IActionStatistics {
       public double SumQuality { get; set; }

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/Policies/UcbTuned.cs

@@ -12 +12 @@
 namespace HeuristicLab.Algorithms.DataAnalysis.MctsSymbolicRegression.Policies {
   [Item("UcbTuned Policy", "UcbTuned is similar to Ucb but tracks empirical variance. Use parameter c to balance between exploitation and exploration")]
-  internal class UcbTuned : PolicyBase {
+  public class UcbTuned : PolicyBase {
     private class ActionStatistics : IActionStatistics {
       public double SumQuality { get; set; }

trunk/sources/HeuristicLab.Tests/HeuristicLab.Algorithms.DataAnalysis-3.4/MctsSymbolicRegressionTest.cs

@@ -4 +4 @@
 using System.Threading;
 using HeuristicLab.Algorithms.DataAnalysis.MctsSymbolicRegression;
+using HeuristicLab.Algorithms.DataAnalysis.MctsSymbolicRegression.Policies;
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
@@ -274 +275 @@
     #endregion
 
-  
+
     #region Nguyen
     [TestMethod]
@@ -505 +506 @@
       mctsSymbReg.Iterations = iterations;
       mctsSymbReg.MaxVariableReferences = 10;
-      mctsSymbReg.C = 2; // less greedy
+      var ucbPolicy = new Ucb();
+      ucbPolicy.C = 2;
+      mctsSymbReg.Policy = ucbPolicy;
       mctsSymbReg.SetSeedRandomly = false;
       mctsSymbReg.Seed = 1234;
@@ -540 +543 @@
       mctsSymbReg.Iterations = int.MaxValue; // stopping when all solutions have been enumerated
       mctsSymbReg.MaxVariableReferences = maxNumberOfVariables;
-      mctsSymbReg.C = 1000; // essentially breath first seach
+      var ucbPolicy = new Ucb();
+      ucbPolicy.C = 1000; // essentially breadth first search
+      mctsSymbReg.Policy = ucbPolicy;
       mctsSymbReg.AllowedFactors.SetItemCheckedState(mctsSymbReg.AllowedFactors.Single(s => s.Value.StartsWith("prod")), allowProd);
       mctsSymbReg.AllowedFactors.SetItemCheckedState(mctsSymbReg.AllowedFactors.Single(s => s.Value.Contains("exp")), allowExp);