Changeset 9352 for branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3

Timestamp:

04/10/13 15:15:13 (11 years ago)

Author:

sforsten

Message:

#1980:

• added DecisionListView
• added event handlers in *ProblemData
• renamed project Problems.XCS.Views to Problems.lCS.Views and Problems.Instances.ConditionActionClassification to Problems.Instances.LCS
• integrated niching in GAssist and added NichingTournamentSelector
• minor code improvements and property changes

Location:

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3

Files:

• Action/IAction.cs (modified) (1 diff)
• Action/IntAction.cs (modified) (4 diffs)
• Action/StringAction.cs (modified) (4 diffs)
• Analyzer (added)
• Analyzer/BestTrainingDecisionListAnalyzer.cs (added)
• Creators/UniformRandomDecisionListCreator.cs (modified) (1 diff)
• Crossover/SinglePointCrossover.cs (modified) (1 diff)
• DecisionList.cs (modified) (2 diffs)
• DecisionListCreator.cs (modified) (1 diff)
• DecisionListNicheComparer.cs (added)
• HeuristicLab.Encodings.DecisionList-3.3.csproj (modified) (2 diffs)
• Interfaces/IDecisionListClassificationProblemData.cs (modified) (2 diffs)
• Interfaces/IDecisionListCreator.cs (modified) (1 diff)
• Properties/AssemblyInfo.cs (modified) (2 diffs)
• Rule.cs (modified) (1 diff)
• Variable/Variable.cs (modified) (1 diff)

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/Action/IAction.cs

@@ -22 +22 @@
 using System.Collections.Generic;
 using HeuristicLab.Core;
+using HeuristicLab.Optimization.Operators.LCS;
 
 namespace HeuristicLab.Encodings.DecisionList {
-  public interface IAction : IItem {
+  public interface IAction : IGAssistNiche {
     string VariableName { get; }
 
     int Possibilities { get; }
     void Randomize(IRandom random);
+    void Randomize(IRandom random, IEnumerable<IAction> except);
 
     bool Match(IAction action);

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/Action/IntAction.cs

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Optimization.Operators.LCS;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -31 +32 @@
   [Item("IntAction", "")]
   public class IntAction : Item, IAction<int> {
+
+    public static IEqualityComparer<IGAssistNiche> Comparer {
+      get { return new DecisionListNicheComparer(); }
+    }
+    IEqualityComparer<IGAssistNiche> IGAssistNiche.Comparer {
+      get { return Comparer; }
+    }
 
     [Storable]
@@ -88 +96 @@
     }
 
+    public void Randomize(IRandom random, IEnumerable<IAction> except) {
+      if (except.Count() == 0) {
+        Randomize(random);
+        return;
+      }
+      try {
+        var exceptInt = except.Cast<IntAction>().Select(x => x.currentAction);
+        var newPossibleFeatures = possibleFeatures.Except(exceptInt);
+        currentAction = newPossibleFeatures.ElementAt(random.Next(0, newPossibleFeatures.Count()));
+      }
+      catch (InvalidCastException) {
+        throw new InvalidCastException("Actions have to be of type IntAction");
+      }
+    }
+
     public bool Match(IAction action) {
       var targetCast = action as IntAction;
@@ -103 +126 @@
 
     public override string ToString() {
-      return currentAction.ToString();
+      return variableName + ": " + currentAction.ToString();
+    }
+
+    public bool SameNiche(IGAssistNiche niche) {
+      return Match(niche as IAction);
+    }
+
+    public int GetNicheHashCode() {
+      int result = 1;
+      result = 37 * result + currentAction;
+      result = 37 * result + variableName.GetHashCode();
+      foreach (var feature in possibleFeatures) {
+        result = 37 * result + feature;
+      }
+      return result;
     }
   }

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/Action/StringAction.cs

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Optimization.Operators.LCS;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -31 +32 @@
   [Item("StringAction", "")]
   public class StringAction : Item, IAction<string> {
+
+    public static IEqualityComparer<IGAssistNiche> Comparer {
+      get { return new DecisionListNicheComparer(); }
+    }
+
+    IEqualityComparer<IGAssistNiche> IGAssistNiche.Comparer {
+      get { return Comparer; }
+    }
 
     [Storable]
@@ -92 +101 @@
     }
 
+    public void Randomize(IRandom random, IEnumerable<IAction> except) {
+      if (except.Count() == 0) {
+        Randomize(random);
+        return;
+      }
+      try {
+        var exceptInt = except.Cast<StringAction>().Select(x => x.CurrentActionIndex);
+        var newPossibleFeatures = Enumerable.Range(0, possibleFeatures.Count()).Except(exceptInt);
+        currentActionIndex = newPossibleFeatures.ElementAt(random.Next(0, newPossibleFeatures.Count()));
+      }
+      catch (InvalidCastException) {
+        throw new InvalidCastException("Actions have to be of type IntAction");
+      }
+    }
+
     public bool Match(IAction action) {
       var targetCast = action as StringAction;
@@ -107 +131 @@
 
     public override string ToString() {
-      return CurrentAction;
+      return variableName + ": " + CurrentAction;
+    }
+
+    public bool SameNiche(IGAssistNiche niche) {
+      return Match(niche as IAction);
+    }
+
+    public int GetNicheHashCode() {
+      int result = 1;
+      result = 37 * result + currentActionIndex;
+      result = 37 * result + variableName.GetHashCode();
+      foreach (var feature in possibleFeatures) {
+        result = 37 * result + feature.GetHashCode();
+      }
+      return result;
     }
   }

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/Creators/UniformRandomDecisionListCreator.cs

@@ -51 +51 @@
       }
 
-      return new DecisionList(rules); //, DefaultActionParameter.ActualValue);
+      return new DecisionList(rules);
     }
   }

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/Crossover/SinglePointCrossover.cs

@@ -48 +48 @@
 
     public static DecisionList Apply(IRandom random, DecisionList parent1, DecisionList parent2) {
+      if (!parent1.DefaultAction.Match(parent2.DefaultAction)) { throw new ArgumentException("Default action of parents have to match!"); }
+
       int rulesP1 = random.Next(0, parent1.Rules.Count());
       int rulesP2 = random.Next(0, parent2.Rules.Count());

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

@@ -109 +109 @@
     #region IGAssistIndividual Members
 
+    public IGAssistNiche Niche {
+      get { return defaultAction; }
+    }
+
+    public void SetNiche(IRandom random, IGAssistNiche niche) {
+      var action = niche as IAction;
+      if (action == null) {
+        throw new ArgumentException("Niche has to be an action");
+      }
+      if (Niche != null) {
+        throw new ArgumentException("Niche has already been set. It cannot be set again.");
+      }
+      defaultAction = action;
+      var except = new List<IAction>() { action };
+      foreach (var rule in rules.Where(x => x.Action.SameNiche(niche))) {
+        rule.Action.Randomize(random, except);
+      }
+    }
+
     public void ApplySplit(IRandom random, double probability) {
       foreach (var rule in rules) {
@@ -126 +145 @@
       }
     }
-
     #endregion
   }

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/DecisionListCreator.cs

@@ -52 +52 @@
       get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
     }
-    public IValueLookupParameter<IAction> DefaultActionParameter {
-      get { return (IValueLookupParameter<IAction>)Parameters["DefaultAction"]; }
-    }
     #endregion
 

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/HeuristicLab.Encodings.DecisionList-3.3.csproj

@@ -92 +92 @@
     <Compile Include="Action\IAction.cs" />
     <Compile Include="Action\IntAction.cs" />
+    <Compile Include="Analyzer\BestTrainingDecisionListAnalyzer.cs" />
     <Compile Include="Creators\UniformRandomDecisionListCreator.cs" />
     <Compile Include="Crossover\SinglePointCrossover.cs" />
@@ -97 +98 @@
     <Compile Include="DecisionListCrossover.cs" />
     <Compile Include="DecisionListManipulator.cs" />
+    <Compile Include="DecisionListNicheComparer.cs" />
     <Compile Include="DecisionListSolution.cs" />
     <Compile Include="Evaluator\DecisionListEvaluator.cs" />

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

@@ -24 +24 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Optimization.Operators.LCS;
 using HeuristicLab.Problems.DataAnalysis;
 
 namespace HeuristicLab.Encodings.DecisionList {
-  public interface IDecisionListClassificationProblemData : INamedItem {
+  public interface IDecisionListClassificationProblemData : IGAssistNichesProblemData {
     Dataset Dataset { get; }
     ICheckedItemList<StringValue> ConditionVariables { get; }
@@ -45 +46 @@
     int Classes { get; }
 
-    IFixedValueParameter<Rule> SampleRuleParameter { get; }
+    IValueParameter<Rule> SampleRuleParameter { get; }
 
     DecisionListInput FetchInput(int row);

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

@@ -31 +31 @@
     IValueLookupParameter<IntValue> InitialNumberOfRulesParameter { get; }
     IValueLookupParameter<PercentValue> OneProbabilityParameter { get; }
-    IValueLookupParameter<IAction> DefaultActionParameter { get; }
   }
 }

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/Properties/AssemblyInfo.cs

@@ -21 +21 @@
 
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -54 +55 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.7.9204")]
+[assembly: AssemblyFileVersion("3.3.7.9342")]

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/Rule.cs

@@ -73 +73 @@
         sb.Append(variable.Value + "|");
       }
-      sb.Append(Action);
+      sb.Append("|" + Action);
       return sb.ToString();
     }

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/Variable/Variable.cs

@@ -76 +76 @@
     public override string ToString() {
       StringBuilder sb = new StringBuilder();
+      sb.Append(variableName + ": ");
       foreach (var attr in attributes) {
         if (attr) {