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

Timestamp:

01/11/11 15:03:46 (14 years ago)

Author:

gkronber

Message:

Merged changes from trunk to data analysis exploration branch and added fractional distance metric evaluator. #1142

Location:

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

Files:

• CovariantParsimonyPressure.cs (modified) (3 diffs)
• CovariantParsimonyPressureAdder.cs (modified) (3 diffs)
• DynOpEqComparator.cs (modified) (3 diffs)
• DynOpEqHistogramInitializer.cs (modified) (3 diffs)
• DynamicDepthLimitComparator.cs (modified) (3 diffs)
• DynamicDepthLimitInitializer.cs (modified) (2 diffs)
• WeightedParentsQualityVarianceComparator.cs (modified) (4 diffs)

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

@@ -32 +32 @@
 using HeuristicLab.Problems.DataAnalysis.Evaluators;
 using HeuristicLab.Analysis;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.DataAnalysis.Operators {
@@ -80 +81 @@
     }
 
-    public CovariantParsimonyPressure(bool deserializing) : base(deserializing) { }
+    protected CovariantParsimonyPressure(bool deserializing) : base(deserializing) { }
+    protected CovariantParsimonyPressure(CovariantParsimonyPressure original, Cloner clone) : base(original, clone) { }
     public CovariantParsimonyPressure()
       : base() {
@@ -98 +100 @@
       Parameters.Add(new ValueLookupParameter<BoolValue>("InvertComplexityAdaption"));
     }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new CovariantParsimonyPressure(this, cloner);
+    }
+
 
     [StorableHook(Persistence.Default.CompositeSerializers.Storable.HookType.AfterDeserialization)]

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

@@ -32 +32 @@
 using HeuristicLab.Problems.DataAnalysis.Evaluators;
 using HeuristicLab.Analysis;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.DataAnalysis.Operators {
@@ -66 +67 @@
 
     [StorableConstructor]
-    public CovariantParsimonyPressureAdder(bool deserializing) : base(deserializing) { }
+    protected CovariantParsimonyPressureAdder(bool deserializing) : base(deserializing) { }
+    protected CovariantParsimonyPressureAdder(CovariantParsimonyPressureAdder original, Cloner cloner) : base(original, cloner) { }
     public CovariantParsimonyPressureAdder()
       : base() {
@@ -79 +81 @@
       Parameters.Add(new ValueLookupParameter<BoolValue>("ApplyParsimonyPressure"));
     }
-
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new CovariantParsimonyPressureAdder(this, cloner);
+    }
     [StorableHook(Persistence.Default.CompositeSerializers.Storable.HookType.AfterDeserialization)]
     private void AfterDeserialization() {

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

@@ -30 +30 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using System.Collections.Generic;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.DataAnalysis.Operators {
@@ -81 +82 @@
     }
 
+    [StorableConstructor]
+    protected DynOpEqComparator(bool deserializing) : base(deserializing) { }
+    protected DynOpEqComparator(DynOpEqComparator original, Cloner cloner)
+      : base(original, cloner) {
+    }
     public DynOpEqComparator()
       : base() {
@@ -100 +106 @@
     }
 
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new DynOpEqComparator(this, cloner);
+    }
     public override IOperation Apply() {
       if (ResultParameter.ActualValue == null || ResultParameter.ActualValue.Value == true) {

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

@@ -30 +30 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using System.Collections.Generic;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.DataAnalysis.Operators {
@@ -63 +64 @@
     }
 
+    [StorableConstructor]
+    protected DynOpEqHistogramInitializer(bool deserializing) : base(deserializing) { }
+    protected DynOpEqHistogramInitializer(DynOpEqHistogramInitializer original, Cloner cloner)
+      : base(original, cloner) {
+    }
     public DynOpEqHistogramInitializer()
       : base() {
@@ -75 +81 @@
       Parameters.Add(new LookupParameter<BoolValue>("Maximization"));
     }
-
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new DynOpEqHistogramInitializer(this, cloner);
+    }
     public override IOperation Apply() {
       if (BinCapacityParameter.ActualValue == null) {

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

@@ -29 +29 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.DataAnalysis.Operators {
@@ -65 +66 @@
     }
 
+    [StorableConstructor]
+    protected DynamicDepthLimitComparator(bool deserializing) : base(deserializing) { }
+    protected DynamicDepthLimitComparator(DynamicDepthLimitComparator original, Cloner cloner)
+      : base(original, cloner) {
+    }
+
     public DynamicDepthLimitComparator()
       : base() {
@@ -77 +84 @@
       Parameters.Add(new ValueParameter<DoubleValue>("cLower", "", new DoubleValue(0.03)));
       Parameters.Add(new ValueParameter<DoubleValue>("cRaise", "", new DoubleValue(0.015)));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new DynamicDepthLimitComparator(this, cloner);
     }
 

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

@@ -29 +29 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.DataAnalysis.Operators {
@@ -41 +42 @@
     }
 
+    [StorableConstructor]
+    protected DynamicDepthLimitInitializer(bool deserializing) : base(deserializing) { }
+    protected DynamicDepthLimitInitializer(DynamicDepthLimitInitializer original, Cloner cloner)
+      : base(original, cloner) {
+    }
     public DynamicDepthLimitInitializer()
       : base() {
       Parameters.Add(new ValueLookupParameter<IntValue>("DynamicDepthLimit", "The current depth limit."));
       Parameters.Add(new ValueLookupParameter<IntValue>("InitialDepthLimit", "The initial depth limit."));
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new DynamicDepthLimitInitializer(this, cloner);
     }
 

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

@@ -28 +28 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Problems.DataAnalysis.Operators {
@@ -61 +62 @@
     }
 
+    [StorableConstructor]
+    protected WeightedParentsQualityVarianceComparator(bool deserializing) : base(deserializing) { }
+    protected WeightedParentsQualityVarianceComparator(WeightedParentsQualityVarianceComparator original, Cloner cloner)
+      : base(original, cloner) {
+    }
     public WeightedParentsQualityVarianceComparator()
       : base() {
@@ -75 +81 @@
       Parameters.Add(new ScopeTreeLookupParameter<IntValue>("RightSideSamples", "The number of samples used to calculate the quality of the parent."));
     }
-
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new WeightedParentsQualityVarianceComparator(this, cloner);
+    }
     public override IOperation Apply() {
       double leftQuality = LeftSideParameter.ActualValue.Value;
@@ -114 +122 @@
       double stat = (xmean - ymean) / Math.Sqrt(xvar / n + yvar / m);
       double c = xvar / n / (xvar / n + yvar / m);
-      double df = (n - 1) * (m - 1) / ((m - 1) * AP.Math.Sqr(c) + (n - 1) * (1 - AP.Math.Sqr(c)));
+      double df = (n - 1) * (m - 1) / ((m - 1) * alglib.math.sqr(c) + (n - 1) * (1 - alglib.math.sqr(c)));
       if ((double)(stat) > (double)(0))
-        p = 1 - 0.5 * ibetaf.incompletebeta(df / 2, 0.5, df / (df + AP.Math.Sqr(stat)));
+        p = 1 - 0.5 * alglib.ibetaf.incompletebeta(df / 2, 0.5, df / (df + alglib.math.sqr(stat)));
       else
-        p = 0.5 * ibetaf.incompletebeta(df / 2, 0.5, df / (df + AP.Math.Sqr(stat)));
+        p = 0.5 * alglib.ibetaf.incompletebeta(df / 2, 0.5, df / (df + alglib.math.sqr(stat)));
       double bothtails = 2 * Math.Min(p, 1 - p);
       double lefttail = p;