Changeset 9990


Ignore:
Timestamp:
09/19/13 10:32:22 (7 years ago)
Author:
abeham
Message:

#1909: merged into stable branch

Location:
stable
Files:
25 edited
3 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Problems.Instances

  • stable/HeuristicLab.Problems.Instances/3.3/Properties/AssemblyInfo.cs.frame

    r9462 r9990  
    2828// associated with an assembly.
    2929[assembly: AssemblyTitle("HeuristicLab.Problems.Instances")]
    30 [assembly: AssemblyDescription("")]
     30[assembly: AssemblyDescription("Base plugin for making problem instances available to problems.")]
    3131[assembly: AssemblyConfiguration("")]
    3232[assembly: AssemblyCompany("HEAL")]
  • stable/HeuristicLab.Problems.TestFunctions

  • stable/HeuristicLab.Problems.TestFunctions.Views/3.3/HeuristicLab.Problems.TestFunctions.Views-3.3.csproj

    r8600 r9990  
    113113  </ItemGroup>
    114114  <ItemGroup>
     115    <Compile Include="SingleObjectiveTestFunctionProblemView.cs">
     116      <SubType>UserControl</SubType>
     117    </Compile>
     118    <Compile Include="SingleObjectiveTestFunctionProblemView.Designer.cs">
     119      <DependentUpon>SingleObjectiveTestFunctionProblemView.cs</DependentUpon>
     120    </Compile>
    115121    <Compile Include="SingleObjectiveTestFunctionSolutionView.cs">
    116122      <SubType>UserControl</SubType>
     
    177183      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    178184      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     185      <Private>False</Private>
     186    </ProjectReference>
     187    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     188      <Project>{3540e29e-4793-49e7-8ee2-fea7f61c3994}</Project>
     189      <Name>HeuristicLab.Problems.Instances-3.3</Name>
    179190      <Private>False</Private>
    180191    </ProjectReference>
     
    211222  -->
    212223  <PropertyGroup>
    213    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     224    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    214225set ProjectDir=$(ProjectDir)
    215226set SolutionDir=$(SolutionDir)
     
    218229call PreBuildEvent.cmd
    219230</PreBuildEvent>
    220 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     231    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    221232export ProjectDir=$(ProjectDir)
    222233export SolutionDir=$(SolutionDir)
  • stable/HeuristicLab.Problems.TestFunctions.Views/3.3/Plugin.cs.frame

    r9462 r9990  
    3636  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    3737  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
     38  [PluginDependency("HeuristicLab.Optimization", "3.3")]
     39  [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
    3840  [PluginDependency("HeuristicLab.Problems.TestFunctions", "3.3")]
    3941  public class HeuristicLabProblemsTestFunctionsViewsPlugin : PluginBase {
  • stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/AckleyEvaluator.cs

    r9456 r9990  
    3535  [StorableClass]
    3636  public class AckleyEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
     37    public override string FunctionName { get { return "Ackley"; } }
    3738    /// <summary>
    3839    /// Returns false as the Ackley function is a minimization problem.
  • stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BealeEvaluator.cs

    r9456 r9990  
    3535  [StorableClass]
    3636  public class BealeEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
     37    public override string FunctionName { get { return "Beale"; } }
    3738    /// <summary>
    3839    /// Returns false as the Beale function is a minimization problem.
  • stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BoothEvaluator.cs

    r9456 r9990  
    3434  [StorableClass]
    3535  public class BoothEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
     36    public override string FunctionName { get { return "Booth"; } }
    3637    /// <summary>
    3738    /// Returns false as the Booth function is a minimization problem.
  • stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/GriewankEvaluator.cs

    r9456 r9990  
    3636  [StorableClass]
    3737  public class GriewankEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
     38    public override string FunctionName { get { return "Griewank"; } }
    3839    /// <summary>
    3940    /// Returns false as the Griewank function is a minimization problem.
  • stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/LevyEvaluator.cs

    r9456 r9990  
    3434  [StorableClass]
    3535  public class LevyEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
     36    public override string FunctionName { get { return "Levy"; } }
    3637    /// <summary>
    3738    /// Returns false as the Levy function is a minimization problem.
  • stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MatyasEvaluator.cs

    r9456 r9990  
    3434  [StorableClass]
    3535  public class MatyasEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
     36    public override string FunctionName { get { return "Matyas"; } }
    3637    /// <summary>
    3738    /// Returns false as the Matyas function is a minimization problem.
  • stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MultinormalEvaluator.cs

    r9456 r9990  
    3535  [StorableClass]
    3636  public class MultinormalEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
     37    public override string FunctionName { get { return "Multinormal"; } }
    3738
    3839    private ItemList<RealVector> centers {
  • stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RandomEvaluator.cs

    r9456 r9990  
    3535  [StorableClass]
    3636  public class RandomEvaluator : SingleObjectiveTestFunctionProblemEvaluator, IStochasticOperator {
     37    public override string FunctionName { get { return "Random"; } }
    3738    /// <summary>
    3839    /// It does not really matter.
  • stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RastriginEvaluator.cs

    r9456 r9990  
    3636  [StorableClass]
    3737  public class RastriginEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
     38    public override string FunctionName { get { return "Rastrigin"; } }
    3839    /// <summary>
    3940    /// Returns false as the Rastrigin function is a minimization problem.
  • stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RosenbrockEvaluator.cs

    r9456 r9990  
    3838  [StorableClass]
    3939  public class RosenbrockEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
     40    public override string FunctionName { get { return "Rosenbrock"; } }
    4041    /// <summary>
    4142    /// Returns false as the Rosenbrock function is a minimization problem.
  • stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SchwefelEvaluator.cs

    r9456 r9990  
    3434  [StorableClass]
    3535  public class SchwefelEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
     36    public override string FunctionName { get { return "Schwefel"; } }
    3637    /// <summary>
    3738    /// Returns false as the Schwefel (sine root) function is a minimization problem.
  • stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SingleObjectiveTestFunctionProblemEvaluator.cs

    r9456 r9990  
    3535  [StorableClass]
    3636  public abstract class SingleObjectiveTestFunctionProblemEvaluator : SingleSuccessorOperator, ISingleObjectiveTestFunctionProblemEvaluator {
     37    /// <summary>
     38    /// The name of the function
     39    /// </summary>
     40    public abstract string FunctionName { get; }
    3741    /// <summary>
    3842    /// These operators should not change their name through the GUI
  • stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SphereEvaluator.cs

    r9456 r9990  
    3636  [StorableClass]
    3737  public class SphereEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
     38    public override string FunctionName { get { return "Sphere"; } }
    3839    /// <summary>
    3940    /// Returns false as the Sphere function is a minimization problem.
  • stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SumSquaresEvaluator.cs

    r9456 r9990  
    3333  [StorableClass]
    3434  public class SumSquaresEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
     35    public override string FunctionName { get { return "SumSquares"; } }
    3536    /// <summary>
    3637    /// Returns false as the Sum Squares function is a minimization problem.
  • stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/ZakharovEvaluator.cs

    r9456 r9990  
    3333  [StorableClass]
    3434  public class ZakharovEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
     35    public override string FunctionName { get { return "Zakharov"; } }
    3536    /// <summary>
    3637    /// Returns false as the Zakharov function is a minimization problem.
  • stable/HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj

    r9300 r9990  
    110110    <Compile Include="Evaluators\RandomEvaluator.cs" />
    111111    <Compile Include="Improvers\SingleObjectiveTestFunctionImprovementOperator.cs" />
     112    <Compile Include="Instances\SOTFData.cs" />
     113    <Compile Include="Instances\SOTFDataDescriptor.cs" />
     114    <Compile Include="Instances\SOTFInstanceProvider.cs" />
    112115    <Compile Include="MoveEvaluators\RandomAdditiveMoveEvaluator.cs" />
    113116    <Compile Include="PathRelinkers\SingleObjectiveTestFunctionPathRelinker.cs" />
     
    227230      <Private>False</Private>
    228231    </ProjectReference>
     232    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     233      <Project>{3540e29e-4793-49e7-8ee2-fea7f61c3994}</Project>
     234      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     235      <Private>False</Private>
     236    </ProjectReference>
    229237  </ItemGroup>
    230238  <ItemGroup>
     
    245253    </BootstrapperPackage>
    246254  </ItemGroup>
    247   <ItemGroup />
    248255  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    249256  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • stable/HeuristicLab.Problems.TestFunctions/3.3/Interfaces/ISingleObjectiveTestFunctionProblemEvaluator.cs

    r9456 r9990  
    3535    int MinimumProblemSize { get; }
    3636    int MaximumProblemSize { get; }
     37    string FunctionName { get; }
    3738
    3839    ILookupParameter<RealVector> PointParameter { get; }
  • stable/HeuristicLab.Problems.TestFunctions/3.3/Plugin.cs.frame

    r9462 r9990  
    3838  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    3939  [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
     40  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    4041  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    4142  [PluginDependency("HeuristicLab.Persistence", "3.3")]
  • stable/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs

    r9456 r9990  
    2020#endregion
    2121
     22using System;
     23using System.Collections.Generic;
     24using System.Linq;
    2225using HeuristicLab.Analysis;
    2326using HeuristicLab.Common;
     
    2932using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3033using HeuristicLab.PluginInfrastructure;
    31 using System;
    32 using System.Collections.Generic;
    33 using System.Linq;
     34using HeuristicLab.Problems.Instances;
    3435
    3536namespace HeuristicLab.Problems.TestFunctions {
     
    3738  [StorableClass]
    3839  [Creatable("Problems")]
    39   public sealed class SingleObjectiveTestFunctionProblem : SingleObjectiveHeuristicOptimizationProblem<ISingleObjectiveTestFunctionProblemEvaluator, IRealVectorCreator>, IStorableContent {
     40  public sealed class SingleObjectiveTestFunctionProblem : SingleObjectiveHeuristicOptimizationProblem<ISingleObjectiveTestFunctionProblemEvaluator, IRealVectorCreator>, IStorableContent, IProblemInstanceConsumer<SOTFData> {
    4041    public string Filename { get; set; }
    4142
     
    324325      try {
    325326        BestKnownSolutionParameter.Value = Evaluator.GetBestKnownSolution(ProblemSize.Value);
    326       }
    327       catch (ArgumentException e) {
     327      } catch (ArgumentException e) {
    328328        ErrorHandling.ShowErrorDialog(e);
    329329        ProblemSize.Value = Evaluator.MinimumProblemSize;
     
    406406    }
    407407    #endregion
     408
     409    public void Load(SOTFData data) {
     410      Name = data.Name;
     411      Description = data.Description;
     412      Evaluator = data.Evaluator;
     413    }
    408414  }
    409415}
Note: See TracChangeset for help on using the changeset viewer.