Changeset 4553 for branches/OKB

Timestamp:

10/05/10 01:14:31 (14 years ago)

Author:

swagner

Message:

Worked on OKB (#1174)

Location:

branches/OKB/HeuristicLab.Clients.OKB-3.3

Files:

• HeuristicLab.Clients.OKB-3.3.csproj (modified) (1 diff)
• OKBExperiment.cs (modified) (4 diffs)
• Views/OKBExperimentView.cs (modified) (4 diffs)

branches/OKB/HeuristicLab.Clients.OKB-3.3/HeuristicLab.Clients.OKB-3.3.csproj

@@ -204 +204 @@
     <None Include="HeuristicLabClientsOKBPlugin.cs.frame" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\OKBExperimentView.resx">
-      <DependentUpon>OKBExperimentView.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/OKB/HeuristicLab.Clients.OKB-3.3/OKBExperiment.cs

@@ -53 +53 @@
         algorithm = value;
         RegisterAlgorithmEvents();
-        algorithm.Problem = Problem;
+        if (algorithm != null) algorithm.Problem = Problem;
         OnChanged();
       }
     }
+    [Storable]
     private long ProblemId { get; set; }
+    [Storable]
     private IProblem problem;
     public IProblem Problem {
@@ -68 +70 @@
     }
 
+    public ExecutionState ExecutionState {
+      get {
+        if (Algorithm != null) return Algorithm.ExecutionState;
+        else return ExecutionState.Stopped;
+      }
+    }
+    public TimeSpan ExecutionTime {
+      get {
+        if (Algorithm != null) return Algorithm.ExecutionTime;
+        else return TimeSpan.Zero;
+      }
+    }
     public IKeyedItemCollection<string, IParameter> Parameters {
       get {
@@ -84 +98 @@
         if (Algorithm != null) return Algorithm.Runs;
         else return null;
-      }
-    }
-    public ExecutionState ExecutionState {
-      get {
-        if (Algorithm != null) return Algorithm.ExecutionState;
-        else return ExecutionState.Stopped;
-      }
-    }
-    public TimeSpan ExecutionTime {
-      get {
-        if (Algorithm != null) return Algorithm.ExecutionTime;
-        else return TimeSpan.Zero;
       }
     }
@@ -105 +107 @@
     }
     [StorableConstructor]
-    private OKBExperiment(bool deserializing) : base(deserializing) { }
-
-    public void LoadAlgorithm(long id) {
-      AlgorithmId = id;
-      AlgorithmData algorithmData = OKBClient.Instance.GetAlgorithmData(id);
-
-      using (MemoryStream stream = new MemoryStream(algorithmData.Data)) {
-        Algorithm = XmlParser.Deserialize<IAlgorithm>(stream);
-      }
-    }
-    public void LoadProblem(long id) {
-      ProblemId = id;
-      ProblemData problemData = OKBClient.Instance.GetProblemData(id);
-
-      using (MemoryStream stream = new MemoryStream(problemData.Data)) {
-        Problem = XmlParser.Deserialize<IProblem>(stream);
-      }
-    }
-
-    public void Pause() {
-      Algorithm.Pause();
-    }
+    private OKBExperiment(bool deserializing)
+      : base(deserializing) {
+      RegisterAlgorithmEvents();
+    }
+
+    public void Load(Algorithm algorithm) {
+      if (algorithm == null) {
+        AlgorithmId = 0;
+        Algorithm = null;
+      } else {
+        AlgorithmId = algorithm.Id;
+        AlgorithmData algorithmData = OKBClient.Instance.GetAlgorithmData(algorithm.Id);
+
+        using (MemoryStream stream = new MemoryStream(algorithmData.Data)) {
+          Algorithm = XmlParser.Deserialize<IAlgorithm>(stream);
+        }
+      }
+    }
+    public void Load(Problem problem) {
+      if (problem == null) {
+        ProblemId = 0;
+        Problem = null;
+      } else {
+        ProblemId = problem.Id;
+        ProblemData problemData = OKBClient.Instance.GetProblemData(problem.Id);
+
+        using (MemoryStream stream = new MemoryStream(problemData.Data)) {
+          Problem = XmlParser.Deserialize<IProblem>(stream);
+        }
+      }
+    }
+
     public void Prepare(bool clearRuns) {
       if (Algorithm != null) Algorithm.Prepare(clearRuns);
     }
     public void Prepare() {
-      Algorithm.Prepare();
+      if (Algorithm != null) Algorithm.Prepare();
     }
     public void Start() {
-      Algorithm.Start();
+      if (Algorithm != null) Algorithm.Start();
+    }
+    public void Pause() {
+      if (Algorithm != null) Algorithm.Pause();
     }
     public void Stop() {
-      Algorithm.Stop();
+      if (Algorithm != null) Algorithm.Stop();
     }
 

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/OKBExperimentView.cs

@@ -91 +91 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
+      algorithmComboBox.Enabled = (Content != null) && !ReadOnly && !Locked && (algorithmComboBox.Items.Count > 0);
+      problemComboBox.Enabled = (Content != null) && !ReadOnly && !Locked && (problemComboBox.Items.Count > 0);
+      tabControl.Enabled = Content != null;
       executionTimeTextBox.Enabled = Content != null;
       SetEnabledStateOfExecutableButtons();
@@ -100 +103 @@
         algorithmComboBox.DataSource = OKBClient.Instance.Algorithms.Where(x => x.PlatformId == platform.Id).ToList();
         algorithmComboBox.DisplayMember = "Name";
+        algorithmComboBox.SelectedIndex = -1;
         problemComboBox.DataSource = OKBClient.Instance.Problems.Where(x => x.PlatformId == platform.Id).ToList();
         problemComboBox.DisplayMember = "Name";
+        problemComboBox.SelectedIndex = -1;
       }
     }
@@ -155 +160 @@
         Invoke(new EventHandler(Content_Prepared), sender, e);
       else {
+        resultsViewHost.Content = Content.Results;
         ReadOnly = Locked = false;
         SetEnabledStateOfExecutableButtons();
@@ -191 +197 @@
     private void algorithmComboBox_SelectedValueChanged(object sender, System.EventArgs e) {
       Algorithm algorithm = algorithmComboBox.SelectedValue as Algorithm;
-      if ((algorithm != null) && (Content != null)) {
-        Content.LoadAlgorithm(algorithm.Id);
-      }
+      if (Content != null) Content.Load(algorithm);
     }
     private void problemComboBox_SelectedValueChanged(object sender, System.EventArgs e) {
       Problem problem = problemComboBox.SelectedValue as Problem;
-      if ((problem != null) && (Content != null)) {
-        Content.LoadProblem(problem.Id);
-      }
+      if (Content != null) Content.Load(problem);
     }
     private void prepareButton_Click(object sender, EventArgs e) {