Changeset 16749

Timestamp:

04/03/19 14:39:50 (5 years ago)

Author:

abeham

Message:

#2521: fixed RealVectorEncoding

Location:

branches/2521_ProblemRefactoring

Files:

• HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorSolutionsOperator.cs (modified) (1 diff)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/RealVectorSwarmUpdater.cs (modified) (2 diffs)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/SPSOSwarmUpdater.cs (modified) (2 diffs)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/RealVectorEncoding.cs (modified) (1 diff)
• HeuristicLab.Problems.Programmable/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/Analyzers/BestSingleObjectiveTestFunctionSolutionAnalyzer.cs (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorSolutionsOperator.cs

@@ -24 +24 @@
 namespace HeuristicLab.Encodings.RealVectorEncoding {
   public interface IRealVectorSolutionsOperator : IRealVectorOperator {
-    IScopeTreeLookupParameter<RealVector> RealVectorsParameter { get; }
+    IScopeTreeLookupParameter<RealVector> RealVectorParameter { get; }
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/RealVectorSwarmUpdater.cs

@@ -56 +56 @@
       get { return (IScopeTreeLookupParameter<DoubleValue>)Parameters["NeighborBestQuality"]; }
     }
-    public IScopeTreeLookupParameter<RealVector> RealVectorsParameter {
+    public IScopeTreeLookupParameter<RealVector> RealVectorParameter {
       get { return (IScopeTreeLookupParameter<RealVector>)Parameters["RealVectors"]; }
     }
@@ -134 +134 @@
     }
     private ItemArray<RealVector> RealVectors {
-      get { return RealVectorsParameter.ActualValue; }
+      get { return RealVectorParameter.ActualValue; }
     }
     private ItemArray<RealVector> PersonalBest {

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/ParticleOperators/SPSOSwarmUpdater.cs

@@ -55 +55 @@
       get { return (IScopeTreeLookupParameter<DoubleValue>)Parameters["NeighborBestQuality"]; }
     }
-    public IScopeTreeLookupParameter<RealVector> RealVectorsParameter {
-      get { return (IScopeTreeLookupParameter<RealVector>)Parameters["RealVectors"]; }
+    public IScopeTreeLookupParameter<RealVector> RealVectorParameter {
+      get { return (IScopeTreeLookupParameter<RealVector>)Parameters["RealVector"]; }
     }
     public IScopeTreeLookupParameter<RealVector> PersonalBestParameter {
@@ -169 +169 @@
       var max = MaximizationParameter.ActualValue.Value;
       // Update of the personal bests
-      var points = RealVectorsParameter.ActualValue;
+      var points = RealVectorParameter.ActualValue;
       var qualities = QualityParameter.ActualValue;
       var particles = points.Select((p, i) => new { Particle = p, Index = i })

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/RealVectorEncoding.cs

@@ -307 +307 @@
     private void ConfigureRealVectorSolutionsOperators(IEnumerable<IRealVectorSolutionsOperator> solutionsOperators) {
       foreach (var solutionsOperator in solutionsOperators)
-        solutionsOperator.RealVectorsParameter.ActualName = Name;
+        solutionsOperator.RealVectorParameter.ActualName = Name;
     }
     private void ConfigureRealVectorBoundedOperators(IEnumerable<IRealVectorBoundedOperator> boundedOperators) {

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/Plugin.cs.frame

@@ -36 +36 @@
   [PluginDependency("HeuristicLab.Encodings.PermutationEncoding", "3.3")]
   [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")]
-  [PluginDependency("HeuristicLab.Encodings.LinearLinkageEncoding", "3.3")]
+  [PluginDependency("HeuristicLab.Encodings.LinearLinkageEncoding", "3.4")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
   [PluginDependency("HeuristicLab.Parameters", "3.3")]

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Analyzers/BestSingleObjectiveTestFunctionSolutionAnalyzer.cs

@@ -44 +44 @@
       get { return (LookupParameter<BoolValue>)Parameters["Maximization"]; }
     }
-    public IScopeTreeLookupParameter<RealVector> RealVectorsParameter {
+    public IScopeTreeLookupParameter<RealVector> RealVectorParameter {
       get { return (IScopeTreeLookupParameter<RealVector>)Parameters["RealVectors"]; }
     }
@@ -85 +85 @@
 
       MaximizationParameter.Hidden = true;
-      RealVectorsParameter.Hidden = true;
+      RealVectorParameter.Hidden = true;
       QualityParameter.Hidden = true;
       BestSolutionParameter.Hidden = true;
@@ -100 +100 @@
 
     public override IOperation Apply() {
-      ItemArray<RealVector> realVectors = RealVectorsParameter.ActualValue;
+      ItemArray<RealVector> realVectors = RealVectorParameter.ActualValue;
       ItemArray<DoubleValue> qualities = QualityParameter.ActualValue;
       bool max = MaximizationParameter.ActualValue.Value;