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

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/StateFunctions

Files:

• DefaultStateFunction.cs (modified) (2 diffs)
• ParentChildStateFunction.cs (modified) (2 diffs)

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));
     }