Changeset 12967

Timestamp:

09/23/15 14:50:18 (8 years ago)

Author:

gkronber

Message:

#2471: implemented linear state value approximation using sparse binary features and implemented a state function for generating features for symbolic expression trees

Location:

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

Files:

• HeuristicLab.Algorithms.IteratedSymbolicExpressionConstruction-3.3.csproj (modified) (2 diffs)
• Policies/BoltzmannExplorationSymbolicExpressionConstructionPolicy.cs (modified) (3 diffs)
• QualityFunctions/SparseLinearApproximateStateValueFunction.cs (added)
• StateFunctions/SymbolicExpressionTermsStateFunction.cs (added)

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

@@ -179 +179 @@
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="QualityFunctions\SparseLinearApproximateStateValueFunction.cs" />
     <Compile Include="QualityFunctions\GbtApproximateStateValueFunction.cs" />
     <Compile Include="QualityFunctions\TabularStateValueFunctionBase.cs" />
@@ -184 +185 @@
     <Compile Include="QualityFunctions\TabularMaxStateValueFunction.cs" />
     <Compile Include="SearchTree.cs" />
+    <Compile Include="StateFunctions\SymbolicExpressionTermsStateFunction.cs" />
     <Compile Include="StateFunctions\ParentChildStateFunction.cs" />
     <Compile Include="StateFunctions\DefaultStateFunction.cs" />

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

@@ -20 +20 @@
     }
 
-    public ITabularStateValueFunction StateValueFunction {
+    public IStateValueFunction StateValueFunction {
       get {
-        return ((IValueParameter<ITabularStateValueFunction>)Parameters["Quality function"]).Value;
+        return ((IValueParameter<IStateValueFunction>)Parameters["Quality function"]).Value;
       }
-      set { ((IValueParameter<ITabularStateValueFunction>)Parameters["Quality function"]).Value = value; }
+      set { ((IValueParameter<IStateValueFunction>)Parameters["Quality function"]).Value = value; }
     }
 
@@ -39 +39 @@
       : base() {
       Parameters.Add(new FixedValueParameter<DoubleValue>("Beta", "The weighting factor beta", new DoubleValue(1.0)));
-      Parameters.Add(new ValueParameter<ITabularStateValueFunction>("Quality function", "The quality function to use", new TabularAvgStateValueFunction()));
+      Parameters.Add(new ValueParameter<IStateValueFunction>("Quality function", "The quality function to use", new TabularAvgStateValueFunction()));
     }
 
     protected sealed override int Select(IReadOnlyList<object> followStates, IRandom random) {
       var idxs = Enumerable.Range(0, followStates.Count);
-      // find best action
-      if (followStates.Any(s => StateValueFunction.Tries(s) == 0)) {
-        return idxs.Where(idx => StateValueFunction.Tries(followStates[idx]) == 0).SampleRandom(random);
-      }
 
       // windowing
@@ -72 +68 @@
     }
 
-    public override IDeepCloneable Clone(HeuristicLab.Common.Cloner cloner) {
+    public override IDeepCloneable Clone(Cloner cloner) {
       return new BoltzmannExplorationSymbolicExpressionConstructionPolicy(this, cloner);
     }