Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/22/10 13:41:31 (15 years ago)
Author:
abeham
Message:

Changed name of test functions problem as discussed with swagner #934
the commit, it fails me, help me prof. smith with my adhoc solution

Location:
trunk/sources/HeuristicLab.Problems.TestFunctions
Files:
1 added
6 deleted
13 edited
5 copied
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3

    • Property svn:ignore

      •  

        old new  
        22bin
        33obj
        4 HeuristicLabProblemsTestFunctionsSingleObjectivePlugin.cs
         4HeuristicLabProblemsTestFunctionsPlugin.cs

  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/AckleyEvaluator.cs

    r3154 r3170  
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727
    28 namespace HeuristicLab.Problems.TestFunctions.SingleObjective {
     28namespace HeuristicLab.Problems.TestFunctions {
    2929  /// <summary>
    3030  /// Ackley Function<br/>
    … …  
    3434  [Item("AckleyEvaluator", "Evaluates the Ackley function on a given point. The optimum of this function is 0 at the origin.")]
    3535  [StorableClass]
    36   public class AckleyEvaluator : SingleObjectiveTestFunctionEvaluator {
     36  public class AckleyEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
    3737    /// <summary>
    3838    /// Returns false as the Ackley function is a minimization problem.

  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BealeEvaluator.cs

    r3154 r3170  
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727
    28 namespace HeuristicLab.Problems.TestFunctions.SingleObjective {
     28namespace HeuristicLab.Problems.TestFunctions {
    2929  /// <summary>
    3030  /// Beale Function<br/>
    … …  
    3434  [Item("BealeEvaluator", "Evaluates the Beale function on a given point. The optimum of this function is 0 at (3,0.5).")]
    3535  [StorableClass]
    36   public class BealeEvaluator : SingleObjectiveTestFunctionEvaluator {
     36  public class BealeEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
    3737    /// <summary>
    3838    /// Returns false as the Beale function is a minimization problem.

  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BoothEvaluator.cs

    r3154 r3170  
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727
    28 namespace HeuristicLab.Problems.TestFunctions.SingleObjective {
     28namespace HeuristicLab.Problems.TestFunctions {
    2929  /// <summary>
    3030  /// Booth Function<br/>
    … …  
    3434  [Item("BoothEvaluator", "Evaluates the Booth function on a given point. The optimum of this function is 0 at (1,3).")]
    3535  [StorableClass]
    36   public class BoothEvaluator : SingleObjectiveTestFunctionEvaluator {
     36  public class BoothEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
    3737    /// <summary>
    3838    /// Returns false as the Booth function is a minimization problem.

  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/GriewangkEvaluator.cs

    r3154 r3170  
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727
    28 namespace HeuristicLab.Problems.TestFunctions.SingleObjective {
     28namespace HeuristicLab.Problems.TestFunctions {
    2929  /// <summary>
    3030  /// Griewangk Function<br/>
    … …  
    3434  [Item("GriewangkEvaluator", "Evaluates the Griewangk function on a given point. The optimum of this function is 0 at the origin.")]
    3535  [StorableClass]
    36   public class GriewangkEvaluator : SingleObjectiveTestFunctionEvaluator {
     36  public class GriewangkEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
    3737    /// <summary>
    3838    /// Returns false as the Griewangk function is a minimization problem.

  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/LevyEvaluator.cs

    r3154 r3170  
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727
    28 namespace HeuristicLab.Problems.TestFunctions.SingleObjective {
     28namespace HeuristicLab.Problems.TestFunctions {
    2929  /// <summary>
    3030  /// Levy Function<br/>
    … …  
    3434  [Item("LevyEvaluator", "Evaluates the Levy function on a given point. The optimum of this function is 0 at (1,1,...,1).")]
    3535  [StorableClass]
    36   public class LevyEvaluator : SingleObjectiveTestFunctionEvaluator {
     36  public class LevyEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
    3737    /// <summary>
    3838    /// Returns false as the Levy function is a minimization problem.

  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MatyasEvaluator.cs

    r3154 r3170  
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727
    28 namespace HeuristicLab.Problems.TestFunctions.SingleObjective {
     28namespace HeuristicLab.Problems.TestFunctions {
    2929  /// <summary>
    3030  /// Matyas Function<br/>
    … …  
    3434  [Item("MatyasEvaluator", "Evaluates the Matyas function on a given point. The optimum of this function is 0 at the origin.")]
    3535  [StorableClass]
    36   public class MatyasEvaluator : SingleObjectiveTestFunctionEvaluator {
     36  public class MatyasEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
    3737    /// <summary>
    3838    /// Returns false as the Beale function is a minimization problem.

  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RastriginEvaluator.cs

    r3154 r3170  
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727
    28 namespace HeuristicLab.Problems.TestFunctions.SingleObjective {
     28namespace HeuristicLab.Problems.TestFunctions {
    2929  /// <summary>
    3030  /// Rastrigin Function<br/>
    … …  
    3434  [Item("RastriginEvaluator", "Evaluates the Rastrigin function on a given point. The optimum of this function is 0 at the origin.")]
    3535  [StorableClass]
    36   public class RastriginEvaluator : SingleObjectiveTestFunctionEvaluator {
     36  public class RastriginEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
    3737    /// <summary>
    3838    /// Returns false as the Rastrigin function is a minimization problem.

  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RosenbrockEvaluator.cs

    r3154 r3170  
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727
    28 namespace HeuristicLab.Problems.TestFunctions.SingleObjective {
     28namespace HeuristicLab.Problems.TestFunctions {
    2929  /// <summary>
    3030  /// Rosenbrock Function<br/>
    … …  
    3434  [Item("RosenbrockEvaluator", "Evaluates the Rosenbrock function on a given point. The optimum of this function is 0 at (1,1,...,1).")]
    3535  [StorableClass]
    36   public class RosenbrockEvaluator : SingleObjectiveTestFunctionEvaluator {
     36  public class RosenbrockEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
    3737    /// <summary>
    3838    /// Returns false as the Rosenbrock function is a minimization problem.

  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SchwefelEvaluator.cs

    r3154 r3170  
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727
    28 namespace HeuristicLab.Problems.TestFunctions.SingleObjective {
     28namespace HeuristicLab.Problems.TestFunctions {
    2929  /// <summary>
    3030  /// Schwefel Function (Sine Root)<br/>
    … …  
    3434  [Item("SchwefelEvaluator", "Evaluates the Schwefel function on a given point. The optimum of this function is 0 at (420.968746453712,420.968746453712,...,420.968746453712).")]
    3535  [StorableClass]
    36   public class SchwefelEvaluator : SingleObjectiveTestFunctionEvaluator {
     36  public class SchwefelEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
    3737    /// <summary>
    3838    /// Returns false as the Rosenbrock function is a minimization problem.

  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SphereEvaluator.cs

    r3154 r3170  
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727
    28 namespace HeuristicLab.Problems.TestFunctions.SingleObjective {
     28namespace HeuristicLab.Problems.TestFunctions {
    2929  /// <summary>
    3030  /// Sphere Function<br/>
    … …  
    3434  [Item("SphereEvaluator", "Evaluates the Sphere function on a given point. The optimum of this function is 0 at the origin.")]
    3535  [StorableClass]
    36   public class SphereEvaluator : SingleObjectiveTestFunctionEvaluator {
     36  public class SphereEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
    3737    /// <summary>
    3838    /// Returns false as the Rosenbrock function is a minimization problem.

  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/ZakharovEvaluator.cs

    r3154 r3170  
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727
    28 namespace HeuristicLab.Problems.TestFunctions.SingleObjective {
     28namespace HeuristicLab.Problems.TestFunctions {
    2929  /// <summary>
    3030  /// Zakharov Function<br/>
    … …  
    3434  [Item("ZakharovEvaluator", "Evaluates the Zakharov function on a given point. The optimum of this function is 0 at the origin.")]
    3535  [StorableClass]
    36   public class ZakharovEvaluator : SingleObjectiveTestFunctionEvaluator {
     36  public class ZakharovEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
    3737    /// <summary>
    3838    /// Returns false as the Ackley function is a minimization problem.

  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj

    r3163 r3170  
    99    <OutputType>Library</OutputType>
    1010    <AppDesignerFolder>Properties</AppDesignerFolder>
    11     <RootNamespace>HeuristicLab.Problems.TestFunctions.SingleObjective</RootNamespace>
    12     <AssemblyName>HeuristicLab.Problems.TestFunctions.SingleObjective-3.3</AssemblyName>
     11    <RootNamespace>HeuristicLab.Problems.TestFunctions</RootNamespace>
     12    <AssemblyName>HeuristicLab.Problems.TestFunctions-3.3</AssemblyName>
    1313    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    … …  
    9393    <Compile Include="Evaluators\RosenbrockEvaluator.cs" />
    9494    <Compile Include="Evaluators\SchwefelEvaluator.cs" />
    95     <Compile Include="Evaluators\SingleObjectiveTestFunctionEvaluator.cs" />
     95    <Compile Include="Evaluators\SingleObjectiveTestFunctionProblemEvaluator.cs" />
    9696    <Compile Include="Evaluators\SphereEvaluator.cs" />
    9797    <Compile Include="Evaluators\ZakharovEvaluator.cs" />
    98     <Compile Include="HeuristicLabProblemsTestFunctionsSingleObjectivePlugin.cs" />
    99     <Compile Include="Interfaces\ISingleObjectiveTestFunctionEvaluator.cs" />
    100     <Compile Include="Interfaces\ISingleObjectiveTestFunctionSolutionsVisualizer.cs" />
    101     <Compile Include="SingleObjectiveTestFunction.cs" />
     98    <Compile Include="HeuristicLabProblemsTestFunctionsPlugin.cs" />
     99    <Compile Include="Interfaces\ISingleObjectiveTestFunctionProblemEvaluator.cs" />
     100    <Compile Include="Interfaces\ISingleObjectiveTestFunctionProblemSolutionsVisualizer.cs" />
     101    <Compile Include="SingleObjectiveTestFunctionProblem.cs" />
    102102    <None Include="HeuristicLab.snk" />
    103     <None Include="HeuristicLabProblemsTestFunctionsSingleObjectivePlugin.cs.frame" />
     103    <None Include="HeuristicLabProblemsTestFunctionsPlugin.cs.frame" />
    104104    <None Include="Properties\AssemblyInfo.frame" />
    105105  </ItemGroup>
    … …  
    165165
    166166call PreBuildEvent.cmd
    167 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsTestFunctionsSingleObjectivePlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsTestFunctionsSingleObjectivePlugin.cs"</PreBuildEvent>
     167SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsTestFunctionsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsTestFunctionsPlugin.cs"</PreBuildEvent>
    168168  </PropertyGroup>
    169169</Project>

  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/HeuristicLabProblemsTestFunctionsPlugin.cs.frame

    r3163 r3170  
    2222using HeuristicLab.PluginInfrastructure;
    2323
    24 namespace HeuristicLab.Problems.TestFunctions.SingleObjective {
     24namespace HeuristicLab.Problems.TestFunctions {
    2525  /// <summary>
    26   /// Plugin class for HeuristicLab.Problems.TestFunctions.SingleObjective plugin
     26  /// Plugin class for HeuristicLab.Problems.TestFunctions plugin
    2727  /// </summary>
    28   [Plugin("HeuristicLab.Problems.TestFunctions.SingleObjective", "3.3.0.$WCREV$")]
    29   [PluginFile("HeuristicLab.Problems.TestFunctions.SingleObjective-3.3.dll", PluginFileType.Assembly)]
     28  [Plugin("HeuristicLab.Problems.TestFunctions", "3.3.0.$WCREV$")]
     29  [PluginFile("HeuristicLab.Problems.TestFunctions-3.3.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3131  [PluginDependency("HeuristicLab.Common", "3.2")]
    … …  
    3838  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    3939  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    40   public class HeuristicLabProblemsTestFunctionsSingleObjectivePlugin : PluginBase {
     40  public class HeuristicLabProblemsTestFunctionsPlugin : PluginBase {
    4141  }
    4242}

  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Interfaces/ISingleObjectiveTestFunctionProblemEvaluator.cs

    r3163 r3170  
    2525using HeuristicLab.Optimization;
    2626
    27 namespace HeuristicLab.Problems.TestFunctions.SingleObjective {
     27namespace HeuristicLab.Problems.TestFunctions {
    2828  /// <summary>
    2929  /// An interface which represents an evaluation operator for single objective test functions.
    3030  /// </summary>
    31   public interface ISingleObjectiveTestFunctionEvaluator : ISingleObjectiveEvaluator {
     31  public interface ISingleObjectiveTestFunctionProblemEvaluator : ISingleObjectiveEvaluator {
    3232    bool Maximization { get; }
    3333    DoubleMatrix Bounds { get; }

  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Interfaces/ISingleObjectiveTestFunctionProblemSolutionsVisualizer.cs

    r3163 r3170  
    2424using HeuristicLab.Optimization;
    2525
    26 namespace HeuristicLab.Problems.TestFunctions.SingleObjective {
     26namespace HeuristicLab.Problems.TestFunctions {
    2727  /// <summary>
    2828  /// An interface which represents an operator for visualizing solutions of single objective test functions.
    2929  /// </summary>
    30   public interface ISingleObjectiveTestFunctionSolutionsVisualizer : ISingleObjectiveSolutionsVisualizer {
     30  public interface ISingleObjectiveTestFunctionProblemSolutionsVisualizer : ISingleObjectiveSolutionsVisualizer {
    3131    ILookupParameter<RealVector> PointParameter { get; }
    3232  }

  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Properties/AssemblyInfo.frame

    r3150 r3170  
    2626// set of attributes. Change these attribute values to modify the information
    2727// associated with an assembly.
    28 [assembly: AssemblyTitle("HeuristicLab.Problems.TestFunctions.SingleObjective")]
    29 [assembly: AssemblyDescription("HeuristicLab Single Objective Test Functions classes")]
     28[assembly: AssemblyTitle("HeuristicLab.Problems.TestFunctions")]
     29[assembly: AssemblyDescription("HeuristicLab Test Functions classes")]
    3030[assembly: AssemblyConfiguration("")]
    3131[assembly: AssemblyCompany("")]

  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs

    r3163 r3170  
    3434using HeuristicLab.PluginInfrastructure;
    3535
    36 namespace HeuristicLab.Problems.TestFunctions.SingleObjective {
     36namespace HeuristicLab.Problems.TestFunctions {
    3737  [Item("SingleObjective TestFunction", "Test function with real valued inputs and a single objective.")]
    3838  [StorableClass]
    3939  [Creatable("Problems")]
    40   public sealed class SingleObjectiveTestFunction : ParameterizedNamedItem, ISingleObjectiveProblem {
     40  public sealed class SingleObjectiveTestFunctionProblem : ParameterizedNamedItem, ISingleObjectiveProblem {
    4141    public override Image ItemImage {
    4242      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Type; }
    … …  
    6262      get { return SolutionCreatorParameter; }
    6363    }
    64     public ValueParameter<ISingleObjectiveTestFunctionEvaluator> EvaluatorParameter {
    65       get { return (ValueParameter<ISingleObjectiveTestFunctionEvaluator>)Parameters["Evaluator"]; }
     64    public ValueParameter<ISingleObjectiveTestFunctionProblemEvaluator> EvaluatorParameter {
     65      get { return (ValueParameter<ISingleObjectiveTestFunctionProblemEvaluator>)Parameters["Evaluator"]; }
    6666    }
    6767    IParameter IProblem.EvaluatorParameter {
    6868      get { return EvaluatorParameter; }
    6969    }
    70     public OptionalValueParameter<ISingleObjectiveTestFunctionSolutionsVisualizer> VisualizerParameter {
    71       get { return (OptionalValueParameter<ISingleObjectiveTestFunctionSolutionsVisualizer>)Parameters["Visualizer"]; }
     70    public OptionalValueParameter<ISingleObjectiveTestFunctionProblemSolutionsVisualizer> VisualizerParameter {
     71      get { return (OptionalValueParameter<ISingleObjectiveTestFunctionProblemSolutionsVisualizer>)Parameters["Visualizer"]; }
    7272    }
    7373    IParameter IProblem.VisualizerParameter {
    … …  
    102102      get { return SolutionCreatorParameter.Value; }
    103103    }
    104     public ISingleObjectiveTestFunctionEvaluator Evaluator {
     104    public ISingleObjectiveTestFunctionProblemEvaluator Evaluator {
    105105      get { return EvaluatorParameter.Value; }
    106106      set { EvaluatorParameter.Value = value; }
    … …  
    112112      get { return EvaluatorParameter.Value; }
    113113    }
    114     public ISingleObjectiveTestFunctionSolutionsVisualizer Visualizer {
     114    public ISingleObjectiveTestFunctionProblemSolutionsVisualizer Visualizer {
    115115      get { return VisualizerParameter.Value; }
    116116      set { VisualizerParameter.Value = value; }
    … …  
    130130
    131131    [StorableConstructor]
    132     private SingleObjectiveTestFunction(bool deserializing) : base() { }
    133     public SingleObjectiveTestFunction()
     132    private SingleObjectiveTestFunctionProblem(bool deserializing) : base() { }
     133    public SingleObjectiveTestFunctionProblem()
    134134      : base() {
    135135      UniformRandomRealVectorCreator creator = new UniformRandomRealVectorCreator();
    … …  
    140140      Parameters.Add(new ValueParameter<IntValue>("ProblemSize", "The dimension of the problem.", new IntValue(2)));
    141141      Parameters.Add(new ValueParameter<IRealVectorCreator>("SolutionCreator", "The operator which should be used to create new TSP solutions.", creator));
    142       Parameters.Add(new ValueParameter<ISingleObjectiveTestFunctionEvaluator>("Evaluator", "The operator which should be used to evaluate TSP solutions.", evaluator));
    143       Parameters.Add(new OptionalValueParameter<ISingleObjectiveTestFunctionSolutionsVisualizer>("Visualizer", "The operator which should be used to visualize TSP solutions."));
     142      Parameters.Add(new ValueParameter<ISingleObjectiveTestFunctionProblemEvaluator>("Evaluator", "The operator which should be used to evaluate TSP solutions.", evaluator));
     143      Parameters.Add(new OptionalValueParameter<ISingleObjectiveTestFunctionProblemSolutionsVisualizer>("Visualizer", "The operator which should be used to visualize TSP solutions."));
    144144      Parameters.Add(new OptionalValueParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this TSP instance.", new DoubleValue(evaluator.BestKnownQuality)));
    145145
    … …  
    153153
    154154    public override IDeepCloneable Clone(Cloner cloner) {
    155       SingleObjectiveTestFunction clone = (SingleObjectiveTestFunction)base.Clone(cloner);
     155      SingleObjectiveTestFunctionProblem clone = (SingleObjectiveTestFunctionProblem)base.Clone(cloner);
    156156      clone.Initialize();
    157157      return clone;
Note: See TracChangeset for help on using the changeset viewer.