Changeset 18186 for branches/3040_VectorBasedGP

Timestamp:

01/12/22 14:49:45 (3 years ago)

Author:

pfleck

Message:

#3040 Added first version of SegmentOptimization Mutators.

Location:

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (3 diffs)
• Mutators/SegmentOptimization (added)
• Mutators/SegmentOptimization/SamplingSegmentOptimizationManipulator.cs (added)
• Mutators/SegmentOptimization/SegmentOptimizationMutator.cs (added)
• SegmentOptimization/SegmentOptimizationProblem.cs (modified) (3 diffs)

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

@@ -176 +176 @@
     <Compile Include="Mutators\MultiSymbolicDataAnalysisExpressionManipulator.cs" />
     <Compile Include="Interfaces\ISymbolicDataAnalysisExpressionManipulator.cs" />
+    <Compile Include="Mutators\SegmentOptimization\SamplingSegmentOptimizationManipulator.cs" />
     <Compile Include="Mutators\SymbolicDataAnalysisExpressionManipulator.cs" />
     <Compile Include="Crossovers\SymbolicDataAnalysisExpressionDiversityPreservingCrossover.cs" />
@@ -205 +206 @@
     <Compile Include="Interpreter\SymbolicDataAnalysisExpressionTreeNativeInterpreter.cs" />
     <Compile Include="Mutators\SubVectorImprovementManipulator.cs" />
+    <Compile Include="Mutators\SegmentOptimization\SegmentOptimizationMutator.cs" />
     <Compile Include="SegmentOptimization\SegmentOptimizationProblem.cs" />
     <Compile Include="Selectors\DiversitySelector.cs" />
@@ -463 +465 @@
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <PackageReference Include="OneOf">
+      <Version>3.0.205</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SegmentOptimization/SegmentOptimizationProblem.cs

@@ -29 +29 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
+using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Problems.Instances;
 using HeuristicLab.Problems.Instances.Types;
@@ -81 +82 @@
       });
       #endregion
+
+      var optMutators = ApplicationManager.Manager.GetInstances<SegmentOptimizationMutator>();
+      Encoding.ConfigureOperators(optMutators);
+      Operators.AddRange(optMutators);
     }
     private SegmentOptimizationProblem(SegmentOptimizationProblem original, Cloner cloner)
@@ -126 +131 @@
       var knownBounds = KnownBoundsParameter.Value;
       var aggregation = aggregationParameter.Value.Value;
-
       var solution = individual.IntegerVector(Encoding.Name);
+      return Evaluate(solution, data, knownBounds, aggregation);
+    }
+
+    public static double Evaluate(IntegerVector solution, DoubleMatrix data, IntRange knownBounds, Aggregation aggregation) {
       var bounds = new IntRange(solution.Min(), solution.Max());
-
       double target = BoundedAggregation(data, knownBounds, aggregation);
       double prediction = BoundedAggregation(data, bounds, aggregation);
-
       return Math.Pow(target - prediction, 2);
     }