Changeset 8206 for branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/ReplaceBranchMoveSoftTabuCriterion.cs

Timestamp:

07/03/12 16:46:35 (12 years ago)

Author:

gkronber

Message:

#1847: merged r8084:8205 from trunk into GP move operators branch

Location:

branches/GP-MoveOperators

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/ReplaceBranchMoveSoftTabuCriterion.cs (moved) (moved from branches/GP-MoveOperators/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Moves/ReplaceBranchMoveSoftTabuCriterion.cs) (3 diffs)

branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/ReplaceBranchMoveSoftTabuCriterion.cs

@@ -24 +24 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
@@ -29 +30 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
+namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
   [Item("ReplaceBranchMoveSoftTabuCriterion", @"")]
   [StorableClass]
@@ -119 +120 @@
         }
       }
-      //int length = permutation.Length;
-      //double moveQuality = MoveQualityParameter.ActualValue.Value;
-      //bool maximization = MaximizationParameter.ActualValue.Value;
-      //bool useAspiration = UseAspirationCriterion.Value;
-      //bool isTabu = false;
 
-      //if (permutation.PermutationType == PermutationTypes.Absolute) {
-      //  int count = move.Index2 - move.Index1 + 1;
-      //  int[] numbers = new int[count];
-      //  for (int i = move.Index1; i <= move.Index2; i++)
-      //    numbers[i - move.Index1] = permutation[i];
-
-      //  foreach (IItem tabuMove in tabuList) {
-      //    TranslocationMoveAbsoluteAttribute attribute = (tabuMove as TranslocationMoveAbsoluteAttribute);
-      //    if (attribute != null) {
-      //      if (!useAspiration
-      //        || maximization && moveQuality <= attribute.MoveQuality
-      //        || !maximization && moveQuality >= attribute.MoveQuality) { // if the move quality is improving beyond what was recorded when the move in the tabu list was recorded the move is regarded as okay
-
-      //        for (int i = 0; i < count; i++) {
-      //          for (int j = 0; j < attribute.Number.Length; j++) {
-      //            if (attribute.Number[j] == numbers[i] && attribute.OldPosition + j == move.Index3 + i) {
-      //              isTabu = true;
-      //              break;
-      //            }
-      //          }
-      //          if (isTabu) break;
-      //        }
-      //      }
-      //    }
-      //    if (isTabu) break;
-      //  }
-      //} else {
-      //  int E1S = permutation.GetCircular(move.Index1 - 1);
-      //  int E1T = permutation[move.Index1];
-      //  int E2S = permutation[move.Index2];
-      //  int E2T = permutation.GetCircular(move.Index2 + 1);
-      //  int E3S, E3T;
-      //  if (move.Index3 > move.Index1) {
-      //    E3S = permutation.GetCircular(move.Index3 + move.Index2 - move.Index1);
-      //    E3T = permutation.GetCircular(move.Index3 + move.Index2 - move.Index1 + 1);
-      //  } else {
-      //    E3S = permutation.GetCircular(move.Index3 - 1);
-      //    E3T = permutation[move.Index3];
-      //  }
-      //  foreach (IItem tabuMove in tabuList) {
-      //    TranslocationMoveRelativeAttribute attribute = (tabuMove as TranslocationMoveRelativeAttribute);
-      //    if (attribute != null) {
-      //      if (!useAspiration
-      //        || maximization && moveQuality <= attribute.MoveQuality
-      //        || !maximization && moveQuality >= attribute.MoveQuality) {
-
-      //        // if previously deleted Edge1Source-Target is readded
-      //        if (permutation.PermutationType == PermutationTypes.RelativeUndirected) {
-      //          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
-      //            // 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
-      //            // 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) {
-      //            isTabu = true;
-      //            break;
-      //          }
-      //        } else {
-      //          if (attribute.Edge1Source == E3S && attribute.Edge1Target == E1T
-      //            || attribute.Edge1Source == E2S && attribute.Edge1Target == E3T
-      //            // if previously deleted Edge2Source-Target is readded
-      //            || attribute.Edge2Source == E3S && attribute.Edge2Target == E1T
-      //            || attribute.Edge2Source == E2S && attribute.Edge2Target == E3T
-      //            // if previously deleted Edge3Source-Target is readded
-      //            || attribute.Edge3Source == E3S && attribute.Edge3Target == E1T
-      //            || attribute.Edge3Source == E2S && attribute.Edge3Target == E3T) {
-      //            isTabu = true;
-      //            break;
-      //          }
-      //        }
-      //      }
-      //    }
-      //  }
-      //}
       MoveTabuParameter.ActualValue = new BoolValue(isTabu);
       return base.Apply();