Changeset 4704 for trunk/sources/HeuristicLab.Analysis

Timestamp:

11/02/10 04:30:06 (14 years ago)

Author:

swagner

Message:

Worked on allele frequency analysis (#1234)

Location:

trunk/sources/HeuristicLab.Analysis/3.3

Files:

• AlleleFrequencyAnalyzer.cs (modified) (4 diffs)
• AlleleFrequencyCollection.cs (modified) (2 diffs)
• AlleleFrequencyCollectionHistory.cs (modified) (2 diffs)

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

@@ -51 +51 @@
       get { return (ValueLookupParameter<ResultCollection>)Parameters["Results"]; }
     }
-    public ValueParameter<BoolValue> StoreAlleleFrequenciesHistoryParameter {
-      get { return (ValueParameter<BoolValue>)Parameters["StoreAlleleFrequenciesHistory"]; }
+    public ValueParameter<BoolValue> StoreHistoryParameter {
+      get { return (ValueParameter<BoolValue>)Parameters["StoreHistory"]; }
     }
     public ValueParameter<IntValue> UpdateIntervalParameter {
@@ -61 +61 @@
     }
 
+    [StorableConstructor]
+    protected AlleleFrequencyAnalyzer(bool deserializing) : base(deserializing) { }
     public AlleleFrequencyAnalyzer()
       : base() {
@@ -68 +70 @@
       Parameters.Add(new LookupParameter<T>("BestKnownSolution", "The best known solution."));
       Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The result collection where the allele frequency analysis results should be stored."));
-      Parameters.Add(new ValueParameter<BoolValue>("StoreAlleleFrequenciesHistory", "True if the history of all allele frequencies should be stored.", new BoolValue(false)));
+      Parameters.Add(new ValueParameter<BoolValue>("StoreHistory", "True if the history of the allele frequency analysis 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.", "AlleleFrequencyAnalyzerUpdateCounter"));
@@ -99 +101 @@
         ItemArray<DoubleValue> qualities = QualityParameter.ActualValue;
         T bestKnownSolution = BestKnownSolutionParameter.ActualValue;
-        bool storeHistory = StoreAlleleFrequenciesHistoryParameter.Value.Value;
+        bool storeHistory = StoreHistoryParameter.Value.Value;
 
         // calculate index of current best solution

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

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using System.Drawing;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -31 +32 @@
   [StorableClass]
   public class AlleleFrequencyCollection : ReadOnlyItemCollection<AlleleFrequency> {
+    public override Image ItemImage {
+      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Statistics; }
+    }
+
     public AlleleFrequencyCollection() : base() { }
     public AlleleFrequencyCollection(IEnumerable<AlleleFrequency> frequencies) : base(new ItemCollection<AlleleFrequency>(frequencies)) { }

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

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using System.Drawing;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -31 +32 @@
   [StorableClass]
   public class AlleleFrequencyCollectionHistory : ItemCollection<AlleleFrequencyCollection> {
+    public override Image ItemImage {
+      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Cab; }
+    }
+
     public AlleleFrequencyCollectionHistory() : base() { }
     public AlleleFrequencyCollectionHistory(IEnumerable<AlleleFrequencyCollection> collections) : base(new ItemCollection<AlleleFrequencyCollection>(collections)) { }