Changeset 17334

Timestamp:

10/17/19 11:55:58 (5 years ago)

Author:

mkommend

Message:

#2521: Moved IStorableContent from generic problem implementation to IProblem.

Location:

branches/2521_ProblemRefactoring

Files:

• HeuristicLab.Clients.OKB/3.3/RunCreation/MultiObjectiveOKBProblem.cs (modified) (2 diffs)
• HeuristicLab.Clients.OKB/3.3/RunCreation/OKBProblem.cs (modified) (3 diffs)
• HeuristicLab.Clients.OKB/3.3/RunCreation/SingleObjectiveOKBProblem.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/BasicProblems/Problem.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IProblem.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/Problems/Problem.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Clients.OKB/3.3/RunCreation/MultiObjectiveOKBProblem.cs

@@ -21 +21 @@
 
 using System;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
-using HEAL.Attic;
 
 namespace HeuristicLab.Clients.OKB.RunCreation {
@@ -30 +30 @@
   [Creatable(CreatableAttribute.Categories.TestingAndAnalysisOKB, Priority = 120)]
   [StorableType("BB74E220-F721-4129-9A50-374647B16B97")]
-  public sealed class MultiObjectiveOKBProblem : OKBProblem, IMultiObjectiveHeuristicOptimizationProblem, IStorableContent {
-    public string Filename { get; set; }
-
+  public sealed class MultiObjectiveOKBProblem : OKBProblem, IMultiObjectiveHeuristicOptimizationProblem {
     public override Type ProblemType {
       get { return typeof(IMultiObjectiveHeuristicOptimizationProblem); }

branches/2521_ProblemRefactoring/HeuristicLab.Clients.OKB/3.3/RunCreation/OKBProblem.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Common;
-using HeuristicLab.Core;
-using HeuristicLab.Optimization;
-using HEAL.Attic;
-using HeuristicLab.Persistence.Default.Xml;
 using System;
 using System.Collections.Generic;
@@ -30 +25 @@
 using System.IO;
 using System.Linq;
+using HEAL.Attic;
+using HeuristicLab.Common;
+using HeuristicLab.Core;
+using HeuristicLab.Optimization;
+using HeuristicLab.Persistence.Default.Xml;
 
 namespace HeuristicLab.Clients.OKB.RunCreation {
@@ -35 +35 @@
   [StorableType("041DC8A8-2987-4045-B24A-CBA7EAD47316")]
   public abstract class OKBProblem : Item, IHeuristicOptimizationProblem {
+    public string Filename { get; set; }
     public virtual Type ProblemType {
       get { return typeof(IHeuristicOptimizationProblem); }

branches/2521_ProblemRefactoring/HeuristicLab.Clients.OKB/3.3/RunCreation/SingleObjectiveOKBProblem.cs

@@ -21 +21 @@
 
 using System;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
-using HEAL.Attic;
 
 namespace HeuristicLab.Clients.OKB.RunCreation {
@@ -30 +30 @@
   [Creatable(CreatableAttribute.Categories.TestingAndAnalysisOKB, Priority = 110)]
   [StorableType("1A1DF6E8-4A3F-4D91-9B1D-6FF6EC8D1055")]
-  public sealed class SingleObjectiveOKBProblem : OKBProblem, ISingleObjectiveHeuristicOptimizationProblem, IStorableContent {
-    public string Filename { get; set; }
+  public sealed class SingleObjectiveOKBProblem : OKBProblem, ISingleObjectiveHeuristicOptimizationProblem {
 
     public override Type ProblemType {

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Problem.cs

@@ -36 +36 @@
     where TEncodedSolution : class, IEncodedSolution
     where TEvaluator : class, IEvaluator {
-    public string Filename { get; set; } // TODO: Really okay here? should be in Problem (non-generic)
+   
 
     //TODO remove parameter for encoding?

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/Interfaces/IProblem.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using HEAL.Attic;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 
@@ -30 +31 @@
   /// Interface to represent an optimization problem.
   /// </summary>
-  public interface IProblem : IParameterizedNamedItem {
+  public interface IProblem : IParameterizedNamedItem , IStorableContent{
     IEnumerable<IItem> Operators { get; }
 

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/Problems/Problem.cs

@@ -34 +34 @@
   [StorableType("6DC97432-9BD1-4304-802A-1FC48A0E0468")]
   public abstract class Problem : ParameterizedNamedItem, IProblem {
+    public string Filename { get; set; } 
+
     private const string OperatorsParameterName = "Operators";
     public IFixedValueParameter<ItemCollection<IItem>> OperatorsParameter {