Changeset 15045

Timestamp:

06/23/17 12:24:27 (8 years ago)

Author:

bwerth

Message:

#2592 improvements/changes as requested in review comment

Location:

branches/MOCMAEvolutionStrategy/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3

Files:

• CrowdingIndicator.cs (deleted)
• DoubleMatrixHelper.cs (added)
• HeuristicLab.Algorithms.MOCMAEvolutionStrategy-3.3.csproj (modified) (1 diff)
• HypervolumeIndicator.cs (deleted)
• IIndicator.cs (modified) (2 diffs)
• Indicators (added)
• Indicators/CrowdingIndicator.cs (added)
• Indicators/HypervolumeIndicator.cs (added)
• Indicators/MinimalDistanceIndicator.cs (added)
• Individual.cs (added)
• MOCMAEvolutionStrategy.cs (added)
• MOCMASEvolutionStrategy.cs (deleted)
• MinimalDistanceIndicator.cs (deleted)
• MocmaesIndividual.cs (deleted)
• MocmaesParameters.cs (deleted)
• Utilities.cs (deleted)

branches/MOCMAEvolutionStrategy/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/HeuristicLab.Algorithms.MOCMAEvolutionStrategy-3.3.csproj

@@ -106 +106 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="MinimalDistanceIndicator.cs" />
-    <Compile Include="CrowdingIndicator.cs" />
-    <Compile Include="HypervolumeIndicator.cs" />
+    <Compile Include="Indicators\MinimalDistanceIndicator.cs" />
+    <Compile Include="Indicators\CrowdingIndicator.cs" />
+    <Compile Include="Indicators\HypervolumeIndicator.cs" />
     <Compile Include="IIndicator.cs" />
-    <Compile Include="MocmaesIndividual.cs" />
-    <Compile Include="MocmaesParameters.cs" />
-    <Compile Include="MOCMASEvolutionStrategy.cs" />
+    <Compile Include="Individual.cs" />
+    <Compile Include="MOCMAEvolutionStrategy.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Utilities.cs" />
+    <Compile Include="DoubleMatrixHelper.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/MOCMAEvolutionStrategy/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/IIndicator.cs

@@ -19 +19 @@
  */
 #endregion
-using System;
 using System.Collections.Generic;
 using HeuristicLab.Core;
@@ -33 +32 @@
     /// <typeparam name="TR"></typeparam>
     /// <param name="front">a front which will be evaluated</param>
-    /// <param name="extractor">some mapping function to map any R to double[]</param>
     /// <param name="problem">The problem on which the front is evaluated (!! The function itself will NOT be evluated only bounds referencePoints & other metadate will be used</param>
     /// <returns>the index of the least contributing point according to any type of quality criteria</returns>
-    int LeastContributer<TR>(IEnumerable<TR> front, Func<TR, double[]> extractor, MultiObjectiveBasicProblem<RealVectorEncoding> problem);
+    int LeastContributer(IReadOnlyList<Individual> front, MultiObjectiveBasicProblem<RealVectorEncoding> problem);
   }
 }