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:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/ScatterSearch (trunk integration)

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.QuadraticAssignment.Views

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

    r7646 r8086  
    102102  </PropertyGroup>
    103103  <ItemGroup>
    104     <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    105       <Private>False</Private>
    106     </Reference>
    107     <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    108       <Private>False</Private>
    109     </Reference>
    110     <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    111       <Private>False</Private>
    112     </Reference>
    113     <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    114       <Private>False</Private>
    115     </Reference>
    116     <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    117       <Private>False</Private>
    118     </Reference>
    119     <Reference Include="HeuristicLab.Problems.DataAnalysis.Views-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    120       <Private>False</Private>
    121     </Reference>
    122104    <Reference Include="System" />
    123105    <Reference Include="System.Core" />
    … …  
    162144      <Private>False</Private>
    163145    </ProjectReference>
    164     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    165       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    166       <Name>HeuristicLab.Collections-3.3</Name>
    167       <Private>False</Private>
    168     </ProjectReference>
    169146    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    170147      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    … …  
    187164      <Private>False</Private>
    188165    </ProjectReference>
    189     <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
    190       <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
    191       <Name>HeuristicLab.Data.Views-3.3</Name>
    192       <Private>False</Private>
    193     </ProjectReference>
    194166    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    195167      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    … …  
    227199      <Private>False</Private>
    228200    </ProjectReference>
    229     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views-3.4.csproj">
    230       <Project>{BF1E4DF4-A4CC-451F-9D50-303F405E265E}</Project>
    231       <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views-3.4</Name>
    232       <Private>False</Private>
    233     </ProjectReference>
    234201    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    235202      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    … …  
    240207      <Project>{79271BC8-4446-40E2-BB89-9BE4E17174FE}</Project>
    241208      <Name>HeuristicLab.Problems.QuadraticAssignment-3.3</Name>
    242       <Private>False</Private>
    243     </ProjectReference>
    244     <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
    245       <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
    246       <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
    247209      <Private>False</Private>
    248210    </ProjectReference>

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QAPAssignmentView.Designer.cs

    r7259 r8086  
    193193      //
    194194      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    195       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     195      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    196196      this.Controls.Add(this.splitContainer);
    197197      this.Name = "QAPAssignmentView";

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QAPVisualizationControl.Designer.cs

    r7259 r8086  
    136136      //
    137137      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    138       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     138      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    139139      this.Controls.Add(this.label1);
    140140      this.Controls.Add(this.stressLabel);

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QuadraticAssignmentProblemView.Designer.cs

    r7641 r8086  
    5959      this.SuspendLayout();
    6060      //
    61       // libraryInfoButton
    62       //
    63       this.libraryInfoButton.Location = new System.Drawing.Point(224, 1);
    64       //
    6561      // problemInstanceSplitContainer
    6662      //
    … …  
    7268      // parameterCollectionView
    7369      //
    74       this.parameterCollectionView.Location = new System.Drawing.Point(0, 3);
    75       this.parameterCollectionView.Size = new System.Drawing.Size(497, 269);
     70      this.parameterCollectionView.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)));
     71      this.parameterCollectionView.Dock = System.Windows.Forms.DockStyle.Fill;
     72      this.parameterCollectionView.Location = new System.Drawing.Point(3, 3);
     73      this.parameterCollectionView.Size = new System.Drawing.Size(497, 274);
    7674      //
    7775      // nameTextBox
    … …  
    8280      // tabControl
    8381      //
    84       this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    85                   | System.Windows.Forms.AnchorStyles.Left)
    86                   | System.Windows.Forms.AnchorStyles.Right)));
     82      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     83            | System.Windows.Forms.AnchorStyles.Left)
     84            | System.Windows.Forms.AnchorStyles.Right)));
    8785      this.tabControl.Controls.Add(this.problemTabPage);
    8886      this.tabControl.Controls.Add(this.visualizationTabPage);
    89       this.tabControl.Location = new System.Drawing.Point(0, 29);
     87      this.tabControl.Location = new System.Drawing.Point(0, 27);
    9088      this.tabControl.Name = "tabControl";
    9189      this.tabControl.SelectedIndex = 0;
    92       this.tabControl.Size = new System.Drawing.Size(511, 304);
     90      this.tabControl.Size = new System.Drawing.Size(511, 306);
    9391      this.tabControl.TabIndex = 8;
    9492      //
    … …  
    9997      this.problemTabPage.Name = "problemTabPage";
    10098      this.problemTabPage.Padding = new System.Windows.Forms.Padding(3);
    101       this.problemTabPage.Size = new System.Drawing.Size(503, 278);
     99      this.problemTabPage.Size = new System.Drawing.Size(503, 280);
    102100      this.problemTabPage.TabIndex = 0;
    103101      this.problemTabPage.Text = "Problem";
    … …  
    110108      this.visualizationTabPage.Name = "visualizationTabPage";
    111109      this.visualizationTabPage.Padding = new System.Windows.Forms.Padding(3);
    112       this.visualizationTabPage.Size = new System.Drawing.Size(503, 278);
     110      this.visualizationTabPage.Size = new System.Drawing.Size(503, 280);
    113111      this.visualizationTabPage.TabIndex = 1;
    114112      this.visualizationTabPage.Text = "Visualization";
    … …  
    122120      this.qapView.Location = new System.Drawing.Point(3, 3);
    123121      this.qapView.Name = "qapView";
    124       this.qapView.Size = new System.Drawing.Size(497, 272);
     122      this.qapView.Size = new System.Drawing.Size(497, 245);
    125123      this.qapView.TabIndex = 0;
    126124      this.qapView.Weights = null;
    … …  
    129127      //
    130128      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    131       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     129      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    132130      this.Name = "QuadraticAssignmentProblemView";
    133131      this.problemInstanceSplitContainer.Panel1.ResumeLayout(false);
    134       this.problemInstanceSplitContainer.Panel1.PerformLayout();
    135132      this.problemInstanceSplitContainer.Panel2.ResumeLayout(false);
    136133      this.problemInstanceSplitContainer.Panel2.PerformLayout();

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.QuadraticAssignment.Views/3.3/QuadraticAssignmentProblemView.cs

    r7641 r8086  
    3737    public QuadraticAssignmentProblemView() {
    3838      InitializeComponent();
    39       Controls.Remove(parameterCollectionView);
    40       parameterCollectionView.Dock = DockStyle.Fill;
    41       problemTabPage.Controls.Add(parameterCollectionView);
    4239    }
    4340
Note: See TracChangeset for help on using the changeset viewer.