Changeset 5522 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints

Timestamp:

02/21/11 00:46:33 (14 years ago)

Author:

cneumuel

Message:

#1215

• implemented population diversity analysis

Location:

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints

Files:

• ConstrainedValue.cs (modified) (1 diff)
• DoubleValueRange.cs (modified) (1 diff)
• IntValueRange.cs (modified) (1 diff)
• PercentValueRange.cs (modified) (1 diff)
• Range.cs (modified) (2 diffs)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints/ConstrainedValue.cs

@@ -86 +86 @@
     #endregion
 
-    void value_ToStringChanged(object sender, EventArgs e) {
+    private void value_ToStringChanged(object sender, EventArgs e) {
       OnToStringChanged();
     }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints/DoubleValueRange.cs

@@ -48 +48 @@
       return solutions;
     }
+
+    protected override double CalculateSimilarityValue(DoubleValue a, DoubleValue b) {
+      double range = UpperBound.Value - LowerBound.Value;
+      double diff = Math.Abs(a.Value - b.Value);
+      return Math.Max(0, (range - (diff*2)) / range);
+    }
   }
 }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints/IntValueRange.cs

@@ -47 +47 @@
       return solutions;
     }
+
+    protected override double CalculateSimilarityValue(IntValue a, IntValue b) {
+      double range = UpperBound.Value - LowerBound.Value;
+      double diff = Math.Abs(a.Value - b.Value);
+      return Math.Max(0, (range - (diff * 2)) / range);
+    }
   }
 }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints/PercentValueRange.cs

@@ -52 +52 @@
       return solutions;
     }
+
+    protected override double CalculateSimilarityValue(PercentValue a, PercentValue b) {
+      double range = UpperBound.Value - LowerBound.Value;
+      double diff = Math.Abs(a.Value - b.Value);
+      return Math.Max(0, (range - (diff * 2)) / range);
+    }
   }
 }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints/Range.cs

@@ -208 +208 @@
 
     protected abstract T GetRandomSample(IRandom random);
+
     IItem IRange.GetRandomValue(IRandom random) {
       return GetRandomValue(random);
@@ -216 +217 @@
       return GetCombinations().Cast<IItem>().ToArray();
     }
+
+    public virtual double CalculateSimilarity(IItem a, IItem b) {
+      return CalculateSimilarityValue((T)a, (T)b);
+    }
+
+    protected abstract double CalculateSimilarityValue(T a, T b);
   }
 }