Changeset 7255 for branches/RegressionBenchmarks/HeuristicLab.Problems.VehicleRouting

Timestamp:

01/02/12 11:40:31 (13 years ago)

Author:

sforsten

Message:

#1708: merged r7209 from trunk

• adjusted GUI
• added toggle for the different series
• X Axis labels are rounded to useful values
• added ToolTip

Location:

branches/RegressionBenchmarks

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting/3.3/Analyzers/BestAverageWorstVRPToursAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting/3.3/Analyzers/BestVRPSolutionAnalyzer.cs (modified) (2 diffs)
• HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/TourEncoding.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting/3.3/VRPSolution.cs (modified) (1 diff)

branches/RegressionBenchmarks/HeuristicLab.Problems.VehicleRouting/3.3/Analyzers/BestAverageWorstVRPToursAnalyzer.cs

@@ -140 +140 @@
 
     #region Properties
+    public bool EnabledByDefault {
+      get { return true; }
+    }
     private BestVRPToursMemorizer BestMemorizer {
       get { return (BestVRPToursMemorizer)OperatorGraph.InitialOperator; }

branches/RegressionBenchmarks/HeuristicLab.Problems.VehicleRouting/3.3/Analyzers/BestVRPSolutionAnalyzer.cs

@@ -36 +36 @@
   [StorableClass]
   public sealed class BestVRPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer {
+    public bool EnabledByDefault {
+      get { return true; }
+    }
+
     public ScopeTreeLookupParameter<IVRPEncoding> VRPToursParameter {
       get { return (ScopeTreeLookupParameter<IVRPEncoding>)Parameters["VRPTours"]; }
@@ -95 +99 @@
     public BestVRPSolutionAnalyzer()
       : base() {
-        Parameters.Add(new ScopeTreeLookupParameter<IVRPEncoding>("VRPTours", "The VRP tours which should be evaluated."));
+      Parameters.Add(new ScopeTreeLookupParameter<IVRPEncoding>("VRPTours", "The VRP tours which should be evaluated."));
       Parameters.Add(new LookupParameter<DoubleMatrix>("Coordinates", "The x- and y-Coordinates of the cities."));
       Parameters.Add(new LookupParameter<DoubleMatrix>("DistanceMatrix", "The matrix which contains the distances between the cities."));

branches/RegressionBenchmarks/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/TourEncoding.cs

@@ -32 +32 @@
   [StorableClass]
   public abstract class TourEncoding : Item, IVRPEncoding {
-    public override Image ItemImage {
+    public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
     }

branches/RegressionBenchmarks/HeuristicLab.Problems.VehicleRouting/3.3/VRPSolution.cs

@@ -34 +34 @@
   [StorableClass]
   public sealed class VRPSolution : Item {
-    public override Image ItemImage {
+    public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Image; }
     }