Changeset 9392 for branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/Variable/DoubleVariable.cs

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)
• Variable/DoubleVariable.cs (modified) (4 diffs)

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/Variable/DoubleVariable.cs

@@ -46 +46 @@
     protected DoubleVariable(DoubleVariable original, Cloner cloner)
       : base(original, cloner) {
-      discretizer = (IDiscretizer)original.discretizer.Clone();
-      curIntervals = new List<int>(original.curIntervals);
+      if (original.discretizer != null) {
+        discretizer = (IDiscretizer)original.discretizer.Clone();
+        curIntervals = new List<int>(original.curIntervals);
+      }
       maxIntervals = original.maxIntervals;
     }
@@ -68 +70 @@
 
       attributes = new List<bool>(numberOfIntervals);
-      var curIntervals = new List<int>(numberOfIntervals);
+      curIntervals = new List<int>(numberOfIntervals);
 
       for (int i = 0; i < numberOfIntervals - 1; i++) {
@@ -74 +76 @@
         microIntervals -= microInt;
         curIntervals.Add(microInt);
-        attributes[i] = random.NextDouble() < onePercentage;
+        attributes.Add(random.NextDouble() < onePercentage);
       }
       // add last interval
       curIntervals.Add(microIntervals);
-      attributes[numberOfIntervals - 1] = random.NextDouble() < onePercentage;
+      attributes.Add(random.NextDouble() < onePercentage);
     }
 
@@ -114 +116 @@
     }
 
-    private IList<double> GetValuesToCutPoints(IEnumerable<double> cutpoints, IEnumerable<int> microIntervals) {
+    private IList<double> GetValuesToCutPoints(IEnumerable<double> cutpoints, IList<int> microIntervals) {
       var intervalValues = new List<double>();
       var cutpointList = cutpoints.ToList();
-      int cur = 0;
-      foreach (var microInterval in microIntervals) {
-        cur += microInterval;
+      int cur = -1;
+      for (int i = 0; i < microIntervals.Count - 1; i++) {
+        cur += microIntervals[i];
         intervalValues.Add(cutpointList[cur]);
       }
+      intervalValues.Add(Double.PositiveInfinity);
       return intervalValues;
     }

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