Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/03/13 20:19:00 (11 years ago)
Author:
sforsten
Message:

#1980:

  • included an adapted version of GA correctly
  • added action set subsumption
  • added deletion after GA and before covering
Location:
branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3
Files:
11 added
6 edited

Legend:

Unmodified
Added
Removed

  • branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3

    • Property svn:ignore

      •  

        old new  
        11obj
        22Plugin.cs
         3*.user

  • branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Covering/CoveringOperator.cs

    r9090 r9105  
    5353      get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
    5454    }
     55    public ILookupParameter<IntValue> CurrentPopulationSizeParameter {
     56      get { return (ILookupParameter<IntValue>)Parameters["CurrentPopulationSize"]; }
     57    }
    5558    public IValueLookupParameter<BoolValue> ParallelParameter {
    5659      get { return (IValueLookupParameter<BoolValue>)Parameters["Parallel"]; }
    … …  
    8386      Parameters.Add(new ValueLookupParameter<BoolValue>("Parallel", "True if the operator should be applied in parallel on all sub-scopes, otherwise false.", new BoolValue(true)));
    8487      Parameters.Add(new ScopeParameter("CurrentScope", "The current scope to which the new solutions are added as sub-scopes."));
     88      Parameters.Add(new LookupParameter<IntValue>("CurrentPopulationSize"));
    8589    }
    8690
    … …  
    97101        throw new ArgumentException("More classifiers with unique actions shall be created than unique actions are available.");
    98102      }
     103
     104      CurrentPopulationSizeParameter.ActualValue.Value += count;
    99105
    100106      int current = CurrentScope.SubScopes.Count;

  • branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Covering/ICovering.cs

    r9090 r9105  
    3333    IValueLookupParameter<ICoveringSolutionCreator> SolutionCreatorParameter { get; }
    3434    IValueLookupParameter<BoolValue> ParallelParameter { get; }
     35
     36    ILookupParameter<IntValue> CurrentPopulationSizeParameter { get; }
    3537  }
    3638}

  • branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/HeuristicLab.Encodings.ConditionActionEncoding-3.3.csproj

    r9089 r9105  
    7171    <Reference Include="System" />
    7272    <Reference Include="System.Core" />
     73    <Reference Include="System.Drawing" />
    7374    <Reference Include="System.Xml.Linq" />
    7475    <Reference Include="System.Data.DataSetExtensions" />
    … …  
    8384    <Compile Include="ActionSelection\RandomActionSelector.cs" />
    8485    <Compile Include="Covering\CoveringOperator.cs" />
     86    <Compile Include="Covering\DoDeletionBeforeCovering.cs" />
    8587    <Compile Include="Covering\ICovering.cs" />
    8688    <Compile Include="Covering\ICoveringSolutionCreator.cs" />
     89    <Compile Include="Deletion\CalculateNumberOfDeletionsOperator.cs" />
     90    <Compile Include="Deletion\XCSDeletionOperator.cs" />
    8791    <Compile Include="Evaluators\XCSEvaluator.cs" />
    8892    <Compile Include="Evaluators\IConditionActionEvaluator.cs" />
    8993    <Compile Include="Evaluators\IXCSEvaluator.cs" />
     94    <Compile Include="GA\XCSAfterCrossoverOperator.cs" />
    9095    <Compile Include="IClassifier.cs" />
    9196    <Compile Include="Interfaces\IConditionActionProblem.cs" />
    9297    <Compile Include="Interfaces\IConditionActionProblemData.cs" />
    9398    <Compile Include="Operator\CalculateAccuracy.cs" />
     99    <Compile Include="GA\XCSCheckIfGAShouldBeApplied.cs" />
    94100    <Compile Include="Operator\CountNumberOfUniqueActions.cs" />
    95101    <Compile Include="Operator\PredictionArrayCalculator.cs" />
    96102    <Compile Include="Operator\MatchActionOperator.cs" />
    97103    <Compile Include="Operator\MatchConditionOperator.cs" />
     104    <Compile Include="Operator\SubScopeVariableCopier.cs" />
    98105    <Compile Include="Operator\SumAccuracy.cs" />
    99106    <Compile Include="Properties\AssemblyInfo.cs" />
    … …  
    104111    <Compile Include="Selectors\IMatchSelector.cs" />
    105112    <Compile Include="Selectors\MatchSelector.cs" />
     113    <Compile Include="Subsumption\ActionSetSubsumptionoperator.cs" />
     114    <Compile Include="Subsumption\IActionSetSubsumption.cs" />
    106115    <None Include="Properties\AssemblyInfo.cs.frame" />
    107116  </ItemGroup>
    … …  
    112121  <ItemGroup />
    113122  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
     123  <PropertyGroup>
     124    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     125set ProjectDir=$(ProjectDir)
     126set SolutionDir=$(SolutionDir)
     127set Outdir=$(Outdir)
     128
     129call PreBuildEvent.cmd
     130</PreBuildEvent>
     131  </PropertyGroup>
    114132  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    115133       Other similar extension points exist, see Microsoft.Common.targets.

  • branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/IClassifier.cs

    r9089 r9105  
    3535    bool MatchCondition(IClassifier target);
    3636    bool MatchAction(IClassifier target);
     37    bool IsMoreGeneral(IClassifier target);
    3738
    3839    //to use IMatching as key in a dictionary, Equals and GetHashCode have to be override.

  • branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Interfaces/IConditionActionProblem.cs

    r9090 r9105  
    3939    IParameter CoveringSolutionCreatorParameter { get; }
    4040
     41    IParameter ActionSetSubsumptionOperatorParameter { get; }
     42    IActionSetSubsumption ActionSetSubsumptionOperator { get; }
     43
    4144    new IXCSEvaluator Evaluator { get; }
    4245  }
Note: See TracChangeset for help on using the changeset viewer.