Changeset 1709 for trunk/sources

Timestamp:

04/29/09 23:08:05 (16 years ago)

Author:

abeham

Message:

Added operator for averaging numeric data

Location:

trunk/sources/HeuristicLab.SimOpt/3.2

Files:

• HeuristicLab.SimOpt-3.2.csproj (modified) (1 diff)
• NumericDataAverageMultiCrossover.cs (added)
• NumericDataRoundedAverageMultiCrossover.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.SimOpt/3.2/HeuristicLab.SimOpt-3.2.csproj

@@ -89 +89 @@
     </Compile>
     <Compile Include="IntParameterBoundConstraint.cs" />
+    <Compile Include="NumericDataAverageMultiCrossover.cs" />
     <Compile Include="NumericDataRoundedAverageMultiCrossover.cs">
       <SubType>Code</SubType>

trunk/sources/HeuristicLab.SimOpt/3.2/NumericDataRoundedAverageMultiCrossover.cs

@@ -45 +45 @@
       double sum = 0.0;
       IVariable var = null;
+      string name = scope.TranslateName("VariableName");
       for (int i = 0; i < parents.Length; i++) {
-        var = parents[i].GetVariable(scope.TranslateName("VariableName"));
+        var = parents[i].GetVariable(name);
         if (var.Value is DoubleData) {
           sum += ((DoubleData)var.Value).Data;
@@ -68 +69 @@
         (varChild.Value as ConstrainedDoubleData).TrySetData(roundedAverage);
       }
-      scope.AddVariable(varChild);
+      IVariable varScope = scope.GetVariable(name);
+      if (varScope == null)
+        scope.AddVariable(varChild);
+      else varScope.Value = varChild.Value;
     }
   }