Changeset 13202 for branches

Timestamp:

11/17/15 09:28:57 (9 years ago)

Author:

abeham

Message:

#2221: reverse engineered PTSPData and added simple instance provider based on TSPLIB

Location:

branches/PTSP

Files:

• HeuristicLab.Problems.PTSP.Views/3.3/HeuristicLab.Problems.PTSP.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.PTSP/3.3/HeuristicLab.Problems.PTSP-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Problems.PTSP/3.3/PTSP.cs (modified) (5 diffs)
• HeuristicLab.Problems.PTSP/3.3/PTSPData.cs (added)
• HeuristicLab.Problems.PTSP/3.3/PTSPLIBInstanceProvider.cs (added)

branches/PTSP/HeuristicLab.Problems.PTSP.Views/3.3/HeuristicLab.Problems.PTSP.Views-3.3.csproj

@@ -122 +122 @@
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <WCFMetadata Include="Service References\" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/PTSP/HeuristicLab.Problems.PTSP/3.3/HeuristicLab.Problems.PTSP-3.3.csproj

@@ -98 +98 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Problems.Instances.TSPLIB-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances.TSPLIB-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -105 +110 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -112 +118 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="PTSPData.cs" />
+    <Compile Include="PTSPLIBInstanceProvider.cs" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
     <None Include="Plugin.cs.frame" />

branches/PTSP/HeuristicLab.Problems.PTSP/3.3/PTSP.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using HeuristicLab.Common;
+using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Optimization;
-using HeuristicLab.PluginInfrastructure;
-using HeuristicLab.Core;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.Instances;
-using HeuristicLab.Encodings.PermutationEncoding;
-using HeuristicLab.Common;
-using HeuristicLab.Parameters;
-using HeuristicLab.Data;
-using HeuristicLab.Random;
 
 namespace HeuristicLab.Problems.PTSP {
@@ -59 +52 @@
       get { return (ValueParameter<DoubleArray>)Parameters["ProbabilityMatrix"]; }
     }
-    
+
 
     #endregion
@@ -84 +77 @@
       set { ProbabilityMatrixParameter.Value = value; }
     }
-    
+
     #endregion
-    
+
 
     public override bool Maximization {
@@ -112 +105 @@
       });
 
-      ProbabilityMatrix = new DoubleArray(new double[] {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1});
-      
+      ProbabilityMatrix = new DoubleArray(new double[] { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 });
+
     }
 
@@ -134 +127 @@
         BestKnownSolution = new Permutation(PermutationTypes.RelativeUndirected, data.BestKnownTour);
       }
-      
-      bool clearCoordinates = false, clearDistanceMatrix = false;
-      if (data.Coordinates != null && data.Coordinates.GetLength(0) > 0)
-        Coordinates = new DoubleMatrix(data.Coordinates);
-      else clearCoordinates = true;
 
-      // reset them after assigning the evaluator
-      if (clearCoordinates) Coordinates = null;
-      if (clearDistanceMatrix) DistanceMatrix = null;
+      Coordinates = data.Coordinates != null && data.Coordinates.GetLength(0) > 0 ? new DoubleMatrix(data.Coordinates) : null;
+      DistanceMatrix = new DistanceMatrix(data.GetDistanceMatrix());
 
-      DistanceMatrix = new DistanceMatrix(data.GetDistanceMatrix());
-      
       Encoding.Length = data.Dimension;