Changeset 4045 for trunk/sources/HeuristicLab.Encodings.PermutationEncoding

Timestamp:

07/19/10 15:24:32 (14 years ago)

Author:

abeham

Message:

#1040

• Added first possibly working NSGA-II
• Added Maximization parameter to IMultiObjectiveProblem and IMultiObjectiveSelector

Location:

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3

Files:

• HeuristicLab.Encodings.PermutationEncoding-3.3.csproj (modified) (1 diff)
• Moves/ThreeOpt/TranslocationMoveSoftTabuCriterion.cs (modified) (2 diffs)

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

@@ -112 +112 @@
     <Compile Include="Moves\PermutationMoveAttribute.cs" />
     <Compile Include="Moves\ThreeIndexMove.cs" />
+    <Compile Include="Moves\ThreeOpt\StochasticSingleInsertionMoveGenerator.cs" />
     <Compile Include="Moves\ThreeOpt\TranslocationMoveAbsoluteAttribute.cs" />
     <Compile Include="Moves\ThreeOpt\ExhaustiveInsertionMoveGenerator.cs">

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveSoftTabuCriterion.cs

@@ -137 +137 @@
                 if (attribute.Edge1Source == E3S && attribute.Edge1Target == E1T || attribute.Edge1Source == E1T && attribute.Edge1Target == E3S
                   || attribute.Edge1Source == E2S && attribute.Edge1Target == E3T || attribute.Edge1Source == E3T && attribute.Edge1Target == E2S
-                  || attribute.Edge1Source == E1S && attribute.Edge1Target == E2T || attribute.Edge1Source == E2T && attribute.Edge1Target == E1S
                   // if previously deleted Edge2Source-Target is readded
                   || attribute.Edge2Source == E3S && attribute.Edge2Target == E1T || attribute.Edge2Source == E1T && attribute.Edge2Target == E3S
                   || attribute.Edge2Source == E2S && attribute.Edge2Target == E3T || attribute.Edge2Source == E3T && attribute.Edge2Target == E2S
-                  || attribute.Edge2Source == E1S && attribute.Edge2Target == E2T || attribute.Edge2Source == E2T && attribute.Edge2Target == E1S
                   // if previously deleted Edge3Source-Target is readded
                   || attribute.Edge3Source == E3S && attribute.Edge3Target == E1T || attribute.Edge3Source == E1T && attribute.Edge3Target == E3S
-                  || attribute.Edge3Source == E2S && attribute.Edge3Target == E3T || attribute.Edge3Source == E3T && attribute.Edge3Target == E2S
-                  || attribute.Edge3Source == E1S && attribute.Edge3Target == E2T || attribute.Edge3Source == E2T && attribute.Edge3Target == E1S) {
+                  || attribute.Edge3Source == E2S && attribute.Edge3Target == E3T || attribute.Edge3Source == E3T && attribute.Edge3Target == E2S) {
                   isTabu = true;
                   break;
@@ -152 +149 @@
                 if (attribute.Edge1Source == E3S && attribute.Edge1Target == E1T
                   || attribute.Edge1Source == E2S && attribute.Edge1Target == E3T
-                  || attribute.Edge1Source == E1S && attribute.Edge1Target == E2T
                   // if previously deleted Edge2Source-Target is readded
                   || attribute.Edge2Source == E3S && attribute.Edge2Target == E1T
                   || attribute.Edge2Source == E2S && attribute.Edge2Target == E3T
-                  || attribute.Edge2Source == E1S && attribute.Edge2Target == E2T
                   // if previously deleted Edge3Source-Target is readded
                   || attribute.Edge3Source == E3S && attribute.Edge3Target == E1T
-                  || attribute.Edge3Source == E2S && attribute.Edge3Target == E3T
-                  || attribute.Edge3Source == E1S && attribute.Edge3Target == E2T) {
+                  || attribute.Edge3Source == E2S && attribute.Edge3Target == E3T) {
                   isTabu = true;
                   break;