Changeset 12891 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/BuildingBlockAnalyzers
- Timestamp:
- 08/22/15 14:27:37 (9 years ago)
- Location:
- branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed
-
branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/BuildingBlockAnalyzers/SymbolicDataAnalysisPoly10Analyzer.cs
r12406 r12891 153 153 var values = interpreter.GetValues(s, dataset, rows); 154 154 OnlineCalculatorError error; 155 var r2 = OnlinePearsonsRSquaredCalculator.Calculate(values, evaluationMap[key], out error); 156 if (error == OnlineCalculatorError.None && r2 >= PhenotypicSimilarityThreshold) { 155 var r = OnlinePearsonsRCalculator.Calculate(values, evaluationMap[key], out error); 156 var r2 = error == OnlineCalculatorError.None ? r * r : double.NaN; 157 if (!double.IsNaN(r2) && r2 >= PhenotypicSimilarityThreshold) { 157 158 bbFrequencies[key]++; 158 159 i += s.GetLength(); … … 162 163 } 163 164 var table = (DataTable)results[BuildingBlocksFrequenciesTableName].Value; 164 double max = bbFrequencies.Max(x => x.Value);165 165 foreach (var pair in bbFrequencies) { 166 166 var formatter = new SymbolicExpressionTreeStringFormatter(); … … 169 169 if (table.Rows.ContainsKey(label)) { 170 170 var row = table.Rows[label]; 171 row.Values.Add( max > 0 ? pair.Value / max : 0);171 row.Values.Add(pair.Value); 172 172 } 173 173 }
Note: See TracChangeset
for help on using the changeset viewer.