Changeset 12272 for branches

Timestamp:

03/31/15 16:57:05 (10 years ago)

Author:

apolidur

Message:

#2221: Adding 2.5-opt-EEs operators to PTSP

Location:

branches/PTSP

Files:

• HeuristicLab.Problems.PTSP.Tests-3.3/PTSPMoveEvaluatorTest.cs (modified) (2 diffs)
• HeuristicLab.Problems.PTSP/3.3/EstimatedPTSP.cs (modified) (2 diffs)
• HeuristicLab.Problems.PTSP/3.3/HeuristicLab.Problems.PTSP-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.PTSP/3.3/Interfaces/I25MoveOperator.cs (added)
• HeuristicLab.Problems.PTSP/3.3/MoveEvaluators/OneShift/PTSPEstimatedInsertionEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.PTSP/3.3/MoveEvaluators/TwoOpt/PTSPEstimatedInversionMovePathEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.PTSP/3.3/MoveEvaluators/TwoPointFiveOpt (added)
• HeuristicLab.Problems.PTSP/3.3/MoveEvaluators/TwoPointFiveOpt/PTSP25MoveEvaluator.cs (added)
• HeuristicLab.Problems.PTSP/3.3/MoveGenerators (added)
• HeuristicLab.Problems.PTSP/3.3/MoveGenerators/Exhaustive25MoveGenerator.cs (added)
• HeuristicLab.Problems.PTSP/3.3/MoveGenerators/Stochastic25MultiMoveGenerator.cs (added)
• HeuristicLab.Problems.PTSP/3.3/MoveGenerators/Stochastic25SingleMoveGenerator.cs (added)
• HeuristicLab.Problems.PTSP/3.3/MoveGenerators/TwoPointFiveMoveGenerator.cs (added)
• HeuristicLab.Problems.PTSP/3.3/MoveMakers (added)
• HeuristicLab.Problems.PTSP/3.3/MoveMakers/TwoPointFiveMoveMaker.cs (added)
• HeuristicLab.Problems.PTSP/3.3/Moves (added)
• HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt (added)
• HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/TwoPointFiveMove.cs (added)

branches/PTSP/HeuristicLab.Problems.PTSP.Tests-3.3/PTSPMoveEvaluatorTest.cs

@@ -88 +88 @@
         double afterMatrix = ePTSP.EvaluateWithParams(distances, ProbabilityMatrix, realizations, tour)[0];
 
-        Assert.IsTrue(moveMatrix.IsAlmost(Math.Abs(afterMatrix - beforeMatrix)), string.Format(failureString, (Math.Abs(afterMatrix - beforeMatrix)).ToString()));
+        Assert.IsTrue(Math.Abs(moveMatrix).IsAlmost(Math.Abs(afterMatrix - beforeMatrix)), string.Format(failureString, (Math.Abs(afterMatrix - beforeMatrix)).ToString()));
 
         beforeMatrix = afterMatrix;
@@ -115 +115 @@
         double afterMatrix = ePTSP.EvaluateWithParams(distances, ProbabilityMatrix, realizations, tour)[0];
 
-        Assert.IsTrue(moveMatrix.IsAlmost(Math.Abs(afterMatrix - beforeMatrix)), string.Format(failureString, (Math.Abs(afterMatrix - beforeMatrix)).ToString()));
+        Assert.IsTrue(Math.Abs(moveMatrix).IsAlmost(Math.Abs(afterMatrix - beforeMatrix)), string.Format(failureString, (Math.Abs(afterMatrix - beforeMatrix)).ToString()));
 
         beforeMatrix = afterMatrix;

branches/PTSP/HeuristicLab.Problems.PTSP/3.3/EstimatedPTSP.cs

@@ -95 +95 @@
       Operators.Add(new PTSPExhaustiveInversionLocalImprovement());
       Operators.Add(new PTSPExhaustiveInsertionLocalImprovement());
+
+      Operators.Add(new Exhaustive25MoveGenerator());
+      Operators.Add(new Stochastic25MultiMoveGenerator());
+      Operators.Add(new Stochastic25SingleMoveGenerator());
+      Operators.Add(new TwoPointFiveMoveMaker());
+      Operators.Add(new PTSP25MoveEvaluator());
+
       Encoding.ConfigureOperators(Operators.OfType<IOperator>());
+      foreach (var twopointfiveMoveOperator in Operators.OfType<I25MoveOperator>()) {
+        twopointfiveMoveOperator.TwoPointFiveMoveParameter.ActualName = "Permutation.TwoPointFiveMove";
+      }
     }
 
@@ -156 +166 @@
         op.RealizationsParameter.Value = realizations;
       }
+      foreach (var op in Operators.OfType<PTSP25MoveEvaluator>()) {
+        op.RealizationsParameter.Value = realizations;
+      }
+
     }
   }

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

@@ -119 +119 @@
     <Compile Include="Improvers\PTSPExhaustiveInsertionLocalImprovement.cs" />
     <Compile Include="Improvers\PTSPExhaustiveInversionLocalImprovement.cs" />
+    <Compile Include="Interfaces\I25MoveOperator.cs" />
     <Compile Include="Interfaces\IPTSPPathMoveEvaluator.cs" />
     <Compile Include="Interfaces\IPTSPMoveEvaluator.cs" />
@@ -126 +127 @@
     <Compile Include="MoveEvaluators\TwoOpt\PTSPAnalyticalInversionMovePathEvaluator.cs" />
     <Compile Include="MoveEvaluators\TwoOpt\PTSPEstimatedInversionMovePathEvaluator.cs" />
+    <Compile Include="MoveEvaluators\TwoPointFiveOpt\PTSP25MoveEvaluator.cs" />
+    <Compile Include="MoveGenerators\Exhaustive25MoveGenerator.cs" />
+    <Compile Include="MoveGenerators\Stochastic25MultiMoveGenerator.cs" />
+    <Compile Include="MoveGenerators\Stochastic25SingleMoveGenerator.cs" />
+    <Compile Include="MoveGenerators\TwoPointFiveMoveGenerator.cs" />
+    <Compile Include="MoveMakers\TwoPointFiveMoveMaker.cs" />
+    <Compile Include="Moves\TwoPointFiveOpt\TwoPointFiveMove.cs" />
     <Compile Include="PathPTSPTour.cs" />
     <Compile Include="PTSP.cs" />

branches/PTSP/HeuristicLab.Problems.PTSP/3.3/MoveEvaluators/OneShift/PTSPEstimatedInsertionEvaluator.cs

@@ -157 +157 @@
       }
       // return average of cost differences
-      return Math.Abs(moveQuality) / realizations.Capacity;
+      return moveQuality / realizations.Capacity;
     }
 

branches/PTSP/HeuristicLab.Problems.PTSP/3.3/MoveEvaluators/TwoOpt/PTSPEstimatedInversionMovePathEvaluator.cs

@@ -119 +119 @@
       }
       // return average of cost differences
-      return Math.Abs(moveQuality) / realizations.Capacity;
+      return moveQuality / realizations.Capacity;
     }