Changeset 15249 for stable/HeuristicLab.Algorithms.DataAnalysis/3.4/KernelRidgeRegression/KernelFunctions/KernelBase.cs

Timestamp:

07/15/17 10:29:40 (7 years ago)

Author:

gkronber

Message:

#2699,#2700
merged r14862, r14863, r14911, r14936, r15156, r15157, r15158, r15164, r15169, r15207:15209, r15225, r15227, r15234, r15248 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis/3.4/KernelRidgeRegression (copied) (copied from trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/KernelRidgeRegression)
• HeuristicLab.Algorithms.DataAnalysis/3.4/KernelRidgeRegression/KernelFunctions/KernelBase.cs (modified) (4 diffs)

stable/HeuristicLab.Algorithms.DataAnalysis/3.4/KernelRidgeRegression/KernelFunctions/KernelBase.cs

@@ -28 +28 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Algorithms.DataAnalysis.KernelRidgeRegression {
+namespace HeuristicLab.Algorithms.DataAnalysis {
   [StorableClass]
   public abstract class KernelBase : ParameterizedNamedItem, IKernel {
 
-    #region Parameternames
     private const string DistanceParameterName = "Distance";
-    #endregion
-    #region Parameterproperties
-    public ValueParameter<IDistance> DistanceParameter {
-      get { return Parameters[DistanceParameterName] as ValueParameter<IDistance>; }
+
+    public IValueParameter<IDistance> DistanceParameter {
+      get { return (IValueParameter<IDistance>)Parameters[DistanceParameterName]; }
     }
 
     [Storable]
-    public double? Beta { get; set; }
-    #endregion
-    #region Properties
+    private double? beta;
+    public double? Beta {
+      get { return beta; }
+      set {
+        if (value != beta) {
+          beta = value;
+          RaiseBetaChanged();
+        }
+      }
+    }
+
     public IDistance Distance {
       get { return DistanceParameter.Value; }
-      set { DistanceParameter.Value = value; }
+      set {
+        if (DistanceParameter.Value != value) {
+          DistanceParameter.Value = value;
+        }
+      }
     }
-
-    #endregion
 
     [StorableConstructor]
     protected KernelBase(bool deserializing) : base(deserializing) { }
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() { }
 
     protected KernelBase(KernelBase original, Cloner cloner)
       : base(original, cloner) {
-      Beta = original.Beta;
+      beta = original.beta;
+      RegisterEvents();
     }
 
@@ -64 +71 @@
       Parameters.Add(new ValueParameter<IDistance>(DistanceParameterName, "The distance function used for kernel calculation"));
       DistanceParameter.Value = new EuclideanDistance();
+      RegisterEvents();
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      RegisterEvents();
+    }
+
+    private void RegisterEvents() {
+      DistanceParameter.ValueChanged += (sender, args) => RaiseDistanceChanged();
     }
 
@@ -82 +99 @@
     public ParameterizedCovarianceFunction GetParameterizedCovarianceFunction(double[] p, int[] columnIndices) {
       if (p.Length != GetNumberOfParameters(columnIndices.Length)) throw new ArgumentException("Illegal parametrization");
-      var myClone = (KernelBase)Clone(new Cloner());
+      var myClone = (KernelBase)Clone();
       myClone.SetParameter(p);
       var cov = new ParameterizedCovarianceFunction {
@@ -101 +118 @@
       return dist.Get(r1, r2);
     }
+
+    #region events
+    public event EventHandler BetaChanged;
+    public event EventHandler DistanceChanged;
+
+    protected void RaiseBetaChanged() {
+      var handler = BetaChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+
+    protected void RaiseDistanceChanged() {
+      var handler = DistanceChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+    #endregion
   }
 }