Changeset 3074 for trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3

Timestamp:

03/16/10 21:29:10 (15 years ago)

Author:

abeham

Message:

updated tabu search #840

Location:

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3

Files:

• HeuristicLab.Encodings.PermutationEncoding-3.3.csproj (modified) (3 diffs)
• Interfaces/IThreeOptPermutationMoveOperator.cs (added)
• Moves/ThreeIndexMove.cs (added)
• Moves/ThreeOpt (added)
• Moves/ThreeOpt/StochasticThreeOptMoveGenerator.cs (added)
• Moves/ThreeOpt/ThreeOptMove.cs (added)
• Moves/ThreeOpt/ThreeOptMoveGenerator.cs (added)
• Moves/TwoOpt/StochasticTwoOptMoveGenerator.cs (modified) (2 diffs)
• Moves/TwoOpt/TwoOptMoveGenerator.cs (modified) (3 diffs)
• Moves/TwoOpt/TwoOptMoveMaker.cs (modified) (3 diffs)
• Moves/TwoOpt/TwoOptMoveTabuAttribute.cs (deleted)
• Moves/TwoOpt/TwoOptMoveTabuEvaluator.cs (deleted)
• Moves/TwoOpt/TwoOptMoveTabuMaker.cs (deleted)
• Moves/TwoOpt/TwoOptTabuMoveAttribute.cs (added)
• Moves/TwoOpt/TwoOptTabuMoveEvaluator.cs (added)
• Moves/TwoOpt/TwoOptTabuMoveMaker.cs (added)

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/HeuristicLab.Encodings.PermutationEncoding-3.3.csproj

@@ -98 +98 @@
     <Compile Include="Interfaces\IPermutationMoveOperator.cs" />
     <Compile Include="Interfaces\IPermutationOperator.cs" />
+    <Compile Include="Interfaces\IThreeOptPermutationMoveOperator.cs" />
     <Compile Include="Interfaces\ITwoOptPermutationMoveOperator.cs" />
     <Compile Include="Manipulators\InsertionManipulator.cs" />
@@ -106 +107 @@
     <Compile Include="Manipulators\TranslocationInversionManipulator.cs" />
     <Compile Include="Manipulators\TranslocationManipulator.cs" />
+    <Compile Include="Moves\ThreeIndexMove.cs" />
+    <Compile Include="Moves\ThreeOpt\StochasticThreeOptMoveGenerator.cs" />
+    <Compile Include="Moves\ThreeOpt\ThreeOptMove.cs" />
+    <Compile Include="Moves\ThreeOpt\ThreeOptMoveGenerator.cs" />
     <Compile Include="Moves\TwoOpt\ExhaustiveTwoOptMoveGenerator.cs">
       <SubType>Code</SubType>
@@ -120 +125 @@
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Moves\TwoOpt\TwoOptMoveTabuAttribute.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Moves\TwoOpt\TwoOptMoveTabuEvaluator.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Moves\TwoOpt\TwoOptMoveTabuMaker.cs">
-      <SubType>Code</SubType>
-    </Compile>
+    <Compile Include="Moves\TwoOpt\TwoOptTabuMoveAttribute.cs" />
+    <Compile Include="Moves\TwoOpt\TwoOptTabuMoveEvaluator.cs" />
+    <Compile Include="Moves\TwoOpt\TwoOptTabuMoveMaker.cs" />
     <Compile Include="PermutationManipulator.cs" />
     <Compile Include="PermutationCrossover.cs" />

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/StochasticTwoOptMoveGenerator.cs

@@ -38 +38 @@
     }
 
+    public IntValue SampleSize {
+      get { return SampleSizeParameter.Value; }
+      set { SampleSizeParameter.Value = value; }
+    }
+
     public StochasticTwoOptMoveGenerator()
       : base() {
@@ -50 +55 @@
       TwoOptMove[] moves = new TwoOptMove[sampleSize];
       for (int i = 0; i < sampleSize; i++) {
-        int index1 = random.Next(length - 1);
-        int index2 = random.Next(index1 + 1, length);
+        int index1 = random.Next(length - 1), index2;
+        if (index1 >= 2)
+          index2 = random.Next(index1 + 1, length);
+        else index2 = random.Next(index1 + 1, length - (2 - index1));
         moves[i] = new TwoOptMove(index1, index2);
       }

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/TwoOptMoveGenerator.cs

@@ -35 +35 @@
     }
     public ILookupParameter<TwoOptMove> TwoOptMoveParameter {
-      get { return (LookupParameter<TwoOptMove>)Parameters["Move"]; }
+      get { return (LookupParameter<TwoOptMove>)Parameters["TwoOptMove"]; }
     }
     protected ScopeParameter CurrentScopeParameter {
@@ -44 +44 @@
       : base() {
       Parameters.Add(new LookupParameter<Permutation>("Permutation", "The permutation for which moves should be generated."));
-      Parameters.Add(new LookupParameter<TwoOptMove>("Move", "The moves that should be generated in subscopes."));
+      Parameters.Add(new LookupParameter<TwoOptMove>("TwoOptMove", "The moves that should be generated in subscopes."));
       Parameters.Add(new ScopeParameter("CurrentScope", "The current scope where the moves should be added as subscopes."));
     }
@@ -61 +61 @@
 
     protected abstract TwoOptMove[] GenerateMoves(Permutation permutation);
+
+    public override bool CanChangeName {
+      get { return false; }
+    }
   }
 }

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/TwoOpt/TwoOptMoveMaker.cs

@@ -33 +33 @@
   public class TwoOptMoveMaker : SingleSuccessorOperator, ITwoOptPermutationMoveOperator, IMoveMaker {
     public ILookupParameter<DoubleValue> QualityParameter {
-      get { return (LookupParameter<DoubleValue>)Parameters["Quality"]; }
+      get { return (ILookupParameter<DoubleValue>)Parameters["Quality"]; }
     }
     public ILookupParameter<DoubleValue> MoveQualityParameter {
-      get { return (LookupParameter<DoubleValue>)Parameters["MoveQuality"]; }
+      get { return (ILookupParameter<DoubleValue>)Parameters["MoveQuality"]; }
     }
     public ILookupParameter<TwoOptMove> TwoOptMoveParameter {
-      get { return (LookupParameter<TwoOptMove>)Parameters["Move"]; }
+      get { return (ILookupParameter<TwoOptMove>)Parameters["TwoOptMove"]; }
     }
     public ILookupParameter<Permutation> PermutationParameter {
@@ -48 +48 @@
       : base() {
       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality of the solution."));
-      Parameters.Add(new LookupParameter<TwoOptMove>("Move", "The move to evaluate."));
+      Parameters.Add(new LookupParameter<TwoOptMove>("TwoOptMove", "The move to evaluate."));
       Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The relative quality of the move."));
       Parameters.Add(new LookupParameter<Permutation>("Permutation", "The solution as permutation."));
@@ -64 +64 @@
       return base.Apply();
     }
+
+    public override bool CanChangeName {
+      get { return false; }
+    }
   }
 }