Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/04/15 10:18:39 (10 years ago)
Author:
abeham
Message:

#1985:

  • Restored compilable state of TimeLimitRunOptimizer branch
  • Updated changes from trunk
Location:
branches/TimeLimitRunOptimizer
Files:
61 edited
3 copied

Legend:

Unmodified
Added
Removed

  • branches/TimeLimitRunOptimizer

    • Property svn:ignore set to
      *.suo

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/HLScript/HeuristicLab.Optimizationmergedeligible
      /stable/HeuristicLab.Optimizationmergedeligible
      /trunk/sources/HeuristicLab.Optimizationmergedeligible
      /branches/1721-RandomForestPersistence/HeuristicLab.Optimization10321-10322
      /branches/Algorithms.GradientDescent/HeuristicLab.Optimization5516-5520
      /branches/Benchmarking/sources/HeuristicLab.Optimization6917-7005
      /branches/Classification-Extensions/HeuristicLab.Optimization11687-11761
      /branches/CloningRefactoring/HeuristicLab.Optimization4656-4721
      /branches/DataAnalysis Refactoring/HeuristicLab.Optimization5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Optimization5815-6180
      /branches/DataAnalysis/HeuristicLab.Optimization4458-4459,​4462,​4464
      /branches/DataPreprocessing/HeuristicLab.Optimization10085-11101
      /branches/GP.Grammar.Editor/HeuristicLab.Optimization6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Optimization5060
      /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Optimization6123-9799
      /branches/LogResidualEvaluator/HeuristicLab.Optimization10202-10483
      /branches/NET40/sources/HeuristicLab.Optimization5138-5162
      /branches/ParallelEngine/HeuristicLab.Optimization5175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization7568-7810
      /branches/ProgrammableProblem/HeuristicLab.Optimization11573-11959
      /branches/QAPAlgorithms/HeuristicLab.Optimization6350-6627
      /branches/Restructure trunk solution/HeuristicLab.Optimization6828
      /branches/RuntimeOptimizer/HeuristicLab.Optimization8943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization7787-8333
      /branches/SlaveShutdown/HeuristicLab.Optimization8944-8956
      /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Optimization10204-10479
      /branches/SuccessProgressAnalysis/HeuristicLab.Optimization5370-5682
      /branches/Trunk/HeuristicLab.Optimization6829-6865
      /branches/UnloadJobs/HeuristicLab.Optimization9168-9215
      /branches/VNS/HeuristicLab.Optimization5594-5752
      /branches/histogram/HeuristicLab.Optimization5959-6341

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IAlgorithm.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IAnalyzer.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/ICrossover.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IDiscreteDoubleMatrixModifier.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IDiscreteDoubleValueModifier.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IEvaluator.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IExhaustiveMoveGenerator.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IGlobalParticleUpdater.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IHeuristicOptimizationProblem.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IImprovementOperator.cs

    r8334 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IIterationBasedOperator.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/ILocalImprovementOperator.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2020#endregion
    2121
    22 using System;
    2322using HeuristicLab.Core;
    2423using HeuristicLab.Data;
    … …  
    2625namespace HeuristicLab.Optimization {
    2726  public interface ILocalImprovementOperator : IOperator {
    28     Type ProblemType { get; }
    29     IProblem Problem { get; set; }
    3027    IValueLookupParameter<IntValue> MaximumIterationsParameter { get; }
    3128    ILookupParameter<IntValue> EvaluatedSolutionsParameter { get; }

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/ILocalParticleUpdater.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IManipulator.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IMigrator.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IMoveGenerator.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626  /// An interface which represents an operator for generating moves.
    2727  /// </summary>
     28  /// <remarks>
     29  /// Please read the remarks on <see cref="IMoveOperator"/> on how to implement moves.
     30  /// </remarks>
    2831  public interface IMoveGenerator : IOperator {
    2932  }

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IMoveMaker.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IMoveOperator.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2424namespace HeuristicLab.Optimization {
    2525  /// <summary>
    26   /// The basic interface that marks all move operators.
     26  /// The basic interface that marks all move operators. Derived interfaces
     27  /// are used to group move operators together.
    2728  /// </summary>
    2829  /// <remarks>
    29   /// A group of move operators that belong together should derive an interface from this one
    30   /// and implement the interface in each operator.<br />
    31   /// In an algorithm one can thus find out all move operators that belong together, by grouping operators
    32   /// according to the most specific interface derived from this interface that they implement.<br /><br />
    33   /// A concrete example:<br />
    34   /// You have a solution representation <c>MyRep</c> and there you have a move <c>MyRepMove</c> that you want
    35   /// to make available to the friendly GUIs. So in <c>MyRep</c> you derive an interface <c>IMyRepMoveOperator</c>.<br />
    36   /// Now you need to implement at least three operators that handle these moves: A MoveGenerator, a MoveMaker, and a MoveEvaluator.
    37   /// Note: The MoveEvaluator should be implemented in the problem plugin if you choose to separate representation and problem.<br />
    38   /// In each of these operators you implement <c>IMyRepMoveOperator</c> as well as the appropriate operator specific interface.
    39   /// For a MoveGenerator that would be one of <c>IExhaustiveMoveGenerator</c>, <c>ISingleMoveGenerator</c>,
    40   /// or <c>IMultiMoveGenerator</c>, for a MoveMaker that would be <c>IMoveMaker</c>, and for a MoveEvaluator that would
    41   /// either be <c>ISingleObjectiveMoveEvaluator</c> or <c>IMultiObjectiveMoveEvaluator</c>.<br />
    42   /// If you have this you need to make sure that an instance of all your operators are loaded in the Operators collection of your IProblem
    43   /// and you can select them in the respective algorithms.<br /><br />
    44   /// For Tabu Search support you will need two additional operators: A TabuChecker (e.g. derived from <see cref="TabuChecker" />),
    45   /// and a TabuMaker.<br /><br />
    46   /// If you decide later that you want another move, e.g. <c>MyRepMove2</c>, you would do as before and group them under
    47   /// the interface <c>IMyRepMove2Operator</c>.<br /><br />
    48   /// If you want to make use of multiple different moves, all your operators would need to know about all the moves that you plan
    49   /// to use.<br /><br />
    50   /// Take a look at the Permutation and TSP plugin to see how this looks like in real code.
    51   /// </remarks>
     30  /// A group of move operators that belong together should derive a new
     31  /// interface from IMoveOperator and implement the new interface in each
     32  /// operator.<br />
     33  ///
     34  /// E.g. a new move is to be implemented and INewMove is created as a derived
     35  /// type of IMoveOperator. Then you create the additional following types<br />
     36  /// <list type="bullet">
     37  /// <item>
     38  ///   <term>NewMoveGenerator</term>
     39  ///   <description>
     40  ///   implements INewMove as well as either IExhaustiveMoveGenerator,
     41  ///   IMultiMoveGenerator or ISingleMoveGenerator
     42  ///   </description>
     43  /// </item>
     44  /// <item>
     45  ///   <term>NewMoveMaker</term>
     46  ///   <description>
     47  ///   implements INewMove as well as IMoveMaker
     48  ///   </description>
     49  /// </item>
     50  /// <item>
     51  ///   <term>NewMoveEvaluator</term>
     52  ///   <description>
     53  ///   (problem plugin) implements INewMove as well as ISingleObjectiveMoveEvaluator
     54  ///   </description>
     55  /// </item>
     56  /// <item>
     57  ///   <term>NewMoveTabuMaker</term>
     58  ///   <description>
     59  ///   (only for Tabu Search) implements INewMove as well as TabuMaker
     60  ///   </description>
     61  /// </item>
     62  /// <item>
     63  ///   <term>NewMoveTabuChecker</term>
     64  ///   <description>
     65  ///   (only for Tabu Search) implements INewMove as well as ITabuChecker
     66  ///   </description>
     67  /// </item>
     68  /// </list>
     69  ///
     70  /// These operators should not implement further move types. For further moves
     71  /// a new interface derived from IMoveOperator should be created.
    5272  public interface IMoveOperator : IOperator {
    5373  }

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IMultiAnalyzer.cs

    r9151 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IMultiMoveGenerator.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IMultiNeighborhoodShakingOperator.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IMultiObjectiveEvaluator.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727  /// An interface which represents an evaluation operator for multi-objective optimization problems.
    2828  /// </summary>
    29   public interface IMultiObjectiveEvaluator : IEvaluator {
     29  public interface IMultiObjectiveEvaluator : IEvaluator, IMultiObjectiveOperator {
    3030    ILookupParameter<DoubleArray> QualitiesParameter { get; }
    3131  }

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IMultiObjectiveHeuristicOptimizationProblem.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IMultiObjectiveSelector.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727  /// An interface which represents a selection operator for selecting solutions of multi-objective optimization problems.
    2828  /// </summary>
    29   public interface IMultiObjectiveSelector : ISelector {
     29  public interface IMultiObjectiveSelector : ISelector, IMultiObjectiveOperator {
    3030    ILookupParameter<BoolArray> MaximizationParameter { get; }
    3131    ILookupParameter<ItemArray<DoubleArray>> QualitiesParameter { get; }

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IOptimizer.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IParticleCreator.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IParticleUpdater.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IPathRelinker.cs

    r8334 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IProblem.cs

    r7999 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3131    IEnumerable<IItem> Operators { get; }
    3232
     33
     34    IEnumerable<IParameterizedItem> ExecutionContextItems { get; }
    3335    event EventHandler OperatorsChanged;
    3436    event EventHandler Reset;

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IQualityComparator.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IReducer.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IReplacer.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IResult.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IRun.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
     22using System.ComponentModel;
    2423using System.Drawing;
     24using HeuristicLab.Collections;
    2525using HeuristicLab.Core;
    2626
    … …  
    2929  /// Represents the parameters and results of an algorithm run.
    3030  /// </summary>
    31   public interface IRun : INamedItem {
     31  public interface IRun : INamedItem, INotifyPropertyChanged {
    3232    IAlgorithm Algorithm { get; }
    33     IDictionary<string, IItem> Parameters { get; }
    34     IDictionary<string, IItem> Results { get; }
     33    IObservableDictionary<string, IItem> Parameters { get; }
     34    IObservableDictionary<string, IItem> Results { get; }
    3535
    3636    Color Color { get; set; }
    3737    bool Visible { get; set; }
    38     event EventHandler Changed;
    3938  }
    4039}

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IRunCollectionModifier.cs

    r8924 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/ISelector.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/ISelfAdaptiveManipulator.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/ISimilarityBasedOperator.cs

    r8334 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2424namespace HeuristicLab.Optimization {
    2525  public interface ISimilarityBasedOperator : IOperator {
    26     ISolutionSimilarityCalculator SimilarityCalculator { get; set; }
     26    IConstrainedValueParameter<ISolutionSimilarityCalculator> SimilarityCalculatorParameter { get; }
    2727  }
    2828}

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/ISingleMoveGenerator.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2121
    2222namespace HeuristicLab.Optimization {
    23   public interface ISingleMoveGenerator : IMoveGenerator {
     23  public interface ISingleMoveGenerator : IMoveGenerator, ISingleObjectiveOperator {
    2424  }
    2525}

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/ISingleObjectiveEvaluator.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727  /// An interface which represents an evaluation operator for single-objective optimization problems.
    2828  /// </summary>
    29   public interface ISingleObjectiveEvaluator : IEvaluator {
     29  public interface ISingleObjectiveEvaluator : IEvaluator, ISingleObjectiveOperator {
    3030    ILookupParameter<DoubleValue> QualityParameter { get; }
    3131  }

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/ISingleObjectiveHeuristicOptimizationProblem.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/ISingleObjectiveImprovementOperator.cs

    r8334 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626  /// An interface which represents an operator for improvement of a single objective solution.
    2727  /// </summary>
    28   public interface ISingleObjectiveImprovementOperator : IImprovementOperator {
     28  public interface ISingleObjectiveImprovementOperator : IImprovementOperator, ISingleObjectiveOperator {
    2929    IValueLookupParameter<IItem> SolutionParameter { get; }
    3030  }

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/ISingleObjectiveMoveEvaluator.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2424
    2525namespace HeuristicLab.Optimization {
    26   public interface ISingleObjectiveMoveEvaluator : IOperator {
     26  public interface ISingleObjectiveMoveEvaluator : IOperator, ISingleObjectiveOperator {
    2727    ILookupParameter<DoubleValue> QualityParameter { get; }
    2828    ILookupParameter<DoubleValue> MoveQualityParameter { get; }

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/ISingleObjectivePathRelinker.cs

    r8334 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626  /// An interface which represents an operator for path relinking between single objective solutions.
    2727  /// </summary>
    28   public interface ISingleObjectivePathRelinker : IPathRelinker {
     28  public interface ISingleObjectivePathRelinker : IPathRelinker, ISingleObjectiveOperator {
    2929    ILookupParameter<ItemArray<IItem>> ParentsParameter { get; }
    3030  }

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/ISingleObjectiveReplacer.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727  /// An interface which represents a replacement operator for replacing solutions of single-objective optimization problems.
    2828  /// </summary>
    29   public interface ISingleObjectiveReplacer : IReplacer {
     29  public interface ISingleObjectiveReplacer : IReplacer, ISingleObjectiveOperator {
    3030    IValueLookupParameter<BoolValue> MaximizationParameter { get; }
    3131    ILookupParameter<ItemArray<DoubleValue>> QualityParameter { get; }

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/ISingleObjectiveSelector.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727  /// An interface which represents a selection operator for selecting solutions of single-objective optimization problems.
    2828  /// </summary>
    29   public interface ISingleObjectiveSelector : ISelector {
     29  public interface ISingleObjectiveSelector : ISelector, ISingleObjectiveOperator {
    3030    IValueLookupParameter<BoolValue> MaximizationParameter { get; }
    3131    ILookupParameter<ItemArray<DoubleValue>> QualityParameter { get; }

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/ISingleObjectiveSolutionSimilarityCalculator.cs

    r8334 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2020#endregion
    2121
     22using System;
     23
    2224namespace HeuristicLab.Optimization {
     25  // use HeuristicLab.Optimization.ISolutionSimilarityCalculator instead
     26  // BackwardsCompatibility3.3
     27  #region Backwards compatible code, remove with 3.4
    2328  /// <summary>
    2429  /// An interface which represents an operator for similarity calculation between single objective solutions.
    2530  /// </summary>
    26   public interface ISingleObjectiveSolutionSimilarityCalculator : ISolutionSimilarityCalculator {
    27     string SolutionVariableName { get; set; }
    28     string QualityVariableName { get; set; }
     31  [Obsolete("use HeuristicLab.Optimization.ISolutionSimilarityCalculator instead")]
     32  public interface ISingleObjectiveSolutionSimilarityCalculator : ISolutionSimilarityCalculator, ISingleObjectiveOperator {
     33
    2934  }
     35  #endregion
    3036}

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/ISolutionCreator.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/ISolutionSimilarityCalculator.cs

    r8334 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2828  /// </summary>
    2929  public interface ISolutionSimilarityCalculator : IItem, IEqualityComparer<IScope> {
     30    string SolutionVariableName { get; set; }
     31    string QualityVariableName { get; set; }
     32
    3033    /// <summary>
    3134    /// Calculates the similarity of two solutions.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IStochasticOperator.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IStrategyParameterCreator.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IStrategyParameterCrossover.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/IStrategyParameterManipulator.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/ISubScopesQualityComparator.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/ISwarmUpdater.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/ITabuChecker.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/ITabuMaker.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/ITopologyInitializer.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/Interfaces/ITopologyUpdater.cs

    r7259 r12118  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
Note: See TracChangeset for help on using the changeset viewer.