Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/28/11 13:47:28 (13 years ago)
Author:
sforsten
Message:

#1669: branch has been merged with the trunk in revision 7081 and methods in RegressionBenchmark have been renamed.

Location:
branches/RegressionBenchmarks
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/RegressionBenchmarks

  • branches/RegressionBenchmarks/HeuristicLab.Encodings.PermutationEncoding.Views/3.3/HeuristicLab.Encodings.PermutationEncoding.Views-3.3.csproj

    r6866 r7085  
    9393  </PropertyGroup>
    9494  <ItemGroup>
    95     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
    96     <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
    97     <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
    98     <Reference Include="HeuristicLab.Visualization.ChartControlsExtensions-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
    9995    <Reference Include="System" />
    10096    <Reference Include="System.Core">
    … …  
    135131  </ItemGroup>
    136132  <ItemGroup>
     133    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     134      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     135      <Name>HeuristicLab.Collections-3.3</Name>
     136      <Private>False</Private>
     137    </ProjectReference>
     138    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
     139      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
     140      <Name>HeuristicLab.Common.Resources-3.3</Name>
     141      <Private>False</Private>
     142    </ProjectReference>
    137143    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    138144      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    … …  
    180186      <Private>False</Private>
    181187    </ProjectReference>
     188    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     189      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     190      <Name>HeuristicLab.Optimization-3.3</Name>
     191      <Private>False</Private>
     192    </ProjectReference>
    182193    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    183194      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    184195      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     196      <Private>False</Private>
     197    </ProjectReference>
     198    <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
     199      <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
     200      <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
    185201      <Private>False</Private>
    186202    </ProjectReference>

  • branches/RegressionBenchmarks/HeuristicLab.Encodings.PermutationEncoding.Views/3.3/PermutationTypeView.Designer.cs

    r5445 r7085  
    5454      this.valueLabel.Location = new System.Drawing.Point(3, 3);
    5555      this.valueLabel.Name = "valueLabel";
    56       this.valueLabel.Size = new System.Drawing.Size(37, 13);
     56      this.valueLabel.Size = new System.Drawing.Size(34, 13);
    5757      this.valueLabel.TabIndex = 0;
    58       this.valueLabel.Text = "&Value:";
     58      this.valueLabel.Text = "&Type:";
    5959      //
    6060      // valueComboBox
    … …  
    7171      this.valueComboBox.SelectedIndexChanged += new System.EventHandler(this.valueComboBox_SelectedIndexChanged);
    7272      //
    73       // ComparisonView
     73      // PermutationTypeView
    7474      //
    7575      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    … …  
    7777      this.Controls.Add(this.valueComboBox);
    7878      this.Controls.Add(this.valueLabel);
    79       this.Name = "ComparisonView";
     79      this.Name = "PermutationTypeView";
    8080      this.Size = new System.Drawing.Size(265, 29);
    8181      this.ResumeLayout(false);

  • branches/RegressionBenchmarks/HeuristicLab.Encodings.PermutationEncoding.Views/3.3/PermutationView.Designer.cs

    r6628 r7085  
    7272      this.Controls.Add(this.permutationTypeView);
    7373      this.Name = "PermutationView";
    74       this.Controls.SetChildIndex(this.permutationTypeView, 0);
    7574      this.Controls.SetChildIndex(this.lengthLabel, 0);
    7675      this.Controls.SetChildIndex(this.lengthTextBox, 0);
     76      this.Controls.SetChildIndex(this.permutationTypeView, 0);
    7777      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    7878      this.ResumeLayout(false);

  • branches/RegressionBenchmarks/HeuristicLab.Encodings.PermutationEncoding.Views/3.3/PermutationView.cs

    r6628 r7085  
    3737      InitializeComponent();
    3838      dataGridView.Top = permutationTypeView.Bottom + permutationTypeView.Margin.Bottom + dataGridView.Margin.Top;
     39      dataGridView.Height = Bottom - dataGridView.Top;
    3940    }
    4041
Note: See TracChangeset for help on using the changeset viewer.