Changeset 9392 for branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/Interfaces

Timestamp:

04/23/13 13:31:29 (11 years ago)

Author:

sforsten

Message:

#1980:

• several small bug fixes
• added windowing technique ILAS to GAssist
• GAssist and XCS work now with real-valued features
• severely improved the performance of XCS

Location:

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3

Files:

• . (modified) (1 prop)
• Interfaces/IDecisionListClassificationProblemData.cs (modified) (1 diff)
• Interfaces/IDecisionListEvaluator.cs (modified) (1 diff)
• Interfaces/IDecisionListSolution.cs (modified) (1 diff)

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3

@@ -1 +1 @@
 *.user
 Plugin.cs
+obj

@@ -1 +1 @@
 *.user
 Plugin.cs
+obj

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/Interfaces/IDecisionListClassificationProblemData.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Optimization.Operators.LCS;
-using HeuristicLab.Problems.DataAnalysis;
 
 namespace HeuristicLab.Encodings.DecisionList {
   public interface IDecisionListClassificationProblemData : IGAssistNichesProblemData {
-    Dataset Dataset { get; }
-    ICheckedItemList<StringValue> ConditionVariables { get; }
-    StringValue TargetVariable { get; }
-    IEnumerable<string> AllowedConditionVariables { get; }
-    //IEnumerable<string> AllowedTargetVariables { get; }
-
-    IntRange TrainingPartition { get; }
-    IntRange TestPartition { get; }
-
-    IEnumerable<int> TrainingIndices { get; }
-    IEnumerable<int> TestIndices { get; }
-
-    bool IsTrainingSample(int index);
-    bool IsTestSample(int index);
-
-    int Classes { get; }
-
     IValueParameter<Rule> SampleRuleParameter { get; }
-
-    DecisionListInput FetchInput(int row);
-    IEnumerable<DecisionListInput> FetchInput(IEnumerable<int> row);
-
-    IEnumerable<IAction> FetchAction(IEnumerable<int> rows);
-    IAction FetchAction(int rows);
-
-    event EventHandler Changed;
   }
 }

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/Interfaces/IDecisionListEvaluator.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Optimization;
+using HeuristicLab.Optimization.Operators.LCS;
 
 namespace HeuristicLab.Encodings.DecisionList {
-  public interface IDecisionListEvaluator : ISingleObjectiveEvaluator {
+  public interface IDecisionListEvaluator : IStrataSingleObjectiveEvaluator {
     ILookupParameter<DecisionList> DecisionListParameter { get; }
-    IValueLookupParameter<IntRange> EvaluationPartitionParameter { get; }
-    IValueLookupParameter<PercentValue> RelativeNumberOfEvaluatedSamplesParameter { get; }
     IValueLookupParameter<IDecisionListClassificationProblemData> ProblemDataParameter { get; }
     IValueLookupParameter<IntValue> SizePenaltyMinRulesParameter { get; }

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/Interfaces/IDecisionListSolution.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using HeuristicLab.Optimization.Operators.LCS;
 
-using System;
 namespace HeuristicLab.Encodings.DecisionList {
-  public interface IDecisionListSolution {
+  public interface IDecisionListSolution : IGAssistSolution {
     DecisionList Model { get; }
-    IDecisionListClassificationProblemData ProblemData { get; set; }
+    //IDecisionListClassificationProblemData ProblemData { get; set; }
 
     event EventHandler ModelChanged;
     event EventHandler ProblemDataChanged;
-
-    double TrainingAccuracy { get; }
-    double TestAccuracy { get; }
-    int TrainingNumberOfAliveRules { get; }
-    double TrainingTheoryLength { get; }
-    double TrainingExceptionsLength { get; }
   }
 }

@@ -1 +1 @@
 *.user
 Plugin.cs
+obj