Free cookie consent management tool by TermsFeed Policy Generator

Changeset 7088


Ignore:
Timestamp:
11/28/11 16:58:23 (13 years ago)
Author:
svonolfe
Message:

Refactored solution (#1177)

Location:
branches/VRP
Files:
1 added
1 deleted
6 edited
4 moved

Legend:

Unmodified
Added
Removed

  • branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4

    • Property svn:ignore

      •  

        old new  
        11*.user
        22HeuristicLabProblemsVehicleRoutingViewsPlugin.cs
         3Plugin.cs
        34bin
        45obj

  • branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/HeuristicLab.Problems.VehicleRouting.Views-3.4.csproj

    r6970 r7088  
    4040    <DebugType>full</DebugType>
    4141    <Optimize>false</Optimize>
    42     <OutputPath>bin\Debug\</OutputPath>
     42    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    4343    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4444    <ErrorReport>prompt</ErrorReport>
    … …  
    9696  <ItemGroup>
    9797    <Reference Include="HeuristicLab.Collections-3.3">
    98       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
     98      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     99      <Private>False</Private>
    99100    </Reference>
    100101    <Reference Include="HeuristicLab.Common-3.3">
    101       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     102      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     103      <Private>False</Private>
    102104    </Reference>
    103105    <Reference Include="HeuristicLab.Common.Resources-3.3">
    104       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     106      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     107      <Private>False</Private>
    105108    </Reference>
    106109    <Reference Include="HeuristicLab.Core-3.3">
    107       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     110      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     111      <Private>False</Private>
    108112    </Reference>
    109113    <Reference Include="HeuristicLab.Core.Views-3.3">
    110       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core.Views-3.3.dll</HintPath>
     114      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
     115      <Private>False</Private>
    111116    </Reference>
    112117    <Reference Include="HeuristicLab.Data-3.3">
    113       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
     118      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
     119      <Private>False</Private>
    114120    </Reference>
    115121    <Reference Include="HeuristicLab.Data.Views-3.3">
    116       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data.Views-3.3.dll</HintPath>
     122      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data.Views-3.3.dll</HintPath>
     123      <Private>False</Private>
    117124    </Reference>
    118125    <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3">
    119       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
     126      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
     127      <Private>False</Private>
    120128    </Reference>
    121129    <Reference Include="HeuristicLab.MainForm-3.3">
    122       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm-3.3.dll</HintPath>
     130      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
     131      <Private>False</Private>
    123132    </Reference>
    124133    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3">
    125       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
     134      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
     135      <Private>False</Private>
    126136    </Reference>
    127137    <Reference Include="HeuristicLab.Operators-3.3">
    128       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll</HintPath>
     138      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     139      <Private>False</Private>
    129140    </Reference>
    130141    <Reference Include="HeuristicLab.Optimization-3.3">
    131       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
     142      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     143      <Private>False</Private>
    132144    </Reference>
    133145    <Reference Include="HeuristicLab.Optimization.Views-3.3">
    134       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
     146      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
     147      <Private>False</Private>
    135148    </Reference>
    136149    <Reference Include="HeuristicLab.Parameters-3.3">
    137       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Parameters-3.3.dll</HintPath>
     150      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     151      <Private>False</Private>
    138152    </Reference>
    139153    <Reference Include="HeuristicLab.Persistence-3.3">
    140       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
     154      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     155      <Private>False</Private>
    141156    </Reference>
    142157    <Reference Include="HeuristicLab.Persistence.GUI-3.3">
    143       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence.GUI-3.3.dll</HintPath>
     158      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence.GUI-3.3.dll</HintPath>
     159      <Private>False</Private>
    144160    </Reference>
    145161    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    146       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     162      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     163      <Private>False</Private>
    147164    </Reference>
    148165    <Reference Include="System" />
    … …  
    162179  </ItemGroup>
    163180  <ItemGroup>
     181    <Compile Include="Properties\AssemblyInfo.cs" />
    164182    <Compile Include="MDCVRPPDTWView.cs">
    165183      <SubType>UserControl</SubType>
    … …  
    192210      <DependentUpon>CVRPTWView.cs</DependentUpon>
    193211    </Compile>
    194     <Compile Include="HeuristicLabProblemsVehicleRoutingViewsPlugin.cs" />
    195     <Compile Include="Properties\AssemblyInfo.cs" />
     212    <Compile Include="Plugin.cs" />
    196213    <Compile Include="SingleDepotVRPView.cs">
    197214      <SubType>UserControl</SubType>
    … …  
    226243  </ItemGroup>
    227244  <ItemGroup>
     245    <None Include="Properties\AssemblyInfo.cs.frame" />
    228246    <None Include="HeuristicLab.snk" />
    229     <None Include="HeuristicLabProblemsVehicleRoutingViewsPlugin.cs.frame" />
    230     <None Include="Properties\AssemblyInfo.frame" />
    231   </ItemGroup>
    232   <ItemGroup>
    233     <ProjectReference Include="..\..\HeuristicLab.Problems.VehicleRouting\3.4\HeuristicLab.Problems.VehicleRouting-3.4.csproj">
    234       <Project>{B94FFB82-43D4-40AB-9980-B03470ADF221}</Project>
    235       <Name>HeuristicLab.Problems.VehicleRouting-3.4</Name>
    236     </ProjectReference>
     247    <None Include="Plugin.cs.frame" />
    237248  </ItemGroup>
    238249  <ItemGroup>
    … …  
    253264    </BootstrapperPackage>
    254265  </ItemGroup>
     266  <ItemGroup>
     267    <ProjectReference Include="..\..\HeuristicLab.Problems.VehicleRouting\3.4\HeuristicLab.Problems.VehicleRouting-3.4.csproj">
     268      <Project>{B94FFB82-43D4-40AB-9980-B03470ADF221}</Project>
     269      <Name>HeuristicLab.Problems.VehicleRouting-3.4</Name>
     270      <Private>False</Private>
     271    </ProjectReference>
     272  </ItemGroup>
    255273  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    256274  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    … …  
    267285set Outdir=$(Outdir)
    268286
    269 call PreBuildEvent.cmd
    270 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsVehicleRoutingViewsPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsVehicleRoutingViewsPlugin.cs"</PreBuildEvent>
     287call PreBuildEvent.cmd</PreBuildEvent>
    271288  </PropertyGroup>
    272289  <PropertyGroup>
    273     <PostBuildEvent>set ProjectName=$(ProjectName)
    274 set Source=$(TargetPath)
    275 set Configuration=$(ConfigurationName)
    276 set Platform=$(PlatformName)
    277 set SolutionDir=$(SolutionDir)
    278 
    279 if exist "$(SolutionDir)CustomPostBuild.cmd" call "$(SolutionDir)CustomPostBuild.cmd"</PostBuildEvent>
     290    <PostBuildEvent>
     291    </PostBuildEvent>
    280292  </PropertyGroup>
    281293</Project>

  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4

    • Property svn:ignore

      •  

        old new  
        11*.user
        22HeuristicLabProblemsVehicleRoutingPlugin.cs
         3Plugin.cs
        34bin
        45obj

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

    r6970 r7088  
    4040    <DebugType>full</DebugType>
    4141    <Optimize>false</Optimize>
    42     <OutputPath>bin\Debug\</OutputPath>
     42    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    4343    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4444    <ErrorReport>prompt</ErrorReport>
    … …  
    9999  <ItemGroup>
    100100    <Reference Include="HeuristicLab.Analysis-3.3">
    101       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Analysis-3.3.dll</HintPath>
     101      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
     102      <Private>False</Private>
    102103    </Reference>
    103104    <Reference Include="HeuristicLab.Collections-3.3">
    104       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
     105      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     106      <Private>False</Private>
    105107    </Reference>
    106108    <Reference Include="HeuristicLab.Common-3.3">
    107       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     109      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     110      <Private>False</Private>
    108111    </Reference>
    109112    <Reference Include="HeuristicLab.Common.Resources-3.3">
    110       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     113      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     114      <Private>False</Private>
    111115    </Reference>
    112116    <Reference Include="HeuristicLab.Core-3.3">
    113       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     117      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     118      <Private>False</Private>
    114119    </Reference>
    115120    <Reference Include="HeuristicLab.Data-3.3">
    116       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
     121      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
     122      <Private>False</Private>
    117123    </Reference>
    118124    <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3">
    119       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
     125      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
     126      <Private>False</Private>
    120127    </Reference>
    121128    <Reference Include="HeuristicLab.Operators-3.3">
    122       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll</HintPath>
     129      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     130      <Private>False</Private>
    123131    </Reference>
    124132    <Reference Include="HeuristicLab.Optimization-3.3">
    125       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
     133      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     134      <Private>False</Private>
    126135    </Reference>
    127136    <Reference Include="HeuristicLab.Optimization.Operators-3.3">
    128       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
     137      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
     138      <Private>False</Private>
    129139    </Reference>
    130140    <Reference Include="HeuristicLab.Parameters-3.3">
    131       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Parameters-3.3.dll</HintPath>
     141      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     142      <Private>False</Private>
    132143    </Reference>
    133144    <Reference Include="HeuristicLab.Persistence-3.3">
    134       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
     145      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     146      <Private>False</Private>
    135147    </Reference>
    136148    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    137       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     149      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     150      <Private>False</Private>
    138151    </Reference>
    139152    <Reference Include="System" />
    … …  
    166179    <Compile Include="Analyzer\ConstraintRelaxation\TimeWindowed\TimeWindowRelaxationVRPAnalyzer.cs" />
    167180    <Compile Include="Analyzer\VRPSolution.cs" />
     181    <Compile Include="Properties\AssemblyInfo.cs" />
    168182    <Compile Include="Encodings\Alba\AlbaEncoding.cs" />
    169183    <Compile Include="Encodings\Alba\Creators\DefaultRepresentationCreator.cs" />
    … …  
    346360    <Compile Include="Parsers\CordeauParser.cs" />
    347361    <Compile Include="Parsers\LiLimParser.cs" />
     362    <Compile Include="Plugin.cs" />
    348363    <Compile Include="ProblemInstances\MultiDepotVRP\MDCVRP\MDCVRPEvaluator.cs" />
    349364    <Compile Include="ProblemInstances\MultiDepotVRP\MDCVRP\MDCVRPProblemInstance.cs" />
    … …  
    387402    <Compile Include="Encodings\Tour.cs" />
    388403    <Compile Include="Parsers\TSPLIBParser.cs" />
    389     <Compile Include="HeuristicLabProblemsVehicleRoutingPlugin.cs" />
    390     <Compile Include="Properties\AssemblyInfo.cs" />
    391404    <Compile Include="Parsers\SolomonParser.cs" />
    392405    <Compile Include="VehicleRoutingProblem.cs" />
    393406  </ItemGroup>
    394407  <ItemGroup>
     408    <None Include="Properties\AssemblyInfo.cs.frame" />
    395409    <None Include="HeuristicLab.snk" />
    396     <None Include="HeuristicLabProblemsVehicleRoutingPlugin.cs.frame" />
    397     <None Include="Properties\AssemblyInfo.frame" />
     410    <None Include="Plugin.cs.frame" />
    398411  </ItemGroup>
    399412  <ItemGroup>
    … …  
    429442set Outdir=$(Outdir)
    430443
    431 call PreBuildEvent.cmd
    432 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsVehicleRoutingPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsVehicleRoutingPlugin.cs"</PreBuildEvent>
     444call PreBuildEvent.cmd</PreBuildEvent>
    433445  </PropertyGroup>
    434446  <PropertyGroup>
    435     <PostBuildEvent>set ProjectName=$(ProjectName)
    436 set Source=$(TargetPath)
    437 set Configuration=$(ConfigurationName)
    438 set Platform=$(PlatformName)
    439 set SolutionDir=$(SolutionDir)
    440 
    441 if exist "$(SolutionDir)CustomPostBuild.cmd" call "$(SolutionDir)CustomPostBuild.cmd"</PostBuildEvent>
     447    <PostBuildEvent>
     448    </PostBuildEvent>
    442449  </PropertyGroup>
    443450</Project>

  • branches/VRP/HeuristicLab.VRP.sln

    r6970 r7088  
    44Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EA53A5B2-BFCF-4D7E-AFAA-4A2916D2A548}"
    55  ProjectSection(SolutionItems) = preProject
    6     CustomPostBuild.cmd = CustomPostBuild.cmd
     6    Build.cmd = Build.cmd
    77    PreBuildEvent.cmd = PreBuildEvent.cmd
    88  EndProjectSection

  • branches/VRP/PreBuildEvent.cmd

    r6970 r7088  
    1 SubWCRev "%ProjectDir%\" "%ProjectDir%\Properties\AssemblyInfo.frame" "%ProjectDir%\Properties\AssemblyInfo.cs"
     1IF EXIST "%ProjectDir%\Properties\AssemblyInfo.cs.frame" SubWCRev "%ProjectDir%\" "%ProjectDir%\Properties\AssemblyInfo.cs.frame" "%ProjectDir%\Properties\AssemblyInfo.cs"
     2IF EXIST "%ProjectDir%\Plugin.cs.frame" SubWCRev "%ProjectDir%\" "%ProjectDir%\Plugin.cs.frame" "%ProjectDir%\Plugin.cs"
Note: See TracChangeset for help on using the changeset viewer.