Changeset 2088 for trunk/sources

Timestamp:

06/24/09 17:27:17 (15 years ago)

Author:

gkronber

Message:

Added views for the executer and the dispatcher and the server (which contains the executer and dispatcher views). #676 (Cockpit for the CEDMA Server to control algorithm settings)

Location:

trunk/sources/HeuristicLab.CEDMA.Server/3.3

Files:

• DispatcherBase.cs (modified) (2 diffs)
• DispatcherView.Designer.cs (added)
• DispatcherView.cs (added)
• DispatcherView.resx (added)
• ExecuterBase.cs (modified) (1 diff)
• ExecuterView.Designer.cs (added)
• ExecuterView.cs (added)
• ExecuterView.resx (added)
• HeuristicLab.CEDMA.Server-3.3.csproj (modified) (3 diffs)
• IDispatcher.cs (modified) (1 diff)
• IExecuter.cs (modified) (1 diff)
• Server.cs (modified) (6 diffs)
• ServerApplication.cs (modified) (1 diff)
• ServerForm.cs (modified) (1 diff)
• ServerForm.designer.cs (modified) (6 diffs)
• ServerForm.resx (modified) (1 diff)

trunk/sources/HeuristicLab.CEDMA.Server/3.3/DispatcherBase.cs

@@ -41 +41 @@
     private IStore store;
     private DataSet dataset;
-    
+
+    public IEnumerable<string> AllowedTargetVariables {
+      get {
+        if (dataset != null) {
+          return dataset.Problem.AllowedTargetVariables.Select(x => dataset.Problem.Dataset.GetVariableName(x));
+        } else return new string[0];
+      }
+    }
+
+    public IEnumerable<string> AllowedInputVariables {
+      get {
+        if (dataset != null) {
+          return dataset.Problem.AllowedInputVariables.Select(x => dataset.Problem.Dataset.GetVariableName(x));
+        } else return new string[0];
+      }
+    }
+
     public DispatcherBase(IStore store) {
       this.store = store;
@@ -91 +107 @@
       return Enumerable.Range(0, dataset.Rows).Select(x => dataset.GetValue(x, targetVariable)).Distinct();
     }
+
+    #region IViewable Members
+
+    public IView CreateView() {
+      return new DispatcherView(this);
+    }
+
+    #endregion
   }
 }

trunk/sources/HeuristicLab.CEDMA.Server/3.3/ExecuterBase.cs

@@ -129 +129 @@
 
     public abstract string[] GetJobs();
+
+
+    #region IViewable Members
+
+    public IView CreateView() {
+      return new ExecuterView(this);
+    }
+
+    #endregion
   }
 }

trunk/sources/HeuristicLab.CEDMA.Server/3.3/HeuristicLab.CEDMA.Server-3.3.csproj

@@ -91 +91 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ExecuterView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ExecuterView.Designer.cs">
+      <DependentUpon>ExecuterView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DispatcherView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="DispatcherView.Designer.cs">
+      <DependentUpon>DispatcherView.cs</DependentUpon>
+    </Compile>
     <Compile Include="ExecuterBase.cs" />
     <Compile Include="IExecuter.cs" />
@@ -101 +113 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ServerForm.cs">
-      <SubType>Form</SubType>
+      <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="ServerForm.designer.cs">
@@ -159 +171 @@
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="DispatcherView.resx">
+      <DependentUpon>DispatcherView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ExecuterView.resx">
+      <DependentUpon>ExecuterView.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="ServerForm.resx">
       <DependentUpon>ServerForm.cs</DependentUpon>

trunk/sources/HeuristicLab.CEDMA.Server/3.3/IDispatcher.cs

@@ -38 +38 @@
 
 namespace HeuristicLab.CEDMA.Server {
-  public interface IDispatcher {
+  public interface IDispatcher : IViewable {
     IAlgorithm GetNextJob();
   }

trunk/sources/HeuristicLab.CEDMA.Server/3.3/IExecuter.cs

@@ -37 +37 @@
 
 namespace HeuristicLab.CEDMA.Server {
-  public interface IExecuter {
+  public interface IExecuter : IViewable {
     int MaxActiveJobs { get; set; }
     string[] GetJobs();

trunk/sources/HeuristicLab.CEDMA.Server/3.3/Server.cs

@@ -32 +32 @@
 using HeuristicLab.Grid;
 using HeuristicLab.Grid.HiveBridge;
+using HeuristicLab.Core;
 
 namespace HeuristicLab.CEDMA.Server {
-  public class Server {
+  public class Server : IViewable {
     private static readonly string rdfFile = AppDomain.CurrentDomain.BaseDirectory + "rdf_store.db3";
     private static readonly string rdfConnectionString = "sqlite:rdf:Data Source=\"" + rdfFile + "\"";
@@ -40 +41 @@
     private ServiceHost host;
     private Store store;
+
     private IDispatcher dispatcher;
+    public IDispatcher Dispatcher { get { return dispatcher; } }
     private IExecuter executer;
+    public IExecuter Executer { get { return executer; } }
 
     private string gridServiceUrl;
@@ -53 +57 @@
       get { return cedmaServiceUrl; }
       set { cedmaServiceUrl = value; }
-    }
-
-    private int maxActiveJobs;
-    public int MaxActiveJobs {
-      get { return maxActiveJobs; }
-      set {
-        if (value > 0) {
-          maxActiveJobs = value;
-          if (executer != null) {
-            executer.MaxActiveJobs = value;
-          }
-        }
-      }
     }
 
@@ -80 +71 @@
       cedmaServiceUrl = "net.tcp://" + addresses[index] + ":8002/CEDMA";
       store = new Store(rdfConnectionString);
-      maxActiveJobs = 10;
     }
 
@@ -103 +93 @@
     }
 
-    internal string[] GetActiveJobDescriptions() {
-      if (executer != null) return executer.GetJobs();
-      else return new string[] { };
-    }
-
     internal void Connect(string serverUrl) {
       dispatcher = new SimpleDispatcher(store);
@@ -118 +103 @@
       }
       executer = new GridExecuter(dispatcher, store, gridServer);
-      executer.MaxActiveJobs = MaxActiveJobs;
       executer.Start();
     }
+    #region IViewable Members
+
+    public IView CreateView() {
+      return new ServerForm(this);
+    }
+
+    #endregion
   }
 }

trunk/sources/HeuristicLab.CEDMA.Server/3.3/ServerApplication.cs

@@ -30 +30 @@
   class ServerApplication : ApplicationBase {
     public override void Run() {
-      Form mainForm = new ServerForm();
+      Server server = new Server();
+      server.Start();
+      Form mainForm = new Form();
+      UserControl serverControl = (UserControl)server.CreateView();
+      serverControl.Dock = DockStyle.Fill;
+      mainForm.Controls.Add(serverControl);
       Application.Run(mainForm);
     }

trunk/sources/HeuristicLab.CEDMA.Server/3.3/ServerForm.cs

@@ -41 +41 @@
 
 namespace HeuristicLab.CEDMA.Server {
-  public partial class ServerForm : Form {
+  public partial class ServerForm : ViewBase {
     private Server server;
 
-
-    public ServerForm() {
+    public ServerForm(Server server) {
+      this.server = server;
       InitializeComponent();
-      server = new Server();
-      server.Start();
       addressTextBox.Text = server.CedmaServiceUrl;
-    }
-
-    private void refreshTimer_Tick(object sender, EventArgs e) {
-      listBox.DataSource = server.GetActiveJobDescriptions();
     }
 
     private void connectButton_Click(object sender, EventArgs e) {
       server.Connect(address.Text);
-      maxActiveJobsUpDown.Enabled = true;
-      activeJobsLabel.Enabled = true;
-      maxActiveJobsUpDown.Value = server.MaxActiveJobs;
-      connectButton.Enabled = false;
-      refreshTimer.Start();
-    }
-
-    private void maxActiveJobsUpDown_ValueChanged(object sender, EventArgs e) {
-      server.MaxActiveJobs = Convert.ToInt32(maxActiveJobsUpDown.Value);
+      UserControl executerControl = (UserControl)server.Executer.CreateView();
+      executerControl.Dock = DockStyle.Fill;
+      executerTabPage.Controls.Add(executerControl);
+      UserControl dispatcherControl = (UserControl)server.Dispatcher.CreateView();
+      dispatcherControl.Dock = DockStyle.Fill;
+      dispatcherTabPage.Controls.Add(dispatcherControl);
+      connectButton.Enabled = false;      
     }
   }

trunk/sources/HeuristicLab.CEDMA.Server/3.3/ServerForm.designer.cs

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.components = new System.ComponentModel.Container();
       this.addressTextBox = new System.Windows.Forms.TextBox();
       this.externalAddressLabel = new System.Windows.Forms.Label();
@@ -51 +50 @@
       this.address = new System.Windows.Forms.TextBox();
       this.connectButton = new System.Windows.Forms.Button();
-      this.listBox = new System.Windows.Forms.ListBox();
-      this.refreshTimer = new System.Windows.Forms.Timer(this.components);
-      this.maxActiveJobsUpDown = new System.Windows.Forms.NumericUpDown();
-      this.activeJobsLabel = new System.Windows.Forms.Label();
-      ((System.ComponentModel.ISupportInitialize)(this.maxActiveJobsUpDown)).BeginInit();
+      this.tabControl = new System.Windows.Forms.TabControl();
+      this.executerTabPage = new System.Windows.Forms.TabPage();
+      this.dispatcherTabPage = new System.Windows.Forms.TabPage();
+      this.tabControl.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -101 +99 @@
       this.connectButton.Click += new System.EventHandler(this.connectButton_Click);
       // 
-      // listBox
+      // tabControl
       // 
-      this.listBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.listBox.FormattingEnabled = true;
-      this.listBox.Location = new System.Drawing.Point(12, 84);
-      this.listBox.Name = "listBox";
-      this.listBox.Size = new System.Drawing.Size(350, 251);
-      this.listBox.TabIndex = 11;
+      this.tabControl.Controls.Add(this.executerTabPage);
+      this.tabControl.Controls.Add(this.dispatcherTabPage);
+      this.tabControl.Location = new System.Drawing.Point(3, 58);
+      this.tabControl.Name = "tabControl";
+      this.tabControl.SelectedIndex = 0;
+      this.tabControl.Size = new System.Drawing.Size(573, 543);
+      this.tabControl.TabIndex = 14;
       // 
-      // refreshTimer
+      // executerTabPage
       // 
-      this.refreshTimer.Interval = 1000;
-      this.refreshTimer.Tick += new System.EventHandler(this.refreshTimer_Tick);
+      this.executerTabPage.Location = new System.Drawing.Point(4, 22);
+      this.executerTabPage.Name = "executerTabPage";
+      this.executerTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.executerTabPage.Size = new System.Drawing.Size(565, 517);
+      this.executerTabPage.TabIndex = 0;
+      this.executerTabPage.Text = "Executer";
+      this.executerTabPage.UseVisualStyleBackColor = true;
       // 
-      // maxActiveJobsUpDown
+      // dispatcherTabPage
       // 
-      this.maxActiveJobsUpDown.Enabled = false;
-      this.maxActiveJobsUpDown.Location = new System.Drawing.Point(106, 59);
-      this.maxActiveJobsUpDown.Maximum = new decimal(new int[] {
-            64,
-            0,
-            0,
-            0});
-      this.maxActiveJobsUpDown.Name = "maxActiveJobsUpDown";
-      this.maxActiveJobsUpDown.Size = new System.Drawing.Size(120, 20);
-      this.maxActiveJobsUpDown.TabIndex = 12;
-      this.maxActiveJobsUpDown.ValueChanged += new System.EventHandler(this.maxActiveJobsUpDown_ValueChanged);
-      // 
-      // activeJobsLabel
-      // 
-      this.activeJobsLabel.AutoSize = true;
-      this.activeJobsLabel.Enabled = false;
-      this.activeJobsLabel.Location = new System.Drawing.Point(12, 61);
-      this.activeJobsLabel.Name = "activeJobsLabel";
-      this.activeJobsLabel.Size = new System.Drawing.Size(84, 13);
-      this.activeJobsLabel.TabIndex = 13;
-      this.activeJobsLabel.Text = "&Max active jobs:";
+      this.dispatcherTabPage.Location = new System.Drawing.Point(4, 22);
+      this.dispatcherTabPage.Name = "dispatcherTabPage";
+      this.dispatcherTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.dispatcherTabPage.Size = new System.Drawing.Size(565, 517);
+      this.dispatcherTabPage.TabIndex = 1;
+      this.dispatcherTabPage.Text = "Dispatcher";
+      this.dispatcherTabPage.UseVisualStyleBackColor = true;
       // 
       // ServerForm
@@ -145 +136 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.ClientSize = new System.Drawing.Size(374, 342);
-      this.Controls.Add(this.activeJobsLabel);
-      this.Controls.Add(this.maxActiveJobsUpDown);
-      this.Controls.Add(this.listBox);
+      this.Controls.Add(this.tabControl);
       this.Controls.Add(this.connectButton);
       this.Controls.Add(this.gridAddressLabel);
@@ -155 +143 @@
       this.Controls.Add(this.addressTextBox);
       this.Name = "ServerForm";
-      this.Text = "CEDMA Server";
-      ((System.ComponentModel.ISupportInitialize)(this.maxActiveJobsUpDown)).EndInit();
+      this.Size = new System.Drawing.Size(579, 604);
+      this.tabControl.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -169 +157 @@
     private System.Windows.Forms.TextBox address;
     private System.Windows.Forms.Button connectButton;
-    private System.Windows.Forms.ListBox listBox;
-    private System.Windows.Forms.Timer refreshTimer;
-    private System.Windows.Forms.NumericUpDown maxActiveJobsUpDown;
-    private System.Windows.Forms.Label activeJobsLabel;
+    private System.Windows.Forms.TabControl tabControl;
+    private System.Windows.Forms.TabPage executerTabPage;
+    private System.Windows.Forms.TabPage dispatcherTabPage;
   }
 }

trunk/sources/HeuristicLab.CEDMA.Server/3.3/ServerForm.resx

@@ -118 +118 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="refreshTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>