Changeset 13336 for branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/internal

Timestamp:

11/23/15 15:15:27 (9 years ago)

Author:

mkommend

Message:

#2521: Refactored encodings and problems.

Location:

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/internal

Files:

• IMultiObjectiveAnalysisOperator.cs (modified) (1 diff)
• IMultiObjectiveEvaluationOperator.cs (modified) (1 diff)
• INeighborBasedOperator.cs (modified) (1 diff)
• ISingleObjectiveAnalysisOperator.cs (modified) (1 diff)
• ISingleObjectiveEvaluationOperator.cs (modified) (1 diff)

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/internal/IMultiObjectiveAnalysisOperator.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Optimization {
-  internal interface IMultiObjectiveAnalysisOperator : IEncodingOperator, IAnalyzer, IMultiObjectiveOperator {
-    Action<Individual[], double[][], ResultCollection, IRandom> AnalyzeAction { get; set; }
+  internal interface IMultiObjectiveAnalysisOperator<TSolution> : IEncodingOperator<TSolution>, IAnalyzer, IMultiObjectiveOperator
+  where TSolution : class, ISolution {
+    Action<TSolution[], double[][], ResultCollection, IRandom> AnalyzeAction { get; set; }
   }
 }

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/internal/IMultiObjectiveEvaluationOperator.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Optimization {
-  internal interface IMultiObjectiveEvaluationOperator : IMultiObjectiveEvaluator, IEncodingOperator {
-    Func<Individual, IRandom, double[]> EvaluateFunc { get; set; }
+  internal interface IMultiObjectiveEvaluationOperator<TSolution> : IMultiObjectiveEvaluator, IEncodingOperator<TSolution>
+  where TSolution : class, ISolution {
+    Func<TSolution, IRandom, double[]> EvaluateFunc { get; set; }
   }
 }

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/internal/INeighborBasedOperator.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Optimization {
-  internal interface INeighborBasedOperator : IEncodingOperator {
-    Func<Individual, IRandom, IEnumerable<Individual>> GetNeighborsFunc { get; set; }
+  internal interface INeighborBasedOperator<TSolution> : IEncodingOperator<TSolution>
+  where TSolution : class, ISolution {
+    Func<TSolution, IRandom, IEnumerable<TSolution>> GetNeighborsFunc { get; set; }
   }
 }

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/internal/ISingleObjectiveAnalysisOperator.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Optimization {
-  internal interface ISingleObjectiveAnalysisOperator : IEncodingOperator, ISingleObjectiveOperator {
-    Action<Individual[], double[], ResultCollection, IRandom> AnalyzeAction { get; set; }
+  internal interface ISingleObjectiveAnalysisOperator<TSolution> : IEncodingOperator<TSolution>, ISingleObjectiveOperator
+  where TSolution : class, ISolution {
+    Action<TSolution[], double[], ResultCollection, IRandom> AnalyzeAction { get; set; }
   }
 }

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/internal/ISingleObjectiveEvaluationOperator.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Optimization {
-  internal interface ISingleObjectiveEvaluationOperator : ISingleObjectiveEvaluator, IEncodingOperator {
-    Func<Individual, IRandom, double> EvaluateFunc { get; set; }
+  internal interface ISingleObjectiveEvaluationOperator<TSolution> : ISingleObjectiveEvaluator, IEncodingOperator<TSolution>
+  where TSolution : class, ISolution {
+    Func<TSolution, IRandom, double> EvaluateFunc { get; set; }
   }
 }