Free cookie consent management tool by TermsFeed Policy Generator

Changeset 3246


Ignore:
Timestamp:
04/01/10 04:33:08 (14 years ago)
Author:
swagner
Message:

Continued work on algorithm batch processing (#947).

Location:
trunk/sources
Files:
3 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Optimization.Views/3.3/BatchRunView.Designer.cs

    r3226 r3246  
    6262      this.repetitionsLabel = new System.Windows.Forms.Label();
    6363      this.repetitionsNumericUpDown = new System.Windows.Forms.NumericUpDown();
    64       this.resultsView = new HeuristicLab.Optimization.Views.ResultCollectionListView();
     64      this.resultsView = new HeuristicLab.Optimization.Views.ResultCollectionView();
    6565      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    6666      this.tabControl.SuspendLayout();
     
    273273                  | System.Windows.Forms.AnchorStyles.Left)
    274274                  | System.Windows.Forms.AnchorStyles.Right)));
    275       this.resultsView.Caption = "ResultCollectionList";
     275      this.resultsView.Caption = "ResultCollection";
    276276      this.resultsView.Content = null;
    277277      this.resultsView.Location = new System.Drawing.Point(6, 6);
     
    334334    private System.Windows.Forms.Label repetitionsLabel;
    335335    private System.Windows.Forms.NumericUpDown repetitionsNumericUpDown;
    336     private ResultCollectionListView resultsView;
     336    private ResultCollectionView resultsView;
    337337
    338338  }
  • trunk/sources/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

    r3226 r3246  
    9898      <DependentUpon>BatchRunView.cs</DependentUpon>
    9999    </Compile>
    100     <Compile Include="ResultCollectionListView.cs">
    101       <SubType>UserControl</SubType>
    102     </Compile>
    103     <Compile Include="ResultCollectionListView.Designer.cs">
    104       <DependentUpon>ResultCollectionListView.cs</DependentUpon>
    105     </Compile>
    106100    <Compile Include="UserDefinedAlgorithmView.cs">
    107101      <SubType>UserControl</SubType>
  • trunk/sources/HeuristicLab.Optimization/3.3/BatchRun.cs

    r3226 r3246  
    7474
    7575    [Storable]
    76     private ResultCollectionList results;
    77     public ResultCollectionList Results {
     76    private ResultCollection results;
     77    public ResultCollection Results {
    7878      get { return results; }
    7979    }
     
    111111      : base() {
    112112      repetitions = 10;
    113       results = new ResultCollectionList();
     113      results = new ResultCollection();
    114114      executionTime = TimeSpan.Zero;
    115115    }
    116116    public BatchRun(string name) : base(name) {
    117117      repetitions = 10;
    118       results = new ResultCollectionList();
     118      results = new ResultCollection();
    119119      executionTime = TimeSpan.Zero;
    120120    }
    121121    public BatchRun(string name, string description) : base(name, description) {
    122122      repetitions = 10;
    123       results = new ResultCollectionList();
     123      results = new ResultCollection();
    124124      executionTime = TimeSpan.Zero;
    125125    }
     
    129129      clone.Algorithm = (IAlgorithm)cloner.Clone(algorithm);
    130130      clone.repetitions = repetitions;
    131       clone.results = (ResultCollectionList)cloner.Clone(results);
     131      clone.results = (ResultCollection)cloner.Clone(results);
    132132      clone.executionTime = executionTime;
    133133      clone.running = running;
     
    208208
    209209    private void Algorithm_Prepared(object sender, EventArgs e) {
    210       results.Add(Algorithm.Results);
     210      results.Add(new Result("Run " + DateTime.Now.ToString(), Algorithm.Results));
    211211    }
    212212    private void Algorithm_RunningChanged(object sender, EventArgs e) {
  • trunk/sources/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

    r3232 r3246  
    8787    <Compile Include="Algorithm.cs" />
    8888    <Compile Include="BatchRun.cs" />
    89     <Compile Include="ResultCollectionList.cs" />
    9089    <Compile Include="Interfaces\IMultiObjectiveSolutionsVisualizer.cs" />
    9190    <Compile Include="Interfaces\IResult.cs" />
Note: See TracChangeset for help on using the changeset viewer.