Changeset 13861

Timestamp:

05/30/16 00:03:14 (9 years ago)

Author:

abeham

Message:

#2457: added directed walk for qap

Location:

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3

Files:

• HeuristicLab.OptimizationExpertSystem.Common-3.3.csproj (modified) (3 diffs)
• ProblemCharacteristicAnalysis/QAP/QAPBestDirectedWalk.cs (added)
• Recommenders/DistanceWeightedRecommender.cs (modified) (1 diff)

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3/HeuristicLab.OptimizationExpertSystem.Common-3.3.csproj

@@ -114 +114 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -159 +164 @@
   <ItemGroup>
     <Compile Include="Interfaces\IRecommendationModel.cs" />
+    <Compile Include="ProblemCharacteristicAnalysis\QAP\QAPBestDirectedWalk.cs" />
     <Compile Include="Recommenders\KNearestNeighborModel.cs" />
     <Compile Include="Recommenders\OverallBestRecommender.cs" />
@@ -183 +189 @@
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
+      <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
+      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
       <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3/Recommenders/DistanceWeightedRecommender.cs

@@ -57 +57 @@
     }
 
-    public IRecommendationModel TrainModel(KnowledgeCenter okc, string[] characteristics) {
+    public IRecommendationModel TrainModel(IRun[] problemInstances, KnowledgeCenter okc, string[] characteristics) {
       var piDistances = okc.GetProblemDistances(characteristics);
       var maxDist = piDistances.Max(x => x.Value);