Changeset 6044


Ignore:
Timestamp:
04/23/11 01:30:48 (9 years ago)
Author:
abeham
Message:

#1425

  • readded the removal of one of the result collector's collected values (and added a comment to the local search mainloop hinting, that a change can break another operator)
  • updated and readded the sample
Location:
trunk/sources
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchImprovementOperator.cs

    r6043 r6044  
    2828using HeuristicLab.Operators;
    2929using HeuristicLab.Optimization;
     30using HeuristicLab.Optimization.Operators;
    3031using HeuristicLab.Parameters;
    3132using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    139140
    140141      loop = new LocalSearchMainLoop();
     142      ((ResultsCollector)((SingleSuccessorOperator)loop.OperatorGraph.InitialOperator).Successor).CollectedValues.Remove(loop.BestLocalQualityParameter.Name);
    141143      ParameterizeLSMainLoop();
    142144
  • trunk/sources/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchMainLoop.cs

    r6043 r6044  
    204204
    205205      #region Create operator graph
    206       OperatorGraph.InitialOperator = subScopesProcessor0;
     206      OperatorGraph.InitialOperator = subScopesProcessor0; // don't change this without adapting the constructor of LocalSearchImprovementOperator
    207207      subScopesProcessor0.Operators.Add(bestQualityInitializer);
    208208      subScopesProcessor0.Successor = resultsCollector1;
  • trunk/sources/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

    r6042 r6044  
    115115    <EmbeddedResource Include="Documents\SGP_SymbClass_Mammographic.hl" />
    116116    <EmbeddedResource Include="Documents\SGP_SymbReg.hl" />
     117    <EmbeddedResource Include="Documents\VNS_TSP.hl" />
    117118    <None Include="HeuristicLabOptimizerPlugin.cs.frame" />
    118119    <Compile Include="CreateExperimentDialog.cs">
Note: See TracChangeset for help on using the changeset viewer.