Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/HeuristicLab.Encodings.PermutationEncoding-3.3.csproj

    r3832 r4045  
    112112    <Compile Include="Moves\PermutationMoveAttribute.cs" />
    113113    <Compile Include="Moves\ThreeIndexMove.cs" />
     114    <Compile Include="Moves\ThreeOpt\StochasticSingleInsertionMoveGenerator.cs" />
    114115    <Compile Include="Moves\ThreeOpt\TranslocationMoveAbsoluteAttribute.cs" />
    115116    <Compile Include="Moves\ThreeOpt\ExhaustiveInsertionMoveGenerator.cs">
  • trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/ThreeOpt/TranslocationMoveSoftTabuCriterion.cs

    r3376 r4045  
    137137                if (attribute.Edge1Source == E3S && attribute.Edge1Target == E1T || attribute.Edge1Source == E1T && attribute.Edge1Target == E3S
    138138                  || attribute.Edge1Source == E2S && attribute.Edge1Target == E3T || attribute.Edge1Source == E3T && attribute.Edge1Target == E2S
    139                   || attribute.Edge1Source == E1S && attribute.Edge1Target == E2T || attribute.Edge1Source == E2T && attribute.Edge1Target == E1S
    140139                  // if previously deleted Edge2Source-Target is readded
    141140                  || attribute.Edge2Source == E3S && attribute.Edge2Target == E1T || attribute.Edge2Source == E1T && attribute.Edge2Target == E3S
    142141                  || attribute.Edge2Source == E2S && attribute.Edge2Target == E3T || attribute.Edge2Source == E3T && attribute.Edge2Target == E2S
    143                   || attribute.Edge2Source == E1S && attribute.Edge2Target == E2T || attribute.Edge2Source == E2T && attribute.Edge2Target == E1S
    144142                  // if previously deleted Edge3Source-Target is readded
    145143                  || attribute.Edge3Source == E3S && attribute.Edge3Target == E1T || attribute.Edge3Source == E1T && attribute.Edge3Target == E3S
    146                   || attribute.Edge3Source == E2S && attribute.Edge3Target == E3T || attribute.Edge3Source == E3T && attribute.Edge3Target == E2S
    147                   || attribute.Edge3Source == E1S && attribute.Edge3Target == E2T || attribute.Edge3Source == E2T && attribute.Edge3Target == E1S) {
     144                  || attribute.Edge3Source == E2S && attribute.Edge3Target == E3T || attribute.Edge3Source == E3T && attribute.Edge3Target == E2S) {
    148145                  isTabu = true;
    149146                  break;
     
    152149                if (attribute.Edge1Source == E3S && attribute.Edge1Target == E1T
    153150                  || attribute.Edge1Source == E2S && attribute.Edge1Target == E3T
    154                   || attribute.Edge1Source == E1S && attribute.Edge1Target == E2T
    155151                  // if previously deleted Edge2Source-Target is readded
    156152                  || attribute.Edge2Source == E3S && attribute.Edge2Target == E1T
    157153                  || attribute.Edge2Source == E2S && attribute.Edge2Target == E3T
    158                   || attribute.Edge2Source == E1S && attribute.Edge2Target == E2T
    159154                  // if previously deleted Edge3Source-Target is readded
    160155                  || attribute.Edge3Source == E3S && attribute.Edge3Target == E1T
    161                   || attribute.Edge3Source == E2S && attribute.Edge3Target == E3T
    162                   || attribute.Edge3Source == E1S && attribute.Edge3Target == E2T) {
     156                  || attribute.Edge3Source == E2S && attribute.Edge3Target == E3T) {
    163157                  isTabu = true;
    164158                  break;
Note: See TracChangeset for help on using the changeset viewer.