Changeset 11981 for branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GrammaticalOptimization

Timestamp:

02/11/15 20:11:35 (9 years ago)

Author:

gkronber

Message:

#2283: cleanup and included HeuristicLab.dlls to create a self-contained branch

Location:

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GrammaticalOptimization

Files:

• HeuristicLab.Algorithms.GrammaticalOptimization.csproj (modified) (1 diff)
• SequentialDecisionPolicies/GenericContextualGrammarPolicy.cs (deleted)
• SequentialDecisionPolicies/GenericFunctionApproximationGrammarPolicy.cs (modified) (2 diffs)
• SequentialDecisionPolicies/GenericTDPolicy.cs (deleted)
• SequentialDecisionPolicies/TDPolicy.cs (deleted)
• Solvers/AlternativesContextSampler.cs (deleted)
• Solvers/AlternativesSampler.cs (deleted)

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GrammaticalOptimization/HeuristicLab.Algorithms.GrammaticalOptimization.csproj

@@ -39 +39 @@
   <ItemGroup>
     <Compile Include="ISequentialDecisionPolicy.cs" />
-    <Compile Include="SequentialDecisionPolicies\GenericContextualGrammarPolicy.cs" />
     <Compile Include="SequentialDecisionPolicies\GenericFunctionApproximationGrammarPolicy.cs" />
     <Compile Include="SequentialDecisionPolicies\GenericGrammarPolicy.cs" />
-    <Compile Include="SequentialDecisionPolicies\GenericTDPolicy.cs" />
     <Compile Include="SequentialDecisionPolicies\GrammarPolicy.cs" />
     <Compile Include="SequentialDecisionPolicies\IGrammarPolicy.cs" />
     <Compile Include="SequentialDecisionPolicies\RandomPolicy.cs" />
-    <Compile Include="SequentialDecisionPolicies\TDPolicy.cs" />
     <Compile Include="SolverBase.cs" />
     <Compile Include="ISolver.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Solvers\AlternativesContextSampler.cs" />
-    <Compile Include="Solvers\AlternativesSampler.cs" />
     <Compile Include="Solvers\ExhaustiveBreadthFirstSearch.cs" />
     <Compile Include="Solvers\ExhaustiveDepthFirstSearch.cs" />

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GrammaticalOptimization/SequentialDecisionPolicies/GenericFunctionApproximationGrammarPolicy.cs

@@ -60 +60 @@
         originalIdx++;
       }
-
-      
-      /*
-      const double beta = 10;
-      var w = from idx in Enumerable.Range(0, maxIdx)
-              let afterStateQ = activeAfterStates[idx]
-              select Math.Exp(beta * afterStateQ);
-
-      var bestAction = Enumerable.Range(0, maxIdx).SampleProportional(random, w);
-      selectedStateIdx = actionIndexMap[bestAction];
-      Debug.Assert(selectedStateIdx >= 0);
-      */
       
       
-      if (random.NextDouble() < 0.5) {
+      // TODO: policy should be a parameter of the function approximation policy
+      if (random.NextDouble() < 0.2) {
         selectedStateIdx = actionIndexMap[random.Next(maxIdx)];
       } else {
@@ -139 +128 @@
     private void UpdateWeights(string state, double reward) {
       double delta = reward - GetValue(state);
-      // delta /= problem.GetFeatures(state).Count();
-      //const double alpha = 0.001;
       foreach (var feature in problem.GetFeatures(state)) {
         featureTries[feature.Id] = GetFeatureTries(feature.Id) + 1;