Changeset 3719 for trunk/sources/HeuristicLab.Problems.TestFunctions/3.3

Timestamp:

05/08/10 16:33:50 (14 years ago)

Author:

mkofler

Message:

Worked on #852 (PSO)

Location:

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3

Files:

• HeuristicLab.Problems.TestFunctions-3.3.csproj (modified) (2 diffs)
• Interfaces/IRealVectorPSODecoder.cs (added)
• SingleObjectiveTestFunctionProblem.cs (modified) (3 diffs)

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

@@ -101 +101 @@
     <Compile Include="Evaluators\ZakharovEvaluator.cs" />
     <Compile Include="HeuristicLabProblemsTestFunctionsPlugin.cs" />
+    <Compile Include="Interfaces\IRealVectorPSODecoder.cs" />
     <Compile Include="Interfaces\IBestSingleObjectiveTestFunctionSolutionAnalyzer.cs" />
     <Compile Include="Interfaces\IRastriginMoveEvaluator.cs" />
@@ -123 +124 @@
     <Compile Include="MoveEvaluators\AdditiveMoveEvaluator.cs" />
     <Compile Include="MoveEvaluators\RealVectorAdditiveMoveWrapper.cs" />
+    <Compile Include="RealVectorToRealVectorDecoder.cs" />
+    <Compile Include="RealVectorToRealVectorEncoder.cs" />
     <Compile Include="SingleObjectiveTestFunctionSolution.cs" />
     <Compile Include="SingleObjectiveTestFunctionProblem.cs" />

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs

@@ -221 +221 @@
       if (Bounds.Columns != 2 || Bounds.Rows < 1)
         Bounds = new DoubleMatrix(1, 2);
+      ParameterizeOperators(); 
     }
     private void Bounds_ItemChanged(object sender, EventArgs<int, int> e) {
@@ -227 +228 @@
       if (e.Value2 == 1 && Bounds[e.Value, 0] >= Bounds[e.Value, 1])
         Bounds[e.Value, 0] = Bounds[e.Value, 1] - 0.1;
+      ParameterizeOperators(); 
     }
     private void MoveGenerator_AdditiveMoveParameter_ActualNameChanged(object sender, EventArgs e) {
@@ -355 +357 @@
       }
       foreach (IRealVectorPSOEncoder op in Operators.OfType<IRealVectorPSOEncoder>()) {
-        ((ILookupParameter)op.OriginalRealVectorParameter).ActualName = SolutionCreator.RealVectorParameter.ActualName; 
+        ((ILookupParameter)op.OriginalRealVectorParameter).ActualName = SolutionCreator.RealVectorParameter.ActualName;
+        op.BoundsParameter.Value = (DoubleMatrix)BoundsParameter.Value.Clone();
+        op.BoundsParameter.ActualName = "ParticleBounds"; 
       }
     }