Changeset 4559

Timestamp:

10/06/10 03:27:57 (14 years ago)

Author:

swagner

Message:

Worked on OKB (#1174)

Location:

branches/OKB

Files:

• HeuristicLab.Clients.OKB-3.3/OKBClient.cs (modified) (2 diffs)
• HeuristicLab.Clients.OKB-3.3/OKBExperiment.cs (modified) (3 diffs)
• HeuristicLab.Services.OKB.DataTransfer/3.3/AlgorithmParameter.cs (added)
• HeuristicLab.Services.OKB.DataTransfer/3.3/Experiment.cs (added)
• HeuristicLab.Services.OKB.DataTransfer/3.3/HeuristicLab.Services.OKB.DataTransfer-3.3.csproj (modified) (1 diff)
• HeuristicLab.Services.OKB.DataTransfer/3.3/ProblemParameter.cs (added)
• HeuristicLab.Services.OKB.DataTransfer/3.3/Result.cs (added)
• HeuristicLab.Services.OKB.DataTransfer/3.3/Run.cs (added)
• HeuristicLab.Services.OKB/3.3/Convert.cs (modified) (3 diffs)

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

@@ -27 +27 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Optimization;
 using HeuristicLab.PluginInfrastructure;
 
@@ -157 +158 @@
       }
     }
+    public bool Store(long algorithmId, long probleId, Run run) {
+      return true;
+    }
     #endregion
 

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

@@ -277 +277 @@
         Algorithm.Started += new EventHandler(algorithm_Started);
         Algorithm.Stopped += new EventHandler(algorithm_Stopped);
+        Algorithm.Runs.ItemsAdded += new Collections.CollectionItemsChangedEventHandler<IRun>(Runs_ItemsAdded);
       }
     }
@@ -289 +290 @@
         Algorithm.Started -= new EventHandler(algorithm_Started);
         Algorithm.Stopped -= new EventHandler(algorithm_Stopped);
+        Algorithm.Runs.ItemsAdded -= new Collections.CollectionItemsChangedEventHandler<IRun>(Runs_ItemsAdded);
       }
     }
@@ -314 +316 @@
     private void algorithm_Stopped(object sender, EventArgs e) {
       OnStopped();
+    }
+    private void Runs_ItemsAdded(object sender, Collections.CollectionItemsChangedEventArgs<IRun> e) {
+      try {
+        foreach (Run run in e.Items)
+          OKBClient.Instance.Store(AlgorithmId, ProblemId, run);
+      }
+      catch (Exception ex) {
+        OnExceptionOccurred(ex);
+      }
     }
     #endregion

branches/OKB/HeuristicLab.Services.OKB.DataTransfer/3.3/HeuristicLab.Services.OKB.DataTransfer-3.3.csproj

@@ -51 +51 @@
     <Compile Include="Algorithm.cs" />
     <Compile Include="AlgorithmData.cs" />
+    <Compile Include="AlgorithmParameter.cs" />
+    <Compile Include="Run.cs" />
+    <Compile Include="Experiment.cs" />
+    <Compile Include="Result.cs" />
+    <Compile Include="ProblemParameter.cs" />
     <Compile Include="ProblemData.cs" />
     <Compile Include="Problem.cs" />

branches/OKB/HeuristicLab.Services.OKB/3.3/Convert.cs

@@ -101 +101 @@
     #endregion
 
+    #region AlgorithmParameter
+    public static DT.AlgorithmParameter ToDto(DA.AlgorithmParameter source) {
+      if (source == null) return null;
+      return new DT.AlgorithmParameter { Id = source.Id, Name = source.Name, Description = source.Description, Alias = source.Alias, AlgorithmId = source.AlgorithmId, DataTypeId = source.DataTypeId };
+    }
+    public static DA.AlgorithmParameter ToEntity(DT.AlgorithmParameter source) {
+      if (source == null) return null;
+      return new DA.AlgorithmParameter { Id = source.Id, Name = source.Name, Description = source.Description, Alias = source.Alias, AlgorithmId = source.AlgorithmId, DataTypeId = source.DataTypeId };
+    }
+    public static void ToEntity(DT.AlgorithmParameter source, DA.AlgorithmParameter target) {
+      if ((source != null) && (target != null))
+        target.Id = source.Id; target.Name = source.Name; target.Description = source.Description; target.Alias = source.Alias; target.AlgorithmId = source.AlgorithmId; target.DataTypeId = source.DataTypeId;
+    }
+    #endregion
+
     #region ProblemClass
     public static DT.ProblemClass ToDto(DA.ProblemClass source) {
@@ -116 +131 @@
     #endregion
 
-    #region Algorithm
+    #region Problem
     public static DT.Problem ToDto(DA.Problem source) {
       if (source == null) return null;
@@ -145 +160 @@
     }
     #endregion
+
+    #region ProblemParameter
+    public static DT.ProblemParameter ToDto(DA.ProblemParameter source) {
+      if (source == null) return null;
+      return new DT.ProblemParameter { Id = source.Id, Name = source.Name, Description = source.Description, Alias = source.Alias, ProblemId = source.ProblemId, DataTypeId = source.DataTypeId };
+    }
+    public static DA.ProblemParameter ToEntity(DT.ProblemParameter source) {
+      if (source == null) return null;
+      return new DA.ProblemParameter { Id = source.Id, Name = source.Name, Description = source.Description, Alias = source.Alias, ProblemId = source.ProblemId, DataTypeId = source.DataTypeId };
+    }
+    public static void ToEntity(DT.ProblemParameter source, DA.ProblemParameter target) {
+      if ((source != null) && (target != null))
+        target.Id = source.Id; target.Name = source.Name; target.Description = source.Description; target.Alias = source.Alias; target.ProblemId = source.ProblemId; target.DataTypeId = source.DataTypeId;
+    }
+    #endregion
+
+    #region Result
+    public static DT.Result ToDto(DA.Result source) {
+      if (source == null) return null;
+      return new DT.Result { Id = source.Id, Name = source.Name, Description = source.Description, Alias = source.Alias, AlgorithmId = source.AlgorithmId, DataTypeId = source.DataTypeId };
+    }
+    public static DA.Result ToEntity(DT.Result source) {
+      if (source == null) return null;
+      return new DA.Result { Id = source.Id, Name = source.Name, Description = source.Description, Alias = source.Alias, AlgorithmId = source.AlgorithmId, DataTypeId = source.DataTypeId };
+    }
+    public static void ToEntity(DT.Result source, DA.Result target) {
+      if ((source != null) && (target != null))
+        target.Id = source.Id; target.Name = source.Name; target.Description = source.Description; target.Alias = source.Alias; target.AlgorithmId = source.AlgorithmId; target.DataTypeId = source.DataTypeId;
+    }
+    #endregion
+
+    #region Experiment
+    public static DT.Experiment ToDto(DA.Experiment source) {
+      if (source == null) return null;
+      return new DT.Experiment { Id = source.Id, AlgorithmId = source.AlgorithmId, ProblemId = source.ProblemId };
+    }
+    public static DA.Experiment ToEntity(DT.Experiment source) {
+      if (source == null) return null;
+      return new DA.Experiment { Id = source.Id, AlgorithmId = source.AlgorithmId, ProblemId = source.ProblemId };
+    }
+    public static void ToEntity(DT.Experiment source, DA.Experiment target) {
+      if ((source != null) && (target != null))
+        target.Id = source.Id; target.AlgorithmId = source.AlgorithmId; target.ProblemId = source.ProblemId;
+    }
+    #endregion
+
+    #region Run
+    public static DT.Run ToDto(DA.Run source) {
+      if (source == null) return null;
+      return new DT.Run { Id = source.Id, RandomSeed = source.RandomSeed, FinishedDate = source.FinishedDate, ExperimentId = source.ExperimentId, UserId = source.UserId, ClientId = source.ClientId };
+    }
+    public static DA.Run ToEntity(DT.Run source) {
+      if (source == null) return null;
+      return new DA.Run { Id = source.Id, RandomSeed = source.RandomSeed, FinishedDate = source.FinishedDate, ExperimentId = source.ExperimentId, UserId = source.UserId, ClientId = source.ClientId };
+    }
+    public static void ToEntity(DT.Run source, DA.Run target) {
+      if ((source != null) && (target != null))
+        target.Id = source.Id; target.RandomSeed = source.RandomSeed; target.FinishedDate = source.FinishedDate; target.ExperimentId = source.ExperimentId; target.UserId = source.UserId; target.ClientId = source.ClientId;
+
+    }
+    #endregion
   }
 }