Changeset 14450 for branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/Interfaces

Timestamp:

12/03/16 00:32:09 (8 years ago)

Author:

abeham

Message:

#2701: working on MemPR implementation

Location:

branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/Interfaces

Files:

• . (added)
• Interfaces.cs (copied) (copied from branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/Optimization/Interfaces.cs) (2 diffs)

branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/Interfaces/Interfaces.cs

@@ -19 +19 @@
  */
 #endregion
-
-using System;
+ 
 using System.Collections.Generic;
 using HeuristicLab.Algorithms.MemPR.Binary;
+using HeuristicLab.Algorithms.MemPR.Permutation;
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.BinaryVectorEncoding;
+using HeuristicLab.Optimization;
 
-/*************************************************
- * ********************************************* *
- *                    DATA                       *
- * ********************************************* *
- *************************************************/
+namespace HeuristicLab.Algorithms.MemPR.Interfaces {
 
-namespace HeuristicLab.Optimization.SolutionModel {
+  /*************************************************
+   * ********************************************* *
+   *                    DATA                       *
+   * ********************************************* *
+   *************************************************/
 
   public interface ISolutionModel<TSolution> : IItem {
     TSolution Sample();
   }
-}
 
-namespace HeuristicLab.Optimization {
+  public interface ISolutionSubspace<TSolution> : IItem { }
 
-  public interface ISolutionSubspace : IItem { }
-}
-
-/*************************************************
+  /*************************************************
    * ********************************************* *
    *                  OPERATORS                    *
    * ********************************************* *
    *************************************************/
-
-namespace HeuristicLab.Optimization.SolutionModel {
-
-  public interface ISolutionModelTrainer<TSolution> : IOperator
-      where TSolution : class, IItem {
-    IScopeTreeLookupParameter<TSolution> SolutionParameter { get; }
-    ILookupParameter<ISolutionModel<TSolution>> SamplingModelParameter { get; }
-  }
-
-  public interface ISolutionModelTrainer<TSolution, TContext> : ISolutionModelTrainer<TSolution>
-      where TSolution : class, IItem
-      where TContext : ISolutionModelContext<TSolution> {
-
+   
+  public interface ISolutionModelTrainer<TContext> : IItem {
     void TrainModel(TContext context);
   }
 
-  public interface IBinarySolutionModelTrainer<TContext> : ISolutionModelTrainer<BinaryVector, TContext>
-      where TContext : ISolutionModelContext<BinaryVector> { }
-}
-
-namespace HeuristicLab.Optimization.LocalSearch {
-
-  public interface ILocalSearch<TSolution> : IOperator
-      where TSolution : class, IItem {
-    ILookupParameter<TSolution> SolutionParameter { get; }
-
-    Func<TSolution, double> EvaluateFunc { get; set; }
-  }
-
-  public interface ILocalSearch<TSolution, TContext> : ILocalSearch<TSolution>
-      where TSolution : class, IItem {
-
+  public interface ILocalSearch<TContext> : IItem {
     void Optimize(TContext context);
   }
-
-  public interface IBinaryLocalSearch<TContext> : ILocalSearch<BinaryVector, TContext> {
-    
-  }
-
-}
-
-/*************************************************
+  
+  /*************************************************
    * ********************************************* *
    *                  CONTEXTS                     *
@@ -96 +61 @@
    *************************************************/
 
-namespace HeuristicLab.Optimization {
-  
-  public interface IStochasticContext : IExecutionContext {
+  public interface IHeuristicAlgorithmContext<TProblem, TSolution> : IExecutionContext
+      where TProblem : class, ISingleObjectiveProblemDefinition {
+    TProblem Problem { get; }
     IRandom Random { get; }
-  }
-
-  public interface IMaximizationContext : IExecutionContext {
-    bool Maximization { get; }
-  }
-
-  public interface IEvaluatedSolutionsContext : IExecutionContext {
-    int EvaluatedSolutions { get; set; }
-  }
-
-  public interface IBestQualityContext : IExecutionContext {
+    int Iterations { get; set; }
+    int EvaluatedSolutions { get; }
+    void IncrementEvaluatedSolutions(int byEvaluations);
     double BestQuality { get; set; }
-  }
-
-  public interface IBestSolutionContext<TSolution> : IExecutionContext {
     TSolution BestSolution { get; set; }
   }
 
-  public interface IIterationsContext : IExecutionContext {
-    int Iterations { get; }
+  public interface IPopulationBasedHeuristicAlgorithmContext<TProblem, TSolution> : IHeuristicAlgorithmContext<TProblem, TSolution>
+      where TProblem : class, ISingleObjectiveProblemDefinition {
+    IEnumerable<ISingleObjectiveSolutionScope<TSolution>> Population { get; }
   }
 
-  public interface IIterationsManipulationContext : IIterationsContext {
-    new int Iterations { get; set; }
+  public interface ISingleSolutionHeuristicAlgorithmContext<TProblem, TSolution> : IHeuristicAlgorithmContext<TProblem, TSolution>
+      where TProblem : class, ISingleObjectiveProblemDefinition {
+    ISingleObjectiveSolutionScope<TSolution> Solution { get; }
   }
 
-  public interface IPopulationContext : IExecutionContext {
-    IEnumerable<IScope> Population { get; }
-  }
-
-  public interface IPopulationContext<TSolution> : IPopulationContext {
-    new IEnumerable<ISolutionScope<TSolution>> Population { get; }
-  }
-
-  public interface ISingleObjectivePopulationContext<TSolution> : IPopulationContext<TSolution> {
-    new IEnumerable<ISingleObjectiveSolutionScope<TSolution>> Population { get; }
-  }
-
-  public interface ISolutionContext : IExecutionContext {
-    IScope Solution { get; }
-  }
-
-  public interface ISolutionContext<TSolution> : ISolutionContext {
-    new ISolutionScope<TSolution> Solution { get; }
-  }
-
-  public interface ISingleObjectiveSolutionContext<TSolution> : ISolutionContext<TSolution> {
-    new ISingleObjectiveSolutionScope<TSolution> Solution { get; }
-  }
-
-  /* Probably a setter is not needed anyway, since there is Adopt() also
-  public interface ISolutionManipulationContext : ISolutionContext {
-    new IScope Solution { get; set; }
-  }
-
-  public interface ISolutionManipulationContext<TSolution> : ISolutionManipulationContext, ISolutionContext<TSolution> {
-    new ISolutionScope<TSolution> Solution { get; set; }
-  }
-
-  public interface ISingleObjectiveSolutionManipulationContext<TSolution> : ISolutionManipulationContext<TSolution>, ISingleObjectiveSolutionContext<TSolution> {
-    new ISingleObjectiveSolutionScope<TSolution> Solution { get; set; }
-  }
-  */
-
-  public interface ISolutionSubspaceContext : IExecutionContext {
-    ISolutionSubspace Subspace { get; }
-  }
-  public interface IBinarySolutionSubspaceContext : ISolutionSubspaceContext {
-    new BinarySolutionSubspace Subspace { get; }
-  }
-}
-
-namespace HeuristicLab.Optimization.SolutionModel {
   public interface ISolutionModelContext<TSolution> : IExecutionContext {
     ISolutionModel<TSolution> Model { get; set; }
   }
-}
+
+  public interface ISolutionSubspaceContext<TSolution> : IExecutionContext {
+    ISolutionSubspace<TSolution> Subspace { get; }
+  }
+  public interface IBinaryVectorSubspaceContext : ISolutionSubspaceContext<BinaryVector> {
+    new BinarySolutionSubspace Subspace { get; }
+  }
+  public interface IPermutationSubspaceContext : ISolutionSubspaceContext<Encodings.PermutationEncoding.Permutation> {
+    new PermutationSolutionSubspace Subspace { get; }
+  }
 
 
-/*************************************************
+  /*************************************************
    * ********************************************* *
    *                   SCOPES                      *
    * ********************************************* *
    *************************************************/
-  
-namespace HeuristicLab.Core {
-  public interface ISolutionScope<TSolution> : IScope {
+
+  public interface ISingleObjectiveSolutionScope<TSolution> : IScope {
     TSolution Solution { get; set; }
-
-    void Adopt(ISolutionScope<TSolution> orphan);
-  }
-
-  public interface ISingleObjectiveSolutionScope<TSolution> : ISolutionScope<TSolution> {
     double Fitness { get; set; }