Changeset 4641 for trunk/sources/HeuristicLab.Analysis/3.3
- Timestamp:
- 10/23/10 04:07:18 (14 years ago)
- Location:
- trunk/sources/HeuristicLab.Analysis/3.3
- Files:
-
- 3 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalyzer.cs
r4639 r4641 70 70 Parameters.Add(new ValueParameter<BoolValue>("StoreAlleleFrequenciesHistory", "True if the history of all allele frequencies should be stored.", new BoolValue(false))); 71 71 Parameters.Add(new ValueParameter<IntValue>("UpdateInterval", "The interval in which the allele frequency analysis should be applied.", new IntValue(1))); 72 Parameters.Add(new LookupParameter<IntValue>("UpdateCounter", "The value which counts how many times the operator was called since the last update." ));72 Parameters.Add(new LookupParameter<IntValue>("UpdateCounter", "The value which counts how many times the operator was called since the last update.", "AlleleFrequencyAnalyzerUpdateCounter")); 73 73 } 74 74 75 private class AlleleFrequencyEqualityComparer : IEqualityComparer<AlleleFrequency> { 75 #region AlleleFrequencyIdEqualityComparer 76 private class AlleleFrequencyIdEqualityComparer : IEqualityComparer<AlleleFrequency> { 76 77 public bool Equals(AlleleFrequency x, AlleleFrequency y) { 77 78 return x.Id == y.Id; 78 79 } 79 80 public int GetHashCode(AlleleFrequency obj) { 80 return obj. GetHashCode();81 return obj.Id.GetHashCode(); 81 82 } 82 83 } 84 #endregion 83 85 84 86 public override IOperation Apply() { … … 121 123 122 124 // calculate dummy allele frequencies of alleles of best known solution which did not occur 123 var bestKnownFrequencies = bestKnownAlleles.Select(x => new AlleleFrequency(x.Id, 0, x.Impact, 0, true, false)).Except(frequencies, new AlleleFrequency EqualityComparer());125 var bestKnownFrequencies = bestKnownAlleles.Select(x => new AlleleFrequency(x.Id, 0, x.Impact, 0, true, false)).Except(frequencies, new AlleleFrequencyIdEqualityComparer()); 124 126 125 127 // fetch results collection … … 142 144 if (storeHistory) { 143 145 if (!results.ContainsKey("Allele Frequencies History")) { 144 AlleleFrequencyCollection Collection history = new AlleleFrequencyCollectionCollection();146 AlleleFrequencyCollectionHistory history = new AlleleFrequencyCollectionHistory(); 145 147 history.Add(frequenciesCollection); 146 148 results.Add(new Result("Allele Frequencies History", history)); 147 149 } else { 148 ((AlleleFrequencyCollection Collection)results["Allele Frequencies History"].Value).Add(frequenciesCollection);150 ((AlleleFrequencyCollectionHistory)results["Allele Frequencies History"].Value).Add(frequenciesCollection); 149 151 } 150 152 } -
trunk/sources/HeuristicLab.Analysis/3.3/AlleleFrequencyCollectionHistory.cs
r4639 r4641 26 26 namespace HeuristicLab.Analysis { 27 27 /// <summary> 28 /// Represents a collectionof allele frequencies collections.28 /// Represents history values of allele frequencies collections. 29 29 /// </summary> 30 [Item("AlleleFrequencyCollection Collection", "Represents a collectionof allele frequencies collections.")]30 [Item("AlleleFrequencyCollectionHistory", "Represents history values of allele frequencies collections.")] 31 31 [StorableClass] 32 public class AlleleFrequencyCollection Collection: ItemCollection<AlleleFrequencyCollection> {33 public AlleleFrequencyCollection Collection() : base() { }34 public AlleleFrequencyCollection Collection(IEnumerable<AlleleFrequencyCollection> collections) : base(new ItemCollection<AlleleFrequencyCollection>(collections)) { }32 public class AlleleFrequencyCollectionHistory : ItemCollection<AlleleFrequencyCollection> { 33 public AlleleFrequencyCollectionHistory() : base() { } 34 public AlleleFrequencyCollectionHistory(IEnumerable<AlleleFrequencyCollection> collections) : base(new ItemCollection<AlleleFrequencyCollection>(collections)) { } 35 35 [StorableConstructor] 36 protected AlleleFrequencyCollection Collection(bool deserializing) : base(deserializing) { }36 protected AlleleFrequencyCollectionHistory(bool deserializing) : base(deserializing) { } 37 37 } 38 38 } -
trunk/sources/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj
r4639 r4641 111 111 <None Include="HeuristicLabAnalysisPlugin.cs.frame" /> 112 112 <Compile Include="AlleleFrequencyCollection.cs" /> 113 <Compile Include="AlleleFrequencyCollectionHistory.cs" /> 113 114 <Compile Include="BestAverageWorstQualityAnalyzer.cs" /> 114 115 <Compile Include="BestAverageWorstQualityCalculator.cs" /> … … 117 118 <Compile Include="Allele.cs" /> 118 119 <Compile Include="AlleleFrequency.cs" /> 119 <Compile Include="AlleleFrequencyCollectionCollection.cs" />120 120 <Compile Include="QualityAnalyzer.cs" /> 121 121 <Compile Include="MinAverageMaxValueAnalyzer.cs" /> -
trunk/sources/HeuristicLab.Analysis/3.3/MultiAnalyzer.cs
r3664 r4641 54 54 : base() { 55 55 Parameters.Add(new ValueLookupParameter<IntValue>("UpdateInterval", "The interval in which the contained analyzers should be applied.", new IntValue(1))); 56 Parameters.Add(new LookupParameter<IntValue>("UpdateCounter", "The value which counts how many times the MultiAnalyzer was called since the last update." ));56 Parameters.Add(new LookupParameter<IntValue>("UpdateCounter", "The value which counts how many times the MultiAnalyzer was called since the last update.", "MultiAnalyzerUpdateCounter")); 57 57 } 58 58 [StorableConstructor]
Note: See TracChangeset
for help on using the changeset viewer.