Changeset 8086 for branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.VehicleRouting.Views/3.4

Timestamp:

06/22/12 11:11:38 (12 years ago)

Author:

jkarder

Message:

#1331:

• synced branch with trunk
• added custom interface (ISimilarityBasedOperator) to mark operators that conduct similarity calculation
• similarity calculators are now parameterized by the algorithm
• deleted SolutionPool2TierUpdateMethod
• deleted KnapsackMultipleGuidesPathRelinker
• moved IImprovementOperator, IPathRelinker and ISimilarityCalculator to HeuristicLab.Optimization
• added parameter descriptions
• fixed plugin references
• fixed count of EvaluatedSolutions
• fixed check for duplicate solutions
• minor code improvements

Location:

branches/ScatterSearch (trunk integration)

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.VehicleRouting.Views (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting.Views/3.4 (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/CVRPPDTWView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/CVRPPDTWView.Designer.cs)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/CVRPPDTWView.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/CVRPPDTWView.cs)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/CVRPTWView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/CVRPTWView.Designer.cs)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/CVRPTWView.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/CVRPTWView.cs)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/HeuristicLab.Problems.VehicleRouting.Views-3.4.csproj (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/HeuristicLab.Problems.VehicleRouting.Views-3.4.csproj)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/HeuristicLab.snk (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/HeuristicLab.snk)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/MDCVRPPDTWView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/MDCVRPPDTWView.Designer.cs)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/MDCVRPPDTWView.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/MDCVRPPDTWView.cs)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/MDCVRPTWView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/MDCVRPTWView.Designer.cs)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/MDCVRPTWView.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/MDCVRPTWView.cs)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/MultiDepotVRPView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/MultiDepotVRPView.Designer.cs)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/MultiDepotVRPView.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/MultiDepotVRPView.cs)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/Plugin.cs.frame (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/Plugin.cs.frame) (1 diff)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/Properties (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/Properties)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/Properties/AssemblyInfo.cs.frame (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/Properties/AssemblyInfo.cs.frame) (2 diffs)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/SingleDepotVRPView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/SingleDepotVRPView.Designer.cs)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/SingleDepotVRPView.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/SingleDepotVRPView.cs)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPImportDialog.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPImportDialog.Designer.cs) (1 diff)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPImportDialog.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPImportDialog.cs) (3 diffs)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPProblemInstanceView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPProblemInstanceView.Designer.cs)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPProblemInstanceView.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPProblemInstanceView.cs) (3 diffs)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPSolutionView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPSolutionView.Designer.cs)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPSolutionView.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPSolutionView.cs) (2 diffs)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/VehicleRoutingProblemView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/VehicleRoutingProblemView.Designer.cs)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/VehicleRoutingProblemView.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.4/VehicleRoutingProblemView.cs)

branches/ScatterSearch (trunk integration)

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.VehicleRouting.Views/3.4/Plugin.cs.frame

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

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.VehicleRouting.Views/3.4/Properties/AssemblyInfo.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -31 +31 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2010 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPImportDialog.Designer.cs

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

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPImportDialog.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -22 +22 @@
 using System;
 using System.ComponentModel;
-using System.Text;
 using System.Windows.Forms;
-using HeuristicLab.Data;
 
 namespace HeuristicLab.Problems.VehicleRouting.Views {
@@ -79 +77 @@
       if (MessageBox.Show("Do you want to open the HeuristicLab wiki website?", "Help",
         MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1) == System.Windows.Forms.DialogResult.Yes) {
-          System.Diagnostics.Process.Start("http://dev.heuristiclab.com/trac/hl/core/wiki/Vehicle%20Routing%20Problem");
+        System.Diagnostics.Process.Start("http://dev.heuristiclab.com/trac/hl/core/wiki/Vehicle%20Routing%20Problem");
       }
     }

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPProblemInstanceView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 using HeuristicLab.Core.Views;
@@ -100 +97 @@
             break;
         }
-        
+
         i++;
         if (i == 6) {
           i = 0;
 
-          if(r >= step)
+          if (r >= step)
             r -= step;
 
-          if(g >= step)
-           g -= step;
+          if (g >= step)
+            g -= step;
 
-          if(b >= step)
-           b -= step;
-        }       
+          if (b >= step)
+            b -= step;
+        }
       }
 

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPSolutionView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
 using HeuristicLab.MainForm;
-using HeuristicLab.Parameters;
 
 namespace HeuristicLab.Problems.VehicleRouting.Views {
   [View("VRPSolution View")]
-  [Content(typeof(VRPSolution), true)] 
-  public partial class VRPSolutionView: HeuristicLab.Core.Views.ItemView {
+  [Content(typeof(VRPSolution), true)]
+  public partial class VRPSolutionView : HeuristicLab.Core.Views.ItemView {
     public new VRPSolution Content {
       get { return (VRPSolution)base.Content; }
       set { base.Content = value; }
-    } 
-    
+    }
+
     public VRPSolutionView() {
       InitializeComponent();

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests