Changeset 15490 for branches/GeneralizedQAP/HeuristicLab.Algorithms.GRASP/3.3

Timestamp:

12/04/17 23:00:03 (7 years ago)

Author:

abeham

Message:

#1614:

• branched optimization
• adapted references
• renamed plugin

Location:

branches/GeneralizedQAP

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.GRASP (moved) (moved from branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms)
• HeuristicLab.Algorithms.GRASP/3.3/GRASPWithPathRelinking.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.GRASP/3.3/GRASPWithPathRelinkingMainLoop.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.GRASP/3.3/HeuristicLab.Algorithms.GRASP-3.3.csproj (added)
• HeuristicLab.Algorithms.GRASP/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.3.3.csproj (deleted)
• HeuristicLab.Algorithms.GRASP/3.3/Plugin.cs.frame (modified) (3 diffs)
• HeuristicLab.Algorithms.GRASP/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)

branches/GeneralizedQAP

@@ -2 +2 @@
 TestResults
 *.user
+.vs

@@ -2 +2 @@
 TestResults
 *.user
+.vs

branches/GeneralizedQAP/HeuristicLab.Algorithms.GRASP/3.3/GRASPWithPathRelinking.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -34 +34 @@
 using HeuristicLab.Random;
 
-namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
+namespace HeuristicLab.Algorithms.GRASP {
   /// <summary>
   /// The algorithm combines the Greedy Randomized Adaptive Search Procedure (GRASP) with Path Relinking and is described in Mateus, G., Resende, M., and Silva, R. 2011. GRASP with path-relinking for the generalized quadratic assignment problem. Journal of Heuristics 17, Springer Netherlands, pp. 527-565.

branches/GeneralizedQAP/HeuristicLab.Algorithms.GRASP/3.3/GRASPWithPathRelinkingMainLoop.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -33 +33 @@
 using HeuristicLab.Selection;
 
-namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
+namespace HeuristicLab.Algorithms.GRASP {
   [Item("GRASP+PR MainLoop", "The main loop that implements the behavior of the GRASP+PR algorithm.")]
   [StorableClass]

branches/GeneralizedQAP/HeuristicLab.Algorithms.GRASP/3.3/Plugin.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -22 +22 @@
 using HeuristicLab.PluginInfrastructure;
 
-namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
-  [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms", "3.3.13.$WCREV$")]
-  [PluginFile("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms-3.3.dll", PluginFileType.Assembly)]
+namespace HeuristicLab.Algorithms.GRASP {
+  [Plugin("HeuristicLab.Algorithms.GRASP", "3.3.14.$WCREV$")]
+  [PluginFile("HeuristicLab.Algorithms.GRASP-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Analysis", "3.3")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
@@ -38 +38 @@
   [PluginDependency("HeuristicLab.Random", "3.3")]
   [PluginDependency("HeuristicLab.Selection", "3.3")]
-  public class HeuristicLabProblemsGeneralizedQuadraticAssignmentAlgorithmsPlugin : PluginBase {
+  public class HeuristicLabAlgorithmsGRASPPlugin : PluginBase {
   }
 }

branches/GeneralizedQAP/HeuristicLab.Algorithms.GRASP/3.3/Properties/AssemblyInfo.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -27 +27 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms")]
+[assembly: AssemblyTitle("HeuristicLab.Algorithms.GRASP")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("HEAL")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2017 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -55 +55 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.14.$WCREV$")]

@@ -2 +2 @@
 TestResults
 *.user
+.vs