Context Navigation

Changeset 5615 for branches/DataAnalysis Refactoring

Timestamp:

03/07/11 13:02:45 (14 years ago)

Author:

gkronber

Message:

#1418 changed order of specialization of algorithms to Algorithm -> EngineAlgorithm -> HeuristicOptimizationAlgorithm.

Location:

branches/DataAnalysis Refactoring

Files:

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

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

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

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

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

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

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

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

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

r5578	r5615
71	71
72	72	public virtual Type ProblemType {
73		get { return typeof(I~~HeuristicOptimization~~Problem); }
	73	get { return typeof(IProblem); }
74	74	}
75	75

r5578	r5615
33	33	[Item("EngineAlgorithm", "A base class for algorithms which use an engine for execution.")]
34	34	[StorableClass]
35		public abstract class EngineAlgorithm : ~~HeuristicOptimization~~Algorithm {
	35	public abstract class EngineAlgorithm : Algorithm {
36	36	[Storable]
37	37	private OperatorGraph operatorGraph;

r5578	r5615
31	31	[Item("Heuristic Optimization Algorithm", "A base class for heuristic optimization algorithms.")]
32	32	[StorableClass]
33		public abstract class HeuristicOptimizationAlgorithm : Algorithm {
	33	public abstract class HeuristicOptimizationAlgorithm : EngineAlgorithm {
34	34	public new IHeuristicOptimizationProblem Problem {
35	35	get { return (IHeuristicOptimizationProblem)base.Problem; }

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