Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/22/12 11:11:38 (12 years ago)
Author:
jkarder
Message:

#1331:

  • synced branch with trunk
  • added custom interface (ISimilarityBasedOperator) to mark operators that conduct similarity calculation
  • similarity calculators are now parameterized by the algorithm
  • deleted SolutionPool2TierUpdateMethod
  • deleted KnapsackMultipleGuidesPathRelinker
  • moved IImprovementOperator, IPathRelinker and ISimilarityCalculator to HeuristicLab.Optimization
  • added parameter descriptions
  • fixed plugin references
  • fixed count of EvaluatedSolutions
  • fixed check for duplicate solutions
  • minor code improvements
Location:
branches/ScatterSearch (trunk integration)
Files:
27 edited
2 copied

Legend:

Unmodified
Added
Removed

  • branches/ScatterSearch (trunk integration)

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/AlgorithmView.Designer.cs

    r7259 r8086  
    266266      //
    267267      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    268       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     268      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    269269      this.Controls.Add(this.tabControl);
    270270      this.Name = "AlgorithmView";

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/BatchRunView.Designer.cs

    r7259 r8086  
    230230      //
    231231      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    232       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     232      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    233233      this.Controls.Add(this.repetitionsNumericUpDown);
    234234      this.Controls.Add(this.repetitionsLabel);

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/EngineAlgorithmView.Designer.cs

    r7259 r8086  
    270270      //
    271271      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    272       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     272      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    273273      this.Name = "EngineAlgorithmView";
    274274      this.Size = new System.Drawing.Size(713, 549);

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/ExperimentListView.Designer.cs

    r7259 r8086  
    163163      //
    164164      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    165       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     165      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    166166      this.Controls.Add(this.tabControl);
    167167      this.Name = "ExperimentView";

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/ExperimentTreeView.Designer.cs

    r7274 r8086  
    269269      //
    270270      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    271       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     271      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    272272      this.Controls.Add(this.optimizersGroupBox);
    273273      this.Name = "ExperimentTreeView";

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/ExperimentView.Designer.cs

    r7259 r8086  
    161161      //
    162162      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    163       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     163      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    164164      this.Controls.Add(this.tabControl);
    165165      this.Name = "ExperimentView";

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

    r7646 r8086  
    9999  </PropertyGroup>
    100100  <ItemGroup>
     101    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     102      <Private>False</Private>
     103    </Reference>
    101104    <Reference Include="Microsoft.CSharp" />
    102105    <Reference Include="System" />
    … …  
    115118    <Reference Include="System.Data" />
    116119    <Reference Include="System.Xml" />
    117     <Reference Include="WeifenLuo.WinFormsUI.Docking-2.3.1, Version=2.3.1.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
     120    <Reference Include="WeifenLuo.WinFormsUI.Docking-2.3.1, Version=2.3.1.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     121      <Private>False</Private>
     122    </Reference>
    118123  </ItemGroup>
    119124  <ItemGroup>
    … …  
    138143    </Compile>
    139144    <Compile Include="Plugin.cs" />
    140     <Compile Include="ProblemInstanceProviderView.cs">
    141       <SubType>UserControl</SubType>
    142     </Compile>
    143     <Compile Include="ProblemInstanceProviderView.Designer.cs">
    144       <DependentUpon>ProblemInstanceProviderView.cs</DependentUpon>
    145     </Compile>
    146145    <Compile Include="ProblemView.cs">
    147146      <SubType>UserControl</SubType>
    … …  
    251250    <Compile Include="RunView.Designer.cs">
    252251      <DependentUpon>RunView.cs</DependentUpon>
     252    </Compile>
     253    <Compile Include="RunCollectionViews\RunCollectionDataTableView.cs">
     254      <SubType>UserControl</SubType>
     255    </Compile>
     256    <Compile Include="RunCollectionViews\RunCollectionDataTableView.Designer.cs">
     257      <DependentUpon>RunCollectionDataTableView.cs</DependentUpon>
    253258    </Compile>
    254259    <Compile Include="UserDefinedAlgorithmView.cs">
    … …  
    281286    <None Include="HeuristicLab.snk" />
    282287    <None Include="Properties\AssemblyInfo.cs.frame" />
    283   </ItemGroup>
    284   <ItemGroup>
    285     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    286       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    287       <Name>HeuristicLab.Collections-3.3</Name>
    288       <Private>False</Private>
    289     </ProjectReference>
    290     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    291       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    292       <Name>HeuristicLab.Common.Resources-3.3</Name>
    293       <Private>False</Private>
    294     </ProjectReference>
    295     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    296       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    297       <Name>HeuristicLab.Common-3.3</Name>
    298       <Private>False</Private>
    299     </ProjectReference>
    300     <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    301       <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    302       <Name>HeuristicLab.Core.Views-3.3</Name>
    303       <Private>False</Private>
    304     </ProjectReference>
    305     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    306       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    307       <Name>HeuristicLab.Core-3.3</Name>
    308       <Private>False</Private>
    309     </ProjectReference>
    310     <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
    311       <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
    312       <Name>HeuristicLab.Data.Views-3.3</Name>
    313       <Private>False</Private>
    314     </ProjectReference>
    315     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    316       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    317       <Name>HeuristicLab.Data-3.3</Name>
    318       <Private>False</Private>
    319     </ProjectReference>
    320     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    321       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    322       <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
    323       <Private>False</Private>
    324     </ProjectReference>
    325     <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    326       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    327       <Name>HeuristicLab.MainForm-3.3</Name>
    328       <Private>False</Private>
    329     </ProjectReference>
    330     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    331       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    332       <Name>HeuristicLab.Optimization-3.3</Name>
    333       <Private>False</Private>
    334     </ProjectReference>
    335     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    336       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    337       <Name>HeuristicLab.Persistence-3.3</Name>
    338       <Private>False</Private>
    339     </ProjectReference>
    340     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    341       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    342       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    343       <Private>False</Private>
    344     </ProjectReference>
    345     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    346       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    347       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    348       <Private>False</Private>
    349     </ProjectReference>
    350     <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
    351       <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
    352       <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
    353       <Private>False</Private>
    354     </ProjectReference>
    355288  </ItemGroup>
    356289  <ItemGroup>
    … …  
    371304    </BootstrapperPackage>
    372305  </ItemGroup>
     306  <ItemGroup>
     307    <ProjectReference Include="..\..\HeuristicLab.Analysis.Views\3.3\HeuristicLab.Analysis.Views-3.3.csproj">
     308      <Project>{76945D76-CA61-4147-9DC2-0ACDCDDF87F9}</Project>
     309      <Name>HeuristicLab.Analysis.Views-3.3</Name>
     310      <Private>False</Private>
     311    </ProjectReference>
     312    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     313      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     314      <Name>HeuristicLab.Collections-3.3</Name>
     315      <Private>False</Private>
     316    </ProjectReference>
     317    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
     318      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
     319      <Name>HeuristicLab.Common.Resources-3.3</Name>
     320      <Private>False</Private>
     321    </ProjectReference>
     322    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     323      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     324      <Name>HeuristicLab.Common-3.3</Name>
     325      <Private>False</Private>
     326    </ProjectReference>
     327    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
     328      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
     329      <Name>HeuristicLab.Core.Views-3.3</Name>
     330      <Private>False</Private>
     331    </ProjectReference>
     332    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     333      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     334      <Name>HeuristicLab.Core-3.3</Name>
     335      <Private>False</Private>
     336    </ProjectReference>
     337    <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
     338      <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
     339      <Name>HeuristicLab.Data.Views-3.3</Name>
     340      <Private>False</Private>
     341    </ProjectReference>
     342    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     343      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     344      <Name>HeuristicLab.Data-3.3</Name>
     345      <Private>False</Private>
     346    </ProjectReference>
     347    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
     348      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
     349      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     350      <Private>False</Private>
     351    </ProjectReference>
     352    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
     353      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
     354      <Name>HeuristicLab.MainForm-3.3</Name>
     355      <Private>False</Private>
     356    </ProjectReference>
     357    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     358      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     359      <Name>HeuristicLab.Optimization-3.3</Name>
     360      <Private>False</Private>
     361    </ProjectReference>
     362    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     363      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     364      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     365      <Private>False</Private>
     366    </ProjectReference>
     367    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances.Views\3.3\HeuristicLab.Problems.Instances.Views-3.3.csproj">
     368      <Project>{B1BA398F-953F-4C3A-B07B-1E5E17A27DD9}</Project>
     369      <Name>HeuristicLab.Problems.Instances.Views-3.3</Name>
     370      <Private>False</Private>
     371    </ProjectReference>
     372    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     373      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
     374      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     375      <Private>False</Private>
     376    </ProjectReference>
     377    <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
     378      <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
     379      <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
     380      <Private>False</Private>
     381    </ProjectReference>
     382  </ItemGroup>
    373383  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    374384  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/IOptimizerView.Designer.cs

    r7259 r8086  
    135135      //
    136136      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    137       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     137      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    138138      this.Controls.Add(this.startButton);
    139139      this.Controls.Add(this.executionTimeTextBox);

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/OptimizerListView.Designer.cs

    r7259 r8086  
    4646    private void InitializeComponent() {
    4747      components = new System.ComponentModel.Container();
    48       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     48      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    4949    }
    5050

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/Plugin.cs.frame

    r7558 r8086  
    2828  [Plugin("HeuristicLab.Optimization.Views", "3.3.6.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Optimization.Views-3.3.dll", PluginFileType.Assembly)]
     30  [PluginDependency("HeuristicLab.Analysis", "3.3")]
    3031  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3132  [PluginDependency("HeuristicLab.Common", "3.3")]
    … …  
    3940  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    4041  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
     42  [PluginDependency("HeuristicLab.Problems.Instances.Views", "3.3")]
    4143  [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions","3.3")]
    4244  public class HeuristicLabOptimizationViewsPlugin : PluginBase {

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/ProblemView.Designer.cs

    r7641 r8086  
    4545    /// </summary>
    4646    private void InitializeComponent() {
    47       this.problemInstanceProviderComboBox = new System.Windows.Forms.ComboBox();
    48       this.libraryLabel = new System.Windows.Forms.Label();
    49       this.libraryInfoButton = new System.Windows.Forms.Button();
    5047      this.problemInstanceSplitContainer = new System.Windows.Forms.SplitContainer();
    51       this.problemInstanceProviderViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
     48      this.ProblemInstanceConsumerViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    5249      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    5350      ((System.ComponentModel.ISupportInitialize)(this.problemInstanceSplitContainer)).BeginInit();
    … …  
    7774      this.infoLabel.Location = new System.Drawing.Point(491, 4);
    7875      //
    79       // problemInstanceProviderComboBox
    80       //
    81       this.problemInstanceProviderComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    82       this.problemInstanceProviderComboBox.FormattingEnabled = true;
    83       this.problemInstanceProviderComboBox.Location = new System.Drawing.Point(47, 2);
    84       this.problemInstanceProviderComboBox.Name = "problemInstanceProviderComboBox";
    85       this.problemInstanceProviderComboBox.Size = new System.Drawing.Size(171, 21);
    86       this.problemInstanceProviderComboBox.TabIndex = 13;
    87       this.problemInstanceProviderComboBox.SelectedIndexChanged += new System.EventHandler(this.problemInstanceProviderComboBox_SelectedIndexChanged);
    88       this.problemInstanceProviderComboBox.DataSourceChanged += new System.EventHandler(this.comboBox_DataSourceChanged);
    89       //
    90       // libraryLabel
    91       //
    92       this.libraryLabel.AutoSize = true;
    93       this.libraryLabel.Location = new System.Drawing.Point(3, 6);
    94       this.libraryLabel.Name = "libraryLabel";
    95       this.libraryLabel.Size = new System.Drawing.Size(41, 13);
    96       this.libraryLabel.TabIndex = 12;
    97       this.libraryLabel.Text = "Library:";
    98       //
    99       // libraryInfoButton
    100       //
    101       this.libraryInfoButton.Location = new System.Drawing.Point(224, 1);
    102       this.libraryInfoButton.Name = "libraryInfoButton";
    103       this.libraryInfoButton.Size = new System.Drawing.Size(26, 23);
    104       this.libraryInfoButton.TabIndex = 14;
    105       this.libraryInfoButton.Text = "Info";
    106       this.libraryInfoButton.UseVisualStyleBackColor = true;
    107       this.libraryInfoButton.Click += new System.EventHandler(this.libraryInfoButton_Click);
    108       //
    10976      // problemInstanceSplitContainer
    11077      //
    111       this.problemInstanceSplitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    112                   | System.Windows.Forms.AnchorStyles.Left)
    113                   | System.Windows.Forms.AnchorStyles.Right)));
     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)));
    11481      this.problemInstanceSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
    11582      this.problemInstanceSplitContainer.IsSplitterFixed = true;
    … …  
    12087      // problemInstanceSplitContainer.Panel1
    12188      //
    122       this.problemInstanceSplitContainer.Panel1.Controls.Add(this.problemInstanceProviderViewHost);
    123       this.problemInstanceSplitContainer.Panel1.Controls.Add(this.problemInstanceProviderComboBox);
    124       this.problemInstanceSplitContainer.Panel1.Controls.Add(this.libraryInfoButton);
    125       this.problemInstanceSplitContainer.Panel1.Controls.Add(this.libraryLabel);
     89      this.problemInstanceSplitContainer.Panel1.Controls.Add(this.ProblemInstanceConsumerViewHost);
    12690      this.problemInstanceSplitContainer.Panel1MinSize = 10;
    12791      //
    … …  
    136100      this.problemInstanceSplitContainer.TabIndex = 13;
    137101      //
    138       // problemInstanceProviderViewHost
     102      // ProblemInstanceConsumerViewHost
    139103      //
    140       this.problemInstanceProviderViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    141                   | System.Windows.Forms.AnchorStyles.Right)));
    142       this.problemInstanceProviderViewHost.Caption = "View";
    143       this.problemInstanceProviderViewHost.Content = null;
    144       this.problemInstanceProviderViewHost.Enabled = false;
    145       this.problemInstanceProviderViewHost.Location = new System.Drawing.Point(256, 3);
    146       this.problemInstanceProviderViewHost.Name = "problemInstanceProviderViewHost";
    147       this.problemInstanceProviderViewHost.ReadOnly = false;
    148       this.problemInstanceProviderViewHost.Size = new System.Drawing.Size(251, 22);
    149       this.problemInstanceProviderViewHost.TabIndex = 15;
    150       this.problemInstanceProviderViewHost.ViewsLabelVisible = false;
    151       this.problemInstanceProviderViewHost.ViewType = null;
     104      this.ProblemInstanceConsumerViewHost.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.ProblemInstanceConsumerViewHost.Caption = "ProblemInstanceConsumerView";
     108      this.ProblemInstanceConsumerViewHost.Content = null;
     109      this.ProblemInstanceConsumerViewHost.Enabled = false;
     110      this.ProblemInstanceConsumerViewHost.Location = new System.Drawing.Point(0, 1);
     111      this.ProblemInstanceConsumerViewHost.Name = "ProblemInstanceConsumerViewHost";
     112      this.ProblemInstanceConsumerViewHost.ReadOnly = false;
     113      this.ProblemInstanceConsumerViewHost.Size = new System.Drawing.Size(511, 23);
     114      this.ProblemInstanceConsumerViewHost.TabIndex = 0;
     115      this.ProblemInstanceConsumerViewHost.ViewsLabelVisible = false;
     116      this.ProblemInstanceConsumerViewHost.ViewType = null;
    152117      //
    153118      // ProblemView
    154119      //
    155120      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    156       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     121      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    157122      this.Controls.Add(this.problemInstanceSplitContainer);
    158123      this.Name = "ProblemView";
    … …  
    160125      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    161126      this.problemInstanceSplitContainer.Panel1.ResumeLayout(false);
    162       this.problemInstanceSplitContainer.Panel1.PerformLayout();
    163127      this.problemInstanceSplitContainer.Panel2.ResumeLayout(false);
    164128      this.problemInstanceSplitContainer.Panel2.PerformLayout();
    … …  
    171135    #endregion
    172136
    173     protected System.Windows.Forms.ComboBox problemInstanceProviderComboBox;
    174     protected System.Windows.Forms.Label libraryLabel;
    175     protected System.Windows.Forms.Button libraryInfoButton;
    176137    protected System.Windows.Forms.SplitContainer problemInstanceSplitContainer;
    177     protected MainForm.WindowsForms.ViewHost problemInstanceProviderViewHost;
     138    protected HeuristicLab.MainForm.WindowsForms.ViewHost ProblemInstanceConsumerViewHost;
    178139  }
    179140}

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/ProblemView.cs

    r7641 r8086  
    2222using System;
    2323using System.Collections.Generic;
    24 using System.Diagnostics;
    2524using System.Linq;
    2625using System.Windows.Forms;
    27 using HeuristicLab.Common.Resources;
    2826using HeuristicLab.Core.Views;
    2927using HeuristicLab.MainForm;
    30 using HeuristicLab.PluginInfrastructure;
    3128using HeuristicLab.Problems.Instances;
     29using HeuristicLab.Problems.Instances.Views;
    3230
    3331namespace HeuristicLab.Optimization.Views {
    … …  
    3836  [Content(typeof(IProblem), true)]
    3937  public partial class ProblemView : ParameterizedNamedItemView {
     38
     39    private static Type neededViewType = typeof(ProblemInstanceConsumerView);
     40
    4041    public new IProblem Content {
    4142      get { return (IProblem)base.Content; }
    4243      set { base.Content = value; }
    43     }
    44 
    45     protected IProblemInstanceProvider SelectedProvider {
    46       get { return (problemInstanceProviderComboBox.SelectedIndex >= 0 ? (IProblemInstanceProvider)problemInstanceProviderComboBox.SelectedItem : null); }
    4744    }
    4845
    … …  
    5249    public ProblemView() {
    5350      InitializeComponent();
    54       libraryInfoButton.Text = String.Empty;
    55       libraryInfoButton.Image = VSImageLibrary.Internet;
    5651    }
    5752
    5853    protected override void OnContentChanged() {
    5954      base.OnContentChanged();
    60       if (Content == null) {
    61         problemInstanceProviderComboBox.DataSource = null;
     55      IProblemInstanceConsumer consumer = Content as IProblemInstanceConsumer;
     56      if (consumer != null) {
     57        IEnumerable<Type> viewTypes = MainFormManager.GetViewTypes(consumer.GetType(), true);
     58        Type genericView = viewTypes.Where(x => x.IsSubclassOf(neededViewType)).First();
     59        ProblemInstanceConsumerViewHost.ViewType = genericView;
     60        ProblemInstanceConsumerViewHost.Content = consumer;
     61        ProblemInstanceConsumerView view = (ProblemInstanceConsumerView)ProblemInstanceConsumerViewHost.ActiveView;
     62        problemInstanceSplitContainer.Panel1Collapsed = !view.ProblemInstanceProviders.Any();
    6263      } else {
    63         problemInstanceProviderComboBox.DisplayMember = "Name";
    64         problemInstanceProviderComboBox.DataSource = GetProblemInstanceProviders().ToList();
    65         problemInstanceSplitContainer.Panel1Collapsed = problemInstanceProviderComboBox.Items.Count <= 0;
    66 
     64        problemInstanceSplitContainer.Panel1Collapsed = true;
    6765      }
    6866      SetEnabledStateOfControls();
    6967    }
    7068
    71     protected override void SetEnabledStateOfControls() {
    72       base.SetEnabledStateOfControls();
    73       problemInstanceProviderComboBox.Enabled = !ReadOnly && !Locked && Content != null && problemInstanceProviderComboBox.Items.Count > 0;
    74       libraryInfoButton.Enabled = SelectedProvider != null && SelectedProvider.WebLink != null;
    75     }
    76 
    77     protected virtual void problemInstanceProviderComboBox_SelectedIndexChanged(object sender, System.EventArgs e) {
    78       if (problemInstanceProviderComboBox.SelectedIndex >= 0) {
    79         dynamic provider = SelectedProvider;
    80         dynamic consumer = Content;
    81         provider.Consumer = consumer;
    82         problemInstanceProviderViewHost.Content = SelectedProvider;
    83         SetTooltip();
    84       }
    85       SetEnabledStateOfControls();
    86     }
    87 
    88     private void comboBox_DataSourceChanged(object sender, EventArgs e) {
    89       var comboBox = (ComboBox)sender;
    90       if (comboBox.DataSource == null)
    91         comboBox.Items.Clear();
    92     }
    93 
    94     protected virtual void libraryInfoButton_Click(object sender, EventArgs e) {
    95       if (problemInstanceProviderComboBox.SelectedIndex >= 0) {
    96         if (SelectedProvider != null && SelectedProvider.WebLink != null)
    97           Process.Start(SelectedProvider.WebLink.ToString());
    98       }
    99     }
    100 
    101     protected virtual IEnumerable<IProblemInstanceProvider> GetProblemInstanceProviders() {
    102       var consumerTypes = Content.GetType().GetInterfaces()
    103         .Where(x => x.IsGenericType
    104           && x.GetGenericTypeDefinition() == typeof(IProblemInstanceConsumer<>));
    105 
    106       if (consumerTypes.Any()) {
    107         var instanceTypes = consumerTypes
    108           .Select(x => x.GetGenericArguments().First())
    109           .Select(x => typeof(IProblemInstanceProvider<>).MakeGenericType(x));
    110 
    111         foreach (var type in instanceTypes) {
    112           foreach (var provider in ApplicationManager.Manager.GetInstances(type))
    113             yield return (IProblemInstanceProvider)provider;
    114         }
    115       }
    116     }
    117 
    118     protected virtual void SetTooltip() {
    119       toolTip.SetToolTip(problemInstanceProviderComboBox, GetProviderToolTip());
    120       if (SelectedProvider.WebLink != null)
    121         toolTip.SetToolTip(libraryInfoButton, "Browse to " + SelectedProvider.WebLink.ToString());
    122       else toolTip.SetToolTip(libraryInfoButton, "Library does not have a web reference.");
    123     }
    124 
    125     protected virtual string GetProviderToolTip() {
    126       var provider = SelectedProvider;
    127       string toolTip = provider.Name;
    128 
    129       if (!String.IsNullOrEmpty(provider.ReferencePublication)) {
    130         toolTip = toolTip
    131             + Environment.NewLine + Environment.NewLine
    132             + provider.ReferencePublication;
    133       }
    134       if (provider.WebLink != null) {
    135         toolTip = toolTip
    136             + Environment.NewLine
    137             + provider.WebLink.ToString();
    138       }
    139 
    140       return toolTip;
    141     }
    14269  }
    14370}

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/ResultCollectionView.Designer.cs

    r7259 r8086  
    4646    private void InitializeComponent() {
    4747      components = new System.ComponentModel.Container();
    48       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     48      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    4949    }
    5050

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/ResultValueView.Designer.cs

    r7259 r8086  
    8181      //
    8282      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    83       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     83      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    8484      this.Controls.Add(this.infoLabel);
    8585      this.Controls.Add(this.viewHost);

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/ResultView.Designer.cs

    r7259 r8086  
    127127      //
    128128      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    129       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     129      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    130130      this.Controls.Add(this.valueGroupBox);
    131131      this.Controls.Add(this.dataTypeLabel);

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintViews/RunCollectionColumnConstraintView.Designer.cs

    r7469 r8086  
    118118      //
    119119      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    120       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     120      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    121121      this.Controls.Add(this.cmbConstraintColumn);
    122122      this.Controls.Add(this.chbActive);

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintViews/RunCollectionComparisonConstraintView.Designer.cs

    r7469 r8086  
    7171      //
    7272      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    73       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     73      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    7474      this.Controls.Add(this.txtConstraintData);
    7575      this.errorProvider.SetIconAlignment(this, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintViews/RunCollectionConstraintCollectionView.Designer.cs

    r7469 r8086  
    4646    private void InitializeComponent() {
    4747      components = new System.ComponentModel.Container();
    48       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     48      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    4949    }
    5050

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintViews/RunCollectionContentConstraintView.Designer.cs

    r7469 r8086  
    7676      //
    7777      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    78       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     78      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    7979      this.Controls.Add(this.runsView);
    8080      this.Controls.Add(this.chbActive);

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintViews/RunCollectionEqualityConstraintView.Designer.cs

    r7469 r8086  
    6161      //
    6262      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    63       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     63      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    6464      this.Controls.Add(this.txtConstraintData);
    6565      this.Name = "RunCollectionEqualityConstraintView";

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintViews/RunCollectionTypeCompatibilityConstraintView.Designer.cs

    r7469 r8086  
    6363      //
    6464      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    65       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     65      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    6666      this.Controls.Add(this.cmbType);
    6767      this.Name = "RunCollectionTypeCompatibilityConstraintView";

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/RunCollectionModifierListView.Designer.cs

    r7259 r8086  
    4848    private void InitializeComponent() {
    4949      components = new System.ComponentModel.Container();
    50       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     50      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    5151      this.evaluateButton = new System.Windows.Forms.Button();
    5252      this.SuspendLayout();

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBoxPlotView.Designer.cs

    r7469 r8086  
    209209      //
    210210      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    211       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     211      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    212212      this.BackColor = System.Drawing.SystemColors.Window;
    213213      this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBubbleChartView.Designer.cs

    r7469 r8086  
    329329      //
    330330      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    331       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     331      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    332332      this.BackColor = System.Drawing.SystemColors.Window;
    333333      this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/RunView.Designer.cs

    r7259 r8086  
    247247      //
    248248      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    249       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     249      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    250250      this.Controls.Add(this.colorArea);
    251251      this.Controls.Add(this.showDetailsCheckBox);

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Optimization.Views/3.3/UserDefinedAlgorithmView.Designer.cs

    r7259 r8086  
    141141      //
    142142      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    143       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     143      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    144144      this.Name = "UserDefinedAlgorithmView";
    145145      this.engineTabPage.ResumeLayout(false);
Note: See TracChangeset for help on using the changeset viewer.