Changeset 4639 for trunk/sources/HeuristicLab.Analysis/3.3
- Timestamp:
- 10/22/10 03:17:02 (14 years ago)
- Location:
- trunk/sources/HeuristicLab.Analysis/3.3
- Files:
-
- 1 added
- 2 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Analysis/3.3/AlleleFrequencyAnalyzer.cs
r4631 r4639 20 20 #endregion 21 21 22 using System.Collections.Generic; 22 23 using System.Linq; 23 24 using HeuristicLab.Core; … … 72 73 } 73 74 75 private class AlleleFrequencyEqualityComparer : IEqualityComparer<AlleleFrequency> { 76 public bool Equals(AlleleFrequency x, AlleleFrequency y) { 77 return x.Id == y.Id; 78 } 79 public int GetHashCode(AlleleFrequency obj) { 80 return obj.GetHashCode(); 81 } 82 } 83 74 84 public override IOperation Apply() { 75 85 int updateInterval = UpdateIntervalParameter.Value.Value; … … 110 120 bestAlleles.Any(a => a.Id == x.Key))); 111 121 122 // 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 AlleleFrequencyEqualityComparer()); 124 112 125 // fetch results collection 113 126 ResultCollection results; … … 120 133 121 134 // store allele frequencies 122 AlleleFrequency Array frequenciesArray = new AlleleFrequencyArray(frequencies);135 AlleleFrequencyCollection frequenciesCollection = new AlleleFrequencyCollection(bestKnownFrequencies.Concat(frequencies)); 123 136 if (!results.ContainsKey("Allele Frequencies")) 124 results.Add(new Result("Allele Frequencies", frequencies Array));137 results.Add(new Result("Allele Frequencies", frequenciesCollection)); 125 138 else 126 results["Allele Frequencies"].Value = frequencies Array;139 results["Allele Frequencies"].Value = frequenciesCollection; 127 140 128 141 // store allele frequencies history 129 142 if (storeHistory) { 130 143 if (!results.ContainsKey("Allele Frequencies History")) { 131 ItemCollection<AlleleFrequencyArray> history = new ItemCollection<AlleleFrequencyArray>();132 history.Add(frequencies Array);144 AlleleFrequencyCollectionCollection history = new AlleleFrequencyCollectionCollection(); 145 history.Add(frequenciesCollection); 133 146 results.Add(new Result("Allele Frequencies History", history)); 134 147 } else { 135 (( ItemCollection<AlleleFrequencyArray>)results["Allele Frequencies History"].Value).Add(frequenciesArray);148 ((AlleleFrequencyCollectionCollection)results["Allele Frequencies History"].Value).Add(frequenciesCollection); 136 149 } 137 150 } … … 146 159 allelesTable = (DataTable)results["Alleles"].Value; 147 160 } 148 allelesTable.Rows["Unique Alleles"].Values.Add(frequencies Array.Length);161 allelesTable.Rows["Unique Alleles"].Values.Add(frequenciesCollection.Count); 149 162 } 150 163 return base.Apply(); -
trunk/sources/HeuristicLab.Analysis/3.3/AlleleFrequencyCollection.cs
r4638 r4639 26 26 namespace HeuristicLab.Analysis { 27 27 /// <summary> 28 /// Represents a n arrayof allele frequencies.28 /// Represents a collection of allele frequencies. 29 29 /// </summary> 30 [Item("AlleleFrequency Array", "Represents an arrayof allele frequencies.")]30 [Item("AlleleFrequencyCollection", "Represents a collection of allele frequencies.")] 31 31 [StorableClass] 32 public class AlleleFrequency Array : ReadOnlyItemArray<AlleleFrequency> {33 public AlleleFrequency Array() : base() { }34 public AlleleFrequency Array(IEnumerable<AlleleFrequency> frequencies) : base(new ItemArray<AlleleFrequency>(frequencies)) { }32 public class AlleleFrequencyCollection : ReadOnlyItemCollection<AlleleFrequency> { 33 public AlleleFrequencyCollection() : base() { } 34 public AlleleFrequencyCollection(IEnumerable<AlleleFrequency> frequencies) : base(new ItemCollection<AlleleFrequency>(frequencies)) { } 35 35 [StorableConstructor] 36 protected AlleleFrequency Array(bool deserializing) : base(deserializing) { }36 protected AlleleFrequencyCollection(bool deserializing) : base(deserializing) { } 37 37 } 38 38 } -
trunk/sources/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj
r4623 r4639 110 110 <ItemGroup> 111 111 <None Include="HeuristicLabAnalysisPlugin.cs.frame" /> 112 <Compile Include="AlleleFrequencyCollection.cs" /> 112 113 <Compile Include="BestAverageWorstQualityAnalyzer.cs" /> 113 114 <Compile Include="BestAverageWorstQualityCalculator.cs" /> … … 116 117 <Compile Include="Allele.cs" /> 117 118 <Compile Include="AlleleFrequency.cs" /> 118 <Compile Include="AlleleFrequency Array.cs" />119 <Compile Include="AlleleFrequencyCollectionCollection.cs" /> 119 120 <Compile Include="QualityAnalyzer.cs" /> 120 121 <Compile Include="MinAverageMaxValueAnalyzer.cs" />
Note: See TracChangeset
for help on using the changeset viewer.