Changeset 4641 for trunk/sources/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalyzer.cs

Timestamp:

10/23/10 04:07:18 (14 years ago)

Author:

swagner

Message:

Worked on allele frequency analysis (#1234)

File:

• trunk/sources/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalyzer.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalyzer.cs

@@ -70 +70 @@
       Parameters.Add(new ValueParameter<BoolValue>("StoreAlleleFrequenciesHistory", "True if the history of all allele frequencies should be stored.", new BoolValue(false)));
       Parameters.Add(new ValueParameter<IntValue>("UpdateInterval", "The interval in which the allele frequency analysis should be applied.", new IntValue(1)));
-      Parameters.Add(new LookupParameter<IntValue>("UpdateCounter", "The value which counts how many times the operator was called since the last update."));
+      Parameters.Add(new LookupParameter<IntValue>("UpdateCounter", "The value which counts how many times the operator was called since the last update.", "AlleleFrequencyAnalyzerUpdateCounter"));
     }
 
-    private class AlleleFrequencyEqualityComparer : IEqualityComparer<AlleleFrequency> {
+    #region AlleleFrequencyIdEqualityComparer
+    private class AlleleFrequencyIdEqualityComparer : IEqualityComparer<AlleleFrequency> {
       public bool Equals(AlleleFrequency x, AlleleFrequency y) {
         return x.Id == y.Id;
       }
       public int GetHashCode(AlleleFrequency obj) {
-        return obj.GetHashCode();
+        return obj.Id.GetHashCode();
       }
     }
+    #endregion
 
     public override IOperation Apply() {
@@ -121 +123 @@
 
         // calculate dummy allele frequencies of alleles of best known solution which did not occur
-        var bestKnownFrequencies = bestKnownAlleles.Select(x => new AlleleFrequency(x.Id, 0, x.Impact, 0, true, false)).Except(frequencies, new AlleleFrequencyEqualityComparer());
+        var bestKnownFrequencies = bestKnownAlleles.Select(x => new AlleleFrequency(x.Id, 0, x.Impact, 0, true, false)).Except(frequencies, new AlleleFrequencyIdEqualityComparer());
 
         // fetch results collection
@@ -142 +144 @@
         if (storeHistory) {
           if (!results.ContainsKey("Allele Frequencies History")) {
-            AlleleFrequencyCollectionCollection history = new AlleleFrequencyCollectionCollection();
+            AlleleFrequencyCollectionHistory history = new AlleleFrequencyCollectionHistory();
             history.Add(frequenciesCollection);
             results.Add(new Result("Allele Frequencies History", history));
           } else {
-            ((AlleleFrequencyCollectionCollection)results["Allele Frequencies History"].Value).Add(frequenciesCollection);
+            ((AlleleFrequencyCollectionHistory)results["Allele Frequencies History"].Value).Add(frequenciesCollection);
           }
         }