Changeset 5265 for branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Operators

Timestamp:

01/10/11 13:14:33 (14 years ago)

Author:

gkronber

Message:

changed project files and solution file to make the branch compatible with current trunk version. #1142

Location:

branches/DataAnalysis

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis/3.3/Operators/CovariantParsimonyPressure.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis/3.3/Operators/CovariantParsimonyPressureAdder.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.3/Operators/DynOpEqComparator.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.3/Operators/DynOpEqHistogramInitializer.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.3/Operators/DynamicDepthLimitComparator.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.3/Operators/DynamicDepthLimitInitializer.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.3/Operators/WeightedParentsQualityVarianceComparator.cs (modified) (1 diff)

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Operators/CovariantParsimonyPressure.cs

@@ -22 +22 @@
 using System;
 using System.Linq;
-using alglib;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -200 +199 @@
                                select normFit).ToArray<double>();
 
-        LengthCorrelationParameter.ActualValue = new DoubleValue(alglib.correlation.spearmanrankcorrelation(lengthArr, adjFitess, lengthArr.Length));
-        FitnessCorrelationParameter.ActualValue = new DoubleValue(alglib.correlation.spearmanrankcorrelation(fitnessArr, adjFitess, lengthArr.Length));
+        LengthCorrelationParameter.ActualValue = new DoubleValue(alglib.spearmancorr2(lengthArr, adjFitess, lengthArr.Length));
+        FitnessCorrelationParameter.ActualValue = new DoubleValue(alglib.spearmancorr2(fitnessArr, adjFitess, lengthArr.Length));
 
       } else {
@@ -215 +214 @@
                            select f.Value).ToArray<double>();
 
-        LengthCorrelationParameter.ActualValue = new DoubleValue(alglib.correlation.spearmanrankcorrelation(lengths, fitess, lengths.Length));
+        LengthCorrelationParameter.ActualValue = new DoubleValue(alglib.spearmancorr2(lengths, fitess, lengths.Length));
       }
       return base.Apply();

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Operators/CovariantParsimonyPressureAdder.cs

@@ -22 +22 @@
 using System;
 using System.Linq;
-using alglib;
 using HeuristicLab.Core;
 using HeuristicLab.Data;

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Operators/DynOpEqComparator.cs

@@ -22 +22 @@
 using System;
 using System.Linq;
-using alglib;
 using HeuristicLab.Core;
 using HeuristicLab.Data;

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Operators/DynOpEqHistogramInitializer.cs

@@ -22 +22 @@
 using System;
 using System.Linq;
-using alglib;
 using HeuristicLab.Core;
 using HeuristicLab.Data;

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Operators/DynamicDepthLimitComparator.cs

@@ -22 +22 @@
 using System;
 using System.Linq;
-using alglib;
 using HeuristicLab.Core;
 using HeuristicLab.Data;

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Operators/DynamicDepthLimitInitializer.cs

@@ -22 +22 @@
 using System;
 using System.Linq;
-using alglib;
 using HeuristicLab.Core;
 using HeuristicLab.Data;

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Operators/WeightedParentsQualityVarianceComparator.cs

@@ -22 +22 @@
 using System;
 using System.Linq;
-using alglib;
 using HeuristicLab.Core;
 using HeuristicLab.Data;