Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/05/13 16:37:17 (12 years ago)
Author:
sforsten
Message:

#2018:

  • added new methods to the interface IStringConvertibleMatrix as well as two structs. Also the event ItemChanged has been changed to ItemsChanged
  • class ValueTypeMatrix now implements IStringConvertibleMatrix instead of the classes which inherit from it
  • small changes have been applied to a lot of classes to correctly implement the changed interface IStringConvertibleMatrix
  • solution file, Build.cmd and PreBuildEvent.cmd have been added
Location:
branches/ImprovingStringConvertibleMatrix
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/ImprovingStringConvertibleMatrix

    • Property svn:ignore set to
      *.suo

  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Problems.TravelingSalesman/3.3/HeuristicLab.Problems.TravelingSalesman-3.3.csproj

    r8600 r9286  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     43    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
    … …  
    5252    <DebugType>pdbonly</DebugType>
    5353    <Optimize>true</Optimize>
    54     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     54    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    5555    <DefineConstants>TRACE</DefineConstants>
    5656    <ErrorReport>prompt</ErrorReport>
    … …  
    6363  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6464    <DebugSymbols>true</DebugSymbols>
    65     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     65    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    6666    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6767    <DebugType>full</DebugType>
    … …  
    7171  </PropertyGroup>
    7272  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    73     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     73    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    7474    <DefineConstants>TRACE</DefineConstants>
    7575    <DocumentationFile>
    … …  
    8383  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    8484    <DebugSymbols>true</DebugSymbols>
    85     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     85    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    8686    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8787    <DebugType>full</DebugType>
    … …  
    9191  </PropertyGroup>
    9292  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    93     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     93    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    9494    <DefineConstants>TRACE</DefineConstants>
    9595    <DocumentationFile>
    … …  
    102102  </PropertyGroup>
    103103  <ItemGroup>
     104    <Reference Include="HeuristicLab.Collections-3.3">
     105      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     106      <Private>False</Private>
     107    </Reference>
     108    <Reference Include="HeuristicLab.Common-3.3">
     109      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     110      <Private>False</Private>
     111    </Reference>
     112    <Reference Include="HeuristicLab.Common.Resources-3.3">
     113      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     114      <Private>False</Private>
     115    </Reference>
     116    <Reference Include="HeuristicLab.Core-3.3">
     117      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     118      <Private>False</Private>
     119    </Reference>
     120    <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3">
     121      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
     122      <Private>False</Private>
     123    </Reference>
     124    <Reference Include="HeuristicLab.Operators-3.3">
     125      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     126      <Private>False</Private>
     127    </Reference>
     128    <Reference Include="HeuristicLab.Optimization.Operators-3.3">
     129      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
     130      <Private>False</Private>
     131    </Reference>
     132    <Reference Include="HeuristicLab.Parameters-3.3">
     133      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     134      <Private>False</Private>
     135    </Reference>
     136    <Reference Include="HeuristicLab.Persistence-3.3">
     137      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     138      <Private>False</Private>
     139    </Reference>
     140    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     141      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     142      <Private>False</Private>
     143    </Reference>
     144    <Reference Include="HeuristicLab.Problems.Instances-3.3">
     145      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
     146      <Private>False</Private>
     147    </Reference>
    104148    <Reference Include="System" />
    105149    <Reference Include="System.Core">
    … …  
    154198      <Private>False</Private>
    155199    </ProjectReference>
    156     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    157       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    158       <Name>HeuristicLab.Collections-3.3</Name>
    159       <Private>False</Private>
    160     </ProjectReference>
    161     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    162       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    163       <Name>HeuristicLab.Common.Resources-3.3</Name>
    164       <Private>False</Private>
    165     </ProjectReference>
    166     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    167       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    168       <Name>HeuristicLab.Common-3.3</Name>
    169       <Private>False</Private>
    170     </ProjectReference>
    171     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    172       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    173       <Name>HeuristicLab.Core-3.3</Name>
    174       <Private>False</Private>
    175     </ProjectReference>
    176200    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    177201      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    178202      <Name>HeuristicLab.Data-3.3</Name>
    179203      <Private>False</Private>
    180     </ProjectReference>
    181     <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    182       <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
    183       <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
    184       <Private>False</Private>
    185     </ProjectReference>
    186     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    187       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    188       <Name>HeuristicLab.Operators-3.3</Name>
    189       <Private>False</Private>
    190     </ProjectReference>
    191     <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    192       <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    193       <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    194204    </ProjectReference>
    195205    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    196206      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    197207      <Name>HeuristicLab.Optimization-3.3</Name>
    198       <Private>False</Private>
    199     </ProjectReference>
    200     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    201       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    202       <Name>HeuristicLab.Parameters-3.3</Name>
    203       <Private>False</Private>
    204     </ProjectReference>
    205     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    206       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    207       <Name>HeuristicLab.Persistence-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>
    218208      <Private>False</Private>
    219209    </ProjectReference>
    … …  
    250240  -->
    251241  <PropertyGroup>
    252    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     242    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    253243set ProjectDir=$(ProjectDir)
    254244set SolutionDir=$(SolutionDir)
    … …  
    257247call PreBuildEvent.cmd
    258248</PreBuildEvent>
    259 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     249    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    260250export ProjectDir=$(ProjectDir)
    261251export SolutionDir=$(SolutionDir)

  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Problems.TravelingSalesman/3.3/PathTSPTour.cs

    r7259 r9286  
    2121
    2222using System;
     23using System.Collections.Generic;
    2324using System.Drawing;
    2425using HeuristicLab.Common;
    … …  
    144145
    145146    private void RegisterCoordinatesEvents() {
    146       Coordinates.ItemChanged += new EventHandler<EventArgs<int, int>>(Coordinates_ItemChanged);
     147      Coordinates.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(Coordinates_ItemChanged);
    147148      Coordinates.Reset += new EventHandler(Coordinates_Reset);
    148149    }
    149150    private void DeregisterCoordinatesEvents() {
    150       Coordinates.ItemChanged -= new EventHandler<EventArgs<int, int>>(Coordinates_ItemChanged);
     151      Coordinates.ItemsChanged -= new EventHandler<EventArgs<IEnumerable<Position>>>(Coordinates_ItemChanged);
    151152      Coordinates.Reset -= new EventHandler(Coordinates_Reset);
    152153    }
    … …  
    166167    }
    167168
    168     private void Coordinates_ItemChanged(object sender, EventArgs<int, int> e) {
     169    private void Coordinates_ItemChanged(object sender, EventArgs<IEnumerable<Position>> e) {
    169170      OnCoordinatesChanged();
    170171    }

  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

    r8720 r9286  
    158158    private void CoordinatesParameter_ValueChanged(object sender, EventArgs e) {
    159159      if (Coordinates != null) {
    160         Coordinates.ItemChanged += new EventHandler<EventArgs<int, int>>(Coordinates_ItemChanged);
     160        Coordinates.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(Coordinates_ItemChanged);
    161161        Coordinates.Reset += new EventHandler(Coordinates_Reset);
    162162      }
    … …  
    166166      }
    167167    }
    168     private void Coordinates_ItemChanged(object sender, EventArgs<int, int> e) {
     168    private void Coordinates_ItemChanged(object sender, EventArgs<IEnumerable<Position>> e) {
    169169      if (Evaluator is ITSPCoordinatesPathEvaluator) {
    170170        ClearDistanceMatrix();
    … …  
    223223      CoordinatesParameter.ValueChanged += new EventHandler(CoordinatesParameter_ValueChanged);
    224224      if (Coordinates != null) {
    225         Coordinates.ItemChanged += new EventHandler<EventArgs<int, int>>(Coordinates_ItemChanged);
     225        Coordinates.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(Coordinates_ItemChanged);
    226226        Coordinates.Reset += new EventHandler(Coordinates_Reset);
    227227      }
Note: See TracChangeset for help on using the changeset viewer.