- Timestamp:
- 12/21/15 21:07:12 (9 years ago)
- Location:
- stable
- Files:
-
- 13 edited
- 9 copied
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 13484
- Property svn:mergeinfo changed
-
stable/HeuristicLab 3.3.sln
r13294 r13486 2 2 Microsoft Visual Studio Solution File, Format Version 12.00 3 3 # Visual Studio 2013 4 VisualStudioVersion = 12.0. 31101.04 VisualStudioVersion = 12.0.40629.0 5 5 MinimumVisualStudioVersion = 10.0.40219.1 6 6 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{96396439-A764-4022-A8D2-BE021449B8D1}" … … 24 24 {25087811-F74C-4128-BC86-8324271DA13E} = {25087811-F74C-4128-BC86-8324271DA13E} 25 25 {5AC82412-911B-4FA2-A013-EDC5E3F3FCC2} = {5AC82412-911B-4FA2-A013-EDC5E3F3FCC2} 26 {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B} = {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B} 26 27 {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2} = {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2} 27 28 {E2419315-B10A-4BC1-B517-A24DCF4C59AC} = {E2419315-B10A-4BC1-B517-A24DCF4C59AC} … … 74 75 {E10F395F-C8A6-48AD-B470-9AA7A1F43809} = {E10F395F-C8A6-48AD-B470-9AA7A1F43809} 75 76 {0C378762-D5DB-488A-8931-2BA42B1B7CBF} = {0C378762-D5DB-488A-8931-2BA42B1B7CBF} 77 {97198965-AFEA-496B-B3B1-316905C43FD6} = {97198965-AFEA-496B-B3B1-316905C43FD6} 76 78 {3B90F866-70F8-43EF-A541-51819D255B7B} = {3B90F866-70F8-43EF-A541-51819D255B7B} 77 79 {07486E68-1517-4B9D-A58D-A38E99AE71AB} = {07486E68-1517-4B9D-A58D-A38E99AE71AB} … … 446 448 EndProject 447 449 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.ALPS-3.3", "HeuristicLab.Algorithms.ALPS\3.3\HeuristicLab.Algorithms.ALPS-3.3.csproj", "{59F354CB-FE13-4253-AED2-AD86372BEC27}" 450 EndProject 451 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.PTSP-3.3", "HeuristicLab.Problems.PTSP\3.3\HeuristicLab.Problems.PTSP-3.3.csproj", "{97198965-AFEA-496B-B3B1-316905C43FD6}" 452 EndProject 453 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.PTSP.Views-3.3", "HeuristicLab.Problems.PTSP.Views\3.3\HeuristicLab.Problems.PTSP.Views-3.3.csproj", "{90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}" 448 454 EndProject 449 455 Global … … 2173 2179 {59F354CB-FE13-4253-AED2-AD86372BEC27}.Release|x86.ActiveCfg = Release|x86 2174 2180 {59F354CB-FE13-4253-AED2-AD86372BEC27}.Release|x86.Build.0 = Release|x86 2181 {97198965-AFEA-496B-B3B1-316905C43FD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 2182 {97198965-AFEA-496B-B3B1-316905C43FD6}.Debug|Any CPU.Build.0 = Debug|Any CPU 2183 {97198965-AFEA-496B-B3B1-316905C43FD6}.Debug|x64.ActiveCfg = Debug|x64 2184 {97198965-AFEA-496B-B3B1-316905C43FD6}.Debug|x64.Build.0 = Debug|x64 2185 {97198965-AFEA-496B-B3B1-316905C43FD6}.Debug|x86.ActiveCfg = Debug|x86 2186 {97198965-AFEA-496B-B3B1-316905C43FD6}.Debug|x86.Build.0 = Debug|x86 2187 {97198965-AFEA-496B-B3B1-316905C43FD6}.Release|Any CPU.ActiveCfg = Release|Any CPU 2188 {97198965-AFEA-496B-B3B1-316905C43FD6}.Release|Any CPU.Build.0 = Release|Any CPU 2189 {97198965-AFEA-496B-B3B1-316905C43FD6}.Release|x64.ActiveCfg = Release|x64 2190 {97198965-AFEA-496B-B3B1-316905C43FD6}.Release|x64.Build.0 = Release|x64 2191 {97198965-AFEA-496B-B3B1-316905C43FD6}.Release|x86.ActiveCfg = Release|x86 2192 {97198965-AFEA-496B-B3B1-316905C43FD6}.Release|x86.Build.0 = Release|x86 2193 {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 2194 {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Debug|Any CPU.Build.0 = Debug|Any CPU 2195 {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Debug|x64.ActiveCfg = Debug|x64 2196 {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Debug|x64.Build.0 = Debug|x64 2197 {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Debug|x86.ActiveCfg = Debug|x86 2198 {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Debug|x86.Build.0 = Debug|x86 2199 {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Release|Any CPU.ActiveCfg = Release|Any CPU 2200 {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Release|Any CPU.Build.0 = Release|Any CPU 2201 {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Release|x64.ActiveCfg = Release|x64 2202 {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Release|x64.Build.0 = Release|x64 2203 {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Release|x86.ActiveCfg = Release|x86 2204 {90B6CA12-9791-4430-B2D7-CD3ED7F75E2B}.Release|x86.Build.0 = Release|x86 2175 2205 EndGlobalSection 2176 2206 GlobalSection(SolutionProperties) = preSolution -
stable/HeuristicLab.Problems.Instances
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.Instances merged: 13484
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.Instances.TSPLIB/3.3/HeuristicLab.Problems.Instances.TSPLIB-3.3.csproj
r11932 r13486 115 115 </ItemGroup> 116 116 <ItemGroup> 117 <Compile Include="TSPLIBHeterogeneousPTSPDataDescriptor.cs" /> 118 <Compile Include="TSPLIBHomogeneousPTSPDataDescriptor.cs" /> 119 <Compile Include="TSPLIBHeterogeneousPTSPInstanceProvider.cs" /> 120 <Compile Include="TSPLIBPTSPInstanceProvider.cs" /> 117 121 <Compile Include="TSPLIBInstanceProvider.cs" /> 118 122 <Compile Include="TSPLIBATSPInstanceProvider.cs" /> 119 123 <Compile Include="TSPLIBCVRPInstanceProvider.cs" /> 120 124 <Compile Include="TSPLIBDataDescriptor.cs" /> 125 <Compile Include="TSPLIBHomogeneousPTSPInstanceProvider.cs" /> 121 126 <Compile Include="TSPLIBTSPInstanceProvider.cs" /> 122 127 <Compile Include="TSPLIBParser.cs" /> … … 150 155 </ProjectReference> 151 156 </ItemGroup> 152 <ItemGroup />153 157 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 154 158 <PropertyGroup> -
stable/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBATSPInstanceProvider.cs
r12009 r13486 36 36 protected override string FileExtension { get { return "atsp"; } } 37 37 38 protected override ATSPData LoadInstance(TSPLIBParser parser ) {38 protected override ATSPData LoadInstance(TSPLIBParser parser, IDataDescriptor descriptor = null) { 39 39 var instance = new ATSPData(); 40 40 -
stable/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBCVRPInstanceProvider.cs
r12009 r13486 36 36 protected override string FileExtension { get { return "vrp"; } } 37 37 38 protected override CVRPData LoadInstance(TSPLIBParser parser ) {38 protected override CVRPData LoadInstance(TSPLIBParser parser, IDataDescriptor descriptor = null) { 39 39 parser.Parse(); 40 40 var instance = new CVRPData(); -
stable/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBInstanceProvider.cs
r12009 r13486 45 45 protected abstract string FileExtension { get; } 46 46 47 protected abstract T LoadInstance(TSPLIBParser parser );47 protected abstract T LoadInstance(TSPLIBParser parser, IDataDescriptor descriptor = null); 48 48 protected abstract void LoadSolution(TSPLIBParser parser, T instance); 49 49 … … 74 74 var stream = entry.Open(); 75 75 var parser = new TSPLIBParser(stream); 76 var instance = LoadInstance(parser );76 var instance = LoadInstance(parser, id); 77 77 78 78 if (!String.IsNullOrEmpty(descriptor.SolutionIdentifier)) { -
stable/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBTSPInstanceProvider.cs
r12009 r13486 37 37 protected override string FileExtension { get { return "tsp"; } } 38 38 39 protected override TSPData LoadInstance(TSPLIBParser parser ) {39 protected override TSPData LoadInstance(TSPLIBParser parser, IDataDescriptor descriptor = null) { 40 40 parser.Parse(); 41 41 if (parser.FixedEdges != null) throw new InvalidDataException("TSP instance " + parser.Name + " contains fixed edges which are not supported by HeuristicLab."); -
stable/HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj
r12742 r13486 121 121 <Compile Include="ProblemInstanceManager.cs" /> 122 122 <Compile Include="IProblemInstanceExporter.cs" /> 123 <Compile Include="Types\PTSPData.cs" /> 123 124 <Compile Include="Types\ATSPData.cs" /> 124 125 <Compile Include="Types\JSSPData.cs" /> -
stable/HeuristicLab.Problems.Instances/3.3/Types/DistanceHelper.cs
r12009 r13486 21 21 22 22 using System; 23 using System.Collections.Generic;24 using System.Linq;25 using System.Text;26 23 27 24 namespace HeuristicLab.Problems.Instances { 28 25 public enum DistanceMeasure { Direct, Euclidean, RoundedEuclidean, UpperEuclidean, Geo, Manhattan, Maximum, Att }; 29 26 30 27 public static class DistanceHelper { 31 28 /// <summary> … … 35 32 public static double[,] GetDistanceMatrix(DistanceMeasure distanceMeasure, double[,] coordinates, double[,] distances, int dimension) { 36 33 if (distances != null) return distances; 37 34 38 35 distances = new double[dimension, dimension]; 39 36 for (int i = 0; i < dimension - 1; i++) … … 44 41 45 42 return distances; 43 } 44 45 public static double GetDistance(DistanceMeasure distanceMeasure, double x1, double y1, double x2, double y2) { 46 switch (distanceMeasure) { 47 case DistanceMeasure.Att: 48 return AttDistance(x1, y1, x2, y2); 49 case DistanceMeasure.Direct: 50 throw new ArgumentException("Direct distance measure requires distance matrix for distance calculation."); 51 case DistanceMeasure.Euclidean: 52 return EuclideanDistance(x1, y1, x2, y2); 53 case DistanceMeasure.Geo: 54 return GeoDistance(x1, y1, x2, y2); 55 case DistanceMeasure.Manhattan: 56 return ManhattanDistance(x1, y1, x2, y2); 57 case DistanceMeasure.Maximum: 58 return MaximumDistance(x1, y1, x2, y2); 59 case DistanceMeasure.RoundedEuclidean: 60 return Math.Round(EuclideanDistance(x1, y1, x2, y2)); 61 case DistanceMeasure.UpperEuclidean: 62 return Math.Ceiling(EuclideanDistance(x1, y1, x2, y2)); 63 default: 64 throw new InvalidOperationException("Distance measure is not known."); 65 } 46 66 } 47 67 -
stable/HeuristicLab.Tests
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Tests merged: 13484
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Tests/HeuristicLab-3.3/DeepCloneableCloningTest.cs
r12742 r13486 46 46 typeof (HeuristicLab.Problems.DataAnalysis.ClassificationEnsembleSolution), 47 47 typeof (HeuristicLab.Problems.DataAnalysis.RegressionEnsembleSolution), 48 typeof (HeuristicLab.Problems.Orienteering.DistanceMatrix) 48 typeof (HeuristicLab.Problems.Orienteering.DistanceMatrix), 49 typeof (HeuristicLab.Problems.PTSP.DistanceMatrix) 49 50 }; 50 51 excludedTypes.Add(typeof(SymbolicExpressionGrammar).Assembly.GetType("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.EmptySymbolicExpressionTreeGrammar")); -
stable/HeuristicLab.Tests/HeuristicLab.Tests.csproj
r13312 r13486 201 201 <SpecificVersion>False</SpecificVersion> 202 202 <HintPath>..\bin\HeuristicLab.Encodings.LinearLinkageEncoding-3.3.dll</HintPath> 203 <Private>False</Private> 203 204 </Reference> 204 205 <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3"> … … 367 368 <Reference Include="HeuristicLab.Problems.Orienteering-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 368 369 <HintPath>..\bin\HeuristicLab.Problems.Orienteering-3.3.dll</HintPath> 370 <Private>False</Private> 371 </Reference> 372 <Reference Include="HeuristicLab.Problems.PTSP-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 373 <SpecificVersion>False</SpecificVersion> 374 <HintPath>..\bin\HeuristicLab.Problems.PTSP-3.3.dll</HintPath> 369 375 <Private>False</Private> 370 376 </Reference> … … 572 578 <Compile Include="HeuristicLab.Problems.Instances-3.3\TSPLIBInstanceProviderTest.cs" /> 573 579 <Compile Include="HeuristicLab.Problems.Instances.DataAnalysis-3.3\ClassificationInstanceProviderTest.cs" /> 580 <Compile Include="HeuristicLab.Problems.PTSP-3.3\PTSPMoveEvaluatorTest.cs" /> 574 581 <Compile Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPLIBInstancesTest.cs" /> 575 582 <Compile Include="HeuristicLab.Problems.QuadraticAssignment-3.3\QAPMoveEvaluatorTest.cs" />
Note: See TracChangeset
for help on using the changeset viewer.