Changeset 10294

Timestamp:

01/07/14 12:51:03 (11 years ago)

Author:

mkommend

Message:

#2123: Merged r10195 & r10196 into the stable branch.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Operators/3.3/DataReducer.cs (modified) (2 diffs)
• HeuristicLab.Operators/3.3/HeuristicLab.Operators-3.3.csproj (modified) (1 diff)
• HeuristicLab.Operators/3.3/ReductionOperation.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/ReductionOperations.cs (deleted)

stable/HeuristicLab.Operators/3.3/DataReducer.cs

@@ -69 +69 @@
     public override IOperation Apply() {
       var values = ParameterToReduce.ActualValue;
-      if (values.Count() > 0) {
-        if (values.All(x => typeof(IntValue).IsAssignableFrom(x.GetType()))) {
-          CalculateResult(values.OfType<IntValue>().Select(x => x.Value), values.First().GetType());
-        } else if (values.All(x => typeof(DoubleValue).IsAssignableFrom(x.GetType()))) {
-          CalculateResult(values.OfType<DoubleValue>().Select(x => x.Value), values.First().GetType());
-        } else if (values.All(x => typeof(TimeSpanValue).IsAssignableFrom(x.GetType()))) {
-          CalculateResult(values.OfType<TimeSpanValue>().Select(x => x.Value), values.First().GetType());
-        } else {
-          throw new ArgumentException(string.Format("Type {0} is not supported by the DataReducer.", values.First().GetType()));
-        }
-      }
+      if (!values.Any()) return base.Apply();
+
+      if (values.All(x => x is IntValue)) {
+        CalculateResult(values.OfType<IntValue>().Select(x => x.Value), values.First().GetType());
+      } else if (values.All(x => x is DoubleValue)) {
+        CalculateResult(values.OfType<DoubleValue>().Select(x => x.Value), values.First().GetType());
+      } else if (values.All(x => x is TimeSpanValue)) {
+        CalculateResult(values.OfType<TimeSpanValue>().Select(x => x.Value), values.First().GetType());
+      } else if (values.All(x => x is BoolValue)) {
+        CalculateResult(values.OfType<BoolValue>().Select(x => x.Value), values.First().GetType());
+      } else {
+        throw new ArgumentException(string.Format("Type {0} is not supported by the DataReducer.", values.First().GetType()));
+      }
+
       return base.Apply();
     }
@@ -246 +249 @@
         case ReductionOperations.Assign:
           target = InitializeTarget<TimeSpanValue, TimeSpan>(targetType, new TimeSpan());
+          target.Value = result;
+          break;
+        default:
+          throw new InvalidOperationException(string.Format("Operation {0} is not supported as TargetOperation for type: {1}.", TargetOperation.Value.Value, targetType));
+      }
+    }
+    #endregion
+    #region bool reduction
+    private void CalculateResult(IEnumerable<bool> values, Type targetType) {
+      bool result;
+      switch (ReductionOperation.Value.Value) {
+        case ReductionOperations.All:
+          result = values.All(x => x);
+          break;
+        case ReductionOperations.Any:
+          result = values.Any(x => x);
+          break;
+        default:
+          throw new InvalidOperationException(string.Format("Operation {0} is not supported as ReductionOperation for type: {1}.", ReductionOperation.Value.Value, targetType));
+      }
+
+      BoolValue target;
+      switch (TargetOperation.Value.Value) {
+        case ReductionOperations.Assign:
+          target = InitializeTarget<BoolValue, bool>(targetType, true);
           target.Value = result;
           break;

stable/HeuristicLab.Operators/3.3/HeuristicLab.Operators-3.3.csproj

@@ -126 +126 @@
     <Compile Include="Plugin.cs" />
     <Compile Include="ReductionOperation.cs" />
-    <Compile Include="ReductionOperations.cs" />
     <Compile Include="ScopeCleaner.cs" />
     <Compile Include="StochasticBranch.cs" />

stable/HeuristicLab.Operators/3.3/ReductionOperation.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Operators {
+  public enum ReductionOperations {
+    Sum,
+    Product,
+    Count,
+    Min,
+    Max,
+    Avg,
+    Assign,
+    All,
+    Any
+  }
+
   [Item("ReductionOperation", "Represents a certain type of reduction operation.")]
   [StorableClass]