Changeset 18198 for branches

Timestamp:

01/14/22 15:11:36 (3 years ago)

Author:

mkommend

Message:

#3136: Fixed error in structur GP if only one numeric parameter is present in the template by providing a new copy crossover for real vectors.

Location:

branches/3136_Structural_GP

Files:

• HeuristicLab.Encodings.RealVectorEncoding/3.3/Crossovers/CopyCrossover.cs (added)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/Crossovers/MultiRealVectorCrossover.cs (modified) (3 diffs)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/StructuredSymbolicRegressionSingleObjectiveProblem.cs (modified) (3 diffs)

branches/3136_Structural_GP/HeuristicLab.Encodings.RealVectorEncoding/3.3/Crossovers/MultiRealVectorCrossover.cs

@@ -22 +22 @@
 using System;
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
@@ -29 +30 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 using HeuristicLab.PluginInfrastructure;
 
@@ -67 +67 @@
 
       foreach (Type type in ApplicationManager.Manager.GetTypes(typeof(IRealVectorCrossover))) {
-        if (!typeof(MultiOperator<IRealVectorCrossover>).IsAssignableFrom(type))
-          Operators.Add((IRealVectorCrossover)Activator.CreateInstance(type), true);
+        if (typeof(MultiOperator<IRealVectorCrossover>).IsAssignableFrom(type)) continue;
+        if (typeof(CopyCrossover).IsAssignableFrom(type)) continue;
+
+        Operators.Add((IRealVectorCrossover)Activator.CreateInstance(type), true);
       }
 

branches/3136_Structural_GP/HeuristicLab.Encodings.RealVectorEncoding/3.3/HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj

@@ -115 +115 @@
   <ItemGroup>
     <Compile Include="Creators\NormalDistributedRealVectorCreator.cs" />
+    <Compile Include="Crossovers\CopyCrossover.cs" />
     <Compile Include="Interfaces\IRealVectorMultiNeighborhoodShakingOperator.cs" />
     <Compile Include="ParticleOperators\RealVectorNeighborhoodParticleUpdater.cs" />

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/StructuredSymbolicRegressionSingleObjectiveProblem.cs

@@ -30 +30 @@
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Optimization;
+using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
 using HeuristicLab.Problems.Instances;
@@ -218 +219 @@
         encoding.SolutionCreator = creator;
 
+
         Encoding.Add(encoding);
       }
@@ -234 +236 @@
       }
 
-      //set single point crossover for numeric parameters
+      //set single point || copy crossover for numeric parameters
       var multiCrossover = (IParameterizedItem)Encoding.Operators.OfType<MultiEncodingCrossover>().First();
       foreach (var param in multiCrossover.Parameters.OfType<ConstrainedValueParameter<ICrossover>>()) {
-        var singlePointCrossover = param.ValidValues.OfType<SinglePointCrossover>().FirstOrDefault();
-        param.Value = singlePointCrossover ?? param.ValidValues.First();
+        if (!param.Name.Contains(NumericParametersEncoding)) continue;
+
+        var singlePointCrossover = param.ValidValues.OfType<SinglePointCrossover>().First();
+        var copyCrossover = param.ValidValues.OfType<CopyCrossover>().First();
+
+        var realvectorEncoding = (RealVectorEncoding)Encoding.Encodings.Where(e => e.Name == NumericParametersEncoding).First();
+        if (realvectorEncoding.Length == 1) { //single-point crossover throws if encoding length == 1
+          param.Value = copyCrossover;
+        } else
+          param.Value = singlePointCrossover;
       }