Changeset 4856 for trunk

Timestamp:

11/19/10 15:27:10 (14 years ago)

Author:

svonolfe

Message:

Implemented review changes (#1236)

Location:

trunk/sources

Files:

• HeuristicLab.Problems.VehicleRouting.Views/3.3/HeuristicLab.Problems.VehicleRouting.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting.Views/3.3/VRPEncodingView.Designer.cs (added)
• HeuristicLab.Problems.VehicleRouting.Views/3.3/VRPEncodingView.cs (added)
• HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/TourEncoding.cs (modified) (3 diffs)
• HeuristicLab.Problems.VehicleRouting/3.3/VehicleRoutingProblem.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.VehicleRouting.Views/3.3/HeuristicLab.Problems.VehicleRouting.Views-3.3.csproj

@@ -111 +111 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="VRPEncodingView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="VRPEncodingView.Designer.cs">
+      <DependentUpon>VRPEncodingView.cs</DependentUpon>
+    </Compile>
     <Compile Include="HeuristicLabProblemsVehicleRoutingViewsPlugin.cs" />
     <Compile Include="VRPImportDialog.cs">

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Encodings/General/TourEncoding.cs

@@ -26 +26 @@
 using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using System.Text;
 
 namespace HeuristicLab.Problems.VehicleRouting.Encodings.General {
@@ -67 +68 @@
     public TourEncoding() {
       Tours = new ItemList<Tour>();
+
+      Tours.ToStringChanged += new System.EventHandler(Tours_ToStringChanged);
+    }
+
+    void Tours_ToStringChanged(object sender, System.EventArgs e) {
+      this.OnToStringChanged();
     }
 
@@ -96 +103 @@
       }
     }
+
+    public override string ToString() {
+      StringBuilder sb = new StringBuilder();
+
+      foreach (Tour tour in Tours) {
+        foreach (int city in tour.Cities) {
+          sb.Append(city);
+          sb.Append(" ");
+        }
+
+        sb.AppendLine();
+      }
+
+      return sb.ToString(); 
+    }
   }
 }

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/VehicleRoutingProblem.cs

@@ -200 +200 @@
       : base(original, cloner) {
       operators = original.operators.Select(x => (IOperator)cloner.Clone(x)).ToList();
-      DistanceMatrixParameter.Value = DistanceMatrixParameter.Value;
       AttachEventHandlers();
     }