Changeset 3246

Timestamp:

04/01/10 04:33:08 (15 years ago)

Author:

swagner

Message:

Continued work on algorithm batch processing (#947).

Location:

trunk/sources

Files:

• HeuristicLab.Optimization.Views/3.3/BatchRunView.Designer.cs (modified) (3 diffs)
• HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/ResultCollectionListView.Designer.cs (deleted)
• HeuristicLab.Optimization.Views/3.3/ResultCollectionListView.cs (deleted)
• HeuristicLab.Optimization/3.3/BatchRun.cs (modified) (4 diffs)
• HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimization/3.3/ResultCollectionList.cs (deleted)
• HeuristicLab.Optimizer/3.3/Documents/GA_TSP.hl (modified) (previous)

trunk/sources/HeuristicLab.Optimization.Views/3.3/BatchRunView.Designer.cs

@@ -62 +62 @@
       this.repetitionsLabel = new System.Windows.Forms.Label();
       this.repetitionsNumericUpDown = new System.Windows.Forms.NumericUpDown();
-      this.resultsView = new HeuristicLab.Optimization.Views.ResultCollectionListView();
+      this.resultsView = new HeuristicLab.Optimization.Views.ResultCollectionView();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.tabControl.SuspendLayout();
@@ -273 +273 @@
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.resultsView.Caption = "ResultCollectionList";
+      this.resultsView.Caption = "ResultCollection";
       this.resultsView.Content = null;
       this.resultsView.Location = new System.Drawing.Point(6, 6);
@@ -334 +334 @@
     private System.Windows.Forms.Label repetitionsLabel;
     private System.Windows.Forms.NumericUpDown repetitionsNumericUpDown;
-    private ResultCollectionListView resultsView;
+    private ResultCollectionView resultsView;
 
   }

trunk/sources/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

@@ -98 +98 @@
       <DependentUpon>BatchRunView.cs</DependentUpon>
     </Compile>
-    <Compile Include="ResultCollectionListView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="ResultCollectionListView.Designer.cs">
-      <DependentUpon>ResultCollectionListView.cs</DependentUpon>
-    </Compile>
     <Compile Include="UserDefinedAlgorithmView.cs">
       <SubType>UserControl</SubType>

trunk/sources/HeuristicLab.Optimization/3.3/BatchRun.cs

@@ -74 +74 @@
 
     [Storable]
-    private ResultCollectionList results;
-    public ResultCollectionList Results {
+    private ResultCollection results;
+    public ResultCollection Results {
       get { return results; }
     }
@@ -111 +111 @@
       : base() {
       repetitions = 10;
-      results = new ResultCollectionList();
+      results = new ResultCollection();
       executionTime = TimeSpan.Zero;
     }
     public BatchRun(string name) : base(name) {
       repetitions = 10;
-      results = new ResultCollectionList();
+      results = new ResultCollection();
       executionTime = TimeSpan.Zero;
     }
     public BatchRun(string name, string description) : base(name, description) {
       repetitions = 10;
-      results = new ResultCollectionList();
+      results = new ResultCollection();
       executionTime = TimeSpan.Zero;
     }
@@ -129 +129 @@
       clone.Algorithm = (IAlgorithm)cloner.Clone(algorithm);
       clone.repetitions = repetitions;
-      clone.results = (ResultCollectionList)cloner.Clone(results);
+      clone.results = (ResultCollection)cloner.Clone(results);
       clone.executionTime = executionTime;
       clone.running = running;
@@ -208 +208 @@
 
     private void Algorithm_Prepared(object sender, EventArgs e) {
-      results.Add(Algorithm.Results);
+      results.Add(new Result("Run " + DateTime.Now.ToString(), Algorithm.Results));
     }
     private void Algorithm_RunningChanged(object sender, EventArgs e) {

trunk/sources/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

@@ -87 +87 @@
     <Compile Include="Algorithm.cs" />
     <Compile Include="BatchRun.cs" />
-    <Compile Include="ResultCollectionList.cs" />
     <Compile Include="Interfaces\IMultiObjectiveSolutionsVisualizer.cs" />
     <Compile Include="Interfaces\IResult.cs" />