Changeset 12395 for branches/HiveStatistics/sources/HeuristicLab.Problems.Instances/3.3

Timestamp:

05/20/15 16:41:14 (10 years ago)

Author:

dglaser

Message:

#2388 merged trunk into hive statistics branch

Location:

branches/HiveStatistics/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Instances (modified) (1 prop)
• HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj (modified) (7 diffs)
• HeuristicLab.Problems.Instances/3.3/IDataDescriptor.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances/3.3/IProblemInstanceConsumer.cs (modified) (2 diffs)
• HeuristicLab.Problems.Instances/3.3/IProblemInstanceExporter.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances/3.3/IProblemInstanceProvider.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances/3.3/Plugin.cs.frame (modified) (2 diffs)
• HeuristicLab.Problems.Instances/3.3/ProblemInstanceManager.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances/3.3/ProblemInstanceProvider.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
• HeuristicLab.Problems.Instances/3.3/Types/ATSPData.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances/3.3/Types/CTAPData.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances/3.3/Types/DistanceHelper.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances/3.3/Types/GQAPData.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances/3.3/Types/JSSPData.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances/3.3/Types/QAPData.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances/3.3/Types/TSPData.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances/3.3/Types/VRP/CVRPData.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances/3.3/Types/VRP/CVRPTWData.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances/3.3/Types/VRP/IVRPData.cs (modified) (2 diffs)
• HeuristicLab.Problems.Instances/3.3/Types/VRP/MDCVRPData.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances/3.3/Types/VRP/MDCVRPTWData.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances/3.3/Types/VRP/PDPTWData.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances/3.3/Types/VRP/VRPData.cs (modified) (3 diffs)

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj

@@ -11 +11 @@
     <RootNamespace>HeuristicLab.Problems.Instances</RootNamespace>
     <AssemblyName>HeuristicLab.Problems.Instances-3.3</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -22 +23 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -30 +32 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
@@ -53 +56 @@
     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
     <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
@@ -70 +74 @@
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
     <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
@@ -87 +92 @@
     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
     <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
@@ -103 +109 @@
     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances/3.3/IDataDescriptor.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances/3.3/IProblemInstanceConsumer.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -25 +25 @@
   public interface IProblemInstanceConsumer : IContent { }
 
-  public interface IProblemInstanceConsumer<TData> : IProblemInstanceConsumer {
+  public interface IProblemInstanceConsumer<in TData> : IProblemInstanceConsumer {
     /// <summary>
     /// Loads the given instance data.

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances/3.3/IProblemInstanceExporter.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances/3.3/IProblemInstanceProvider.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances/3.3/Plugin.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -23 +23 @@
 
 namespace HeuristicLab.Problems.Instances {
-  [Plugin("HeuristicLab.Problems.Instances", "3.3.10.$WCREV$")]
+  [Plugin("HeuristicLab.Problems.Instances", "3.3.11.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.Instances-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Common", "3.3")]

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances/3.3/ProblemInstanceManager.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances/3.3/ProblemInstanceProvider.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances/3.3/Properties/AssemblyInfo.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -32 +32 @@
 [assembly: AssemblyCompany("HEAL")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2015 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -55 +55 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.10.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.11.$WCREV$")]

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances/3.3/Types/ATSPData.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances/3.3/Types/CTAPData.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances/3.3/Types/DistanceHelper.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances/3.3/Types/GQAPData.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances/3.3/Types/JSSPData.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances/3.3/Types/QAPData.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances/3.3/Types/TSPData.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances/3.3/Types/VRP/CVRPData.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances/3.3/Types/VRP/CVRPTWData.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances/3.3/Types/VRP/IVRPData.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -31 +31 @@
     double? BestKnownQuality { get; set; }
     int[][] BestKnownTour { get; set; }
+    int[] BestKnownTourVehicleAssignment { get; set; }
   }
 }

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances/3.3/Types/VRP/MDCVRPData.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances/3.3/Types/VRP/MDCVRPTWData.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances/3.3/Types/VRP/PDPTWData.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.Problems.Instances/3.3/Types/VRP/VRPData.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -25 +25 @@
   /// Describes instances of the Vehicle Routing Problem (VRP).
   /// </summary>
-  public abstract class VRPData: IVRPData {
+  public class VRPData : IVRPData {
     /// <summary>
     /// The name of the instance
@@ -78 +78 @@
     public int[][] BestKnownTour { get; set; }
     /// <summary>
+    /// Optional! Specifies the used vehicle for a given tour.
+    /// </summary>
+    public int[] BestKnownTourVehicleAssignment { get; set; }
+    /// <summary>
     /// Optional! The quality of the best-known solution.
     /// </summary>