Changeset 13656 for branches/WebJobManager/HeuristicLab.Problems.VehicleRouting

Timestamp:

03/07/16 10:18:05 (9 years ago)

Author:

ascheibe

Message:

#2582 created branch for Hive Web Job Manager

Location:

branches/WebJobManager

Files:

• . (copied) (copied from trunk/sources)
• HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/VRPSolution.cs (modified) (4 diffs)
• HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/TourEncoding.cs (modified) (3 diffs)
• HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs (modified) (4 diffs)

branches/WebJobManager/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/VRPSolution.cs

@@ -21 +21 @@
 
 using System;
-using System.Drawing;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -35 +34 @@
   [StorableClass]
   public sealed class VRPSolution : Item {
-    public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Image; }
-    }
+
 
     [Storable]
     private IVRPProblemInstance problemInstance;
-    public IVRPProblemInstance ProblemInstance {
+    public IVRPProblemInstance ProblemInstance
+    {
       get { return problemInstance; }
-      set {
+      set
+      {
         if (problemInstance != value) {
           if (problemInstance != null) DeregisterProblemInstanceEvents();
@@ -54 +53 @@
     [Storable]
     private IVRPEncoding solution;
-    public IVRPEncoding Solution {
+    public IVRPEncoding Solution
+    {
       get { return solution; }
-      set {
+      set
+      {
         if (solution != value) {
           if (solution != null) DeregisterSolutionEvents();
@@ -67 +68 @@
     [Storable]
     private DoubleValue quality;
-    public DoubleValue Quality {
+    public DoubleValue Quality
+    {
       get { return quality; }
-      set {
+      set
+      {
         if (quality != value) {
           if (quality != null) DeregisterQualityEvents();

branches/WebJobManager/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/TourEncoding.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
-using System.Drawing;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -31 +30 @@
   [StorableClass]
   public abstract class TourEncoding : Item, IVRPEncoding {
-    public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
-    }
+
 
     #region IVRPEncoding Members
@@ -79 +76 @@
     }
 
-    public int Cities {
-      get {
+    public int Cities
+    {
+      get
+      {
         int cities = 0;
 

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using HeuristicLab.Analysis;
@@ -47 +46 @@
     public string Filename { get; set; }
 
-    public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Type; }
-    }
+
 
     #region Parameter Properties
-    public ValueParameter<BoolValue> MaximizationParameter {
+    public ValueParameter<BoolValue> MaximizationParameter
+    {
       get { return (ValueParameter<BoolValue>)Parameters["Maximization"]; }
     }
-    IParameter ISingleObjectiveHeuristicOptimizationProblem.MaximizationParameter {
+    IParameter ISingleObjectiveHeuristicOptimizationProblem.MaximizationParameter
+    {
       get { return MaximizationParameter; }
     }
-    public ValueParameter<IVRPProblemInstance> ProblemInstanceParameter {
+    public ValueParameter<IVRPProblemInstance> ProblemInstanceParameter
+    {
       get { return (ValueParameter<IVRPProblemInstance>)Parameters["ProblemInstance"]; }
     }
-    public OptionalValueParameter<DoubleValue> BestKnownQualityParameter {
+    public OptionalValueParameter<DoubleValue> BestKnownQualityParameter
+    {
       get { return (OptionalValueParameter<DoubleValue>)Parameters["BestKnownQuality"]; }
     }
-    IParameter ISingleObjectiveHeuristicOptimizationProblem.BestKnownQualityParameter {
+    IParameter ISingleObjectiveHeuristicOptimizationProblem.BestKnownQualityParameter
+    {
       get { return BestKnownQualityParameter; }
     }
-    public OptionalValueParameter<VRPSolution> BestKnownSolutionParameter {
+    public OptionalValueParameter<VRPSolution> BestKnownSolutionParameter
+    {
       get { return (OptionalValueParameter<VRPSolution>)Parameters["BestKnownSolution"]; }
     }
-    public IConstrainedValueParameter<IVRPCreator> SolutionCreatorParameter {
+    public IConstrainedValueParameter<IVRPCreator> SolutionCreatorParameter
+    {
       get { return (IConstrainedValueParameter<IVRPCreator>)Parameters["SolutionCreator"]; }
     }
-    IParameter IHeuristicOptimizationProblem.SolutionCreatorParameter {
+    IParameter IHeuristicOptimizationProblem.SolutionCreatorParameter
+    {
       get { return SolutionCreatorParameter; }
     }
-    public IValueParameter<IVRPEvaluator> EvaluatorParameter {
+    public IValueParameter<IVRPEvaluator> EvaluatorParameter
+    {
       get { return (IValueParameter<IVRPEvaluator>)Parameters["Evaluator"]; }
     }
-    IParameter IHeuristicOptimizationProblem.EvaluatorParameter {
+    IParameter IHeuristicOptimizationProblem.EvaluatorParameter
+    {
       get { return EvaluatorParameter; }
     }
@@ -85 +92 @@
 
     #region Properties
-    public IVRPProblemInstance ProblemInstance {
+    public IVRPProblemInstance ProblemInstance
+    {
       get { return ProblemInstanceParameter.Value; }
       set { ProblemInstanceParameter.Value = value; }
     }
 
-    public VRPSolution BestKnownSolution {
+    public VRPSolution BestKnownSolution
+    {
       get { return BestKnownSolutionParameter.Value; }
       set { BestKnownSolutionParameter.Value = value; }
     }
 
-    public DoubleValue BestKnownQuality {
+    public DoubleValue BestKnownQuality
+    {
       get { return BestKnownQualityParameter.Value; }
       set { BestKnownQualityParameter.Value = value; }
     }
 
-    public ISingleObjectiveEvaluator Evaluator {
+    public ISingleObjectiveEvaluator Evaluator
+    {
       get { return EvaluatorParameter.Value; }
     }
 
-    IEvaluator IHeuristicOptimizationProblem.Evaluator {
+    IEvaluator IHeuristicOptimizationProblem.Evaluator
+    {
       get { return this.Evaluator; }
     }
 
-    ISolutionCreator IHeuristicOptimizationProblem.SolutionCreator {
+    ISolutionCreator IHeuristicOptimizationProblem.SolutionCreator
+    {
       get { return SolutionCreatorParameter.Value; }
     }
-    public IVRPCreator SolutionCreator {
+    public IVRPCreator SolutionCreator
+    {
       get { return SolutionCreatorParameter.Value; }
       set { SolutionCreatorParameter.Value = value; }
@@ -176 +190 @@
 
     [Storable(Name = "operators", AllowOneWay = true)]
-    private List<IOperator> StorableOperators {
+    private List<IOperator> StorableOperators
+    {
       set { Operators.AddRange(value); }
     }