Index: /stable/HeuristicLab.Problems.Instances/3.3/Properties/AssemblyInfo.cs.frame
===================================================================
--- /stable/HeuristicLab.Problems.Instances/3.3/Properties/AssemblyInfo.cs.frame (revision 9989)
+++ /stable/HeuristicLab.Problems.Instances/3.3/Properties/AssemblyInfo.cs.frame (revision 9990)
@@ -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: /stable/HeuristicLab.Problems.TestFunctions.Views/3.3/HeuristicLab.Problems.TestFunctions.Views-3.3.csproj
===================================================================
--- /stable/HeuristicLab.Problems.TestFunctions.Views/3.3/HeuristicLab.Problems.TestFunctions.Views-3.3.csproj (revision 9989)
+++ /stable/HeuristicLab.Problems.TestFunctions.Views/3.3/HeuristicLab.Problems.TestFunctions.Views-3.3.csproj (revision 9990)
@@ -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: /stable/HeuristicLab.Problems.TestFunctions.Views/3.3/Plugin.cs.frame
===================================================================
--- /stable/HeuristicLab.Problems.TestFunctions.Views/3.3/Plugin.cs.frame (revision 9989)
+++ /stable/HeuristicLab.Problems.TestFunctions.Views/3.3/Plugin.cs.frame (revision 9990)
@@ -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: /stable/HeuristicLab.Problems.TestFunctions.Views/3.3/SingleObjectiveTestFunctionProblemView.Designer.cs
===================================================================
--- /stable/HeuristicLab.Problems.TestFunctions.Views/3.3/SingleObjectiveTestFunctionProblemView.Designer.cs (revision 9990)
+++ /stable/HeuristicLab.Problems.TestFunctions.Views/3.3/SingleObjectiveTestFunctionProblemView.Designer.cs (revision 9990)
@@ -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: /stable/HeuristicLab.Problems.TestFunctions.Views/3.3/SingleObjectiveTestFunctionProblemView.cs
===================================================================
--- /stable/HeuristicLab.Problems.TestFunctions.Views/3.3/SingleObjectiveTestFunctionProblemView.cs (revision 9990)
+++ /stable/HeuristicLab.Problems.TestFunctions.Views/3.3/SingleObjectiveTestFunctionProblemView.cs (revision 9990)
@@ -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: /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/AckleyEvaluator.cs
===================================================================
--- /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/AckleyEvaluator.cs (revision 9989)
+++ /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/AckleyEvaluator.cs (revision 9990)
@@ -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: /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BealeEvaluator.cs
===================================================================
--- /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BealeEvaluator.cs (revision 9989)
+++ /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BealeEvaluator.cs (revision 9990)
@@ -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: /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BoothEvaluator.cs
===================================================================
--- /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BoothEvaluator.cs (revision 9989)
+++ /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BoothEvaluator.cs (revision 9990)
@@ -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: /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/GriewankEvaluator.cs
===================================================================
--- /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/GriewankEvaluator.cs (revision 9989)
+++ /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/GriewankEvaluator.cs (revision 9990)
@@ -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: /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/LevyEvaluator.cs
===================================================================
--- /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/LevyEvaluator.cs (revision 9989)
+++ /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/LevyEvaluator.cs (revision 9990)
@@ -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: /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MatyasEvaluator.cs
===================================================================
--- /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MatyasEvaluator.cs (revision 9989)
+++ /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MatyasEvaluator.cs (revision 9990)
@@ -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: /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MultinormalEvaluator.cs
===================================================================
--- /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MultinormalEvaluator.cs (revision 9989)
+++ /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MultinormalEvaluator.cs (revision 9990)
@@ -35,4 +35,5 @@
[StorableClass]
public class MultinormalEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
+ public override string FunctionName { get { return "Multinormal"; } }
private ItemList centers {
Index: /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RandomEvaluator.cs
===================================================================
--- /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RandomEvaluator.cs (revision 9989)
+++ /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RandomEvaluator.cs (revision 9990)
@@ -35,4 +35,5 @@
[StorableClass]
public class RandomEvaluator : SingleObjectiveTestFunctionProblemEvaluator, IStochasticOperator {
+ public override string FunctionName { get { return "Random"; } }
///
/// It does not really matter.
Index: /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RastriginEvaluator.cs
===================================================================
--- /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RastriginEvaluator.cs (revision 9989)
+++ /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RastriginEvaluator.cs (revision 9990)
@@ -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: /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RosenbrockEvaluator.cs
===================================================================
--- /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RosenbrockEvaluator.cs (revision 9989)
+++ /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RosenbrockEvaluator.cs (revision 9990)
@@ -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: /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SchwefelEvaluator.cs
===================================================================
--- /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SchwefelEvaluator.cs (revision 9989)
+++ /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SchwefelEvaluator.cs (revision 9990)
@@ -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: /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SingleObjectiveTestFunctionProblemEvaluator.cs
===================================================================
--- /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SingleObjectiveTestFunctionProblemEvaluator.cs (revision 9989)
+++ /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SingleObjectiveTestFunctionProblemEvaluator.cs (revision 9990)
@@ -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: /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SphereEvaluator.cs
===================================================================
--- /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SphereEvaluator.cs (revision 9989)
+++ /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SphereEvaluator.cs (revision 9990)
@@ -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: /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SumSquaresEvaluator.cs
===================================================================
--- /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SumSquaresEvaluator.cs (revision 9989)
+++ /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SumSquaresEvaluator.cs (revision 9990)
@@ -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: /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/ZakharovEvaluator.cs
===================================================================
--- /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/ZakharovEvaluator.cs (revision 9989)
+++ /stable/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/ZakharovEvaluator.cs (revision 9990)
@@ -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: /stable/HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj
===================================================================
--- /stable/HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj (revision 9989)
+++ /stable/HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj (revision 9990)
@@ -110,4 +110,7 @@
+
+
+
@@ -227,4 +230,9 @@
False
+
+ {3540e29e-4793-49e7-8ee2-fea7f61c3994}
+ HeuristicLab.Problems.Instances-3.3
+ False
+
@@ -245,5 +253,4 @@
-