Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/04/13 20:46:18 (12 years ago)
Author:
sforsten
Message:

#1980:

  • added GA subsumption
  • simplified deletion before covering
  • simplified XCSDeletionOperator
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/LearningClassifierSystems/HeuristicLab.Problems.ConditionActionClassification/3.3/Implementation/ConditionActionClassificationProblem.cs

    r9105 r9110  
    7070      get { return (IFixedValueParameter<ItemSet<IClassifier>>)Parameters["PossibleActions"]; }
    7171    }
     72    public IFixedValueParameter<ItemSet<CombinedIntegerVector>> PossibleActionsConcreteClassParameter {
     73      get { return (IFixedValueParameter<ItemSet<CombinedIntegerVector>>)Parameters["PossibleActionsConcreteClass"]; }
     74    }
    7275    public IFixedValueParameter<IntValue> ThetaMinimalNumberOfActionsParameter {
    7376      get { return (IFixedValueParameter<IntValue>)Parameters["ThetaMinimalNumberOfActions"]; }
     
    9598      get { return ProblemDataParameter.Value; }
    9699    }
     100    IParameter IConditionActionProblem.PossibleActionsConcreteClassParameter {
     101      get { return PossibleActionsConcreteClassParameter; }
     102    }
     103    public ItemSet<CombinedIntegerVector> PossibleActionsConcreteClass {
     104      get { return PossibleActionsConcreteClassParameter.Value; }
     105    }
    97106    IParameter IConditionActionProblem.PossibleActionsParameter {
    98107      get { return PossibleActionsParameter; }
    99108    }
    100     IItemSet<IClassifier> IConditionActionProblem.PossibleActions {
    101       get { return PossibleActions; }
    102     }
     109    //IItemSet<IClassifier> IConditionActionProblem.PossibleActions {
     110    //  get { return PossibleActions; }
     111    //}
    103112    public ItemSet<IClassifier> PossibleActions {
    104113      get { return PossibleActionsParameter.Value; }
     
    121130
    122131
    123     public ActionSetSubsumptionoperator ActionSetSubsumptionOperator {
     132    public ActionSetSubsumptionOperator ActionSetSubsumptionOperator {
    124133      get { return ActionSetSubsumptionOperatorParameter.Value; }
    125134    }
    126     public ValueParameter<ActionSetSubsumptionoperator> ActionSetSubsumptionOperatorParameter {
    127       get { return (ValueParameter<ActionSetSubsumptionoperator>)Parameters[ActionSetSubsumptionOperatorParameterName]; }
     135    public ValueParameter<ActionSetSubsumptionOperator> ActionSetSubsumptionOperatorParameter {
     136      get { return (ValueParameter<ActionSetSubsumptionOperator>)Parameters[ActionSetSubsumptionOperatorParameterName]; }
    128137    }
    129138    IActionSetSubsumption IConditionActionProblem.ActionSetSubsumptionOperator { get { return ActionSetSubsumptionOperator; } }
     
    175184      Parameters.Add(new ValueParameter<CombinedIntegerVectorClassifierFetcher>(ClassifierFetcherParameterName, "", new CombinedIntegerVectorClassifierFetcher()));
    176185      Parameters.Add(new FixedValueParameter<ItemSet<IClassifier>>("PossibleActions"));
     186      Parameters.Add(new FixedValueParameter<ItemSet<CombinedIntegerVector>>("PossibleActionsConcreteClass"));
    177187      Parameters.Add(new FixedValueParameter<IntValue>("ThetaMinimalNumberOfActions", "Minimal number of actions, which have to be present in the match set, or else covering will occure.", new IntValue(1)));
    178188
     
    180190      Parameters.Add(new FixedValueParameter<PercentValue>("ChangeSymbolProbabilityInCovering", "", new PercentValue(0.5)));
    181191
    182       Parameters.Add(new ValueParameter<ActionSetSubsumptionoperator>(ActionSetSubsumptionOperatorParameterName, "", new ActionSetSubsumptionoperator()));
     192      Parameters.Add(new ValueParameter<ActionSetSubsumptionOperator>(ActionSetSubsumptionOperatorParameterName, "", new ActionSetSubsumptionOperator()));
    183193
    184194      Evaluator.InitialErrorParameter.ActualName = "InitialError";
     
    237247      }
    238248      PossibleActions.Clear();
     249      PossibleActionsConcreteClass.Clear();
    239250      while (!done) {
    240251        PossibleActions.Add(new CombinedIntegerVector(curPos, actionLength, actionBounds));
     252        PossibleActionsConcreteClass.Add(new CombinedIntegerVector(curPos, actionLength, actionBounds));
    241253        curPos = GetNextAction(curPos, actionBounds, out done);
    242254      }
Note: See TracChangeset for help on using the changeset viewer.