Changeset 16751 for branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Operators/ScopeUtil.cs

Timestamp:

04/03/19 15:37:38 (5 years ago)

Author:

mkommend

Message:

#2521: Renamed Solution to EncodedSolution.

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Operators/ScopeUtil.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Operators/ScopeUtil.cs

@@ -29 +29 @@
   public static class ScopeUtil {
 
-    public static TSolution CopySolutionToScope<TSolution>(IScope scope, IEncoding<TSolution> encoding, TSolution solution)
-      where TSolution : class,ISolution {
-      return CopySolutionToScope(scope, encoding.Name, solution);
+    public static TEncodedSolution CopyEncodedSolutionToScope<TEncodedSolution>(IScope scope, IEncoding<TEncodedSolution> encoding, TEncodedSolution solution)
+      where TEncodedSolution : class, IEncodedSolution {
+      return CopyEncodedSolutionToScope(scope, encoding.Name, solution);
     }
 
-    public static TSolution CopySolutionToScope<TSolution>(IScope scope, string name, TSolution solution)
-      where TSolution : class,ISolution {
-      var copy = (TSolution)solution.Clone();
+    public static TEncodedSolution CopyEncodedSolutionToScope<TEncodedSolution>(IScope scope, string name, TEncodedSolution solution)
+      where TEncodedSolution : class, IEncodedSolution {
+      var copy = (TEncodedSolution)solution.Clone();
       if (!scope.Variables.ContainsKey(name)) scope.Variables.Add(new Variable(name, copy));
       else scope.Variables[name].Value = copy;
@@ -42 +42 @@
     }
 
-    public static TSolution GetSolution<TSolution>(IScope scope, IEncoding<TSolution> encoding)
-      where TSolution : class,ISolution {
+    public static TEncodedSolution GetEncodedSolution<TEncodedSolution>(IScope scope, IEncoding<TEncodedSolution> encoding)
+      where TEncodedSolution : class, IEncodedSolution {
       var name = encoding.Name;
       if (!scope.Variables.ContainsKey(name)) throw new ArgumentException(string.Format(" {0} cannot be found in the provided scope.", name));
-      var value = scope.Variables[name].Value as TSolution;
-      if (value == null) throw new InvalidOperationException(string.Format("Value of {0} is null or not of type {1}.", name, typeof(TSolution).GetPrettyName()));
+      var value = scope.Variables[name].Value as TEncodedSolution;
+      if (value == null) throw new InvalidOperationException(string.Format("Value of {0} is null or not of type {1}.", name, typeof(TEncodedSolution).GetPrettyName()));
       return value;
     }
 
-    public static ISolution GetSolution(IScope scope, IEncoding encoding) {
-      return GetSolution(scope, encoding.Name);
+    public static IEncodedSolution GetEncodedSolution(IScope scope, IEncoding encoding) {
+      return GetEncodedSolution(scope, encoding.Name);
     }
 
-    public static ISolution GetSolution(IScope scope, string name) {
+    public static IEncodedSolution GetEncodedSolution(IScope scope, string name) {
       IVariable variable;
       if (!scope.Variables.TryGetValue(name, out variable)) throw new ArgumentException(string.Format("{0} cannot be found in the provided scope.", name));
-      var solution = variable.Value as ISolution;
+      var solution = variable.Value as IEncodedSolution;
       if (solution == null) throw new InvalidOperationException(string.Format("{0} is null or not of type ISolution.", name));
       return solution;