Context Navigation

Changeset 5644 for branches

Timestamp:

03/09/11 13:02:00 (14 years ago)

Author:

gkronber

Message:

#1418 introduced HeuristicOptimizationEngineAlgorithm

Location:

branches/DataAnalysis Refactoring

Files:

r5615	r5644
41	41	[Creatable("Algorithms")]
42	42	[StorableClass]
43		public sealed class GeneticAlgorithm : HeuristicOptimizationAlgorithm, IStorableContent {
	43	public sealed class GeneticAlgorithm : HeuristicOptimizationEngineAlgorithm, IStorableContent {
44	44	public string Filename { get; set; }
45	45

r5615	r5644
41	41	[Creatable("Algorithms")]
42	42	[StorableClass]
43		public sealed class IslandGeneticAlgorithm : HeuristicOptimizationAlgorithm, IStorableContent {
	43	public sealed class IslandGeneticAlgorithm : HeuristicOptimizationEngineAlgorithm, IStorableContent {
44	44	public string Filename { get; set; }
45	45

r5615	r5644
38	38	[Creatable("Algorithms")]
39	39	[StorableClass]
40		public sealed class LocalSearch : HeuristicOptimizationAlgorithm, IStorableContent {
	40	public sealed class LocalSearch : HeuristicOptimizationEngineAlgorithm, IStorableContent {
41	41	public string Filename { get; set; }
42	42

r5615	r5644
41	41	[Creatable("Algorithms")]
42	42	[StorableClass]
43		public class NSGA2 : HeuristicOptimizationAlgorithm, IStorableContent {
	43	public class NSGA2 : HeuristicOptimizationEngineAlgorithm, IStorableContent {
44	44	public string Filename { get; set; }
45	45

r5615	r5644
41	41	[Creatable("Algorithms")]
42	42	[StorableClass]
43		public sealed class IslandOffspringSelectionGeneticAlgorithm : HeuristicOptimizationAlgorithm, IStorableContent {
	43	public sealed class IslandOffspringSelectionGeneticAlgorithm : HeuristicOptimizationEngineAlgorithm, IStorableContent {
44	44	public string Filename { get; set; }
45	45

r5615	r5644
41	41	[Creatable("Algorithms")]
42	42	[StorableClass]
43		public sealed class OffspringSelectionGeneticAlgorithm : HeuristicOptimizationAlgorithm, IStorableContent {
	43	public sealed class OffspringSelectionGeneticAlgorithm : HeuristicOptimizationEngineAlgorithm, IStorableContent {
44	44	public string Filename { get; set; }
45	45

r5615	r5644
41	41	[Creatable("Algorithms")]
42	42	[StorableClass]
43		public sealed class SASEGASA : HeuristicOptimizationAlgorithm, IStorableContent {
	43	public sealed class SASEGASA : HeuristicOptimizationEngineAlgorithm, IStorableContent {
44	44	public string Filename { get; set; }
45	45

r5578	r5644
39	39	[Creatable("Algorithms")]
40	40	[StorableClass]
41		public sealed class ParticleSwarmOptimization : EngineAlgorithm, IStorableContent {
	41	public sealed class ParticleSwarmOptimization : HeuristicOptimizationEngineAlgorithm, IStorableContent {
42	42
43	43	#region Problem Properties

r5615	r5644
39	39	[Creatable("Algorithms")]
40	40	[StorableClass]
41		public sealed class SimulatedAnnealing : HeuristicOptimizationAlgorithm, IStorableContent {
	41	public sealed class SimulatedAnnealing : HeuristicOptimizationEngineAlgorithm, IStorableContent {
42	42	public string Filename { get; set; }
43	43

r5615	r5644
38	38	[Creatable("Algorithms")]
39	39	[StorableClass]
40		public sealed class TabuSearch : HeuristicOptimizationAlgorithm, IStorableContent {
	40	public sealed class TabuSearch : HeuristicOptimizationEngineAlgorithm, IStorableContent {
41	41	public string Filename { get; set; }
42	42

r5578	r5644
114	114	<Compile Include="Algorithm.cs" />
115	115	<Compile Include="BatchRun.cs" />
	116	<Compile Include="HeuristicOptimizationEngineAlgorithm.cs" />
116	117	<Compile Include="HeuristicOptimizationAlgorithm.cs" />
117	118	<Compile Include="MultiObjectiveHeuristicOptimizationProblem.cs" />

-                      r5615
+                      r5644
 namespace HeuristicLab.Optimization {
   /// <summary>
   /// A base class for algorithms.
+  /// A base class for heuristic optimization algorithms.
   /// </summary>
   [Item("Heuristic Optimization Algorithm", "A base class for heuristic optimization algorithms.")]
   [StorableClass]
   public abstract class HeuristicOptimizationAlgorithm : EngineAlgorithm {
+  public abstract class HeuristicOptimizationAlgorithm : Algorithm {
     public new IHeuristicOptimizationProblem Problem {
       get { return (IHeuristicOptimizationProblem)base.Problem; }

Note: See TracChangeset for help on using the changeset viewer.