Changeset 8007

Timestamp:

06/14/12 10:52:35 (13 years ago)

Author:

svonolfe

Message:

Merged changes from trunk into branch (#1177)

Location:

branches/VRP

Files:

• HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4 (modified) (1 prop)
• HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/VRPImportDialog.Designer.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/VRPInstanceProviderView.designer.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4 (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting.Views/3.4 (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPImportDialog.Designer.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting.Views/3.4/VehicleRoutingProblemView.Designer.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting/3.4 (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting/3.4/Interfaces/IVRPProblemInstance.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs (modified) (10 diffs)

branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/VRPImportDialog.Designer.cs

@@ -169 +169 @@
       this.AcceptButton = this.okButton;
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.CancelButton = this.cancelButton;
       this.ClientSize = new System.Drawing.Size(586, 104);

branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting.Views/3.4/VRPInstanceProviderView.designer.cs

@@ -25 +25 @@
     private void InitializeComponent() {
       components = new System.ComponentModel.Container();
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
     }
 

branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPImportDialog.Designer.cs

@@ -173 +173 @@
       this.AcceptButton = this.okButton;
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.CancelButton = this.cancelButton;
       this.ClientSize = new System.Drawing.Size(586, 104);

branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/VehicleRoutingProblemView.Designer.cs

@@ -25 +25 @@
     private void InitializeComponent() {
       components = new System.ComponentModel.Container();
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
     }
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Interfaces/IVRPProblemInstance.cs

@@ -31 +31 @@
 namespace HeuristicLab.Problems.VehicleRouting.Interfaces {
   public interface IVRPProblemInstance: IItem {
-    IVRPEvaluator SolutionEvaluator { get; }
+    IVRPEvaluator SolutionEvaluator { get; set; }
     IVRPEvaluator MoveEvaluator { get; }
     IEnumerable<IOperator> Operators { get; }

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs

@@ -174 +174 @@
         return evaluator;
       }
+
+      set {
+        moveEvaluator = null;
+        evaluator = value;
+        EvalBestKnownSolution();
+      }
     }
 

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

@@ -41 +41 @@
   [Creatable("Problems")]
   [StorableClass]
-  public sealed class VehicleRoutingProblem : ParameterizedNamedItem, ISingleObjectiveHeuristicOptimizationProblem, IStorableContent, IProblemInstanceConsumer<IVRPData> {
+  public sealed class VehicleRoutingProblem : Problem, ISingleObjectiveHeuristicOptimizationProblem, IStorableContent, IProblemInstanceConsumer<IVRPData> {
     public string Filename { get; set; }
 
@@ -107 +107 @@
     public ISolutionCreator SolutionCreator {
       get { return SolutionCreatorParameter.Value; }
-    }
-
-    [Storable]
-    private List<IItem> operators;
-
-    public IEnumerable<IItem> Operators {
-      get { return operators; }
     }
     #endregion
@@ -131 +124 @@
       EvaluatorParameter.Hidden = true;
 
-      operators = new List<IItem>();
-
       InitializeRandomVRPInstance();
       InitializeOperators();
@@ -147 +138 @@
     private VehicleRoutingProblem(VehicleRoutingProblem original, Cloner cloner)
       : base(original, cloner) {
-      this.operators = original.operators.Select(x => (IItem)cloner.Clone(x)).ToList();
       this.AttachEventHandlers();
     }
@@ -162 +152 @@
       if (handler != null) handler(this, EventArgs.Empty);
     }
-    public event EventHandler OperatorsChanged;
-    private void OnOperatorsChanged() {
-      EventHandler handler = OperatorsChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-    public event EventHandler Reset;
-    private void OnReset() {
-      EventHandler handler = Reset;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
     #endregion
 
@@ -181 +161 @@
     }
 
+    [Storable(Name = "operators", AllowOneWay = true)]
+    private List<IOperator> StorableOperators {
+      set { Operators.AddRange(value); }
+    }
+
     private void AttachEventHandlers() {
       ProblemInstanceParameter.ValueChanged += new EventHandler(ProblemInstanceParameter_ValueChanged);
       BestKnownSolutionParameter.ValueChanged += new EventHandler(BestKnownSolutionParameter_ValueChanged);
+      EvaluatorParameter.ValueChanged += new EventHandler(EvaluatorParameter_ValueChanged);
+      SolutionCreatorParameter.ValueChanged += new EventHandler(SolutionCreatorParameter_ValueChanged);
     }
 
@@ -193 +180 @@
         EvaluatorParameter.Value = ProblemInstance.SolutionEvaluator;
         IVRPCreator defaultCreator = null;
-        foreach (IVRPCreator creator in operators.Where(o => o is IVRPCreator)) {
+        foreach (IVRPCreator creator in Operators.Where(o => o is IVRPCreator)) {
           solutionCreatorParameter.ValidValues.Add(creator);
           if (creator is Encodings.Alba.RandomCreator)
@@ -220 +207 @@
 
     void ProblemInstance_EvaluationChanged(object sender, EventArgs e) {
+      EvaluatorParameter.Value = ProblemInstance.SolutionEvaluator;
       EvalBestKnownSolution();
     }
@@ -245 +233 @@
 
     private void SolutionCreatorParameter_ValueChanged(object sender, EventArgs e) {
-      ParameterizeSolutionCreator();
-
       OnSolutionCreatorChanged();
     }
     private void EvaluatorParameter_ValueChanged(object sender, EventArgs e) {
+      if (ProblemInstance != null)
+        ProblemInstance.SolutionEvaluator = EvaluatorParameter.Value;
       OnEvaluatorChanged();
     }
 
     private void InitializeOperators() {
-      operators = new List<IItem>();
+      Operators.Clear();
 
       if (ProblemInstance != null) {
-        operators.AddRange(
+        Operators.AddRange(
         ProblemInstance.Operators.Concat(
           ApplicationManager.Manager.GetInstances<IGeneralVRPOperator>().Cast<IOperator>()).OrderBy(op => op.Name));
@@ -265 +253 @@
     }
 
-    private void ParameterizeSolutionCreator() {
-      if (SolutionCreator is IMultiVRPOperator) {
-        (SolutionCreator as IMultiVRPOperator).SetOperators(Operators.OfType<IOperator>());
-      }
-    }
-
     private void ParameterizeOperators() {
-      foreach (IOperator op in Operators) {
+      foreach (IOperator op in Operators.OfType<IOperator>()) {
         if (op is IMultiVRPOperator) {
           (op as IMultiVRPOperator).SetOperators(Operators.OfType<IOperator>());