Changeset 11190

Timestamp:

07/15/14 09:16:57 (10 years ago)

Author:

pfleck

Message:

#2208

• Added BestOrienteeringSolutionAnalyser
• Added OrienteeringSolution
• Implemented InitializeInitialOrienteeringInstance

Location:

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3

Files:

• Analyzers (added)
• Analyzers/BestOrienteeringSolutionAnalyser.cs (added)
• HeuristicLab.Problems.Orienteering-3.3.csproj (modified) (4 diffs)
• OrienteeringProblem.cs (modified) (10 diffs)
• OrienteeringSolution.cs (added)

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

@@ -46 +46 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Analyzers\BestOrienteeringSolutionAnalyser.cs" />
     <Compile Include="DistanceMatrix.cs" />
     <Compile Include="Interfaces\IOrienteeringEvaluator.cs" />
@@ -51 +52 @@
     <Compile Include="OrienteeringProblem.cs" />
     <Compile Include="OrienteeringScript.cs" />
+    <Compile Include="OrienteeringSolution.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -67 +69 @@
       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
       <Name>HeuristicLab.Collections-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
+      <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project>
+      <Name>HeuristicLab.Common.Resources-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
@@ -120 +126 @@
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

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

@@ -21 +21 @@
 
 using System;
+using System.Linq;
+using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -110 +112 @@
       set { BestKnownSolutionParameter.Value = value; }
     }
+    private BestOrienteeringSolutionAnalyser BestOrienteeringSolutionAnalyser {
+      get { return Operators.OfType<BestOrienteeringSolutionAnalyser>().SingleOrDefault(); }
+    }
+    private SingleObjectivePopulationDiversityAnalyzer SingleObjectivePopulationDiversityAnalyzer {
+      get { return Operators.OfType<SingleObjectivePopulationDiversityAnalyzer>().SingleOrDefault(); }
+    }
     #endregion
 
@@ -116 +124 @@
       : base(deserializing) {
     }
-
     private OrienteeringProblem(OrienteeringProblem original, Cloner cloner)
       : base(original, cloner) {
       RegisterEventHandlers();
     }
-
     public override IDeepCloneable Clone(Cloner cloner) {
       return new OrienteeringProblem(this, cloner);
     }
-
-
     public OrienteeringProblem()
       : base(new OrienteeringEvaluator(), new UniformRandomIntegerVectorCreator()) { // TODO: Greedy route creator for solution creator
@@ -144 +148 @@
       SolutionCreator.IntegerVectorParameter.ActualName = "OrienteeringSolution";
 
-      InitializeRandomOrienteeringInstance();
+      InitializeInitialOrienteeringInstance();
 
       ParameterizeSolutionCreator();
@@ -156 +160 @@
     protected override void OnSolutionCreatorChanged() {
       base.OnSolutionCreatorChanged();
-      SolutionCreator.IntegerVectorParameter.ActualNameChanged += new EventHandler(SolutionCreator_IntegerVectorParameter_ActualNameChanged);
+      SolutionCreator.IntegerVectorParameter.ActualNameChanged += SolutionCreator_IntegerVectorParameter_ActualNameChanged;
       ParameterizeSolutionCreator();
       ParameterizeEvaluator();
@@ -171 +175 @@
       ParameterizeAnalyzer();
       ParameterizeOperators();
+    }
+    private void CoordinatesParameter_ValueChanged(object sender, EventArgs e) {
+      if (Coordinates != null) {
+        Coordinates.ItemChanged += new EventHandler<EventArgs<int, int>>(CoordinatesValue_ItemChanged);
+        Coordinates.Reset += new EventHandler(CoordinatesValue_Reset);
+      }
+      ParameterizeSolutionCreator();
+      DistanceMatrix = null;
+    }
+    private void CoordinatesValue_ItemChanged(object sender, EventArgs<int, int> e) {
+      DistanceMatrix = null;
+    }
+    private void CoordinatesValue_Reset(object sender, EventArgs e) {
+      ParameterizeSolutionCreator();
+      DistanceMatrix = null;
+    }
+    private void StartingPointParameter_ValueChanged(object sender, EventArgs e) {
+      ParameterizeEvaluator();
+      ParameterizeAnalyzer();
+    }
+
+    private void TerminusPointParameter_ValueChanged(object sender, EventArgs e) {
+      ParameterizeEvaluator();
+      ParameterizeAnalyzer();
+    }
+    private void MaximumDistanceParameter_ValueChanged(object sender, EventArgs e) {
+      ParameterizeEvaluator();
+      ParameterizeAnalyzer();
+    }
+    private void ScoresParameter_ValueChanged(object sender, EventArgs e) {
+      ParameterizeEvaluator();
+      ParameterizeAnalyzer();
+      ParameterizeSolutionCreator();
+
+      ScoresParameter.Value.Reset += new EventHandler(ScoresValue_Reset);
+    }
+    private void ScoresValue_Reset(object sender, EventArgs e) {
+      ParameterizeSolutionCreator();
+    }
+    private void FixedPenaltyParameter_ValueChanged(object sender, EventArgs e) {
+      ParameterizeEvaluator();
+      ParameterizeAnalyzer();
     }
     #endregion
@@ -181 +227 @@
 
     private void RegisterEventHandlers() {
-      SolutionCreator.IntegerVectorParameter.ActualNameChanged += new EventHandler(SolutionCreator_IntegerVectorParameter_ActualNameChanged);
-      // TODO
-    }
+      SolutionCreator.IntegerVectorParameter.ActualNameChanged += SolutionCreator_IntegerVectorParameter_ActualNameChanged;
+
+      CoordinatesParameter.ValueChanged += CoordinatesParameter_ValueChanged;
+      if (CoordinatesParameter.Value != null) {
+        CoordinatesParameter.Value.ItemChanged += CoordinatesValue_ItemChanged;
+        CoordinatesParameter.Value.Reset += CoordinatesValue_Reset;
+      }
+
+      StartingPointParameter.ValueChanged += StartingPointParameter_ValueChanged;
+      TerminusPointParameter.ValueChanged += TerminusPointParameter_ValueChanged;
+      MaximumDistanceParameter.ValueChanged += MaximumDistanceParameter_ValueChanged;
+
+      ScoresParameter.ValueChanged += ScoresParameter_ValueChanged;
+      ScoresParameter.Value.Reset += ScoresValue_Reset;
+      FixedPenaltyParameter.ValueChanged += FixedPenaltyParameter_ValueChanged;
+    }
+
     private void ParameterizeSolutionCreator() {
-      if (SolutionCreator.LengthParameter.Value == null
-          || SolutionCreator.LengthParameter.Value.Value != Scores.Length) {
-        SolutionCreator.LengthParameter.Value = new IntValue(Scores.Length);
+      if (SolutionCreator is UniformRandomIntegerVectorCreator) {
+        if (SolutionCreator.LengthParameter.Value == null || SolutionCreator.LengthParameter.Value.Value != Scores.Length) {
+          SolutionCreator.LengthParameter.Value = new IntValue(Scores.Length);
+        }
       }
     }
@@ -193 +254 @@
       if (Evaluator is OrienteeringEvaluator) {
         var orienteeringEvaluator = (OrienteeringEvaluator)Evaluator;
-        // TODO
+        orienteeringEvaluator.SolutionParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
+        orienteeringEvaluator.ScoresParameter.ActualName = ScoresParameter.Name;
       }
     }
@@ -200 +262 @@
     }
     private void InitializeOperators() {
-      // TODO  
+      // TODO
     }
     private void ParameterizeOperators() {
@@ -207 +269 @@
     #endregion
 
-    private void InitializeRandomOrienteeringInstance() {
-      // TODO
+    private void InitializeInitialOrienteeringInstance() {
+      Coordinates = new DoubleMatrix(new double[21, 2] {
+        {  4.60,  7.10 }, {  5.70, 11.40 }, {  4.40, 12.30 }, {  2.80, 14.30 }, {  3.20, 10.30 },
+        {  3.50,  9.80 }, {  4.40,  8.40 }, {  7.80, 11.00 }, {  8.80,  9.80 }, {  7.70,  8.20 },
+        {  6.30,  7.90 }, {  5.40,  8.20 }, {  5.80,  6.80 }, {  6.70,  5.80 }, { 13.80, 13.10 },
+        { 14.10, 14.20 }, { 11.20, 13.60 }, {  9.70, 16.40 }, {  9.50, 18.80 }, {  4.70, 16.80 },
+        {  5.00,  5.60 }
+      });
+      UseDistanceMatrix.Value = false;
+
+      StartingPoint.Value = 0;
+      TerminusPoint.Value = 20;
+      MaximumDistance.Value = 30;
+
+      Scores = new DoubleArray(new double[21] { 0, 20, 20, 30, 15, 15, 10, 20, 20, 20, 15, 10, 10, 25, 40, 40, 30, 30, 50, 30, 0 });
     }