Changeset 4929 for branches/OKB/HeuristicLab.Clients.OKB-3.3

Timestamp:

11/25/10 02:51:45 (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) (2 diffs)
• OKBClient.cs (modified) (6 diffs)
• OKBExperiment.cs (modified) (3 diffs)
• ServiceClients/Experiment.cs (added)
• ServiceClients/Run.cs (added)
• Views/AlgorithmParameterView.Designer.cs (added)
• Views/AlgorithmParameterView.cs (added)
• Views/AlgorithmView.Designer.cs (modified) (5 diffs)
• Views/AlgorithmView.cs (modified) (1 diff)
• Views/ExperimentCollectionView.Designer.cs (added)
• Views/ExperimentCollectionView.cs (added)
• Views/ProblemParameterView.Designer.cs (added)
• Views/ProblemParameterView.cs (added)
• Views/ResultCollectionView.cs (modified) (1 diff)
• Views/ResultView.Designer.cs (added)
• Views/ResultView.cs (added)
• Views/RunCollectionView.Designer.cs (added)
• Views/RunCollectionView.cs (added)
• app.config (modified) (1 diff)

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

@@ -105 +105 @@
     <Compile Include="ServiceClients\AlgorithmData.cs" />
     <Compile Include="ServiceClients\AlgorithmParameter.cs" />
+    <Compile Include="ServiceClients\Run.cs" />
+    <Compile Include="ServiceClients\Experiment.cs" />
     <Compile Include="ServiceClients\Result.cs" />
     <Compile Include="ServiceClients\ProblemParameter.cs" />
@@ -159 +161 @@
       <DependentUpon>AlgorithmParameterCollectionView.cs</DependentUpon>
     </Compile>
+    <Compile Include="Views\AlgorithmParameterView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Views\AlgorithmParameterView.Designer.cs">
+      <DependentUpon>AlgorithmParameterView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Views\RunCollectionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Views\RunCollectionView.Designer.cs">
+      <DependentUpon>RunCollectionView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ExperimentCollectionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Views\ExperimentCollectionView.Designer.cs">
+      <DependentUpon>ExperimentCollectionView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ProblemParameterView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Views\ProblemParameterView.Designer.cs">
+      <DependentUpon>ProblemParameterView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ResultView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Views\ResultView.Designer.cs">
+      <DependentUpon>ResultView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Views\ResultCollectionView.cs">
       <SubType>UserControl</SubType>

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

@@ -323 +323 @@
 
     #region Run Methods
-    public bool AddRun(long algorithmId, long problemId, HeuristicLab.Optimization.Run run) {
-      try {
-        IAlgorithm algorithm = run.Algorithm;
+    public bool AddRun(long algorithmId, long problemId, IAlgorithm algorithm) {
+      try {
         IProblem problem = algorithm.Problem;
 
@@ -346 +345 @@
         r.ClientId = Guid.NewGuid();
         r.FinishedDate = DateTime.Now;
-        r.RandomSeed = ((IntValue)((IValueParameter)run.Parameters["Seed"]).Value).Value;
+        r.RandomSeed = ((IntValue)((IValueParameter)algorithm.Parameters["Seed"]).Value).Value;
         r.ResultValues = resultValues.ToArray();
         r.Store();
@@ -361 +360 @@
       List<AlgorithmParameterValue> values = new List<AlgorithmParameterValue>();
       foreach (IValueParameter param in item.Parameters.OfType<IValueParameter>()) {
-        if (param.GetsCollected && (param.Value != null)) {
+        if (param.GetsCollected && (param.Value != null) && (param.Name != "Seed")) {
           AlgorithmParameter p = parameters.FirstOrDefault(x => x.Name == prefix + param.Name);
           if (p == null) {
@@ -376 +375 @@
           value.AlgorithmParameterId = p.Id;
           value.DataTypeId = ConvertToDataType(param.Value.GetType()).Id;
+          values.Add(value);
         }
 
@@ -424 +424 @@
           value.ProblemParameterId = p.Id;
           value.DataTypeId = ConvertToDataType(param.Value.GetType()).Id;
+          values.Add(value);
         }
 
@@ -457 +458 @@
       List<ResultValue> values = new List<ResultValue>();
       foreach (IResult result in algorithm.Results) {
-        if ((result.Value != null) && (results.FirstOrDefault(x => x.Name == result.Name) == null)) {
-          Result r = new Result();
-          r.Name = result.Name;
-          r.Alias = result.Name;
-          r.Description = result.Description;
-          r.AlgorithmId = algorithmId;
-          r.DataTypeId = ConvertToDataType(result.DataType).Id;
-          r.Store();
-          results.Add(r);
+        if (result.Value != null) {
+          Result r = results.FirstOrDefault(x => x.Name == result.Name);
+          if (r == null) {
+            r = new Result();
+            r.Name = result.Name;
+            r.Alias = result.Name;
+            r.Description = result.Description;
+            r.AlgorithmId = algorithmId;
+            r.DataTypeId = ConvertToDataType(result.DataType).Id;
+            r.Store();
+            results.Add(r);
+          }
+          ResultValue value = CreateResultValue(result.Value);
+          value.ResultId = r.Id;
+          value.DataTypeId = ConvertToDataType(result.Value.GetType()).Id;
+          values.Add(value);
         }
       }
       return values;
     }
-    private ResultValue CreateResiötValue(IItem item) {
+    private ResultValue CreateResultValue(IItem item) {
       if (item is BoolValue) {
         ResultBoolValue value = new ResultBoolValue();

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

@@ -290 +290 @@
         Algorithm.Started += new EventHandler(algorithm_Started);
         Algorithm.Stopped += new EventHandler(algorithm_Stopped);
-        Algorithm.Runs.ItemsAdded += new Collections.CollectionItemsChangedEventHandler<IRun>(Runs_ItemsAdded);
       }
     }
@@ -303 +302 @@
         Algorithm.Started -= new EventHandler(algorithm_Started);
         Algorithm.Stopped -= new EventHandler(algorithm_Stopped);
-        Algorithm.Runs.ItemsAdded -= new Collections.CollectionItemsChangedEventHandler<IRun>(Runs_ItemsAdded);
       }
     }
@@ -329 +327 @@
     private void algorithm_Stopped(object sender, EventArgs e) {
       OnStopped();
-    }
-    private void Runs_ItemsAdded(object sender, Collections.CollectionItemsChangedEventArgs<IRun> e) {
+
       try {
-        foreach (HeuristicLab.Optimization.Run run in e.Items)
-          OKBClient.Instance.AddRun(AlgorithmId, ProblemId, run);
+        OKBClient.Instance.AddRun(AlgorithmId, ProblemId, algorithm);
       }
       catch (Exception ex) {

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/AlgorithmView.Designer.cs

@@ -56 +56 @@
       this.dataTabPage = new System.Windows.Forms.TabPage();
       this.algorithmDataView = new HeuristicLab.Clients.OKB.AlgorithmDataView();
+      this.parametersTabPage = new System.Windows.Forms.TabPage();
+      this.algorithmParameterCollectionView = new HeuristicLab.Clients.OKB.AlgorithmParameterCollectionView();
+      this.refreshParametersButton = new System.Windows.Forms.Button();
+      this.resultsTabPage = new System.Windows.Forms.TabPage();
+      this.resultCollectionView = new HeuristicLab.Clients.OKB.ResultCollectionView();
+      this.refreshResultsButton = new System.Windows.Forms.Button();
+      this.experimentsTabPage = new System.Windows.Forms.TabPage();
+      this.refreshExperimentsButton = new System.Windows.Forms.Button();
+      this.experimentCollectionView = new HeuristicLab.Clients.OKB.ExperimentCollectionView();
       this.tabControl.SuspendLayout();
       this.usersTabPage.SuspendLayout();
       this.dataTabPage.SuspendLayout();
+      this.parametersTabPage.SuspendLayout();
+      this.resultsTabPage.SuspendLayout();
+      this.experimentsTabPage.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -138 +150 @@
       this.tabControl.Controls.Add(this.usersTabPage);
       this.tabControl.Controls.Add(this.dataTabPage);
+      this.tabControl.Controls.Add(this.parametersTabPage);
+      this.tabControl.Controls.Add(this.resultsTabPage);
+      this.tabControl.Controls.Add(this.experimentsTabPage);
       this.tabControl.Location = new System.Drawing.Point(0, 162);
       this.tabControl.Name = "tabControl";
@@ -203 +218 @@
       this.algorithmDataView.Size = new System.Drawing.Size(613, 254);
       this.algorithmDataView.TabIndex = 0;
+      // 
+      // parametersTabPage
+      // 
+      this.parametersTabPage.Controls.Add(this.algorithmParameterCollectionView);
+      this.parametersTabPage.Controls.Add(this.refreshParametersButton);
+      this.parametersTabPage.Location = new System.Drawing.Point(4, 22);
+      this.parametersTabPage.Name = "parametersTabPage";
+      this.parametersTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.parametersTabPage.Size = new System.Drawing.Size(625, 266);
+      this.parametersTabPage.TabIndex = 2;
+      this.parametersTabPage.Text = "Parameters";
+      this.parametersTabPage.UseVisualStyleBackColor = true;
+      // 
+      // algorithmParameterCollectionView
+      // 
+      this.algorithmParameterCollectionView.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.algorithmParameterCollectionView.Caption = "AlgorithmParameterCollection View";
+      this.algorithmParameterCollectionView.Content = null;
+      this.algorithmParameterCollectionView.Location = new System.Drawing.Point(6, 36);
+      this.algorithmParameterCollectionView.Name = "algorithmParameterCollectionView";
+      this.algorithmParameterCollectionView.ReadOnly = false;
+      this.algorithmParameterCollectionView.Size = new System.Drawing.Size(613, 224);
+      this.algorithmParameterCollectionView.TabIndex = 1;
+      // 
+      // refreshParametersButton
+      // 
+      this.refreshParametersButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Refresh;
+      this.refreshParametersButton.Location = new System.Drawing.Point(6, 6);
+      this.refreshParametersButton.Name = "refreshParametersButton";
+      this.refreshParametersButton.Size = new System.Drawing.Size(24, 24);
+      this.refreshParametersButton.TabIndex = 0;
+      this.refreshParametersButton.UseVisualStyleBackColor = true;
+      this.refreshParametersButton.Click += new System.EventHandler(this.refreshParametersButton_Click);
+      // 
+      // resultsTabPage
+      // 
+      this.resultsTabPage.Controls.Add(this.resultCollectionView);
+      this.resultsTabPage.Controls.Add(this.refreshResultsButton);
+      this.resultsTabPage.Location = new System.Drawing.Point(4, 22);
+      this.resultsTabPage.Name = "resultsTabPage";
+      this.resultsTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.resultsTabPage.Size = new System.Drawing.Size(625, 266);
+      this.resultsTabPage.TabIndex = 3;
+      this.resultsTabPage.Text = "Results";
+      this.resultsTabPage.UseVisualStyleBackColor = true;
+      // 
+      // resultCollectionView
+      // 
+      this.resultCollectionView.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.resultCollectionView.Caption = "ResultCollection View";
+      this.resultCollectionView.Content = null;
+      this.resultCollectionView.Location = new System.Drawing.Point(6, 36);
+      this.resultCollectionView.Name = "resultCollectionView";
+      this.resultCollectionView.ReadOnly = false;
+      this.resultCollectionView.Size = new System.Drawing.Size(613, 224);
+      this.resultCollectionView.TabIndex = 1;
+      // 
+      // refreshResultsButton
+      // 
+      this.refreshResultsButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Refresh;
+      this.refreshResultsButton.Location = new System.Drawing.Point(6, 6);
+      this.refreshResultsButton.Name = "refreshResultsButton";
+      this.refreshResultsButton.Size = new System.Drawing.Size(24, 24);
+      this.refreshResultsButton.TabIndex = 0;
+      this.refreshResultsButton.UseVisualStyleBackColor = true;
+      this.refreshResultsButton.Click += new System.EventHandler(this.refreshResultsButton_Click);
+      // 
+      // experimentsTabPage
+      // 
+      this.experimentsTabPage.Controls.Add(this.experimentCollectionView);
+      this.experimentsTabPage.Controls.Add(this.refreshExperimentsButton);
+      this.experimentsTabPage.Location = new System.Drawing.Point(4, 22);
+      this.experimentsTabPage.Name = "experimentsTabPage";
+      this.experimentsTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.experimentsTabPage.Size = new System.Drawing.Size(625, 266);
+      this.experimentsTabPage.TabIndex = 4;
+      this.experimentsTabPage.Text = "Experiments";
+      this.experimentsTabPage.UseVisualStyleBackColor = true;
+      // 
+      // refreshExperimentsButton
+      // 
+      this.refreshExperimentsButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Refresh;
+      this.refreshExperimentsButton.Location = new System.Drawing.Point(6, 6);
+      this.refreshExperimentsButton.Name = "refreshExperimentsButton";
+      this.refreshExperimentsButton.Size = new System.Drawing.Size(24, 24);
+      this.refreshExperimentsButton.TabIndex = 0;
+      this.refreshExperimentsButton.UseVisualStyleBackColor = true;
+      this.refreshExperimentsButton.Click += new System.EventHandler(this.refreshExperimentsButton_Click);
+      // 
+      // experimentCollectionView
+      // 
+      this.experimentCollectionView.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.experimentCollectionView.Caption = "ExperimentCollection View";
+      this.experimentCollectionView.Content = null;
+      this.experimentCollectionView.Location = new System.Drawing.Point(6, 36);
+      this.experimentCollectionView.Name = "experimentCollectionView";
+      this.experimentCollectionView.ReadOnly = false;
+      this.experimentCollectionView.Size = new System.Drawing.Size(613, 224);
+      this.experimentCollectionView.TabIndex = 1;
       // 
       // AlgorithmView
@@ -227 +347 @@
       this.usersTabPage.ResumeLayout(false);
       this.dataTabPage.ResumeLayout(false);
+      this.parametersTabPage.ResumeLayout(false);
+      this.resultsTabPage.ResumeLayout(false);
+      this.experimentsTabPage.ResumeLayout(false);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -245 +368 @@
     private System.Windows.Forms.TabPage dataTabPage;
     private AlgorithmDataView algorithmDataView;
+    private System.Windows.Forms.TabPage parametersTabPage;
+    private System.Windows.Forms.TabPage resultsTabPage;
+    private AlgorithmParameterCollectionView algorithmParameterCollectionView;
+    private System.Windows.Forms.Button refreshParametersButton;
+    private System.Windows.Forms.Button refreshResultsButton;
+    private System.Windows.Forms.TabPage experimentsTabPage;
+    private ResultCollectionView resultCollectionView;
+    private ExperimentCollectionView experimentCollectionView;
+    private System.Windows.Forms.Button refreshExperimentsButton;
 
   }

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

@@ -123 +123 @@
       storeUsersButton.Enabled = !ReadOnly;
     }
+
+    private void refreshParametersButton_Click(object sender, EventArgs e) {
+      algorithmParameterCollectionView.Content = OKBClient.Instance.GetAlgorithmParameters(Content.Id);
+    }
+
+    private void refreshResultsButton_Click(object sender, EventArgs e) {
+      resultCollectionView.Content = OKBClient.Instance.GetResults(Content.Id);
+    }
+
+    private void refreshExperimentsButton_Click(object sender, EventArgs e) {
+      experimentCollectionView.Content = null; // TODO
+    }
   }
 }

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

@@ -31 +31 @@
     public ResultCollectionView() {
       InitializeComponent();
-      itemsGroupBox.Text = "Result";
+      itemsGroupBox.Text = "Results";
     }
 

branches/OKB/HeuristicLab.Clients.OKB-3.3/app.config

@@ -7 +7 @@
                     openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
                     bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard"
-                    maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
+                    maxBufferPoolSize="524288" maxReceivedMessageSize="200000000"
                     messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true"
                     allowCookies="false">