Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/14/16 10:16:50 (8 years ago)
Author:
sraggl
Message:

#2701 Merged with trunk to get new version of LinearLinkageEncoding
Improved MoveGenerator

Location:
branches/MemPRAlgorithm/HeuristicLab.Encodings.LinearLinkageEncoding
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/MemPRAlgorithm/HeuristicLab.Encodings.LinearLinkageEncoding

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/crossvalidation-2434/HeuristicLab.Encodings.LinearLinkageEncodingmergedeligible
      /stable/HeuristicLab.Encodings.LinearLinkageEncodingmergedeligible
      /trunk/sources/HeuristicLab.Encodings.LinearLinkageEncodingmergedeligible
      /branches/1721-RandomForestPersistence/HeuristicLab.Encodings.LinearLinkageEncoding10321-10322
      /branches/Algorithms.GradientDescent/HeuristicLab.Encodings.LinearLinkageEncoding5516-5520
      /branches/Benchmarking/sources/HeuristicLab.Encodings.LinearLinkageEncoding6917-7005
      /branches/CloningRefactoring/HeuristicLab.Encodings.LinearLinkageEncoding4656-4721
      /branches/CodeEditor/HeuristicLab.Encodings.LinearLinkageEncoding11700-11806
      /branches/DataAnalysis Refactoring/HeuristicLab.Encodings.LinearLinkageEncoding5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Encodings.LinearLinkageEncoding5815-6180
      /branches/DataAnalysis/HeuristicLab.Encodings.LinearLinkageEncoding4458-4459,​4462,​4464
      /branches/DataPreprocessing/HeuristicLab.Encodings.LinearLinkageEncoding10085-11101
      /branches/GP.Grammar.Editor/HeuristicLab.Encodings.LinearLinkageEncoding6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Encodings.LinearLinkageEncoding5060
      /branches/HLScript/HeuristicLab.Encodings.LinearLinkageEncoding10331-10358
      /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Encodings.LinearLinkageEncoding11570-12508
      /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Encodings.LinearLinkageEncoding6123-9799
      /branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Encodings.LinearLinkageEncoding11130-12721
      /branches/HiveStatistics/sources/HeuristicLab.Encodings.LinearLinkageEncoding12440-12877
      /branches/LogResidualEvaluator/HeuristicLab.Encodings.LinearLinkageEncoding10202-10483
      /branches/NET40/sources/HeuristicLab.Encodings.LinearLinkageEncoding5138-5162
      /branches/NSGA-II Changes/HeuristicLab.Encodings.LinearLinkageEncoding12033-12122
      /branches/ParallelEngine/HeuristicLab.Encodings.LinearLinkageEncoding5175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Encodings.LinearLinkageEncoding7568-7810
      /branches/QAPAlgorithms/HeuristicLab.Encodings.LinearLinkageEncoding6350-6627
      /branches/Restructure trunk solution/HeuristicLab.Encodings.LinearLinkageEncoding6828
      /branches/RuntimeOptimizer/HeuristicLab.Encodings.LinearLinkageEncoding8943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.Encodings.LinearLinkageEncoding7787-8333
      /branches/SlaveShutdown/HeuristicLab.Encodings.LinearLinkageEncoding8944-8956
      /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Encodings.LinearLinkageEncoding10204-10479
      /branches/SuccessProgressAnalysis/HeuristicLab.Encodings.LinearLinkageEncoding5370-5682
      /branches/Trunk/HeuristicLab.Encodings.LinearLinkageEncoding6829-6865
      /branches/UnloadJobs/HeuristicLab.Encodings.LinearLinkageEncoding9168-9215
      /branches/VNS/HeuristicLab.Encodings.LinearLinkageEncoding5594-5752
      /branches/histogram/HeuristicLab.Encodings.LinearLinkageEncoding5959-6341

  • branches/MemPRAlgorithm/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Moves/StaticAPI/MoveGenerator.cs

    r14477 r14487  
    4545            yield return new MergeMove(i, l.Key);
    4646          }
     47        } else {
     48          // Fourth: extract i into group of its own (exclude first, because of Second)
     49          yield return new ExtractMove(i, pred, next);
    4750        }
    4851      }
    49       if (!isFirst)
    50         // Fourth: extract i into group of its own (exclude first, because of Second)
    51         yield return new ExtractMove(i, pred, next);
     52       
    5253
    5354    }
Note: See TracChangeset for help on using the changeset viewer.