Index: /trunk/sources/HeuristicLab 3.3.sln
===================================================================
--- /trunk/sources/HeuristicLab 3.3.sln (revision 9979)
+++ /trunk/sources/HeuristicLab 3.3.sln (revision 9980)
@@ -132,4 +132,5 @@
{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937} = {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}
{6AE0E1F5-D3FF-43A3-90E1-2435E7493FB5} = {6AE0E1F5-D3FF-43A3-90E1-2435E7493FB5}
+ {98EF72F8-D207-4A5B-8291-95DC73DDFD9A} = {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}
{E4EE5AFB-D552-447B-8A16-6CBE7938AF32} = {E4EE5AFB-D552-447B-8A16-6CBE7938AF32}
EndProjectSection
@@ -381,4 +382,6 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Trading.Views-3.4", "HeuristicLab.Problems.DataAnalysis.Trading.Views\3.4\HeuristicLab.Problems.DataAnalysis.Trading.Views-3.4.csproj", "{CB3D0A1E-1BE8-476B-A53C-2B189E30064F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.TestFunctions-3.3", "HeuristicLab.Problems.Instances.TestFunctions\3.3\HeuristicLab.Problems.Instances.TestFunctions-3.3.csproj", "{98EF72F8-D207-4A5B-8291-95DC73DDFD9A}"
EndProject
Global
@@ -1856,4 +1859,16 @@
{CB3D0A1E-1BE8-476B-A53C-2B189E30064F}.Release|x86.ActiveCfg = Release|x86
{CB3D0A1E-1BE8-476B-A53C-2B189E30064F}.Release|x86.Build.0 = Release|x86
+ {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|x64.ActiveCfg = Debug|x64
+ {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|x64.Build.0 = Debug|x64
+ {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|x86.ActiveCfg = Debug|x86
+ {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|x86.Build.0 = Debug|x86
+ {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|x64.ActiveCfg = Release|x64
+ {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|x64.Build.0 = Release|x64
+ {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|x86.ActiveCfg = Release|x86
+ {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
Index: /trunk/sources/HeuristicLab.Problems.Instances.TestFunctions/3.3/HeuristicLab.Problems.Instances.TestFunctions-3.3.csproj
===================================================================
--- /trunk/sources/HeuristicLab.Problems.Instances.TestFunctions/3.3/HeuristicLab.Problems.Instances.TestFunctions-3.3.csproj (revision 9980)
+++ /trunk/sources/HeuristicLab.Problems.Instances.TestFunctions/3.3/HeuristicLab.Problems.Instances.TestFunctions-3.3.csproj (revision 9980)
@@ -0,0 +1,152 @@
+
+
+
+ Debug
+ AnyCPU
+ {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}
+ Library
+ Properties
+ HeuristicLab.Problems.Instances.TestFunctions
+ HeuristicLab.Problems.Instances.TestFunctions-3.3
+ v4.0
+ 512
+
+
+
+ true
+ full
+ false
+ ..\..\bin\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ ..\..\bin\
+ TRACE
+ prompt
+ 4
+
+
+ true
+
+
+ HeuristicLab.snk
+
+
+ true
+ ..\..\bin\
+ DEBUG;TRACE
+ full
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ ..\..\bin\
+ TRACE
+ true
+ pdbonly
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ true
+ ..\..\..\..\trunk\sources\bin\
+ DEBUG;TRACE
+ full
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ ..\..\bin\
+ TRACE
+ true
+ pdbonly
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+
+ {A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}
+ HeuristicLab.Common-3.3
+ False
+
+
+ {C36BD924-A541-4A00-AFA8-41701378DDC5}
+ HeuristicLab.Core-3.3
+ False
+
+
+ {14AB8D24-25BC-400C-A846-4627AA945192}
+ HeuristicLab.Optimization-3.3
+ False
+
+
+ {94186A6A-5176-4402-AE83-886557B53CCA}
+ HeuristicLab.PluginInfrastructure-3.3
+ False
+
+
+ {3540e29e-4793-49e7-8ee2-fea7f61c3994}
+ HeuristicLab.Problems.Instances-3.3
+ False
+
+
+ {88b9b0e3-344e-4196-82a3-0f9732506fe8}
+ HeuristicLab.Problems.TestFunctions-3.3
+ False
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+set ProjectDir=$(ProjectDir)
+set SolutionDir=$(SolutionDir)
+set Outdir=$(Outdir)
+
+call PreBuildEvent.cmd
+
+
+
+ set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+set ProjectDir=$(ProjectDir)
+set SolutionDir=$(SolutionDir)
+
+call "$(ProjectDir)\Protos\ProcessProtos.cmd"
+call PreBuildEvent.cmd
+
+
+export ProjectDir=$(ProjectDir)
+export SolutionDir=$(SolutionDir)
+
+$SolutionDir/PreBuildEvent.sh
+
+
+
Index: /trunk/sources/HeuristicLab.Problems.Instances.TestFunctions/3.3/Plugin.cs.frame
===================================================================
--- /trunk/sources/HeuristicLab.Problems.Instances.TestFunctions/3.3/Plugin.cs.frame (revision 9980)
+++ /trunk/sources/HeuristicLab.Problems.Instances.TestFunctions/3.3/Plugin.cs.frame (revision 9980)
@@ -0,0 +1,32 @@
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see .
+ */
+#endregion
+
+using HeuristicLab.PluginInfrastructure;
+
+namespace HeuristicLab.Problems.Instances.TestFunctions {
+ [Plugin("HeuristicLab.Problems.Instances.TestFunctions", "3.3.8.$WCREV$")]
+ [PluginFile("HeuristicLab.Problems.Instances.TestFunctions-3.3.dll", PluginFileType.Assembly)]
+ [PluginDependency("HeuristicLab.Core", "3.3")]
+ [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
+ [PluginDependency("HeuristicLab.Problems.TestFunctions", "3.3")]
+ public class HeuristicLabProblemsInstancesTestFunctionsPlugin : PluginBase {
+ }
+}
Index: /trunk/sources/HeuristicLab.Problems.Instances.TestFunctions/3.3/Properties/AssemblyInfo.cs.frame
===================================================================
--- /trunk/sources/HeuristicLab.Problems.Instances.TestFunctions/3.3/Properties/AssemblyInfo.cs.frame (revision 9980)
+++ /trunk/sources/HeuristicLab.Problems.Instances.TestFunctions/3.3/Properties/AssemblyInfo.cs.frame (revision 9980)
@@ -0,0 +1,55 @@
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see .
+ */
+#endregion
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("HeuristicLab.Problems.Instances.TestFunctions")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("HEAL")]
+[assembly: AssemblyProduct("HeuristicLab")]
+[assembly: AssemblyCopyright("(c) 2002-2013 HEAL")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("7c14407e-6980-465b-ba3a-4a916d48989b")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("3.3.0.0")]
+[assembly: AssemblyFileVersion("3.3.8.$WCREV$")]
Index: /trunk/sources/HeuristicLab.Problems.Instances.TestFunctions/3.3/SOTFDataDescriptor.cs
===================================================================
--- /trunk/sources/HeuristicLab.Problems.Instances.TestFunctions/3.3/SOTFDataDescriptor.cs (revision 9980)
+++ /trunk/sources/HeuristicLab.Problems.Instances.TestFunctions/3.3/SOTFDataDescriptor.cs (revision 9980)
@@ -0,0 +1,38 @@
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see .
+ */
+#endregion
+
+using HeuristicLab.Problems.TestFunctions;
+
+namespace HeuristicLab.Problems.Instances.TestFunctions {
+ internal class SOTFDataDescriptor : IDataDescriptor {
+ public string Name { get { return Evaluator.FunctionName + " Function"; } }
+
+ public string Description {
+ get { return Evaluator.Description; }
+ }
+
+ internal ISingleObjectiveTestFunctionProblemEvaluator Evaluator { get; set; }
+
+ public SOTFDataDescriptor(ISingleObjectiveTestFunctionProblemEvaluator evaluator) {
+ Evaluator = evaluator;
+ }
+ }
+}
Index: /trunk/sources/HeuristicLab.Problems.Instances.TestFunctions/3.3/SOTFInstanceProvider.cs
===================================================================
--- /trunk/sources/HeuristicLab.Problems.Instances.TestFunctions/3.3/SOTFInstanceProvider.cs (revision 9980)
+++ /trunk/sources/HeuristicLab.Problems.Instances.TestFunctions/3.3/SOTFInstanceProvider.cs (revision 9980)
@@ -0,0 +1,61 @@
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see .
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Problems.TestFunctions;
+
+namespace HeuristicLab.Problems.Instances.TestFunctions {
+ public class SOTFInstanceProvider : ProblemInstanceProvider {
+ public override string Name {
+ get { return "General"; }
+ }
+
+ public override string Description {
+ get { return "Single Objective Test Functions"; }
+ }
+
+ public override Uri WebLink {
+ get { return new Uri("http://dev.heuristiclab.com/trac/hl/core/wiki/TestFunctions"); }
+ }
+
+ public override string ReferencePublication {
+ get { return string.Empty; }
+ }
+
+ public override IEnumerable GetDataDescriptors() {
+ var evaluators = ApplicationManager.Manager.GetInstances()
+ .OrderBy(x => x.Name);
+ return evaluators.Select(x => new SOTFDataDescriptor(x));
+ }
+
+ public override SOTFData LoadData(IDataDescriptor id) {
+ var descriptor = (SOTFDataDescriptor)id;
+ return new SOTFData {
+ Name = descriptor.Name,
+ Description = descriptor.Description,
+ Evaluator = descriptor.Evaluator
+ };
+ }
+ }
+}
Index: /trunk/sources/HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj
===================================================================
--- /trunk/sources/HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj (revision 9979)
+++ /trunk/sources/HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj (revision 9980)
@@ -119,4 +119,5 @@
+
@@ -143,4 +144,9 @@
{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}
HeuristicLab.Common-3.3
+ False
+
+
+ {C36BD924-A541-4A00-AFA8-41701378DDC5}
+ HeuristicLab.Core-3.3
False
Index: /trunk/sources/HeuristicLab.Problems.Instances/3.3/Plugin.cs.frame
===================================================================
--- /trunk/sources/HeuristicLab.Problems.Instances/3.3/Plugin.cs.frame (revision 9979)
+++ /trunk/sources/HeuristicLab.Problems.Instances/3.3/Plugin.cs.frame (revision 9980)
@@ -26,4 +26,5 @@
[PluginFile("HeuristicLab.Problems.Instances-3.3.dll", PluginFileType.Assembly)]
[PluginDependency("HeuristicLab.Common", "3.3")]
+ [PluginDependency("HeuristicLab.Core", "3.3")]
public class HeuristicLabProblemsInstancesPlugin : PluginBase {
}
Index: /trunk/sources/HeuristicLab.Problems.Instances/3.3/Properties/AssemblyInfo.cs.frame
===================================================================
--- /trunk/sources/HeuristicLab.Problems.Instances/3.3/Properties/AssemblyInfo.cs.frame (revision 9979)
+++ /trunk/sources/HeuristicLab.Problems.Instances/3.3/Properties/AssemblyInfo.cs.frame (revision 9980)
@@ -28,5 +28,5 @@
// associated with an assembly.
[assembly: AssemblyTitle("HeuristicLab.Problems.Instances")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("Base plugin for making problem instances available to problems.")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("HEAL")]
Index: /trunk/sources/HeuristicLab.Problems.Instances/3.3/Types/SOTFData.cs
===================================================================
--- /trunk/sources/HeuristicLab.Problems.Instances/3.3/Types/SOTFData.cs (revision 9980)
+++ /trunk/sources/HeuristicLab.Problems.Instances/3.3/Types/SOTFData.cs (revision 9980)
@@ -0,0 +1,44 @@
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see .
+ */
+#endregion
+
+using HeuristicLab.Core;
+
+namespace HeuristicLab.Problems.Instances {
+ ///
+ /// Describes instances of Single Objective Test Functions (SOTF).
+ ///
+ public class SOTFData {
+ ///
+ /// The name of the instance
+ ///
+ public string Name { get; set; }
+
+ ///
+ /// Optional! The description of the instance
+ ///
+ public string Description { get; set; }
+
+ ///
+ /// The operator used for evaluations
+ ///
+ public IOperator Evaluator { get; set; }
+ }
+}
Index: /trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/HeuristicLab.Problems.TestFunctions.Views-3.3.csproj
===================================================================
--- /trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/HeuristicLab.Problems.TestFunctions.Views-3.3.csproj (revision 9979)
+++ /trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/HeuristicLab.Problems.TestFunctions.Views-3.3.csproj (revision 9980)
@@ -113,4 +113,10 @@
+
+ UserControl
+
+
+ SingleObjectiveTestFunctionProblemView.cs
+
UserControl
@@ -177,4 +183,9 @@
{94186A6A-5176-4402-AE83-886557B53CCA}
HeuristicLab.PluginInfrastructure-3.3
+ False
+
+
+ {3540e29e-4793-49e7-8ee2-fea7f61c3994}
+ HeuristicLab.Problems.Instances-3.3
False
@@ -211,5 +222,5 @@
-->
- set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+ set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
set ProjectDir=$(ProjectDir)
set SolutionDir=$(SolutionDir)
@@ -218,5 +229,5 @@
call PreBuildEvent.cmd
-
+
export ProjectDir=$(ProjectDir)
export SolutionDir=$(SolutionDir)
Index: /trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/Plugin.cs.frame
===================================================================
--- /trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/Plugin.cs.frame (revision 9979)
+++ /trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/Plugin.cs.frame (revision 9980)
@@ -36,4 +36,6 @@
[PluginDependency("HeuristicLab.MainForm", "3.3")]
[PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
+ [PluginDependency("HeuristicLab.Optimization", "3.3")]
+ [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
[PluginDependency("HeuristicLab.Problems.TestFunctions", "3.3")]
public class HeuristicLabProblemsTestFunctionsViewsPlugin : PluginBase {
Index: /trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/SingleObjectiveTestFunctionProblemView.Designer.cs
===================================================================
--- /trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/SingleObjectiveTestFunctionProblemView.Designer.cs (revision 9980)
+++ /trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/SingleObjectiveTestFunctionProblemView.Designer.cs (revision 9980)
@@ -0,0 +1,53 @@
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see .
+ */
+#endregion
+
+namespace HeuristicLab.Problems.TestFunctions.Views {
+ partial class SingleObjectiveTestFunctionProblemView {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing) {
+ if (disposing && (components != null)) {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Component Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent() {
+ components = new System.ComponentModel.Container();
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
+ }
+
+ #endregion
+ }
+}
Index: /trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/SingleObjectiveTestFunctionProblemView.cs
===================================================================
--- /trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/SingleObjectiveTestFunctionProblemView.cs (revision 9980)
+++ /trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/SingleObjectiveTestFunctionProblemView.cs (revision 9980)
@@ -0,0 +1,38 @@
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see .
+ */
+#endregion
+
+using HeuristicLab.MainForm;
+using HeuristicLab.Optimization.Views;
+
+namespace HeuristicLab.Problems.TestFunctions.Views {
+ [View("Single Objective Test Function View")]
+ [Content(typeof(SingleObjectiveTestFunctionProblem), IsDefaultView = true)]
+ public partial class SingleObjectiveTestFunctionProblemView : ProblemView {
+ public new SingleObjectiveTestFunctionProblem Content {
+ get { return (SingleObjectiveTestFunctionProblem)base.Content; }
+ set { base.Content = value; }
+ }
+
+ public SingleObjectiveTestFunctionProblemView() {
+ InitializeComponent();
+ }
+ }
+}
Index: /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/AckleyEvaluator.cs
===================================================================
--- /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/AckleyEvaluator.cs (revision 9979)
+++ /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/AckleyEvaluator.cs (revision 9980)
@@ -35,4 +35,5 @@
[StorableClass]
public class AckleyEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
+ public override string FunctionName { get { return "Ackley"; } }
///
/// Returns false as the Ackley function is a minimization problem.
Index: /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BealeEvaluator.cs
===================================================================
--- /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BealeEvaluator.cs (revision 9979)
+++ /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BealeEvaluator.cs (revision 9980)
@@ -35,4 +35,5 @@
[StorableClass]
public class BealeEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
+ public override string FunctionName { get { return "Beale"; } }
///
/// Returns false as the Beale function is a minimization problem.
Index: /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BoothEvaluator.cs
===================================================================
--- /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BoothEvaluator.cs (revision 9979)
+++ /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BoothEvaluator.cs (revision 9980)
@@ -34,4 +34,5 @@
[StorableClass]
public class BoothEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
+ public override string FunctionName { get { return "Booth"; } }
///
/// Returns false as the Booth function is a minimization problem.
Index: /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/GriewankEvaluator.cs
===================================================================
--- /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/GriewankEvaluator.cs (revision 9979)
+++ /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/GriewankEvaluator.cs (revision 9980)
@@ -36,4 +36,5 @@
[StorableClass]
public class GriewankEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
+ public override string FunctionName { get { return "Griewank"; } }
///
/// Returns false as the Griewank function is a minimization problem.
Index: /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/LevyEvaluator.cs
===================================================================
--- /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/LevyEvaluator.cs (revision 9979)
+++ /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/LevyEvaluator.cs (revision 9980)
@@ -34,4 +34,5 @@
[StorableClass]
public class LevyEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
+ public override string FunctionName { get { return "Levy"; } }
///
/// Returns false as the Levy function is a minimization problem.
Index: /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MatyasEvaluator.cs
===================================================================
--- /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MatyasEvaluator.cs (revision 9979)
+++ /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MatyasEvaluator.cs (revision 9980)
@@ -34,4 +34,5 @@
[StorableClass]
public class MatyasEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
+ public override string FunctionName { get { return "Matyas"; } }
///
/// Returns false as the Matyas function is a minimization problem.
Index: /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MultinormalEvaluator.cs
===================================================================
--- /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MultinormalEvaluator.cs (revision 9979)
+++ /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MultinormalEvaluator.cs (revision 9980)
@@ -35,4 +35,5 @@
[StorableClass]
public class MultinormalEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
+ public override string FunctionName { get { return "Multinormal"; } }
private ItemList centers {
Index: /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RandomEvaluator.cs
===================================================================
--- /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RandomEvaluator.cs (revision 9979)
+++ /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RandomEvaluator.cs (revision 9980)
@@ -35,4 +35,5 @@
[StorableClass]
public class RandomEvaluator : SingleObjectiveTestFunctionProblemEvaluator, IStochasticOperator {
+ public override string FunctionName { get { return "Random"; } }
///
/// It does not really matter.
Index: /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RastriginEvaluator.cs
===================================================================
--- /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RastriginEvaluator.cs (revision 9979)
+++ /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RastriginEvaluator.cs (revision 9980)
@@ -36,4 +36,5 @@
[StorableClass]
public class RastriginEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
+ public override string FunctionName { get { return "Rastrigin"; } }
///
/// Returns false as the Rastrigin function is a minimization problem.
Index: /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RosenbrockEvaluator.cs
===================================================================
--- /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RosenbrockEvaluator.cs (revision 9979)
+++ /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RosenbrockEvaluator.cs (revision 9980)
@@ -38,4 +38,5 @@
[StorableClass]
public class RosenbrockEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
+ public override string FunctionName { get { return "Rosenbrock"; } }
///
/// Returns false as the Rosenbrock function is a minimization problem.
Index: /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SchwefelEvaluator.cs
===================================================================
--- /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SchwefelEvaluator.cs (revision 9979)
+++ /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SchwefelEvaluator.cs (revision 9980)
@@ -34,4 +34,5 @@
[StorableClass]
public class SchwefelEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
+ public override string FunctionName { get { return "Schwefel"; } }
///
/// Returns false as the Schwefel (sine root) function is a minimization problem.
Index: /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SingleObjectiveTestFunctionProblemEvaluator.cs
===================================================================
--- /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SingleObjectiveTestFunctionProblemEvaluator.cs (revision 9979)
+++ /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SingleObjectiveTestFunctionProblemEvaluator.cs (revision 9980)
@@ -35,4 +35,8 @@
[StorableClass]
public abstract class SingleObjectiveTestFunctionProblemEvaluator : SingleSuccessorOperator, ISingleObjectiveTestFunctionProblemEvaluator {
+ ///
+ /// The name of the function
+ ///
+ public abstract string FunctionName { get; }
///
/// These operators should not change their name through the GUI
Index: /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SphereEvaluator.cs
===================================================================
--- /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SphereEvaluator.cs (revision 9979)
+++ /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SphereEvaluator.cs (revision 9980)
@@ -36,4 +36,5 @@
[StorableClass]
public class SphereEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
+ public override string FunctionName { get { return "Sphere"; } }
///
/// Returns false as the Sphere function is a minimization problem.
Index: /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SumSquaresEvaluator.cs
===================================================================
--- /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SumSquaresEvaluator.cs (revision 9979)
+++ /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SumSquaresEvaluator.cs (revision 9980)
@@ -33,4 +33,5 @@
[StorableClass]
public class SumSquaresEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
+ public override string FunctionName { get { return "SumSquares"; } }
///
/// Returns false as the Sum Squares function is a minimization problem.
Index: /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/ZakharovEvaluator.cs
===================================================================
--- /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/ZakharovEvaluator.cs (revision 9979)
+++ /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/ZakharovEvaluator.cs (revision 9980)
@@ -33,4 +33,5 @@
[StorableClass]
public class ZakharovEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
+ public override string FunctionName { get { return "Zakharov"; } }
///
/// Returns false as the Zakharov function is a minimization problem.
Index: /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj
===================================================================
--- /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj (revision 9979)
+++ /trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj (revision 9980)
@@ -41,5 +41,5 @@
full
false
- $(SolutionDir)\bin\
+ ..\..\..\..\trunk\sources\bin\
DEBUG;TRACE
prompt
@@ -50,5 +50,5 @@
pdbonly
true
- $(SolutionDir)\bin\
+ ..\..\..\..\trunk\sources\bin\
TRACE
prompt
@@ -58,5 +58,5 @@
true
- $(SolutionDir)\bin\
+ ..\..\..\..\trunk\sources\bin\
DEBUG;TRACE
full
@@ -66,5 +66,5 @@
- $(SolutionDir)\bin\
+ ..\..\..\..\trunk\sources\bin\
TRACE
true
@@ -76,5 +76,5 @@
true
- $(SolutionDir)\bin\
+ ..\..\..\..\trunk\sources\bin\
DEBUG;TRACE
full
@@ -84,5 +84,5 @@
- $(SolutionDir)\bin\
+ ..\..\..\..\trunk\sources\bin\
TRACE
true
@@ -93,4 +93,69 @@
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll
+ False
+
+
+ False
+ ..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll
+ False
+
@@ -164,69 +229,4 @@
-
- {887425B4-4348-49ED-A457-B7D2C26DDBF9}
- HeuristicLab.Analysis-3.3
-
-
- {958B43BC-CC5C-4FA2-8628-2B3B01D890B6}
- HeuristicLab.Collections-3.3
- False
-
-
- {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}
- HeuristicLab.Common.Resources-3.3
- False
-
-
- {A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}
- HeuristicLab.Common-3.3
- False
-
-
- {C36BD924-A541-4A00-AFA8-41701378DDC5}
- HeuristicLab.Core-3.3
- False
-
-
- {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}
- HeuristicLab.Data-3.3
- False
-
-
- {BB6D334A-4BB6-4674-9883-31A6EBB32CAB}
- HeuristicLab.Encodings.RealVectorEncoding-3.3
- False
-
-
- {23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}
- HeuristicLab.Operators-3.3
- False
-
-
- {25087811-F74C-4128-BC86-8324271DA13E}
- HeuristicLab.Optimization.Operators-3.3
-
-
- {14AB8D24-25BC-400C-A846-4627AA945192}
- HeuristicLab.Optimization-3.3
- False
-
-
- {56F9106A-079F-4C61-92F6-86A84C2D84B7}
- HeuristicLab.Parameters-3.3
- False
-
-
- {102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}
- HeuristicLab.Persistence-3.3
- False
-
-
- {94186A6A-5176-4402-AE83-886557B53CCA}
- HeuristicLab.PluginInfrastructure-3.3
- False
-
-
-
False
@@ -245,5 +245,11 @@
-
+
+
+ {3540e29e-4793-49e7-8ee2-fea7f61c3994}
+ HeuristicLab.Problems.Instances-3.3
+ False
+
+