Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/12/17 21:02:01 (7 years ago)
Author:
abeham
Message:

#2666, #2706, #2730, #2736: merged revisions 14412, 14475, 14476, 14659, 14660, 14663, 14779, 14780, 14912, 15050, 15067, 15069, 15079, 15162, 15166, 15172, 15173 to stable

Location:
stable
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Problems.Orienteering/3.3/HeuristicLab.Problems.Orienteering-3.3.csproj

    r13172 r15217  
    112112      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    113113      <Name>HeuristicLab.Analysis-3.3</Name>
     114      <Private>False</Private>
    114115    </ProjectReference>
    115116    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    116117      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    117118      <Name>HeuristicLab.Collections-3.3</Name>
     119      <Private>False</Private>
    118120    </ProjectReference>
    119121    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    120122      <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project>
    121123      <Name>HeuristicLab.Common.Resources-3.3</Name>
     124      <Private>False</Private>
    122125    </ProjectReference>
    123126    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     
    134137      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    135138      <Name>HeuristicLab.Data-3.3</Name>
     139      <Private>False</Private>
    136140    </ProjectReference>
    137141    <ProjectReference Include="..\..\HeuristicLab.Encodings.IntegerVectorEncoding\3.3\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.csproj">
    138142      <Project>{DDFB14DD-2A85-493C-A52D-E69729BBAEB0}</Project>
    139143      <Name>HeuristicLab.Encodings.IntegerVectorEncoding-3.3</Name>
     144      <Private>False</Private>
    140145    </ProjectReference>
    141146    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    142147      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    143148      <Name>HeuristicLab.Operators-3.3</Name>
     149      <Private>False</Private>
     150    </ProjectReference>
     151    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
     152      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
     153      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     154      <Private>False</Private>
    144155    </ProjectReference>
    145156    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    146157      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    147158      <Name>HeuristicLab.Optimization-3.3</Name>
     159      <Private>False</Private>
    148160    </ProjectReference>
    149161    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    150162      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    151163      <Name>HeuristicLab.Parameters-3.3</Name>
     164      <Private>False</Private>
    152165    </ProjectReference>
    153166    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    154167      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    155168      <Name>HeuristicLab.Persistence-3.3</Name>
     169      <Private>False</Private>
    156170    </ProjectReference>
    157171    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    158172      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    159173      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     174      <Private>False</Private>
    160175    </ProjectReference>
    161176    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    162177      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    163178      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     179      <Private>False</Private>
    164180    </ProjectReference>
    165181    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
     
    171187      <Project>{21977CC3-1757-4B3B-87BD-FF817AAA900F}</Project>
    172188      <Name>HeuristicLab.Scripting-3.3</Name>
     189      <Private>False</Private>
    173190    </ProjectReference>
    174191  </ItemGroup>
  • stable/HeuristicLab.Problems.Orienteering/3.3/OrienteeringProblem.cs

    r14186 r15217  
    2323using System.IO;
    2424using System.Linq;
     25using HeuristicLab.Analysis;
    2526using HeuristicLab.Common;
    2627using HeuristicLab.Core;
     
    2829using HeuristicLab.Encodings.IntegerVectorEncoding;
    2930using HeuristicLab.Optimization;
     31using HeuristicLab.Optimization.Operators;
    3032using HeuristicLab.Parameters;
    3133using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    272274      Operators.Add(new OrienteeringLocalImprovementOperator());
    273275      Operators.Add(new OrienteeringShakingOperator());
     276      Operators.Add(new QualitySimilarityCalculator());
     277      Operators.Add(new PopulationSimilarityAnalyzer(Operators.OfType<ISolutionSimilarityCalculator>()));
     278
    274279      ParameterizeOperators();
    275280    }
     
    292297        op.TerminalPointParameter.ActualName = TerminalPointParameter.Name;
    293298        op.PointVisitingCostsParameter.ActualName = PointVisitingCostsParameter.Name;
     299      }
     300      foreach (var similarityCalculator in Operators.OfType<ISolutionSimilarityCalculator>()) {
     301        similarityCalculator.SolutionVariableName = SolutionCreator.IntegerVectorParameter.ActualName;
     302        similarityCalculator.QualityVariableName = Evaluator.QualityParameter.ActualName;
    294303      }
    295304    }
  • stable/HeuristicLab.Problems.Orienteering/3.3/Plugin.cs.frame

    r14190 r15217  
    2828  [Plugin("HeuristicLab.Problems.Orienteering", "3.3.14.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.Orienteering-3.3.dll", PluginFileType.Assembly)]
     30  [PluginDependency("HeuristicLab.Analysis", "3.3")]
    3031  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3132  [PluginDependency("HeuristicLab.Common", "3.3")]
     
    3637  [PluginDependency("HeuristicLab.Operators", "3.3")]
    3738  [PluginDependency("HeuristicLab.Optimization", "3.3")]
     39  [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
    3840  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    3941  [PluginDependency("HeuristicLab.Persistence", "3.3")]
Note: See TracChangeset for help on using the changeset viewer.