Changeset 12924 for branches/HeuristicLab.Algorithms.IteratedSentenceConstruction/HeuristicLab.Algorithms.IteratedSymbolicExpressionConstruction

Timestamp:

08/28/15 17:50:53 (9 years ago)

Author:

gkronber

Message:

#2471

• implemented a demo for value approximation with gbt and a trivial feature function

Location:

branches/HeuristicLab.Algorithms.IteratedSentenceConstruction/HeuristicLab.Algorithms.IteratedSymbolicExpressionConstruction/3.3

Files:

• HeuristicLab.Algorithms.IteratedSymbolicExpressionConstruction-3.3.csproj (modified) (4 diffs)
• Interfaces/IStateValueFunction.cs (modified) (1 diff)
• Policies/BoltzmannExplorationSymbolicExpressionConstructionPolicy.cs (modified) (1 diff)
• Policies/RandomSymbolicExpressionConstructionPolicy.cs (modified) (1 diff)
• QualityFunctions/GbtApproximateStateValueFunction.cs (added)
• QualityFunctions/TabularAvgStateValueFunction.cs (modified) (1 diff)
• QualityFunctions/TabularMaxStateValueFunction.cs (modified) (1 diff)
• QualityFunctions/TabularStateValueFunctionBase.cs (modified) (2 diffs)
• SearchTree.cs (modified) (4 diffs)
• StateFunctions/DefaultStateFunction.cs (modified) (2 diffs)
• StateFunctions/ParentChildStateFunction.cs (modified) (2 diffs)

branches/HeuristicLab.Algorithms.IteratedSentenceConstruction/HeuristicLab.Algorithms.IteratedSymbolicExpressionConstruction/3.3/HeuristicLab.Algorithms.IteratedSymbolicExpressionConstruction-3.3.csproj

@@ -99 +99 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Algorithms.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Algorithms.DataAnalysis-3.4.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -142 +146 @@
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
       <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
     </Reference>
     <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
@@ -169 +177 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="QualityFunctions\GbtApproximateStateValueFunction.cs" />
     <Compile Include="QualityFunctions\TabularStateValueFunctionBase.cs" />
     <Compile Include="QualityFunctions\TabularAvgStateValueFunction.cs" />
@@ -198 +207 @@
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="FeatureFunctions\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/HeuristicLab.Algorithms.IteratedSentenceConstruction/HeuristicLab.Algorithms.IteratedSymbolicExpressionConstruction/3.3/Interfaces/IStateValueFunction.cs

@@ -8 +8 @@
 namespace HeuristicLab.Algorithms.IteratedSymbolicExpressionConstruction {
   // represents the state value function (V(s))
-  public interface IStateValueFunction : IStatefulItem {
+  public interface IStateValueFunction : IItem {
     double Value(object state);
     void Update(object state, double observedQuality);

branches/HeuristicLab.Algorithms.IteratedSentenceConstruction/HeuristicLab.Algorithms.IteratedSymbolicExpressionConstruction/3.3/Policies/BoltzmannExplorationSymbolicExpressionConstructionPolicy.cs

@@ -45 +45 @@
       var idxs = Enumerable.Range(0, followStates.Count);
       // find best action
-      var bestQuality = double.NegativeInfinity;
       if (followStates.Any(s => StateValueFunction.Tries(s) == 0)) {
         return idxs.Where(idx => StateValueFunction.Tries(followStates[idx]) == 0).SampleRandom(random);

branches/HeuristicLab.Algorithms.IteratedSentenceConstruction/HeuristicLab.Algorithms.IteratedSymbolicExpressionConstruction/3.3/Policies/RandomSymbolicExpressionConstructionPolicy.cs

@@ -23 +23 @@
 
     public sealed override void Update(IEnumerable<object> stateSequence, double quality) {
-
       // ignore
     }

branches/HeuristicLab.Algorithms.IteratedSentenceConstruction/HeuristicLab.Algorithms.IteratedSymbolicExpressionConstruction/3.3/QualityFunctions/TabularAvgStateValueFunction.cs

@@ -9 +9 @@
   [StorableClass]
   [Item("TabularAvgQualityFunction", "")]
-  internal class TabularAvgStateValueFunction : TabularStateValueFunctionBase {
+  public class TabularAvgStateValueFunction : TabularStateValueFunctionBase {
 
     public TabularAvgStateValueFunction()

branches/HeuristicLab.Algorithms.IteratedSentenceConstruction/HeuristicLab.Algorithms.IteratedSymbolicExpressionConstruction/3.3/QualityFunctions/TabularMaxStateValueFunction.cs

@@ -9 +9 @@
   [StorableClass]
   [Item("TabularMaxStateValueFunction", "")]
-  internal class TabularMaxStateValueFunction : TabularStateValueFunctionBase {
+  public class TabularMaxStateValueFunction : TabularStateValueFunctionBase {
 
     public TabularMaxStateValueFunction()

branches/HeuristicLab.Algorithms.IteratedSentenceConstruction/HeuristicLab.Algorithms.IteratedSymbolicExpressionConstruction/3.3/QualityFunctions/TabularStateValueFunctionBase.cs

@@ -8 +8 @@
 namespace HeuristicLab.Algorithms.IteratedSymbolicExpressionConstruction {
   [StorableClass]
-  internal abstract class TabularStateValueFunctionBase : ParameterizedNamedItem, ITabularStateValueFunction {
+  public abstract class TabularStateValueFunctionBase : ParameterizedNamedItem, ITabularStateValueFunction {
     [Storable]
     private readonly Dictionary<object, double> q = new Dictionary<object, double>();
@@ -78 +78 @@
     #endregion
 
-    public void InitializeState() {
-      ClearState();
-    }
-
-    public void ClearState() {
-      q.Clear();
-      tries.Clear();
-      qVariance.Clear();
-    }
+    //public void InitializeState() {
+    //  ClearState();
+    //}
+    //
+    //public void ClearState() {
+    //  q.Clear();
+    //  tries.Clear();
+    //  qVariance.Clear();
+    //}
   }
 }

branches/HeuristicLab.Algorithms.IteratedSentenceConstruction/HeuristicLab.Algorithms.IteratedSymbolicExpressionConstruction/3.3/SearchTree.cs

@@ -8 +8 @@
 namespace HeuristicLab.Algorithms.IteratedSymbolicExpressionConstruction {
   internal class SearchTree<TValue> {
-    private class Node<TValue> {
+    private class Node {
       internal TValue value;
-      internal Node<TValue> parent;
-      internal Node<TValue>[] children;
+      internal Node parent;
+      internal Node[] children;
       // children == null -> never visited
       // children[i] != null -> visited at least once, still allowed
@@ -17 +17 @@
     }
 
-    private Node<TValue> root;
+    private Node root;
 
     // for iteration
-    private Node<TValue> currentNode;
+    private Node currentNode;
 
     public SearchTree() {
-      root = new Node<TValue>();
+      root = new Node();
       currentNode = root;
     }
@@ -38 +38 @@
       Contract.Assert(values.Any());
       Contract.Assert(currentNode.children == null);
-      currentNode.children = values.Select(val => new Node<TValue>() { value = val, parent = currentNode }).ToArray();
+      currentNode.children = values.Select(val => new Node() { value = val, parent = currentNode }).ToArray();
     }
 
@@ -71 +71 @@
     }
 
-    private void RemoveRecursively(Node<TValue> node) {
+    private void RemoveRecursively(Node node) {
       // when the last child has been removed we must remove the current node from it's parent
       while (node.parent != null && node.children.All(ch => ch == null)) {

branches/HeuristicLab.Algorithms.IteratedSentenceConstruction/HeuristicLab.Algorithms.IteratedSymbolicExpressionConstruction/3.3/StateFunctions/DefaultStateFunction.cs

@@ -13 +13 @@
   [StorableClass]
   [Item("DefaultStateFunction", "")]
-  internal class DefaultStateFunction : Item, IStateFunction {
+  public class DefaultStateFunction : Item, IStateFunction {
     public DefaultStateFunction()
       : base() {
@@ -19 +19 @@
 
     public object CreateState(ISymbolicExpressionTreeNode root, List<ISymbol> actions, ISymbolicExpressionTreeNode parentNode, int childIdx) {
-      return string.Join(",", actions.Select(a => a.Name));
+      return string.Join(",", actions.Select(a => a.Name)); // TODO: perf
     }
 

branches/HeuristicLab.Algorithms.IteratedSentenceConstruction/HeuristicLab.Algorithms.IteratedSymbolicExpressionConstruction/3.3/StateFunctions/ParentChildStateFunction.cs

@@ -14 +14 @@
   [StorableClass]
   [Item("ParentChildStateFunction", "")]
-  internal class ParentChildStateFunction : Item, IStateFunction {
+  public class ParentChildStateFunction : Item, IStateFunction {
     public ParentChildStateFunction()
       : base() {
@@ -20 +20 @@
 
     public object CreateState(ISymbolicExpressionTreeNode root, List<ISymbol> actions, ISymbolicExpressionTreeNode parentNode, int childIdx) {
-      return (parentNode == null ? "" : parentNode.Symbol.Name) + childIdx;
+      if (parentNode == null) return string.Empty;
+      else return parentNode.Symbol.Name + "." + string.Join(".", parentNode.Subtrees.Select(t => t.Symbol.Name));
     }