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

Legend:

Unmodified
Added
Removed

  • branches/ImprovingStringConvertibleMatrix

    • Property svn:ignore set to
      *.suo

  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Problems.VehicleRouting/3.4/HeuristicLab.Problems.VehicleRouting-3.4.csproj

    r8894 r9286  
    4040    <DebugType>full</DebugType>
    4141    <Optimize>false</Optimize>
    42     <OutputPath>..\..\bin\</OutputPath>
     42    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    4343    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4444    <ErrorReport>prompt</ErrorReport>
    … …  
    5151    <DebugType>pdbonly</DebugType>
    5252    <Optimize>true</Optimize>
    53     <OutputPath>..\..\bin\</OutputPath>
     53    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    5454    <DefineConstants>TRACE</DefineConstants>
    5555    <ErrorReport>prompt</ErrorReport>
    … …  
    6262  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6363    <DebugSymbols>true</DebugSymbols>
    64     <OutputPath>..\..\bin\</OutputPath>
     64    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    6565    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6666    <DebugType>full</DebugType>
    … …  
    7070  </PropertyGroup>
    7171  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    72     <OutputPath>..\..\bin\</OutputPath>
     72    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    7373    <DefineConstants>TRACE</DefineConstants>
    7474    <DocumentationFile>
    … …  
    8282  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    8383    <DebugSymbols>true</DebugSymbols>
    84     <OutputPath>..\..\bin\</OutputPath>
     84    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    8585    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8686    <DebugType>full</DebugType>
    … …  
    9090  </PropertyGroup>
    9191  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    92     <OutputPath>..\..\bin\</OutputPath>
     92    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    9393    <DefineConstants>TRACE</DefineConstants>
    9494    <DocumentationFile>bin\x64\Release\HeuristicLab.Routing.TSP-3.3.XML</DocumentationFile>
    … …  
    100100  </PropertyGroup>
    101101  <ItemGroup>
     102    <Reference Include="HeuristicLab.Collections-3.3">
     103      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     104      <Private>False</Private>
     105    </Reference>
     106    <Reference Include="HeuristicLab.Common-3.3">
     107      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     108      <Private>False</Private>
     109    </Reference>
     110    <Reference Include="HeuristicLab.Common.Resources-3.3">
     111      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     112      <Private>False</Private>
     113    </Reference>
     114    <Reference Include="HeuristicLab.Core-3.3">
     115      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     116      <Private>False</Private>
     117    </Reference>
     118    <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3">
     119      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
     120      <Private>False</Private>
     121    </Reference>
     122    <Reference Include="HeuristicLab.Operators-3.3">
     123      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     124      <Private>False</Private>
     125    </Reference>
     126    <Reference Include="HeuristicLab.Optimization.Operators-3.3">
     127      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
     128      <Private>False</Private>
     129    </Reference>
     130    <Reference Include="HeuristicLab.Parameters-3.3">
     131      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     132      <Private>False</Private>
     133    </Reference>
     134    <Reference Include="HeuristicLab.Persistence-3.3">
     135      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     136      <Private>False</Private>
     137    </Reference>
     138    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     139      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     140      <Private>False</Private>
     141    </Reference>
     142    <Reference Include="HeuristicLab.Problems.Instances-3.3">
     143      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
     144      <Private>False</Private>
     145    </Reference>
    102146    <Reference Include="System" />
    103147    <Reference Include="System.Core">
    … …  
    400444      <Private>False</Private>
    401445    </ProjectReference>
    402     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    403       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    404       <Name>HeuristicLab.Collections-3.3</Name>
    405       <Private>False</Private>
    406     </ProjectReference>
    407     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    408       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    409       <Name>HeuristicLab.Common.Resources-3.3</Name>
    410       <Private>False</Private>
    411     </ProjectReference>
    412     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    413       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    414       <Name>HeuristicLab.Common-3.3</Name>
    415       <Private>False</Private>
    416     </ProjectReference>
    417     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    418       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    419       <Name>HeuristicLab.Core-3.3</Name>
    420       <Private>False</Private>
    421     </ProjectReference>
    422446    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    423447      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    424448      <Name>HeuristicLab.Data-3.3</Name>
    425       <Private>False</Private>
    426     </ProjectReference>
    427     <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    428       <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
    429       <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
    430       <Private>False</Private>
    431     </ProjectReference>
    432     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    433       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    434       <Name>HeuristicLab.Operators-3.3</Name>
    435       <Private>False</Private>
    436     </ProjectReference>
    437     <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    438       <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    439       <Name>HeuristicLab.Optimization.Operators-3.3</Name>
    440449      <Private>False</Private>
    441450    </ProjectReference>
    … …  
    443452      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    444453      <Name>HeuristicLab.Optimization-3.3</Name>
    445       <Private>False</Private>
    446     </ProjectReference>
    447     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    448       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    449       <Name>HeuristicLab.Parameters-3.3</Name>
    450       <Private>False</Private>
    451     </ProjectReference>
    452     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    453       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    454       <Name>HeuristicLab.Persistence-3.3</Name>
    455       <Private>False</Private>
    456     </ProjectReference>
    457     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    458       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    459       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    460       <Private>False</Private>
    461     </ProjectReference>
    462     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    463       <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    464       <Name>HeuristicLab.Problems.Instances-3.3</Name>
    465454      <Private>False</Private>
    466455    </ProjectReference>

  • branches/ImprovingStringConvertibleMatrix/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs

    r8922 r9286  
    281281      DistanceMatrixParameter.ValueChanged += new EventHandler(DistanceMatrixParameter_ValueChanged);
    282282      if (DistanceMatrix != null) {
    283         DistanceMatrix.ItemChanged += new EventHandler<EventArgs<int, int>>(DistanceMatrix_ItemChanged);
     283        DistanceMatrix.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(DistanceMatrix_ItemChanged);
    284284        DistanceMatrix.Reset += new EventHandler(DistanceMatrix_Reset);
    285285      }
    … …  
    311311    void DistanceMatrixParameter_ValueChanged(object sender, EventArgs e) {
    312312      if (DistanceMatrix != null) {
    313         DistanceMatrix.ItemChanged += new EventHandler<EventArgs<int, int>>(DistanceMatrix_ItemChanged);
     313        DistanceMatrix.ItemsChanged += new EventHandler<EventArgs<IEnumerable<Position>>>(DistanceMatrix_ItemChanged);
    314314        DistanceMatrix.Reset += new EventHandler(DistanceMatrix_Reset);
    315315      }
    … …  
    320320      EvalBestKnownSolution();
    321321    }
    322     void DistanceMatrix_ItemChanged(object sender, EventArgs<int, int> e) {
     322    void DistanceMatrix_ItemChanged(object sender, EventArgs<IEnumerable<Position>> e) {
    323323      distanceMatrix = DistanceMatrix;
    324324      EvalBestKnownSolution();
Note: See TracChangeset for help on using the changeset viewer.