Changeset 3121 for trunk/sources

Timestamp:

03/19/10 15:32:52 (15 years ago)

Author:

svonolfe

Message:

Added MoveEvaluator to the OneMax problem (#916)

Location:

trunk/sources/HeuristicLab.Problems.OneMax/3.3

Files:

• HeuristicLab.Problems.OneMax-3.3.csproj (modified) (1 diff)
• Interfaces/IOneMaxMoveEvaluator.cs (added)
• MoveEvaluators (added)
• MoveEvaluators/OneMaxMoveEvaluator.cs (added)
• MoveEvaluators/OneMaxOneBitflipMoveEvaluator.cs (added)
• Onemax.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.OneMax/3.3/HeuristicLab.Problems.OneMax-3.3.csproj

@@ -87 +87 @@
   <ItemGroup>
     <Compile Include="Interfaces\IOneMaxSolutionsVisualizer.cs" />
+    <Compile Include="Interfaces\IOneMaxMoveEvaluator.cs" />
+    <Compile Include="MoveEvaluators\OneMaxMoveEvaluator.cs" />
+    <Compile Include="MoveEvaluators\OneMaxOneBitflipMoveEvaluator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Evaluators\OneMaxEvaluator.cs" />

trunk/sources/HeuristicLab.Problems.OneMax/3.3/Onemax.cs

@@ -197 +197 @@
       OnVisualizerChanged();
     }
+    void OneBitflipMoveParameter_ActualNameChanged(object sender, EventArgs e) {
+      string name = ((ILookupParameter<OneBitflipMove>)sender).ActualName;
+      foreach (IOneBitflipMoveOperator op in Operators.OfType<IOneBitflipMoveOperator>()) {
+        op.OneBitflipMoveParameter.ActualName = name;
+      }
+    }
     #endregion
 
@@ -225 +231 @@
         ParameterizeOperators();
       }
+
+      InitializeMoveGenerators();
+    }
+    private void InitializeMoveGenerators() {
+      foreach (IOneBitflipMoveOperator op in Operators.OfType<IOneBitflipMoveOperator>()) {
+        if (op is IMoveGenerator) {
+          op.OneBitflipMoveParameter.ActualNameChanged += new EventHandler(OneBitflipMoveParameter_ActualNameChanged);
+        }
+      }
     }
     private void ParameterizeOperators() {
@@ -234 +249 @@
         op.BinaryVectorParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName;
       }
+      foreach (IBinaryVectorMoveOperator op in Operators.OfType<IBinaryVectorMoveOperator>()) {
+        op.BinaryVectorParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName;
+      }
     }
     #endregion