Changeset 4641 for trunk/sources/HeuristicLab.Analysis

Timestamp:

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

Author:

swagner

Message:

Worked on allele frequency analysis (#1234)

Location:

trunk/sources/HeuristicLab.Analysis/3.3

Files:

• AlleleFrequencyAnalyzer.cs (modified) (3 diffs)
• AlleleFrequencyCollectionHistory.cs (moved) (moved from trunk/sources/HeuristicLab.Analysis/3.3/AlleleFrequencyCollectionCollection.cs) (1 diff)
• HeuristicLab.Analysis-3.3.csproj (modified) (2 diffs)
• MultiAnalyzer.cs (modified) (1 diff)

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);
           }
         }

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

@@ -26 +26 @@
 namespace HeuristicLab.Analysis {
   /// <summary>
-  /// Represents a collection of allele frequencies collections.
+  /// Represents history values of allele frequencies collections.
   /// </summary>
-  [Item("AlleleFrequencyCollectionCollection", "Represents a collection of allele frequencies collections.")]
+  [Item("AlleleFrequencyCollectionHistory", "Represents history values of allele frequencies collections.")]
   [StorableClass]
-  public class AlleleFrequencyCollectionCollection : ItemCollection<AlleleFrequencyCollection> {
-    public AlleleFrequencyCollectionCollection() : base() { }
-    public AlleleFrequencyCollectionCollection(IEnumerable<AlleleFrequencyCollection> collections) : base(new ItemCollection<AlleleFrequencyCollection>(collections)) { }
+  public class AlleleFrequencyCollectionHistory : ItemCollection<AlleleFrequencyCollection> {
+    public AlleleFrequencyCollectionHistory() : base() { }
+    public AlleleFrequencyCollectionHistory(IEnumerable<AlleleFrequencyCollection> collections) : base(new ItemCollection<AlleleFrequencyCollection>(collections)) { }
     [StorableConstructor]
-    protected AlleleFrequencyCollectionCollection(bool deserializing) : base(deserializing) { }
+    protected AlleleFrequencyCollectionHistory(bool deserializing) : base(deserializing) { }
   }
 }

trunk/sources/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

@@ -111 +111 @@
     <None Include="HeuristicLabAnalysisPlugin.cs.frame" />
     <Compile Include="AlleleFrequencyCollection.cs" />
+    <Compile Include="AlleleFrequencyCollectionHistory.cs" />
     <Compile Include="BestAverageWorstQualityAnalyzer.cs" />
     <Compile Include="BestAverageWorstQualityCalculator.cs" />
@@ -117 +118 @@
     <Compile Include="Allele.cs" />
     <Compile Include="AlleleFrequency.cs" />
-    <Compile Include="AlleleFrequencyCollectionCollection.cs" />
     <Compile Include="QualityAnalyzer.cs" />
     <Compile Include="MinAverageMaxValueAnalyzer.cs" />

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

@@ -54 +54 @@
       : base() {
       Parameters.Add(new ValueLookupParameter<IntValue>("UpdateInterval", "The interval in which the contained analyzers should be applied.", new IntValue(1)));
-      Parameters.Add(new LookupParameter<IntValue>("UpdateCounter", "The value which counts how many times the MultiAnalyzer was called since the last update."));
+      Parameters.Add(new LookupParameter<IntValue>("UpdateCounter", "The value which counts how many times the MultiAnalyzer was called since the last update.", "MultiAnalyzerUpdateCounter"));
     }
     [StorableConstructor]