Changeset 4704


Ignore:
Timestamp:
11/02/10 04:30:06 (11 years ago)
Author:
swagner
Message:

Worked on allele frequency analysis (#1234)

Location:
trunk/sources
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Analysis.Views/3.3/AlleleFrequencyCollectionHistoryView.cs

    r4641 r4704  
    2828  [Content(typeof(AlleleFrequencyCollectionHistory), true)]
    2929  public partial class AlleleFrequencyCollectionHistoryView : MovieView<AlleleFrequencyCollection> {
    30     /// <summary>
    31     /// Initializes a new instance of <see cref="VariablesScopeView"/> with caption "Variables Scope View".
    32     /// </summary>
    3330    public AlleleFrequencyCollectionHistoryView() {
    3431      InitializeComponent();
  • trunk/sources/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalyzer.cs

    r4648 r4704  
    5151      get { return (ValueLookupParameter<ResultCollection>)Parameters["Results"]; }
    5252    }
    53     public ValueParameter<BoolValue> StoreAlleleFrequenciesHistoryParameter {
    54       get { return (ValueParameter<BoolValue>)Parameters["StoreAlleleFrequenciesHistory"]; }
     53    public ValueParameter<BoolValue> StoreHistoryParameter {
     54      get { return (ValueParameter<BoolValue>)Parameters["StoreHistory"]; }
    5555    }
    5656    public ValueParameter<IntValue> UpdateIntervalParameter {
     
    6161    }
    6262
     63    [StorableConstructor]
     64    protected AlleleFrequencyAnalyzer(bool deserializing) : base(deserializing) { }
    6365    public AlleleFrequencyAnalyzer()
    6466      : base() {
     
    6870      Parameters.Add(new LookupParameter<T>("BestKnownSolution", "The best known solution."));
    6971      Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The result collection where the allele frequency analysis results should be stored."));
    70       Parameters.Add(new ValueParameter<BoolValue>("StoreAlleleFrequenciesHistory", "True if the history of all allele frequencies should be stored.", new BoolValue(false)));
     72      Parameters.Add(new ValueParameter<BoolValue>("StoreHistory", "True if the history of the allele frequency analysis should be stored.", new BoolValue(false)));
    7173      Parameters.Add(new ValueParameter<IntValue>("UpdateInterval", "The interval in which the allele frequency analysis should be applied.", new IntValue(1)));
    7274      Parameters.Add(new LookupParameter<IntValue>("UpdateCounter", "The value which counts how many times the operator was called since the last update.", "AlleleFrequencyAnalyzerUpdateCounter"));
     
    99101        ItemArray<DoubleValue> qualities = QualityParameter.ActualValue;
    100102        T bestKnownSolution = BestKnownSolutionParameter.ActualValue;
    101         bool storeHistory = StoreAlleleFrequenciesHistoryParameter.Value.Value;
     103        bool storeHistory = StoreHistoryParameter.Value.Value;
    102104
    103105        // calculate index of current best solution
  • trunk/sources/HeuristicLab.Analysis/3.3/AlleleFrequencyCollection.cs

    r4639 r4704  
    2121
    2222using System.Collections.Generic;
     23using System.Drawing;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    3132  [StorableClass]
    3233  public class AlleleFrequencyCollection : ReadOnlyItemCollection<AlleleFrequency> {
     34    public override Image ItemImage {
     35      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Statistics; }
     36    }
     37
    3338    public AlleleFrequencyCollection() : base() { }
    3439    public AlleleFrequencyCollection(IEnumerable<AlleleFrequency> frequencies) : base(new ItemCollection<AlleleFrequency>(frequencies)) { }
  • trunk/sources/HeuristicLab.Analysis/3.3/AlleleFrequencyCollectionHistory.cs

    r4641 r4704  
    2121
    2222using System.Collections.Generic;
     23using System.Drawing;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    3132  [StorableClass]
    3233  public class AlleleFrequencyCollectionHistory : ItemCollection<AlleleFrequencyCollection> {
     34    public override Image ItemImage {
     35      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Cab; }
     36    }
     37
    3338    public AlleleFrequencyCollectionHistory() : base() { }
    3439    public AlleleFrequencyCollectionHistory(IEnumerable<AlleleFrequencyCollection> collections) : base(new ItemCollection<AlleleFrequencyCollection>(collections)) { }
  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/TSPAlleleFrequencyAnalyzer.cs

    r4623 r4704  
    3939    }
    4040
     41    [StorableConstructor]
     42    private TSPAlleleFrequencyAnalyzer(bool deserializing) : base(deserializing) { }
    4143    public TSPAlleleFrequencyAnalyzer()
    4244      : base() {
Note: See TracChangeset for help on using the changeset viewer.