Changeset 11189

Timestamp:

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

Author:

pfleck

Message:

#2208

• Implemented OrienteeringProblem as CVRPData ProblemInstanceInterpreter.
• Added OrienteeringProblemView.

Location:

branches/HeuristicLab.Problems.Orienteering

Files:

• HeuristicLab.Problems.Orienteering.Views/3.3/HeuristicLab.Problems.Orienteering.Views-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.Orienteering.Views/3.3/OrienteeringProblemView.Designer.cs (added)
• HeuristicLab.Problems.Orienteering.Views/3.3/OrienteeringProblemView.cs (added)
• HeuristicLab.Problems.Orienteering/3.3/HeuristicLab.Problems.Orienteering-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.Orienteering/3.3/OrienteeringProblem.cs (modified) (6 diffs)

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering.Views/3.3/HeuristicLab.Problems.Orienteering.Views-3.3.csproj

@@ -39 +39 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="OrienteeringProblemView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="OrienteeringProblemView.Designer.cs">
+      <DependentUpon>OrienteeringProblemView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -50 +60 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
+      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
+      <Name>HeuristicLab.Common-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
+      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
+      <Name>HeuristicLab.Core.Views-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
+      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
+      <Name>HeuristicLab.Core-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
+      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
+      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
+      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
+      <Name>HeuristicLab.MainForm-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
+      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
+      <Name>HeuristicLab.Optimization.Views-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
+      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
+      <Name>HeuristicLab.Optimization-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
+      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
+      <Name>HeuristicLab.Problems.Instances-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.Orienteering\3.3\HeuristicLab.Problems.Orienteering-3.3.csproj">
+      <Project>{D1EFA4CC-909F-41D5-9C1F-C3AF1957A372}</Project>
+      <Name>HeuristicLab.Problems.Orienteering-3.3</Name>
     </ProjectReference>
   </ItemGroup>

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3/HeuristicLab.Problems.Orienteering-3.3.csproj

@@ -106 +106 @@
       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
+      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
+      <Name>HeuristicLab.Problems.Instances-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
       <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3/OrienteeringProblem.cs

@@ -28 +28 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Problems.Orienteering {
@@ -36 +37 @@
   public class OrienteeringProblem
     : SingleObjectiveHeuristicOptimizationProblem<IOrienteeringEvaluator, IIntegerVectorCreator>,
-    IStorableContent {
+    IStorableContent, IProblemInstanceConsumer<CVRPData> {
 
     public string Filename { get; set; }
@@ -85 +86 @@
       set { UseDistanceMatrixParameter.Value = value; }
     }
+    public IntValue StartingPoint {
+      get { return StartingPointParameter.Value; }
+      set { StartingPointParameter.Value = value; }
+    }
+    public IntValue TerminusPoint {
+      get { return TerminusPointParameter.Value; }
+      set { TerminusPointParameter.Value = value; }
+    }
     public DoubleValue MaximumDistance {
       get { return MaximumDistanceParameter.Value; }
@@ -93 +102 @@
       set { ScoresParameter.Value = value; }
     }
+    public DoubleValue FixedPenalty {
+      get { return FixedPenaltyParameter.Value; }
+      set { FixedPenaltyParameter.Value = value; }
+    }
     public IntegerVector BestKnownSolution {
       get { return BestKnownSolutionParameter.Value; }
@@ -115 +128 @@
 
     public OrienteeringProblem()
-      : base(new OrienteeringEvaluator(), new UniformRandomIntegerVectorCreator()) {
+      : base(new OrienteeringEvaluator(), new UniformRandomIntegerVectorCreator()) { // TODO: Greedy route creator for solution creator
       Parameters.Add(new OptionalValueParameter<DoubleMatrix>("Coordinates", "The x- and y-Coordinates of the points."));
       Parameters.Add(new OptionalValueParameter<DistanceMatrix>("DistanceMatrix", "The matrix which contains the distances between the points."));
@@ -197 +210 @@
       // TODO
     }
+
+    public void Load(CVRPData data) {
+      if (data.Coordinates == null && data.Distances == null)
+        throw new System.IO.InvalidDataException("The given instance specifies neither coordinates nor distances!");
+      if (data.Coordinates != null && data.Coordinates.GetLength(1) != 2)
+        throw new System.IO.InvalidDataException("The coordinates of the given instance are not in the right format, there need to be one row for each customer and two columns for the x and y coordinates.");
+
+      Name = data.Name;
+      Description = data.Description;
+
+      Coordinates = data.Coordinates != null ? new DoubleMatrix(data.Coordinates) : null;
+      UseDistanceMatrix.Value = data.Distances != null;
+      DistanceMatrix = data.Distances != null ? new DistanceMatrix(data.Distances) : null;
+      StartingPoint = new IntValue(0);// Depot is interpreted as start and endpoint (default)
+      TerminusPoint = new IntValue(0);
+
+      MaximumDistance = new DoubleValue(data.Capacity); // capacity is interpreted as max distance
+      Scores = new DoubleArray(data.Demands); // demands are interpreted as scores
+
+      BestKnownQuality = null;
+      BestKnownSolution = null;
+    }
   }
 }