Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/27/12 10:05:59 (13 years ago)
Author:
sforsten
Message:

#1784:

  • added Keijzer, Korns, Vladislavleva und Nguyen regression problem instances
  • changes have been made in the ProblemView. Some parts have been replaced with views from Problems.Instances.Views
Location:
branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization.Views
Files:
2 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization.Views

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

    r7610 r7664  
    188188      <SubType>UserControl</SubType>
    189189    </Compile>
    190     <Compile Include="ProblemView.designer.cs">
     190    <Compile Include="ProblemView.Designer.cs">
    191191      <DependentUpon>ProblemView.cs</DependentUpon>
    192192    </Compile>
    … …  
    305305      <DependentUpon>EngineAlgorithmView.cs</DependentUpon>
    306306    </Compile>
    307     <Compile Include="HeuristicOptimizationProblemView.cs">
    308       <SubType>UserControl</SubType>
    309     </Compile>
    310     <Compile Include="HeuristicOptimizationProblemView.Designer.cs">
    311       <DependentUpon>HeuristicOptimizationProblemView.cs</DependentUpon>
    312     </Compile>
    313307    <Compile Include="Properties\AssemblyInfo.cs" />
    314308    <Compile Include="ResultCollectionView.cs">
    … …  
    330324  </ItemGroup>
    331325  <ItemGroup>
     326    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances.Views\3.4\HeuristicLab.Problems.Instances.Views-3.4.csproj">
     327      <Project>{1BFDCC58-E228-46DE-A36E-8503194B434D}</Project>
     328      <Name>HeuristicLab.Problems.Instances.Views-3.4</Name>
     329    </ProjectReference>
    332330    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    333331      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    334332      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     333      <Private>False</Private>
    335334    </ProjectReference>
    336335  </ItemGroup>

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization.Views/3.3/ProblemInstanceProviderView.cs

    r7610 r7664  
    4949      toolTip.SetToolTip(exportButton, "Export a " + GetProblemType() + " instance to a file.");
    5050      loadButton.Text = String.Empty;
    51       loadButton.Image = VSImageLibrary.Checkout;
     51      loadButton.Image = VSImageLibrary.RefreshDocument;
    5252      toolTip.SetToolTip(loadButton, "Load the selected instance.");
    5353    }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization.Views/3.3/ProblemView.Designer.cs

    r7259 r7664  
    4545    /// </summary>
    4646    private void InitializeComponent() {
     47      this.problemInstanceSplitContainer = new System.Windows.Forms.SplitContainer();
     48      this.problemInstanceConsumerView = new HeuristicLab.Problems.Instances.Views.ProblemInstanceConsumerView();
    4749      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
     50      ((System.ComponentModel.ISupportInitialize)(this.problemInstanceSplitContainer)).BeginInit();
     51      this.problemInstanceSplitContainer.Panel1.SuspendLayout();
     52      this.problemInstanceSplitContainer.Panel2.SuspendLayout();
     53      this.problemInstanceSplitContainer.SuspendLayout();
    4854      this.SuspendLayout();
     55      //
     56      // parameterCollectionView
     57      //
     58      this.parameterCollectionView.Location = new System.Drawing.Point(6, 27);
     59      this.parameterCollectionView.Size = new System.Drawing.Size(501, 303);
    4960      //
    5061      // nameTextBox
    … …  
    5263      this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    5364      this.errorProvider.SetIconPadding(this.nameTextBox, 2);
     65      this.nameTextBox.Location = new System.Drawing.Point(47, 1);
     66      this.nameTextBox.Size = new System.Drawing.Size(438, 20);
     67      //
     68      // nameLabel
     69      //
     70      this.nameLabel.Location = new System.Drawing.Point(3, 6);
     71      //
     72      // infoLabel
     73      //
     74      this.infoLabel.Location = new System.Drawing.Point(491, 4);
     75      //
     76      // problemInstanceSplitContainer
     77      //
     78      this.problemInstanceSplitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     79                  | System.Windows.Forms.AnchorStyles.Left)
     80                  | System.Windows.Forms.AnchorStyles.Right)));
     81      this.problemInstanceSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
     82      this.problemInstanceSplitContainer.IsSplitterFixed = true;
     83      this.problemInstanceSplitContainer.Location = new System.Drawing.Point(0, 0);
     84      this.problemInstanceSplitContainer.Name = "problemInstanceSplitContainer";
     85      this.problemInstanceSplitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal;
     86      //
     87      // problemInstanceSplitContainer.Panel1
     88      //
     89      this.problemInstanceSplitContainer.Panel1.Controls.Add(this.problemInstanceConsumerView);
     90      this.problemInstanceSplitContainer.Panel1MinSize = 10;
     91      //
     92      // problemInstanceSplitContainer.Panel2
     93      //
     94      this.problemInstanceSplitContainer.Panel2.Controls.Add(this.nameLabel);
     95      this.problemInstanceSplitContainer.Panel2.Controls.Add(this.nameTextBox);
     96      this.problemInstanceSplitContainer.Panel2.Controls.Add(this.parameterCollectionView);
     97      this.problemInstanceSplitContainer.Panel2.Controls.Add(this.infoLabel);
     98      this.problemInstanceSplitContainer.Size = new System.Drawing.Size(511, 363);
     99      this.problemInstanceSplitContainer.SplitterDistance = 26;
     100      this.problemInstanceSplitContainer.TabIndex = 13;
     101      //
     102      // problemInstanceConsumerView
     103      //
     104      this.problemInstanceConsumerView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     105                  | System.Windows.Forms.AnchorStyles.Left)
     106                  | System.Windows.Forms.AnchorStyles.Right)));
     107      this.problemInstanceConsumerView.Caption = "ProblemInstanceProviderView";
     108      this.problemInstanceConsumerView.Content = null;
     109      this.problemInstanceConsumerView.Location = new System.Drawing.Point(0, 0);
     110      this.problemInstanceConsumerView.Name = "problemInstanceConsumerView";
     111      this.problemInstanceConsumerView.ReadOnly = false;
     112      this.problemInstanceConsumerView.Size = new System.Drawing.Size(511, 25);
     113      this.problemInstanceConsumerView.TabIndex = 0;
    54114      //
    55115      // ProblemView
    … …  
    57117      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    58118      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     119      this.Controls.Add(this.problemInstanceSplitContainer);
    59120      this.Name = "ProblemView";
     121      this.Size = new System.Drawing.Size(511, 363);
    60122      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
     123      this.problemInstanceSplitContainer.Panel1.ResumeLayout(false);
     124      this.problemInstanceSplitContainer.Panel2.ResumeLayout(false);
     125      this.problemInstanceSplitContainer.Panel2.PerformLayout();
     126      ((System.ComponentModel.ISupportInitialize)(this.problemInstanceSplitContainer)).EndInit();
     127      this.problemInstanceSplitContainer.ResumeLayout(false);
    61128      this.ResumeLayout(false);
    62       this.PerformLayout();
    63129
    64130    }
    … …  
    66132    #endregion
    67133
    68 
     134    protected System.Windows.Forms.SplitContainer problemInstanceSplitContainer;
     135    protected HeuristicLab.Problems.Instances.Views.ProblemInstanceConsumerView problemInstanceConsumerView;
    69136  }
    70137}

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization.Views/3.3/ProblemView.cs

    r7259 r7664  
    2020#endregion
    2121
     22using System.Windows.Forms;
    2223using HeuristicLab.Core.Views;
    2324using HeuristicLab.MainForm;
     25using HeuristicLab.Problems.Instances;
    2426
    2527namespace HeuristicLab.Optimization.Views {
    … …  
    4446    protected override void OnContentChanged() {
    4547      base.OnContentChanged();
     48      //Check if IProblem implements IProblemInstancesConsumer interface
     49      problemInstanceConsumerView.Content = (IProblemInstanceConsumer)Content;
     50      problemInstanceSplitContainer.Panel1Collapsed = !problemInstanceConsumerView.ContainsProviders();
     51      SetEnabledStateOfControls();
     52    }
     53
     54    protected override void SetEnabledStateOfControls() {
     55      base.SetEnabledStateOfControls();
    4656    }
    4757  }
Note: See TracChangeset for help on using the changeset viewer.