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

Legend:

Unmodified
Added
Removed

  • branches/ScatterSearch (trunk integration)

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

    r7646 r8086  
    136136  </ItemGroup>
    137137  <ItemGroup>
    138     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    139       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    140       <Name>HeuristicLab.Collections-3.3</Name>
    141       <Private>False</Private>
    142     </ProjectReference>
    143     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    144       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    145       <Name>HeuristicLab.Common-3.3</Name>
    146       <Private>False</Private>
    147     </ProjectReference>
    148     <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    149       <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    150       <Name>HeuristicLab.Core.Views-3.3</Name>
    151       <Private>False</Private>
    152     </ProjectReference>
    153     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    154       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    155       <Name>HeuristicLab.Core-3.3</Name>
    156       <Private>False</Private>
    157     </ProjectReference>
    158     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    159       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    160       <Name>HeuristicLab.Data-3.3</Name>
    161       <Private>False</Private>
    162     </ProjectReference>
    163     <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    164       <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
    165       <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
    166       <Private>False</Private>
    167     </ProjectReference>
    168     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    169       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    170       <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
    171       <Private>False</Private>
    172     </ProjectReference>
    173     <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    174       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    175       <Name>HeuristicLab.MainForm-3.3</Name>
    176       <Private>False</Private>
    177     </ProjectReference>
    178     <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
    179       <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
    180       <Name>HeuristicLab.Optimization.Views-3.3</Name>
    181       <Private>False</Private>
    182     </ProjectReference>
    183     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    184       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    185       <Name>HeuristicLab.Optimization-3.3</Name>
    186       <Private>False</Private>
    187     </ProjectReference>
    188     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    189       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    190       <Name>HeuristicLab.Parameters-3.3</Name>
    191       <Private>False</Private>
    192     </ProjectReference>
    193     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    194       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    195       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    196       <Private>False</Private>
    197     </ProjectReference>
    198     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    199       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    200       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    201       <Private>False</Private>
    202     </ProjectReference>
    203     <ProjectReference Include="..\..\HeuristicLab.Problems.TravelingSalesman\3.3\HeuristicLab.Problems.TravelingSalesman-3.3.csproj">
    204       <Project>{D767C38D-8014-46B0-9A32-03A3AECCE34A}</Project>
    205       <Name>HeuristicLab.Problems.TravelingSalesman-3.3</Name>
    206       <Private>False</Private>
    207     </ProjectReference>
    208   </ItemGroup>
    209   <ItemGroup>
    210138    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
    211139      <Visible>False</Visible>
    … …  
    223151      <Install>true</Install>
    224152    </BootstrapperPackage>
     153  </ItemGroup>
     154  <ItemGroup>
     155    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     156      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     157      <Name>HeuristicLab.Collections-3.3</Name>
     158      <Private>False</Private>
     159    </ProjectReference>
     160    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     161      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     162      <Name>HeuristicLab.Common-3.3</Name>
     163      <Private>False</Private>
     164    </ProjectReference>
     165    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
     166      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
     167      <Name>HeuristicLab.Core.Views-3.3</Name>
     168      <Private>False</Private>
     169    </ProjectReference>
     170    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     171      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     172      <Name>HeuristicLab.Core-3.3</Name>
     173      <Private>False</Private>
     174    </ProjectReference>
     175    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     176      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     177      <Name>HeuristicLab.Data-3.3</Name>
     178      <Private>False</Private>
     179    </ProjectReference>
     180    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
     181      <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
     182      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
     183      <Private>False</Private>
     184    </ProjectReference>
     185    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
     186      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
     187      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     188      <Private>False</Private>
     189    </ProjectReference>
     190    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
     191      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
     192      <Name>HeuristicLab.MainForm-3.3</Name>
     193      <Private>False</Private>
     194    </ProjectReference>
     195    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
     196      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
     197      <Name>HeuristicLab.Optimization.Views-3.3</Name>
     198      <Private>False</Private>
     199    </ProjectReference>
     200    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     201      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     202      <Name>HeuristicLab.Optimization-3.3</Name>
     203      <Private>False</Private>
     204    </ProjectReference>
     205    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     206      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
     207      <Name>HeuristicLab.Parameters-3.3</Name>
     208      <Private>False</Private>
     209    </ProjectReference>
     210    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     211      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     212      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     213      <Private>False</Private>
     214    </ProjectReference>
     215    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     216      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
     217      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     218      <Private>False</Private>
     219    </ProjectReference>
     220    <ProjectReference Include="..\..\HeuristicLab.Problems.TravelingSalesman\3.3\HeuristicLab.Problems.TravelingSalesman-3.3.csproj">
     221      <Project>{D767C38D-8014-46B0-9A32-03A3AECCE34A}</Project>
     222      <Name>HeuristicLab.Problems.TravelingSalesman-3.3</Name>
     223      <Private>False</Private>
     224    </ProjectReference>
    225225  </ItemGroup>
    226226  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TravelingSalesman.Views/3.3/PathTSPTourView.Designer.cs

    r7259 r8086  
    187187      //
    188188      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    189       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     189      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    190190      this.Controls.Add(this.splitContainer);
    191191      this.Name = "PathTSPTourView";

  • branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TravelingSalesman.Views/3.3/TravelingSalesmanProblemView.Designer.cs

    r7641 r8086  
    5454      this.visualizationTabPage.SuspendLayout();
    5555      this.SuspendLayout();
    56       //
    57       // libraryInfoButton
    58       //
    59       this.libraryInfoButton.Location = new System.Drawing.Point(224, 1);
    6056      //
    6157      // problemInstanceSplitContainer
    … …  
    130126      //
    131127      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    132       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     128      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    133129      this.Name = "TravelingSalesmanProblemView";
    134130      this.problemInstanceSplitContainer.Panel1.ResumeLayout(false);
Note: See TracChangeset for help on using the changeset viewer.