Changeset 13691 for trunk/sources/HeuristicLab.Clients.OKB/3.3

Timestamp:

03/11/16 15:29:05 (9 years ago)

Author:

abeham

Message:

#2588: Adapted OKBProblemView to include download/upload of solutions

Location:

trunk/sources/HeuristicLab.Clients.OKB/3.3

Files:

• HeuristicLab.Clients.OKB-3.3.csproj (modified) (2 diffs)
• RunCreation/OKBProblem.cs (modified) (5 diffs)
• RunCreation/OKBSolution.cs (added)
• RunCreation/SingleObjectiveOKBSolution.cs (added)

trunk/sources/HeuristicLab.Clients.OKB/3.3/HeuristicLab.Clients.OKB-3.3.csproj

@@ -114 +114 @@
     <Compile Include="Administration\ServiceClient\ProblemClass.cs" />
     <Compile Include="OKBRoles.cs" />
+    <Compile Include="RunCreation\OKBSolution.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Query\QueryClient.cs" />
@@ -156 +157 @@
     <Compile Include="RunCreation\OKBProblem.cs" />
     <Compile Include="RunCreation\OKBRun.cs" />
+    <Compile Include="RunCreation\SingleObjectiveOKBSolution.cs" />
     <Compile Include="RunCreation\RunCreationClient.cs" />
     <Compile Include="RunCreation\ServiceClient\Algorithm.cs" />

trunk/sources/HeuristicLab.Clients.OKB/3.3/RunCreation/OKBProblem.cs

@@ -29 +29 @@
 using System.Drawing;
 using System.IO;
+using System.Linq;
 
 namespace HeuristicLab.Clients.OKB.RunCreation {
@@ -63 +64 @@
             OnOperatorsChanged();
             OnReset();
+
+            solutions.Clear();
           }
         }
       }
+    }
+
+    [Storable]
+    private ItemList<OKBSolution> solutions; 
+    public ItemList<OKBSolution> Solutions {
+      get { return solutions; }
     }
 
@@ -135 +144 @@
       problemId = original.problemId;
       problem = cloner.Clone(original.problem);
+      solutions = cloner.Clone(original.solutions);
       RegisterProblemEvents();
     }
@@ -142 +152 @@
       problemId = -1;
       problem = initialProblem;
+      solutions = new ItemList<OKBSolution>();
       RegisterProblemEvents();
     }
@@ -159 +170 @@
     }
 
+    public void RefreshSolutions() {
+      Solutions.Clear();
+      if (ProblemId != -1) {
+        Solutions.AddRange(RunCreationClient.Instance.GetSolutions(ProblemId).Select(OKBSolution.Convert));
+      }
+    }
+
     public IProblem CloneProblem() {
       return (IProblem)Problem.Clone();