Changeset 12823 for branches

Timestamp:

07/31/15 10:57:26 (9 years ago)

Author:

ascheibe

Message:

#2017 added a new mode to hive drain for extracting runs and storing them in a single file

Location:

branches/HeuristicLab.Tools/HeuristicLab.HiveDrain

Files:

• . (modified) (1 prop)
• HeuristicLab.HiveDrain/HeuristicLab.HiveDrain.csproj (modified) (1 diff)
• HeuristicLab.HiveDrain/HiveDrainMainWindow.Designer.cs (modified) (5 diffs)
• HeuristicLab.HiveDrain/HiveDrainMainWindow.cs (modified) (2 diffs)
• HeuristicLab.HiveDrain/JobDownloader.cs (modified) (3 diffs)
• HeuristicLab.HiveDrain/JobTaskDownloader.cs (modified) (2 diffs)
• HeuristicLab.HiveDrain/JobTaskOneFileDownloader.cs (added)
• HeuristicLab.HiveDrain/Plugin.cs (modified) (1 diff)
• HeuristicLab.HiveDrain/TaskSerializer.cs (modified) (1 diff)

branches/HeuristicLab.Tools/HeuristicLab.HiveDrain/HeuristicLab.HiveDrain/HeuristicLab.HiveDrain.csproj

@@ -75 +75 @@
     </Compile>
     <Compile Include="JobDownloader.cs" />
+    <Compile Include="JobTaskOneFileDownloader.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

branches/HeuristicLab.Tools/HeuristicLab.HiveDrain/HeuristicLab.HiveDrain/HiveDrainMainWindow.Designer.cs

@@ -1 @@
-namespace HiveDrain {
+namespace HeuristicLab.HiveDrain {
   partial class HiveDrainMainWindow {
     /// <summary>
@@ -29 +29 @@
       this.downloadButton = new System.Windows.Forms.Button();
       this.logView = new HeuristicLab.Core.Views.LogView();
+      this.oneFileCheckBox = new System.Windows.Forms.CheckBox();
       this.SuspendLayout();
       // 
@@ -73 +74 @@
       this.logView.TabIndex = 4;
       // 
+      // oneFileCheckBox
+      // 
+      this.oneFileCheckBox.AutoSize = true;
+      this.oneFileCheckBox.Location = new System.Drawing.Point(15, 44);
+      this.oneFileCheckBox.Name = "oneFileCheckBox";
+      this.oneFileCheckBox.Size = new System.Drawing.Size(102, 17);
+      this.oneFileCheckBox.TabIndex = 5;
+      this.oneFileCheckBox.Text = "Save as one file";
+      this.oneFileCheckBox.UseVisualStyleBackColor = true;
+      // 
       // HiveDrainMainWindow
       // 
@@ -78 +89 @@
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.ClientSize = new System.Drawing.Size(842, 447);
+      this.Controls.Add(this.oneFileCheckBox);
       this.Controls.Add(this.logView);
       this.Controls.Add(this.downloadButton);
@@ -97 +109 @@
     private System.Windows.Forms.Button downloadButton;
     private HeuristicLab.Core.Views.LogView logView;
+    private System.Windows.Forms.CheckBox oneFileCheckBox;
   }
 }

branches/HeuristicLab.Tools/HeuristicLab.HiveDrain/HeuristicLab.HiveDrain/HiveDrainMainWindow.cs

@@ -5 +5 @@
 using HeuristicLab.Core;
 
-namespace HiveDrain {
+namespace HeuristicLab.HiveDrain {
   public partial class HiveDrainMainWindow : Form {
     public HiveDrainMainWindow() {
@@ -29 +29 @@
       downloadButton.Enabled = false;
 
-      JobDownloader jobDownloader = new JobDownloader(Environment.CurrentDirectory, pattern, Log);
+      JobDownloader jobDownloader = new JobDownloader(Environment.CurrentDirectory, pattern, Log, oneFileCheckBox.Checked);
       task = new Task(jobDownloader.Start);
       task.ContinueWith(x => { Log.LogMessage("All tasks written, quitting."); EnableButton(); }, TaskContinuationOptions.OnlyOnRanToCompletion);

branches/HeuristicLab.Tools/HeuristicLab.HiveDrain/HeuristicLab.HiveDrain/JobDownloader.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.IO;
@@ -6 +27 @@
 using HeuristicLab.Core;
 
-
-namespace HiveDrain {
+namespace HeuristicLab.HiveDrain {
   /// <summary>
   /// Retrieves all jobs and starts downloading their tasks
   /// </summary>
-  class JobDownloader {
+  public class JobDownloader {
     public string RootLocation { get; set; }
 
     public string NamePattern { get; set; }
 
+    public bool OneFile { get; set; }
+
     private ILog log;
 
-    public JobDownloader(string location, string pattern, ILog log) {
+    public JobDownloader(string location, string pattern, ILog log, bool oneFile = false) {
       RootLocation = location;
       NamePattern = pattern;
       this.log = log;
+      OneFile = oneFile;
     }
 
@@ -34 +57 @@
           log.LogMessage(String.Format("\"{0}\": {1}", j.Name, j.Id));
 
-          JobTaskDownloader taskDownloader = new JobTaskDownloader(jobPath, j, limitSemaphore, log);
-          taskDownloader.Start();
+          if (OneFile) {
+            JobTaskOneFileDownloader taskDownloader = new JobTaskOneFileDownloader(jobPath, j, limitSemaphore, log);
+            taskDownloader.Start();
+          } else {
+            JobTaskDownloader taskDownloader = new JobTaskDownloader(jobPath, j, limitSemaphore, log);
+            taskDownloader.Start();
+          }
         } else {
           log.LogMessage(String.Format("\"{0}\": {1} ---> ignored", j.Name, j.Id));

branches/HeuristicLab.Tools/HeuristicLab.HiveDrain/HeuristicLab.HiveDrain/JobTaskDownloader.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.IO;
@@ -8 +29 @@
 using HeuristicLab.Core;
 
-namespace HiveDrain {
+namespace HeuristicLab.HiveDrain {
   /// <summary>
   /// downloads all finished tasks for a job
   /// </summary>
-  class JobTaskDownloader {
+  public class JobTaskDownloader {
     public String RootLocation { get; set; }
     public Job ParentJob { get; set; }

branches/HeuristicLab.Tools/HeuristicLab.HiveDrain/HeuristicLab.HiveDrain/Plugin.cs

@@ -1 @@
-using System.Windows.Forms;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Windows.Forms;
 using HeuristicLab.PluginInfrastructure;
 
-namespace HiveDrain {
+namespace HeuristicLab.HiveDrain {
   // Hive Drain HeuristicLab Application, based on the original code of apetrei's Hive Drain Console Application
   [Plugin("HeuristicLab.HiveDrain", "1.0.0.0")]

branches/HeuristicLab.Tools/HeuristicLab.HiveDrain/HeuristicLab.HiveDrain/TaskSerializer.cs

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System;
 using HeuristicLab.Common;
 
-
-namespace HiveDrain {
+namespace HeuristicLab.HiveDrain {
   static class TaskSerializer {
     public static void Serialize(SerializerTask serializerTask) {