Changeset 12529


Ignore:
Timestamp:
06/29/15 10:48:35 (4 years ago)
Author:
pfleck
Message:

#2027

  • Moved Termination to HeuristicLab.Optimization-Plugin.
  • Moved Termination-Views to HeuristicLab.Optimization.Views-Plugin.
  • Removed Termination-Plugin.
Location:
branches/TerminationCriteria
Files:
1 added
1 deleted
6 edited
11 copied

Legend:

Unmodified
Added
Removed
  • branches/TerminationCriteria/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.csproj

    r12304 r12529  
    199199    </BootstrapperPackage>
    200200  </ItemGroup>
    201   <ItemGroup>
    202     <ProjectReference Include="..\..\HeuristicLab.Termination\3.3\HeuristicLab.Termination-3.3.csproj">
    203       <Project>{5AB79EEE-33AC-4E7A-8AF1-E409AB63A3D3}</Project>
    204       <Name>HeuristicLab.Termination-3.3</Name>
    205     </ProjectReference>
    206   </ItemGroup>
    207201  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    208202  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • branches/TerminationCriteria/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs

    r12447 r12529  
    3434using HeuristicLab.PluginInfrastructure;
    3535using HeuristicLab.Random;
    36 using HeuristicLab.Termination;
    3736
    3837namespace HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm {
  • branches/TerminationCriteria/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithmMainLoop.cs

    r12357 r12529  
    2424using HeuristicLab.Data;
    2525using HeuristicLab.Operators;
     26using HeuristicLab.Optimization;
    2627using HeuristicLab.Optimization.Operators;
    2728using HeuristicLab.Parameters;
    2829using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    29 using HeuristicLab.Termination;
    3030
    3131namespace HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm {
  • branches/TerminationCriteria/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

    r12528 r12529  
    134134      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
    135135    </Reference>
     136    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     137      <SpecificVersion>False</SpecificVersion>
     138      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     139    </Reference>
    136140    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    137141      <SpecificVersion>False</SpecificVersion>
     
    322326    <Compile Include="RunCollectionViews\RunCollectionChartAggregationView.Designer.cs">
    323327      <DependentUpon>RunCollectionChartAggregationView.cs</DependentUpon>
     328    </Compile>
     329    <Compile Include="ThresholdTerminatorView.cs">
     330      <SubType>UserControl</SubType>
     331    </Compile>
     332    <Compile Include="ThresholdTerminatorView.Designer.cs">
     333      <DependentUpon>ThresholdTerminatorView.cs</DependentUpon>
    324334    </Compile>
    325335    <Compile Include="UserDefinedAlgorithmView.cs">
  • branches/TerminationCriteria/HeuristicLab.Optimization.Views/3.3/ThresholdTerminatorView.Designer.cs

    r12527 r12529  
    2020#endregion
    2121
    22 using System;
    23 using HeuristicLab.Core;
    24 using HeuristicLab.Data;
    25 
    26 namespace HeuristicLab.Termination.Views {
     22namespace HeuristicLab.Optimization.Views {
    2723  partial class ThresholdTerminatorView<T> {
    2824    /// <summary>
  • branches/TerminationCriteria/HeuristicLab.Optimization.Views/3.3/ThresholdTerminatorView.cs

    r12527 r12529  
    2525using HeuristicLab.MainForm;
    2626
    27 namespace HeuristicLab.Termination.Views {
     27namespace HeuristicLab.Optimization.Views {
    2828
    2929  [View("ThresholdTerminator View")]
  • branches/TerminationCriteria/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

    r12528 r12529  
    190190    <Compile Include="Interfaces\ISimilarityBasedOperator.cs" />
    191191    <Compile Include="Interfaces\ISolutionSimilarityCalculator.cs" />
     192    <Compile Include="Interfaces\ITerminationBasedOperator.cs" />
     193    <Compile Include="Interfaces\ITerminator.cs" />
    192194    <Compile Include="MetaOptimizers\BatchRun.cs" />
    193195    <Compile Include="MetaOptimizers\Experiment.cs" />
     
    199201    <Compile Include="RunCollectionModification\RunCollectionValueRemover.cs" />
    200202    <Compile Include="Interfaces\IRunCollectionModifier.cs" />
     203    <Compile Include="Termination\ComparisonTerminator.cs" />
     204    <Compile Include="Termination\ExecutionTimeTerminator.cs" />
     205    <Compile Include="Termination\MultiTerminator.cs" />
     206    <Compile Include="Termination\SingleObjectiveQualityTerminator.cs" />
     207    <Compile Include="Termination\TerminationOperator.cs" />
     208    <Compile Include="Termination\Terminator.cs" />
     209    <Compile Include="Termination\ThresholdTerminator.cs" />
    201210    <None Include="Plugin.cs.frame" />
    202211    <Compile Include="Algorithms\Algorithm.cs" />
  • branches/TerminationCriteria/HeuristicLab.Optimization/3.3/Interfaces/ITerminationBasedOperator.cs

    r12527 r12529  
    2323using HeuristicLab.Data;
    2424
    25 namespace HeuristicLab.Termination {
     25namespace HeuristicLab.Optimization {
    2626  public interface ITerminationBasedOperator : IOperator {
    2727    ILookupParameter<BoolValue> TerminateParameter { get; }
  • branches/TerminationCriteria/HeuristicLab.Optimization/3.3/Interfaces/ITerminator.cs

    r12527 r12529  
    2020#endregion
    2121
    22 using HeuristicLab.Core;
    23 
    24 namespace HeuristicLab.Termination {
     22namespace HeuristicLab.Optimization {
    2523  /// <summary>
    2624  /// An interface which represents an operator for checking a termination criterion.
  • branches/TerminationCriteria/HeuristicLab.Optimization/3.3/Termination/ComparisonTerminator.cs

    r12527 r12529  
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2929
    30 namespace HeuristicLab.Termination {
     30namespace HeuristicLab.Optimization {
    3131  [Item("ComparisonTerminator", "An termination criterion which compares two values.")]
    3232  [StorableClass]
  • branches/TerminationCriteria/HeuristicLab.Optimization/3.3/Termination/ExecutionTimeTerminator.cs

    r12527 r12529  
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727
    28 namespace HeuristicLab.Termination {
     28namespace HeuristicLab.Optimization {
    2929  [Item("ExecutionTimeTerminator", "A termination criterion based on execution time of an algorithm.")]
    3030  [StorableClass]
  • branches/TerminationCriteria/HeuristicLab.Optimization/3.3/Termination/MultiTerminator.cs

    r12527 r12529  
    3131using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3232
    33 namespace HeuristicLab.Termination {
     33namespace HeuristicLab.Optimization {
    3434  [Item("MultiTerminator", "A multi operator, containing termination criteria.")]
    3535  [StorableClass]
  • branches/TerminationCriteria/HeuristicLab.Optimization/3.3/Termination/SingleObjectiveQualityTerminator.cs

    r12527 r12529  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Optimization;
    2625using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2726
    28 namespace HeuristicLab.Termination {
     27namespace HeuristicLab.Optimization {
    2928  [Item("SingleObjectiveQualityTerminator", "A termination criterion which uses a quality parameter (eg. current best quality) for termination.")]
    3029  [StorableClass]
  • branches/TerminationCriteria/HeuristicLab.Optimization/3.3/Termination/TerminationOperator.cs

    r12527 r12529  
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2828
    29 namespace HeuristicLab.Termination {
     29namespace HeuristicLab.Optimization {
    3030  [Item("TerminationOperator", "An operator which either calls the terminate- or the continue branch.")]
    3131  [StorableClass]
  • branches/TerminationCriteria/HeuristicLab.Optimization/3.3/Termination/Terminator.cs

    r12527 r12529  
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030
    31 namespace HeuristicLab.Termination {
     31namespace HeuristicLab.Optimization {
    3232  [Item("Terminator", "A base class for all termination criteria.")]
    3333  [StorableClass]
  • branches/TerminationCriteria/HeuristicLab.Optimization/3.3/Termination/ThresholdTerminator.cs

    r12527 r12529  
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2828
    29 namespace HeuristicLab.Termination {
     29namespace HeuristicLab.Optimization {
    3030  [Item("ThresholdTerminator", "Base class for all termination criteria which specifies some threshold.")]
    3131  [StorableClass]
  • branches/TerminationCriteria/TerminationCriteria.sln

    r12528 r12529  
    55MinimumVisualStudioVersion = 10.0.40219.1
    66Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3", "HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm\3.3\HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.csproj", "{F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}"
    7 EndProject
    8 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Termination-3.3", "HeuristicLab.Termination\3.3\HeuristicLab.Termination-3.3.csproj", "{5AB79EEE-33AC-4E7A-8AF1-E409AB63A3D3}"
    97EndProject
    108Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Optimization-3.3", "HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj", "{14AB8D24-25BC-400C-A846-4627AA945192}"
     
    3836    {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}.Release|x86.ActiveCfg = Release|x86
    3937    {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}.Release|x86.Build.0 = Release|x86
    40     {5AB79EEE-33AC-4E7A-8AF1-E409AB63A3D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    41     {5AB79EEE-33AC-4E7A-8AF1-E409AB63A3D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
    42     {5AB79EEE-33AC-4E7A-8AF1-E409AB63A3D3}.Debug|x64.ActiveCfg = Debug|x64
    43     {5AB79EEE-33AC-4E7A-8AF1-E409AB63A3D3}.Debug|x64.Build.0 = Debug|x64
    44     {5AB79EEE-33AC-4E7A-8AF1-E409AB63A3D3}.Debug|x86.ActiveCfg = Debug|x86
    45     {5AB79EEE-33AC-4E7A-8AF1-E409AB63A3D3}.Debug|x86.Build.0 = Debug|x86
    46     {5AB79EEE-33AC-4E7A-8AF1-E409AB63A3D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
    47     {5AB79EEE-33AC-4E7A-8AF1-E409AB63A3D3}.Release|Any CPU.Build.0 = Release|Any CPU
    48     {5AB79EEE-33AC-4E7A-8AF1-E409AB63A3D3}.Release|x64.ActiveCfg = Release|x64
    49     {5AB79EEE-33AC-4E7A-8AF1-E409AB63A3D3}.Release|x64.Build.0 = Release|x64
    50     {5AB79EEE-33AC-4E7A-8AF1-E409AB63A3D3}.Release|x86.ActiveCfg = Release|x86
    51     {5AB79EEE-33AC-4E7A-8AF1-E409AB63A3D3}.Release|x86.Build.0 = Release|x86
    5238    {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    5339    {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|Any CPU.Build.0 = Debug|Any CPU
Note: See TracChangeset for help on using the changeset viewer.