Changeset 13187 for stable

Timestamp:

11/16/15 21:22:48 (9 years ago)

Author:

abeham

Message:

#2446: merged r12812, r12836 to stable

Location:

stable

Files:

• HeuristicLab.Optimizer/3.3/Documents/VNS_OP.hl (modified) (previous)
• HeuristicLab.Tests/HeuristicLab-3.3/Samples/VnsOpSampleTest.cs (modified) (4 diffs)

stable/HeuristicLab.Tests/HeuristicLab-3.3/Samples/VnsOpSampleTest.cs

@@ -37 +37 @@
     [TestCategory("Samples.Create")]
     [TestProperty("Time", "medium")]
-    public void CreateVnsTspSampleTest() {
-      var vns = CreateVnsTspSample();
+    public void CreateVnsOpSampleTest() {
+      var vns = CreateVnsOpSample();
       string path = Path.Combine(SamplesUtils.SamplesDirectory, SampleFileName + SamplesUtils.SampleFileExtension);
       XmlGenerator.Serialize(vns, path);
@@ -45 +45 @@
     [TestCategory("Samples.Execute")]
     [TestProperty("Time", "long")]
-    public void RunVnsTspSampleTest() {
-      var vns = CreateVnsTspSample();
+    public void RunVnsOpSampleTest() {
+      var vns = CreateVnsOpSample();
       vns.SetSeedRandomly = false;
       SamplesUtils.RunAlgorithm(vns);
@@ -55 +55 @@
     }
 
-    private VariableNeighborhoodSearch CreateVnsTspSample() {
+    private VariableNeighborhoodSearch CreateVnsOpSample() {
       VariableNeighborhoodSearch vns = new VariableNeighborhoodSearch();
       #region Problem Configuration
@@ -75 +75 @@
 
       opProblem.Name = "1_p64_t070";
-      opProblem.Description = "Represents a symmetric Traveling Salesman Problem.";
+      opProblem.Description = "Represents an instance of an orienteering problem.";
       #endregion
       #region Algorithm Configuration
-      vns.Name = "Variable Neighborhood Search - TSP";
-      vns.Description = "A variable neighborhood search algorithm which solves a funny TSP instance";
+      vns.Name = "Variable Neighborhood Search - OP";
+      vns.Description = "A variable neighborhood search algorithm which solves an orienteering problem instance";
       vns.Problem = opProblem;