Changeset 12018 for branches/ALPS/HeuristicLab.Problems.Instances

Timestamp:

02/16/15 20:14:52 (10 years ago)

Author:

pfleck

Message:

#2269

• merged trunk after 3.3.11 release
• updated copyright and plugin version in ALPS plugin
• removed old ALPS samples based on an userdefined alg

Location:

branches/ALPS

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Instances (modified) (1 prop)
• HeuristicLab.Problems.Instances/3.3/IDataDescriptor.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances/3.3/IProblemInstanceConsumer.cs (modified) (1 diff)
• 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) (1 diff)
• 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) (1 diff)

branches/ALPS/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/ALPS/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.

branches/ALPS/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/ALPS/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/ALPS/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/ALPS/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/ALPS/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/ALPS/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/ALPS/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/ALPS/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/ALPS/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/ALPS/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/ALPS/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/ALPS/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/ALPS/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/ALPS/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/ALPS/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/ALPS/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.

branches/ALPS/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/ALPS/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/ALPS/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/ALPS/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.