Changeset 13046 for branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/WeightingReducer.cs

Timestamp:

10/21/15 17:42:18 (9 years ago)

Author:

pfleck

Message:

#2269

• Changed the age type from int to double.
• Changed EldersSelector to make use of a ScopeTreeLookupParameter.
• Removed unused operators in LayerUpdator.

File:

• branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/WeightingReducer.cs (modified) (3 diffs)

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/WeightingReducer.cs

@@ -34 +34 @@
   public sealed class WeightingReducer : SingleSuccessorOperator {
 
-    public ScopeTreeLookupParameter<IntValue> ParameterToReduce {
-      get { return (ScopeTreeLookupParameter<IntValue>)Parameters["ParameterToReduce"]; }
+    public IScopeTreeLookupParameter<DoubleValue> ParameterToReduce {
+      get { return (IScopeTreeLookupParameter<DoubleValue>)Parameters["ParameterToReduce"]; }
     }
-    public LookupParameter<IntValue> TargetParameter {
-      get { return (LookupParameter<IntValue>)Parameters["TargetParameter"]; }
+    public ILookupParameter<DoubleValue> TargetParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["TargetParameter"]; }
     }
     public IValueLookupParameter<DoubleValue> WeightParameter {
@@ -54 +54 @@
     public WeightingReducer()
       : base() {
-      Parameters.Add(new ScopeTreeLookupParameter<IntValue>("ParameterToReduce", "The parameter on which the weighting should be applied."));
-      Parameters.Add(new LookupParameter<IntValue>("TargetParameter", "The target variable in which the weighted value should be stored."));
+      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("ParameterToReduce", "The parameter on which the weighting should be applied."));
+      Parameters.Add(new LookupParameter<DoubleValue>("TargetParameter", "The target variable in which the weighted value should be stored."));
       Parameters.Add(new ValueLookupParameter<DoubleValue>("Weight", "Weight of the two values (0.0 for the smaller, 1.0 for the larger)."));
     }
@@ -64 +64 @@
         throw new InvalidOperationException("Weighting between values can only done for two values.");
 
-      var weight = WeightParameter.ActualValue.Value;
+      double weight = WeightParameter.ActualValue.Value;
 
-      var max = values.Max(v => v.Value);
-      var min = values.Min(v => v.Value);
+      double max = values.Max(v => v.Value);
+      double min = values.Min(v => v.Value);
 
-      int result = (int)(max * weight + min * (1 - weight));
+      double result = max * weight + min * (1 - weight);
 
       if (TargetParameter.ActualValue == null)
-        TargetParameter.ActualValue = new IntValue(result);
+        TargetParameter.ActualValue = new DoubleValue(result);
       else TargetParameter.ActualValue.Value = result;