Changeset 5867


Ignore:
Timestamp:
03/29/11 15:40:01 (11 years ago)
Author:
svonolfe
Message:

Merged changes from trunk into branch (#1177)

Location:
branches/VRP
Files:
38 edited

Legend:

Unmodified
Added
Removed
  • branches/VRP/HeuristicLab 3.3.sln

    r4752 r5867  
    6666    {25087811-F74C-4128-BC86-8324271DA13E} = {25087811-F74C-4128-BC86-8324271DA13E}
    6767    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2} = {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}
    68     {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9} = {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}
    6968    {E226881D-315F-423D-B419-A766FE0D8685} = {E226881D-315F-423D-B419-A766FE0D8685}
    70     {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9} = {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}
    7169    {F62BCD22-FB83-4444-9401-8031C2487A86} = {F62BCD22-FB83-4444-9401-8031C2487A86}
    7270    {E0B45023-CB84-48A1-A1B7-8295B64B7BAD} = {E0B45023-CB84-48A1-A1B7-8295B64B7BAD}
     
    8179    {250ADE34-82FD-4BAE-86D5-985FBE589C4A} = {250ADE34-82FD-4BAE-86D5-985FBE589C4A}
    8280    {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1} = {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}
    83     {799B0B38-E384-4A17-A73C-F211EB854592} = {799B0B38-E384-4A17-A73C-F211EB854592}
    8481    {678E2145-8152-4E19-9646-07D439D00301} = {678E2145-8152-4E19-9646-07D439D00301}
    8582    {BB994448-2B21-4564-BB2E-38D8FFF8CF18} = {BB994448-2B21-4564-BB2E-38D8FFF8CF18}
     
    9895    {8824925E-3E00-4543-8293-7DDACE4737F8} = {8824925E-3E00-4543-8293-7DDACE4737F8}
    9996    {E10F395F-C8A6-48AD-B470-9AA7A1F43809} = {E10F395F-C8A6-48AD-B470-9AA7A1F43809}
    100     {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5} = {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}
    10197    {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5} = {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}
    10298    {56F9106A-079F-4C61-92F6-86A84C2D84B7} = {56F9106A-079F-4C61-92F6-86A84C2D84B7}
    103     {30D6606B-96E7-436C-B5D7-EA1455848E37} = {30D6606B-96E7-436C-B5D7-EA1455848E37}
    104     {A8D5676D-9662-437A-B44D-ECB4046CDE12} = {A8D5676D-9662-437A-B44D-ECB4046CDE12}
    10599    {DC3D7072-7999-4719-B65D-3997744D5DC1} = {DC3D7072-7999-4719-B65D-3997744D5DC1}
    106100    {76945D76-CA61-4147-9DC2-0ACDCDDF87F9} = {76945D76-CA61-4147-9DC2-0ACDCDDF87F9}
    107101    {57F38579-409D-4DD8-AB19-3F2C4A665126} = {57F38579-409D-4DD8-AB19-3F2C4A665126}
    108102    {4ABA047D-46DD-4608-9E4A-41C5F92FDBB1} = {4ABA047D-46DD-4608-9E4A-41C5F92FDBB1}
    109     {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC} = {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}
    110     {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F} = {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}
    111103    {D767C38D-8014-46B0-9A32-03A3AECCE34A} = {D767C38D-8014-46B0-9A32-03A3AECCE34A}
    112104    {BF7D9494-A586-457B-8DF9-ED599F9E6A71} = {BF7D9494-A586-457B-8DF9-ED599F9E6A71}
    113105    {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58} = {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}
    114     {DE12659F-87C4-48E6-B2E3-4E73DD95A540} = {DE12659F-87C4-48E6-B2E3-4E73DD95A540}
    115106    {4FE983A1-AAF8-4977-B9E2-52B3224510CB} = {4FE983A1-AAF8-4977-B9E2-52B3224510CB}
    116107    {30DD3DA2-CA57-49DD-A5BA-50CEF19DB45F} = {30DD3DA2-CA57-49DD-A5BA-50CEF19DB45F}
     
    129120    {6908BDCE-D925-43F3-94AC-A531E6DF2591} = {6908BDCE-D925-43F3-94AC-A531E6DF2591}
    130121    {102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B} = {102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}
    131     {13CA37D6-4111-4E7B-BE2E-AF3DE462D384} = {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}
    132     {71D904D9-233B-44B2-ABB2-1525691228C5} = {71D904D9-233B-44B2-ABB2-1525691228C5}
    133122    {EE2034D9-6E27-48A1-B855-42D45F69A4FC} = {EE2034D9-6E27-48A1-B855-42D45F69A4FC}
    134123    {A9EE65D9-405B-4C9C-B470-FC911AAC541B} = {A9EE65D9-405B-4C9C-B470-FC911AAC541B}
     
    140129    {A9E282EA-180F-4233-B809-AEDF0787545C} = {A9E282EA-180F-4233-B809-AEDF0787545C}
    141130    {96AEBBEE-4203-45F3-BCF5-7B73BF256BDA} = {96AEBBEE-4203-45F3-BCF5-7B73BF256BDA}
    142     {5A4679EF-A8F3-4647-B722-441A36B3BA6B} = {5A4679EF-A8F3-4647-B722-441A36B3BA6B}
    143131    {23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE} = {23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}
    144132    {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937} = {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}
     
    198186Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.PermutationEncoding-3.3", "HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj", "{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}"
    199187EndProject
    200 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.PermutationEncoding-3.3.Tests", "HeuristicLab.Encodings.PermutationEncoding\3.3\Tests\HeuristicLab.Encodings.PermutationEncoding-3.3.Tests.csproj", "{13CA37D6-4111-4E7B-BE2E-AF3DE462D384}"
    201 EndProject
    202188Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.RealVectorEncoding-3.3", "HeuristicLab.Encodings.RealVectorEncoding\3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj", "{BB6D334A-4BB6-4674-9883-31A6EBB32CAB}"
    203189EndProject
    204 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.RealVectorEncoding-3.3.Tests", "HeuristicLab.Encodings.RealVectorEncoding\3.3\Tests\HeuristicLab.Encodings.RealVectorEncoding-3.3.Tests.csproj", "{8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}"
    205 EndProject
    206190Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.IntegerVectorEncoding-3.3", "HeuristicLab.Encodings.IntegerVectorEncoding\3.3\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.csproj", "{DDFB14DD-2A85-493C-A52D-E69729BBAEB0}"
    207191EndProject
    208 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.IntegerVectorEncoding-3.3.Tests", "HeuristicLab.Encodings.IntegerVectorEncoding\3.3\Tests\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.Tests.csproj", "{6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}"
    209 EndProject
    210192Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.BinaryVectorEncoding-3.3", "HeuristicLab.Encodings.BinaryVectorEncoding\3.3\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.csproj", "{66D249C3-A01D-42A8-82A2-919BC8EC3D83}"
    211193EndProject
    212 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.BinaryVectorEncoding-3.3.Tests", "HeuristicLab.Encodings.BinaryVectorEncoding\3.3\Tests\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.Tests.csproj", "{30D6606B-96E7-436C-B5D7-EA1455848E37}"
    213 EndProject
    214194Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.OneMax-3.3", "HeuristicLab.Problems.OneMax\3.3\HeuristicLab.Problems.OneMax-3.3.csproj", "{F62BCD22-FB83-4444-9401-8031C2487A86}"
    215195EndProject
     
    236216Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.GeneticAlgorithm-3.3", "HeuristicLab.Algorithms.GeneticAlgorithm\3.3\HeuristicLab.Algorithms.GeneticAlgorithm-3.3.csproj", "{A51DA44F-CB35-4F6F-99F5-2A2E904AB93B}"
    237217EndProject
    238 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.GeneticAlgorithm-3.3.Tests", "HeuristicLab.Algorithms.GeneticAlgorithm\3.3\Tests\HeuristicLab.Algorithms.GeneticAlgorithm-3.3.Tests.csproj", "{DE12659F-87C4-48E6-B2E3-4E73DD95A540}"
    239 EndProject
    240218Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3", "HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj", "{125D3006-67F5-48CB-913E-73C0548F17FA}"
    241219EndProject
     
    246224Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3", "HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3.csproj", "{6F42C5F8-16CD-43EE-8208-FD4573A69D85}"
    247225EndProject
    248 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis-3.3", "HeuristicLab.Problems.DataAnalysis\3.3\HeuristicLab.Problems.DataAnalysis-3.3.csproj", "{70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}"
    249 EndProject
    250 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Regression-3.3", "HeuristicLab.Problems.DataAnalysis.Regression\3.3\HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj", "{BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}"
    251 EndProject
    252226Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.Tests", "HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\Tests\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.Tests.csproj", "{8824925E-3E00-4543-8293-7DDACE4737F8}"
    253227EndProject
    254 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Views-3.3", "HeuristicLab.Problems.DataAnalysis.Views\3.3\HeuristicLab.Problems.DataAnalysis.Views-3.3.csproj", "{799B0B38-E384-4A17-A73C-F211EB854592}"
    255 EndProject
    256228Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3", "HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm\3.3\HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.csproj", "{F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}"
    257229EndProject
     
    265237EndProject
    266238Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.OneMax.Views-3.3", "HeuristicLab.Problems.OneMax.Views\3.3\HeuristicLab.Problems.OneMax.Views-3.3.csproj", "{4FE983A1-AAF8-4977-B9E2-52B3224510CB}"
    267 EndProject
    268 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Tests-3.3", "HeuristicLab.Problems.DataAnalysis\3.3\Tests\HeuristicLab.Problems.DataAnalysis.Tests-3.3.csproj", "{5A4679EF-A8F3-4647-B722-441A36B3BA6B}"
    269 EndProject
    270 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.TestFunctions-3.3.Tests", "HeuristicLab.Problems.TestFunctions\3.3\Tests\HeuristicLab.Problems.TestFunctions-3.3.Tests.csproj", "{71D904D9-233B-44B2-ABB2-1525691228C5}"
    271239EndProject
    272240Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ALGLIB-2.5.0", "HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\2.5.0\ALGLIB-2.5.0\ALGLIB-2.5.0.csproj", "{29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}"
     
    283251  EndProjectSection
    284252EndProject
    285 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.DataAnalysis-3.3", "HeuristicLab.Algorithms.DataAnalysis\3.3\HeuristicLab.Algorithms.DataAnalysis-3.3.csproj", "{A8D5676D-9662-437A-B44D-ECB4046CDE12}"
    286 EndProject
    287253Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtocolBuffers", "HeuristicLab.ExtLibs\HeuristicLab.ProtobufCS\0.9.1\ProtobufCS\src\ProtocolBuffers\ProtocolBuffers.csproj", "{6908BDCE-D925-43F3-94AC-A531E6DF2591}"
    288254EndProject
     
    301267Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.VehicleRouting.Views-3.3", "HeuristicLab.Problems.VehicleRouting.Views\3.3\HeuristicLab.Problems.VehicleRouting.Views-3.3.csproj", "{D1386FE7-682D-4E18-8C4F-CFD423FA5DD0}"
    302268EndProject
    303 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.MainForm.WindowsForms-3.3.Tests", "HeuristicLab.MainForm.WindowsForms\3.3\Tests\HeuristicLab.MainForm.WindowsForms-3.3.Tests.csproj", "{9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}"
    304 EndProject
    305269Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.ExternalEvaluation.GP-3.3", "HeuristicLab.Problems.ExternalEvaluation.GP\3.3\HeuristicLab.Problems.ExternalEvaluation.GP-3.3.csproj", "{E86E215D-E3CE-4244-978D-555D4E17AC09}"
    306270EndProject
     
    314278EndProject
    315279Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Visualization.ChartControlsExtensions-3.3", "HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj", "{315BDA09-3F4F-49B3-9790-B37CFC1C5750}"
     280EndProject
     281Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.VariableNeighborhoodSearch-3.3", "HeuristicLab.Algorithms.VariableNeighborhoodSearch\3.3\HeuristicLab.Algorithms.VariableNeighborhoodSearch-3.3.csproj", "{E4CFB0C3-0589-4893-B38E-8BEDF885C765}"
    316282EndProject
    317283Global
     
    748714    {DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}.Release|x86.ActiveCfg = Release|x86
    749715    {DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}.Release|x86.Build.0 = Release|x86
    750     {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    751     {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Debug|Any CPU.Build.0 = Debug|Any CPU
    752     {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Debug|x64.ActiveCfg = Debug|x64
    753     {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Debug|x64.Build.0 = Debug|x64
    754     {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Debug|x86.ActiveCfg = Debug|x86
    755     {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Debug|x86.Build.0 = Debug|x86
    756     {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Release|Any CPU.ActiveCfg = Release|Any CPU
    757     {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Release|Any CPU.Build.0 = Release|Any CPU
    758     {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Release|x64.ActiveCfg = Release|x64
    759     {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Release|x64.Build.0 = Release|x64
    760     {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Release|x86.ActiveCfg = Release|x86
    761     {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Release|x86.Build.0 = Release|x86
    762716    {BB6D334A-4BB6-4674-9883-31A6EBB32CAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    763717    {BB6D334A-4BB6-4674-9883-31A6EBB32CAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    772726    {BB6D334A-4BB6-4674-9883-31A6EBB32CAB}.Release|x86.ActiveCfg = Release|x86
    773727    {BB6D334A-4BB6-4674-9883-31A6EBB32CAB}.Release|x86.Build.0 = Release|x86
    774     {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    775     {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}.Debug|Any CPU.Build.0 = Debug|Any CPU
    776     {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}.Debug|x64.ActiveCfg = Debug|x64
    777     {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}.Debug|x64.Build.0 = Debug|x64
    778     {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}.Debug|x86.ActiveCfg = Debug|x86
    779     {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}.Debug|x86.Build.0 = Debug|x86
    780     {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}.Release|Any CPU.ActiveCfg = Release|Any CPU
    781     {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}.Release|Any CPU.Build.0 = Release|Any CPU
    782     {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}.Release|x64.ActiveCfg = Release|x64
    783     {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}.Release|x64.Build.0 = Release|x64
    784     {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}.Release|x86.ActiveCfg = Release|x86
    785     {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}.Release|x86.Build.0 = Release|x86
    786728    {DDFB14DD-2A85-493C-A52D-E69729BBAEB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    787729    {DDFB14DD-2A85-493C-A52D-E69729BBAEB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    796738    {DDFB14DD-2A85-493C-A52D-E69729BBAEB0}.Release|x86.ActiveCfg = Release|x86
    797739    {DDFB14DD-2A85-493C-A52D-E69729BBAEB0}.Release|x86.Build.0 = Release|x86
    798     {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    799     {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
    800     {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}.Debug|x64.ActiveCfg = Debug|x64
    801     {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}.Debug|x64.Build.0 = Debug|x64
    802     {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}.Debug|x86.ActiveCfg = Debug|x86
    803     {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}.Debug|x86.Build.0 = Debug|x86
    804     {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
    805     {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}.Release|Any CPU.Build.0 = Release|Any CPU
    806     {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}.Release|x64.ActiveCfg = Release|x64
    807     {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}.Release|x64.Build.0 = Release|x64
    808     {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}.Release|x86.ActiveCfg = Release|x86
    809     {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}.Release|x86.Build.0 = Release|x86
    810740    {66D249C3-A01D-42A8-82A2-919BC8EC3D83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    811741    {66D249C3-A01D-42A8-82A2-919BC8EC3D83}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    820750    {66D249C3-A01D-42A8-82A2-919BC8EC3D83}.Release|x86.ActiveCfg = Release|x86
    821751    {66D249C3-A01D-42A8-82A2-919BC8EC3D83}.Release|x86.Build.0 = Release|x86
    822     {30D6606B-96E7-436C-B5D7-EA1455848E37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    823     {30D6606B-96E7-436C-B5D7-EA1455848E37}.Debug|Any CPU.Build.0 = Debug|Any CPU
    824     {30D6606B-96E7-436C-B5D7-EA1455848E37}.Debug|x64.ActiveCfg = Debug|x64
    825     {30D6606B-96E7-436C-B5D7-EA1455848E37}.Debug|x64.Build.0 = Debug|x64
    826     {30D6606B-96E7-436C-B5D7-EA1455848E37}.Debug|x86.ActiveCfg = Debug|x86
    827     {30D6606B-96E7-436C-B5D7-EA1455848E37}.Debug|x86.Build.0 = Debug|x86
    828     {30D6606B-96E7-436C-B5D7-EA1455848E37}.Release|Any CPU.ActiveCfg = Release|Any CPU
    829     {30D6606B-96E7-436C-B5D7-EA1455848E37}.Release|Any CPU.Build.0 = Release|Any CPU
    830     {30D6606B-96E7-436C-B5D7-EA1455848E37}.Release|x64.ActiveCfg = Release|x64
    831     {30D6606B-96E7-436C-B5D7-EA1455848E37}.Release|x64.Build.0 = Release|x64
    832     {30D6606B-96E7-436C-B5D7-EA1455848E37}.Release|x86.ActiveCfg = Release|x86
    833     {30D6606B-96E7-436C-B5D7-EA1455848E37}.Release|x86.Build.0 = Release|x86
    834752    {F62BCD22-FB83-4444-9401-8031C2487A86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    835753    {F62BCD22-FB83-4444-9401-8031C2487A86}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    976894    {A51DA44F-CB35-4F6F-99F5-2A2E904AB93B}.Release|x86.ActiveCfg = Release|x86
    977895    {A51DA44F-CB35-4F6F-99F5-2A2E904AB93B}.Release|x86.Build.0 = Release|x86
    978     {DE12659F-87C4-48E6-B2E3-4E73DD95A540}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    979     {DE12659F-87C4-48E6-B2E3-4E73DD95A540}.Debug|Any CPU.Build.0 = Debug|Any CPU
    980     {DE12659F-87C4-48E6-B2E3-4E73DD95A540}.Debug|x64.ActiveCfg = Debug|x64
    981     {DE12659F-87C4-48E6-B2E3-4E73DD95A540}.Debug|x64.Build.0 = Debug|x64
    982     {DE12659F-87C4-48E6-B2E3-4E73DD95A540}.Debug|x86.ActiveCfg = Debug|x86
    983     {DE12659F-87C4-48E6-B2E3-4E73DD95A540}.Debug|x86.Build.0 = Debug|x86
    984     {DE12659F-87C4-48E6-B2E3-4E73DD95A540}.Release|Any CPU.ActiveCfg = Release|Any CPU
    985     {DE12659F-87C4-48E6-B2E3-4E73DD95A540}.Release|Any CPU.Build.0 = Release|Any CPU
    986     {DE12659F-87C4-48E6-B2E3-4E73DD95A540}.Release|x64.ActiveCfg = Release|x64
    987     {DE12659F-87C4-48E6-B2E3-4E73DD95A540}.Release|x64.Build.0 = Release|x64
    988     {DE12659F-87C4-48E6-B2E3-4E73DD95A540}.Release|x86.ActiveCfg = Release|x86
    989     {DE12659F-87C4-48E6-B2E3-4E73DD95A540}.Release|x86.Build.0 = Release|x86
    990896    {125D3006-67F5-48CB-913E-73C0548F17FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    991897    {125D3006-67F5-48CB-913E-73C0548F17FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    1036942    {6F42C5F8-16CD-43EE-8208-FD4573A69D85}.Release|x86.ActiveCfg = Release|x86
    1037943    {6F42C5F8-16CD-43EE-8208-FD4573A69D85}.Release|x86.Build.0 = Release|x86
    1038     {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    1039     {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
    1040     {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}.Debug|x64.ActiveCfg = Debug|x64
    1041     {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}.Debug|x64.Build.0 = Debug|x64
    1042     {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}.Debug|x86.ActiveCfg = Debug|x86
    1043     {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}.Debug|x86.Build.0 = Debug|x86
    1044     {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
    1045     {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}.Release|Any CPU.Build.0 = Release|Any CPU
    1046     {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}.Release|x64.ActiveCfg = Release|x64
    1047     {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}.Release|x64.Build.0 = Release|x64
    1048     {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}.Release|x86.ActiveCfg = Release|x86
    1049     {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}.Release|x86.Build.0 = Release|x86
    1050     {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    1051     {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
    1052     {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}.Debug|x64.ActiveCfg = Debug|x64
    1053     {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}.Debug|x64.Build.0 = Debug|x64
    1054     {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}.Debug|x86.ActiveCfg = Debug|x86
    1055     {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}.Debug|x86.Build.0 = Debug|x86
    1056     {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
    1057     {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}.Release|Any CPU.Build.0 = Release|Any CPU
    1058     {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}.Release|x64.ActiveCfg = Release|x64
    1059     {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}.Release|x64.Build.0 = Release|x64
    1060     {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}.Release|x86.ActiveCfg = Release|x86
    1061     {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}.Release|x86.Build.0 = Release|x86
    1062944    {8824925E-3E00-4543-8293-7DDACE4737F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    1063945    {8824925E-3E00-4543-8293-7DDACE4737F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    1072954    {8824925E-3E00-4543-8293-7DDACE4737F8}.Release|x86.ActiveCfg = Release|x86
    1073955    {8824925E-3E00-4543-8293-7DDACE4737F8}.Release|x86.Build.0 = Release|x86
    1074     {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    1075     {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|Any CPU.Build.0 = Debug|Any CPU
    1076     {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|x64.ActiveCfg = Debug|x64
    1077     {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|x64.Build.0 = Debug|x64
    1078     {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|x86.ActiveCfg = Debug|x86
    1079     {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|x86.Build.0 = Debug|x86
    1080     {799B0B38-E384-4A17-A73C-F211EB854592}.Release|Any CPU.ActiveCfg = Release|Any CPU
    1081     {799B0B38-E384-4A17-A73C-F211EB854592}.Release|Any CPU.Build.0 = Release|Any CPU
    1082     {799B0B38-E384-4A17-A73C-F211EB854592}.Release|x64.ActiveCfg = Release|x64
    1083     {799B0B38-E384-4A17-A73C-F211EB854592}.Release|x64.Build.0 = Release|x64
    1084     {799B0B38-E384-4A17-A73C-F211EB854592}.Release|x86.ActiveCfg = Release|x86
    1085     {799B0B38-E384-4A17-A73C-F211EB854592}.Release|x86.Build.0 = Release|x86
    1086956    {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    1087957    {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    11561026    {4FE983A1-AAF8-4977-B9E2-52B3224510CB}.Release|x86.ActiveCfg = Release|x86
    11571027    {4FE983A1-AAF8-4977-B9E2-52B3224510CB}.Release|x86.Build.0 = Release|x86
    1158     {5A4679EF-A8F3-4647-B722-441A36B3BA6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    1159     {5A4679EF-A8F3-4647-B722-441A36B3BA6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
    1160     {5A4679EF-A8F3-4647-B722-441A36B3BA6B}.Debug|x64.ActiveCfg = Debug|x64
    1161     {5A4679EF-A8F3-4647-B722-441A36B3BA6B}.Debug|x64.Build.0 = Debug|x64
    1162     {5A4679EF-A8F3-4647-B722-441A36B3BA6B}.Debug|x86.ActiveCfg = Debug|x86
    1163     {5A4679EF-A8F3-4647-B722-441A36B3BA6B}.Debug|x86.Build.0 = Debug|x86
    1164     {5A4679EF-A8F3-4647-B722-441A36B3BA6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
    1165     {5A4679EF-A8F3-4647-B722-441A36B3BA6B}.Release|Any CPU.Build.0 = Release|Any CPU
    1166     {5A4679EF-A8F3-4647-B722-441A36B3BA6B}.Release|x64.ActiveCfg = Release|x64
    1167     {5A4679EF-A8F3-4647-B722-441A36B3BA6B}.Release|x64.Build.0 = Release|x64
    1168     {5A4679EF-A8F3-4647-B722-441A36B3BA6B}.Release|x86.ActiveCfg = Release|x86
    1169     {5A4679EF-A8F3-4647-B722-441A36B3BA6B}.Release|x86.Build.0 = Release|x86
    1170     {71D904D9-233B-44B2-ABB2-1525691228C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    1171     {71D904D9-233B-44B2-ABB2-1525691228C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
    1172     {71D904D9-233B-44B2-ABB2-1525691228C5}.Debug|x64.ActiveCfg = Debug|x64
    1173     {71D904D9-233B-44B2-ABB2-1525691228C5}.Debug|x64.Build.0 = Debug|x64
    1174     {71D904D9-233B-44B2-ABB2-1525691228C5}.Debug|x86.ActiveCfg = Debug|x86
    1175     {71D904D9-233B-44B2-ABB2-1525691228C5}.Debug|x86.Build.0 = Debug|x86
    1176     {71D904D9-233B-44B2-ABB2-1525691228C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
    1177     {71D904D9-233B-44B2-ABB2-1525691228C5}.Release|Any CPU.Build.0 = Release|Any CPU
    1178     {71D904D9-233B-44B2-ABB2-1525691228C5}.Release|x64.ActiveCfg = Release|x64
    1179     {71D904D9-233B-44B2-ABB2-1525691228C5}.Release|x64.Build.0 = Release|x64
    1180     {71D904D9-233B-44B2-ABB2-1525691228C5}.Release|x86.ActiveCfg = Release|x86
    1181     {71D904D9-233B-44B2-ABB2-1525691228C5}.Release|x86.Build.0 = Release|x86
    11821028    {29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    11831029    {29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    12401086    {25735DB4-8E54-4A2C-83E3-A60C76565E55}.Release|x86.ActiveCfg = Release|x86
    12411087    {25735DB4-8E54-4A2C-83E3-A60C76565E55}.Release|x86.Build.0 = Release|x86
    1242     {A8D5676D-9662-437A-B44D-ECB4046CDE12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    1243     {A8D5676D-9662-437A-B44D-ECB4046CDE12}.Debug|Any CPU.Build.0 = Debug|Any CPU
    1244     {A8D5676D-9662-437A-B44D-ECB4046CDE12}.Debug|x64.ActiveCfg = Debug|x64
    1245     {A8D5676D-9662-437A-B44D-ECB4046CDE12}.Debug|x64.Build.0 = Debug|x64
    1246     {A8D5676D-9662-437A-B44D-ECB4046CDE12}.Debug|x86.ActiveCfg = Debug|x86
    1247     {A8D5676D-9662-437A-B44D-ECB4046CDE12}.Debug|x86.Build.0 = Debug|x86
    1248     {A8D5676D-9662-437A-B44D-ECB4046CDE12}.Release|Any CPU.ActiveCfg = Release|Any CPU
    1249     {A8D5676D-9662-437A-B44D-ECB4046CDE12}.Release|Any CPU.Build.0 = Release|Any CPU
    1250     {A8D5676D-9662-437A-B44D-ECB4046CDE12}.Release|x64.ActiveCfg = Release|x64
    1251     {A8D5676D-9662-437A-B44D-ECB4046CDE12}.Release|x64.Build.0 = Release|x64
    1252     {A8D5676D-9662-437A-B44D-ECB4046CDE12}.Release|x86.ActiveCfg = Release|x86
    1253     {A8D5676D-9662-437A-B44D-ECB4046CDE12}.Release|x86.Build.0 = Release|x86
    12541088    {6908BDCE-D925-43F3-94AC-A531E6DF2591}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    12551089    {6908BDCE-D925-43F3-94AC-A531E6DF2591}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    13481182    {D1386FE7-682D-4E18-8C4F-CFD423FA5DD0}.Release|x86.ActiveCfg = Release|x86
    13491183    {D1386FE7-682D-4E18-8C4F-CFD423FA5DD0}.Release|x86.Build.0 = Release|x86
    1350     {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    1351     {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
    1352     {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Debug|x64.ActiveCfg = Debug|x64
    1353     {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Debug|x64.Build.0 = Debug|x64
    1354     {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Debug|x86.ActiveCfg = Debug|x86
    1355     {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Debug|x86.Build.0 = Debug|x86
    1356     {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
    1357     {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Release|Any CPU.Build.0 = Release|Any CPU
    1358     {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Release|x64.ActiveCfg = Release|x64
    1359     {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Release|x64.Build.0 = Release|x64
    1360     {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Release|x86.ActiveCfg = Release|x86
    1361     {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Release|x86.Build.0 = Release|x86
    13621184    {E86E215D-E3CE-4244-978D-555D4E17AC09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    13631185    {E86E215D-E3CE-4244-978D-555D4E17AC09}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    14321254    {315BDA09-3F4F-49B3-9790-B37CFC1C5750}.Release|x86.ActiveCfg = Release|x86
    14331255    {315BDA09-3F4F-49B3-9790-B37CFC1C5750}.Release|x86.Build.0 = Release|x86
     1256    {E4CFB0C3-0589-4893-B38E-8BEDF885C765}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1257    {E4CFB0C3-0589-4893-B38E-8BEDF885C765}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1258    {E4CFB0C3-0589-4893-B38E-8BEDF885C765}.Debug|x64.ActiveCfg = Debug|x64
     1259    {E4CFB0C3-0589-4893-B38E-8BEDF885C765}.Debug|x64.Build.0 = Debug|x64
     1260    {E4CFB0C3-0589-4893-B38E-8BEDF885C765}.Debug|x86.ActiveCfg = Debug|x86
     1261    {E4CFB0C3-0589-4893-B38E-8BEDF885C765}.Debug|x86.Build.0 = Debug|x86
     1262    {E4CFB0C3-0589-4893-B38E-8BEDF885C765}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1263    {E4CFB0C3-0589-4893-B38E-8BEDF885C765}.Release|Any CPU.Build.0 = Release|Any CPU
     1264    {E4CFB0C3-0589-4893-B38E-8BEDF885C765}.Release|x64.ActiveCfg = Release|x64
     1265    {E4CFB0C3-0589-4893-B38E-8BEDF885C765}.Release|x64.Build.0 = Release|x64
     1266    {E4CFB0C3-0589-4893-B38E-8BEDF885C765}.Release|x86.ActiveCfg = Release|x86
     1267    {E4CFB0C3-0589-4893-B38E-8BEDF885C765}.Release|x86.Build.0 = Release|x86
    14341268  EndGlobalSection
    14351269  GlobalSection(SolutionProperties) = preSolution
  • branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/HeuristicLab.Problems.VehicleRouting.Views-3.4.csproj

    r4860 r5867  
    1111    <RootNamespace>HeuristicLab.Problems.VehicleRouting.Views</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Problems.VehicleRouting.Views-3.4</AssemblyName>
    13     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <SignAssembly>true</SignAssembly>
     
    3434    <UseApplicationTrust>false</UseApplicationTrust>
    3535    <BootstrapperEnabled>true</BootstrapperEnabled>
     36    <TargetFrameworkProfile />
    3637  </PropertyGroup>
    3738  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  • branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPImportDialog.Designer.cs

    r4860 r5867  
    100100      //
    101101      this.openVRPFileButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    102       this.openVRPFileButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Open;
     102      this.openVRPFileButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Open;
    103103      this.openVRPFileButton.Location = new System.Drawing.Point(520, 10);
    104104      this.openVRPFileButton.Name = "openVRPFileButton";
     
    131131      //
    132132      this.openTourFileButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    133       this.openTourFileButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Open;
     133      this.openTourFileButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Open;
    134134      this.openTourFileButton.Location = new System.Drawing.Point(520, 35);
    135135      this.openTourFileButton.Name = "openTourFileButton";
     
    161161      //
    162162      this.clearTourFileButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    163       this.clearTourFileButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Remove;
     163      this.clearTourFileButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Remove;
    164164      this.clearTourFileButton.Location = new System.Drawing.Point(550, 35);
    165165      this.clearTourFileButton.Name = "clearTourFileButton";
  • branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPSolutionView.Designer.cs

    r4374 r5867  
    2424    /// </summary>
    2525    private void InitializeComponent() {
    26       this.tabControl1 = new System.Windows.Forms.TabControl();
     26      this.tabControl1 = new HeuristicLab.MainForm.WindowsForms.DragOverTabControl();
    2727      this.tabPage1 = new System.Windows.Forms.TabPage();
    2828      this.problemInstanceView = new HeuristicLab.MainForm.WindowsForms.ViewHost();
     
    119119    #endregion
    120120
    121     private System.Windows.Forms.TabControl tabControl1;
     121    private HeuristicLab.MainForm.WindowsForms.DragOverTabControl tabControl1;
    122122    private System.Windows.Forms.TabPage tabPage1;
    123123    private MainForm.WindowsForms.ViewHost problemInstanceView;
  • branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/VehicleRoutingProblemView.Designer.cs

    r4860 r5867  
    3333      this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    3434      this.errorProvider.SetIconPadding(this.nameTextBox, 2);
     35      this.nameTextBox.Location = new System.Drawing.Point(60, 0);
     36      this.nameTextBox.Size = new System.Drawing.Size(405, 20);
     37      //
     38      // infoLabel
     39      //
     40      this.infoLabel.Location = new System.Drawing.Point(471, 3);
    3541      //
    3642      // importButton
     
    3844      this.importButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    3945                  | System.Windows.Forms.AnchorStyles.Right)));
    40       this.importButton.Location = new System.Drawing.Point(0, 55);
     46      this.importButton.Location = new System.Drawing.Point(0, 26);
    4147      this.importButton.Name = "importButton";
    4248      this.importButton.Size = new System.Drawing.Size(490, 23);
     
    5359      this.parameterCollectionView.Caption = "ParameterCollection View";
    5460      this.parameterCollectionView.Content = null;
    55       this.parameterCollectionView.Location = new System.Drawing.Point(0, 84);
     61      this.parameterCollectionView.Location = new System.Drawing.Point(0, 55);
    5662      this.parameterCollectionView.Name = "parameterCollectionView";
    5763      this.parameterCollectionView.ReadOnly = false;
    58       this.parameterCollectionView.Size = new System.Drawing.Size(490, 268);
     64      this.parameterCollectionView.Size = new System.Drawing.Size(490, 210);
    5965      this.parameterCollectionView.TabIndex = 9;
    6066      //
     
    6571      this.Controls.Add(this.importButton);
    6672      this.Name = "VehicleRoutingProblemView";
    67       this.Size = new System.Drawing.Size(490, 352);
     73      this.Size = new System.Drawing.Size(490, 275);
    6874      this.Controls.SetChildIndex(this.importButton, 0);
    6975      this.Controls.SetChildIndex(this.parameterCollectionView, 0);
    7076      this.Controls.SetChildIndex(this.nameTextBox, 0);
    7177      this.Controls.SetChildIndex(this.nameLabel, 0);
    72       this.Controls.SetChildIndex(this.descriptionLabel, 0);
    73       this.Controls.SetChildIndex(this.descriptionTextBox, 0);
    7478      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    7579      this.ResumeLayout(false);
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestSolution/BestVRPSolutionAnalyzer.cs

    r5202 r5867  
    149149          validSolution = new VRPSolution(problemInstance, best.Clone() as IVRPEncoding, new DoubleValue(qualities[i].Value));
    150150          BestValidSolutionParameter.ActualValue = validSolution;
    151           results.Add(new Result("Best valid VRP Solution", validSolution));
     151          if (results.ContainsKey("Best valid VRP Solution"))
     152            results["Best valid VRP Solution"].Value = validSolution;
     153          else
     154            results.Add(new Result("Best valid VRP Solution", validSolution));
    152155        }
    153156      } else {
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/VRPSolution.cs

    r5127 r5867  
    3636  public sealed class VRPSolution : Item {
    3737    public override Image ItemImage {
    38       get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Image; }
     38      get { return HeuristicLab.Common.Resources.VSImageLibrary.Image; }
    3939    }
    4040
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Crossovers/AlbaPermutationCrossover.cs

    r4752 r5867  
    5858      IAtomicOperation op = this.ExecutionContext.CreateOperation(
    5959        InnerCrossoverParameter.ActualValue, this.ExecutionContext.Scope);
    60       op.Operator.Execute((IExecutionContext)op);
     60      op.Operator.Execute((IExecutionContext)op, CancellationToken);
    6161
    6262      string childName = InnerCrossoverParameter.ActualValue.ChildParameter.ActualName;
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Manipulators/AlbaPermutationManipulator.cs

    r4752 r5867  
    5656      IAtomicOperation op = this.ExecutionContext.CreateOperation(
    5757        InnerManipulatorParameter.ActualValue, this.ExecutionContext.Scope);
    58       op.Operator.Execute((IExecutionContext)op);
     58      op.Operator.Execute((IExecutionContext)op, CancellationToken);
    5959    }
    6060  }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/IntraRouteInversion/AlbaIntraRouteInversionMove.cs

    r4752 r5867  
    3333  public class AlbaIntraRouteInversionMove : TwoIndexMove, IVRPMove {
    3434    public IVRPEncoding Individual { get { return Permutation as AlbaEncoding; } }
    35    
     35
     36    [StorableConstructor]
     37    protected AlbaIntraRouteInversionMove(bool deserializing) : base(deserializing) { }
     38
     39    protected AlbaIntraRouteInversionMove(AlbaIntraRouteInversionMove original, Cloner cloner)
     40      : base(original, cloner) {
     41    }
     42
    3643    public AlbaIntraRouteInversionMove()
    3744      : base() {
     
    4350
    4451    public AlbaIntraRouteInversionMove(int index1, int index2, AlbaEncoding permutation)
    45       : base(index1, index2, permutation.Clone() as AlbaEncoding) {
     52      : base(index1, index2, null) {
     53        this.Permutation = permutation.Clone() as AlbaEncoding;
    4654     }
    4755
    4856    public override IDeepCloneable Clone(Cloner cloner) {
    4957      return new AlbaIntraRouteInversionMove(this, cloner);
    50     }
    51 
    52     protected AlbaIntraRouteInversionMove(AlbaIntraRouteInversionMove original, Cloner cloner)
    53       : base(original, cloner) {
    54         if (Permutation != null)
    55           this.Permutation = cloner.Clone(original.Permutation);
    5658    }
    5759
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/IntraRouteInversion/AlbaStochasticIntraRouteInversionMutliMoveGenerator.cs

    r4752 r5867  
    3030using HeuristicLab.Problems.VehicleRouting.Interfaces;
    3131using HeuristicLab.Common;
     32using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    3233
    3334namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    3435  [Item("AlbaStochasticIntraRouteInversionMultiMoveGenerator", "Generates multiple random intra route inversion moves from a given VRP encoding.  It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
    3536  [StorableClass]
    36   public sealed class AlbaStochasticIntraRouteInversionMultiMoveGenerator : AlbaIntraRouteInversionMoveGenerator, IStochasticOperator, IMultiMoveGenerator, IAlbaIntraRouteInversionMoveOperator {
     37  public sealed class AlbaStochasticIntraRouteInversionMultiMoveGenerator : AlbaIntraRouteInversionMoveGenerator, IStochasticOperator,
     38    IMultiMoveGenerator, IAlbaIntraRouteInversionMoveOperator, IMultiVRPMoveGenerator {
    3739    public ILookupParameter<IRandom> RandomParameter {
    3840      get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/IntraRouteInversion/AlbaStochasticIntraRouteInversionSingleMoveGenerator.cs

    r4752 r5867  
    3535  [StorableClass]
    3636  public sealed class AlbaStochasticIntraRouteInversionSingleMoveGenerator : AlbaIntraRouteInversionMoveGenerator,
    37     IStochasticOperator, ISingleMoveGenerator, IAlbaIntraRouteInversionMoveOperator, IMultiVRPMoveGenerator {
     37    IStochasticOperator, ISingleMoveGenerator, IAlbaIntraRouteInversionMoveOperator {
    3838    #region IMultiVRPMoveOperator Members
    3939
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/LambdaInterchange/AlbaStochasticLambdaInterchangeMutliMoveGenerator.cs

    r4752 r5867  
    3030using HeuristicLab.Problems.VehicleRouting.Interfaces;
    3131using HeuristicLab.Common;
     32using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    3233
    3334namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba {
    3435  [Item("AlbaStochasticLambdaInterchangeMultiMoveGenerator", "Generates multiple random lambda interchange moves from a given VRP encoding.  It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
    3536  [StorableClass]
    36   public sealed class AlbaStochasticLambdaInterchangeMultiMoveGenerator : AlbaLambdaInterchangeMoveGenerator, IStochasticOperator, IMultiMoveGenerator, IAlbaLambdaInterchangeMoveOperator {
     37  public sealed class AlbaStochasticLambdaInterchangeMultiMoveGenerator : AlbaLambdaInterchangeMoveGenerator, IStochasticOperator,
     38    IMultiMoveGenerator, IAlbaLambdaInterchangeMoveOperator, IMultiVRPMoveGenerator {
    3739    public ILookupParameter<IRandom> RandomParameter {
    3840      get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/LambdaInterchange/AlbaStochasticLambdaInterchangeSingleMoveGenerator.cs

    r5201 r5867  
    3535  [StorableClass]
    3636  public sealed class AlbaStochasticLambdaInterchangeSingleMoveGenerator : AlbaLambdaInterchangeMoveGenerator,
    37     IStochasticOperator, ISingleMoveGenerator, IAlbaLambdaInterchangeMoveOperator, IMultiVRPMoveGenerator {
     37    IStochasticOperator, ISingleMoveGenerator, IAlbaLambdaInterchangeMoveOperator {
    3838    #region IMultiVRPMoveOperator Members
    3939
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaStochasticTranslocationSingleMoveGenerator.cs

    r5130 r5867  
    3434  [Item("AlbaStochasticTranslocationSingleMoveGenerator", "An operator which generates a single translocation move for a VRP representation.  It is implemented as described in Alba, E. and Dorronsoro, B. (2004). Solving the Vehicle Routing Problem by Using Cellular Genetic Algorithms.")]
    3535  [StorableClass]
    36   public sealed class AlbaStochasticTranslocationSingleMoveGenerator : AlbaMoveGenerator, IAlbaTranslocationMoveOperator, IMultiVRPMoveGenerator {
     36  public sealed class AlbaStochasticTranslocationSingleMoveGenerator : AlbaMoveGenerator, IAlbaTranslocationMoveOperator {
    3737    [Storable]
    3838    private TranslocationMoveGenerator generator = new StochasticTranslocationSingleMoveGenerator();
     
    8080      generator.PermutationParameter.ActualName = VRPToursParameter.ActualName;
    8181      IAtomicOperation op = this.ExecutionContext.CreateChildOperation(generator);
    82       op.Operator.Execute((IExecutionContext)op);
     82      op.Operator.Execute((IExecutionContext)op, CancellationToken);
    8383
    8484      foreach (IScope scope in this.ExecutionContext.Scope.SubScopes) {
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveGenerator.cs

    r4752 r5867  
    101101      PermutationMoveOperatorParameter.PermutationParameter.ActualName = VRPToursParameter.ActualName;
    102102      IAtomicOperation op = this.ExecutionContext.CreateChildOperation(PermutationMoveOperatorParameter);
    103       op.Operator.Execute((IExecutionContext)op);
     103      op.Operator.Execute((IExecutionContext)op, CancellationToken);
    104104
    105105      return next;
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveHardTabuCriterion.cs

    r5130 r5867  
    7878    private AlbaTranslocationMoveHardTabuCriterion(AlbaTranslocationMoveHardTabuCriterion original, Cloner cloner)
    7979      : base(original, cloner) {
     80      tabuChecker = cloner.Clone(original.tabuChecker);
    8081    }
    8182
     
    8788      PermutationMoveOperatorParameter.PermutationParameter.ActualName = VRPToursParameter.ActualName;
    8889      IAtomicOperation op = this.ExecutionContext.CreateChildOperation(PermutationMoveOperatorParameter);
    89       op.Operator.Execute((IExecutionContext)op);
     90      op.Operator.Execute((IExecutionContext)op, CancellationToken);
    9091
    9192      return next;
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveMaker.cs

    r5130 r5867  
    6161    private AlbaTranslocationMoveMaker(AlbaTranslocationMoveMaker original, Cloner cloner)
    6262      : base(original, cloner) {
     63        moveMaker = cloner.Clone(original.moveMaker);
    6364    }
    6465
     
    7172      moveMaker.PermutationParameter.ActualName = VRPToursParameter.ActualName;
    7273      IAtomicOperation op = this.ExecutionContext.CreateChildOperation(moveMaker);
    73       op.Operator.Execute((IExecutionContext)op);
     74      op.Operator.Execute((IExecutionContext)op, CancellationToken);
    7475    }
    7576  }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveSoftTabuCriterion.cs

    r5130 r5867  
    7878    private AlbaTranslocationMoveSoftTabuCriterion(AlbaTranslocationMoveSoftTabuCriterion original, Cloner cloner)
    7979      : base(original, cloner) {
     80        tabuChecker = cloner.Clone(original.tabuChecker);
    8081    }
    8182
     
    8788      PermutationMoveOperatorParameter.PermutationParameter.ActualName = VRPToursParameter.ActualName;
    8889      IAtomicOperation op = this.ExecutionContext.CreateChildOperation(PermutationMoveOperatorParameter);
    89       op.Operator.Execute((IExecutionContext)op);
     90      op.Operator.Execute((IExecutionContext)op, CancellationToken);
    9091
    9192      return next;
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveTabuMaker.cs

    r5130 r5867  
    7878    private AlbaTranslocationMoveTabuMaker(AlbaTranslocationMoveTabuMaker original, Cloner cloner)
    7979      : base(original, cloner) {
     80        moveTabuMaker = cloner.Clone(original.moveTabuMaker);
    8081    }
    8182
     
    8788      PermutationMoveOperatorParameter.PermutationParameter.ActualName = VRPToursParameter.ActualName;
    8889      IAtomicOperation op = this.ExecutionContext.CreateChildOperation(PermutationMoveOperatorParameter);
    89       op.Operator.Execute((IExecutionContext)op);
     90      op.Operator.Execute((IExecutionContext)op, CancellationToken);
    9091
    9192      return next;
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveEvaluator.cs

    r4752 r5867  
    5858      moveEvaluator.VRPMoveParameter.ActualName = VRPMoveParameter.Name;
    5959      IAtomicOperation op = this.ExecutionContext.CreateOperation(moveEvaluator);
    60       op.Operator.Execute((IExecutionContext)op);
     60      op.Operator.Execute((IExecutionContext)op, CancellationToken);
    6161    }
    6262  }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveMaker.cs

    r4752 r5867  
    6060      moveMaker.VRPMoveParameter.ActualName = VRPMoveParameter.Name;
    6161      IAtomicOperation op = this.ExecutionContext.CreateOperation(moveMaker);
    62       op.Operator.Execute((IExecutionContext)op);
     62      op.Operator.Execute((IExecutionContext)op, CancellationToken);
    6363    }
    6464  }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/VRPMoveEvaluator.cs

    r5127 r5867  
    6464    //helper method to evaluate an updated individual
    6565    protected void UpdateEvaluation(IVRPEncoding updatedTours) {
    66       IVRPEvaluator evaluator = ProblemInstance.EvaluatorParameter.Value.Clone() as IVRPEvaluator;
    67 
    68       Dictionary<IParameter, string> originalName =
    69         new Dictionary<IParameter, string>();
    70 
    71       foreach (IParameter parameter in evaluator.Parameters) {
    72         if (parameter is ILookupParameter
    73           && parameter != evaluator.ProblemInstanceParameter
    74           && parameter != evaluator.VRPToursParameter) {
    75             originalName[parameter] = (parameter as ILookupParameter).ActualName;
    76 
    77             (parameter as ILookupParameter).ActualName =
    78               MovePrefix +
    79               (parameter as ILookupParameter).ActualName;
    80         }
    81       }
     66      IVRPEvaluator evaluator = ProblemInstance.MoveEvaluator;
    8267
    8368      try {
     
    8671
    8772        IAtomicOperation op = this.ExecutionContext.CreateChildOperation(evaluator);
    88         op.Operator.Execute((IExecutionContext)op);
     73        op.Operator.Execute((IExecutionContext)op, CancellationToken);
    8974      }
    9075      finally {
    91         foreach (IParameter parameter in originalName.Keys) {
    92           (parameter as ILookupParameter).ActualName = originalName[parameter];
    93         }
    94 
    9576        this.ExecutionContext.Scope.Variables.Remove(evaluator.VRPToursParameter.ActualName);
    9677      }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/TourEncoding.cs

    r5127 r5867  
    3434  public abstract class TourEncoding : Item, IVRPEncoding {
    3535    public override Image ItemImage {
    36       get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Class; }
     36      get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
    3737    }
    3838   
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinTwoLevelExchangeManipulator.cs

    r4752 r5867  
    4444      : base(original, cloner) {
    4545    }
    46    
     46
    4747    protected override void Manipulate(IRandom random, PotvinEncoding individual) {
    4848      int selectedIndex = SelectRandomTourBiasedByLength(random, individual);
    49       Tour route1 =
    50         individual.Tours[selectedIndex];
     49      Tour route1 = individual.Tours[selectedIndex];
    5150
    52       for (int customer1Position = 0; customer1Position < route1.Stops.Count; customer1Position++) {
     51      bool performed = false;
     52      int customer1Position = 0;
     53      while (customer1Position < route1.Stops.Count) {
     54        performed = false;
     55
    5356        foreach (Tour tour in individual.Tours) {
    5457          if (tour != route1) {
     
    6063              tour.Stops[customer2Position] = customer1;
    6164              if (ProblemInstance.Feasible(tour)) {
    62                 int route, place;
     65                int routeIdx, place;
    6366                if (FindInsertionPlace(individual,
    64                   customer2, selectedIndex, out route, out place)) {
    65                     individual.Tours[route].Stops.Insert(place, customer2);
    66                     route1.Stops.RemoveAt(customer1Position);
     67                  customer2, selectedIndex, out routeIdx, out place)) {
     68                  individual.Tours[routeIdx].Stops.Insert(place, customer2);
     69                  route1.Stops.RemoveAt(customer1Position);
    6770
    68                     if (route1.Stops.Count == 0)
     71                  if (route1.Stops.Count == 0)
    6972                    individual.Tours.Remove(route1);
    7073
    7174                  //two-level exchange has been performed
    72                   return;
     75                  performed = true;
     76                  break;
    7377                } else {
    7478                  tour.Stops[customer2Position] = customer2;
     
    7983            }
    8084          }
     85
     86          if (performed)
     87            break;
    8188        }
     89
     90        if (!performed)
     91          customer1Position++;
    8292      }
    8393    }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMoveEvaluator.cs

    r5202 r5867  
    8585        string key = AdditionFrequencyMemoryKeyParameter.Value.Value;
    8686
    87         if (memory.ContainsKey(key)) {
     87        if (memory != null && memory.ContainsKey(key)) {
    8888          ItemDictionary<PotvinCustomerRelocationMoveAttribute, IntValue> additionFrequency =
    8989               memory[key].Value as ItemDictionary<PotvinCustomerRelocationMoveAttribute, IntValue>;
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMoveMaker.cs

    r5202 r5867  
    101101      PotvinCustomerRelocationMove move = CustomerRelocationMoveParameter.ActualValue;
    102102
    103       PotvinEncoding newSolution = move.Individual as PotvinEncoding;
     103      PotvinEncoding newSolution = move.Individual.Clone() as PotvinEncoding;
    104104      Apply(newSolution, move);
    105105      VRPToursParameter.ActualValue = newSolution;
     
    125125      string key = AdditionFrequencyMemoryKeyParameter.Value.Value;
    126126
    127       if (!memory.ContainsKey(key)) {
    128         memory.Add(new Variable(key,
    129             new ItemDictionary<PotvinCustomerRelocationMoveAttribute, IntValue>()));
     127      if (memory != null) {
     128        if (!memory.ContainsKey(key)) {
     129          memory.Add(new Variable(key,
     130              new ItemDictionary<PotvinCustomerRelocationMoveAttribute, IntValue>()));
     131        }
     132        ItemDictionary<PotvinCustomerRelocationMoveAttribute, IntValue> additionFrequency =
     133          memory[key].Value as ItemDictionary<PotvinCustomerRelocationMoveAttribute, IntValue>;
     134
     135        PotvinCustomerRelocationMoveAttribute attr = new PotvinCustomerRelocationMoveAttribute(0, move.Tour, move.City);
     136        if (!additionFrequency.ContainsKey(attr))
     137          additionFrequency[attr] = new IntValue(0);
     138
     139        additionFrequency[attr].Value++;
    130140      }
    131       ItemDictionary<PotvinCustomerRelocationMoveAttribute, IntValue> additionFrequency =
    132         memory[key].Value as ItemDictionary<PotvinCustomerRelocationMoveAttribute, IntValue>;
    133 
    134       PotvinCustomerRelocationMoveAttribute attr = new PotvinCustomerRelocationMoveAttribute(0, move.Tour, move.City);
    135       if (!additionFrequency.ContainsKey(attr))
    136         additionFrequency[attr] = new IntValue(0);
    137 
    138       additionFrequency[attr].Value++;
    139141    }
    140142  }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMultiMoveGenerator.cs

    r5127 r5867  
    2929using HeuristicLab.Common;
    3030using HeuristicLab.Data;
     31using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    3132
    3233namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin {
    3334  [Item("PotvinCustomerRelocationMultiMoveGenerator", "Generates customer relocation moves from a given VRP encoding.")]
    3435  [StorableClass]
    35   public sealed class PotvinCustomerRelocationMultiMoveGenerator : PotvinCustomerRelocationMoveGenerator, IMultiMoveGenerator {
     36  public sealed class PotvinCustomerRelocationMultiMoveGenerator : PotvinCustomerRelocationMoveGenerator, IMultiMoveGenerator, IMultiVRPMoveGenerator {
    3637    public ILookupParameter<IRandom> RandomParameter {
    3738      get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationSingleMoveGenerator.cs

    r5127 r5867  
    3535  [StorableClass]
    3636  public sealed class PotvinCustomerRelocationSingleMoveGenerator : PotvinCustomerRelocationMoveGenerator,
    37     ISingleMoveGenerator, IMultiVRPMoveGenerator {
     37    ISingleMoveGenerator {
    3838    #region IMultiVRPMoveOperator Members
    3939
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/Crossovers/PrinsPermutationCrossover.cs

    r4752 r5867  
    5858      IAtomicOperation op = this.ExecutionContext.CreateOperation(
    5959        InnerCrossoverParameter.ActualValue, this.ExecutionContext.Scope);
    60       op.Operator.Execute((IExecutionContext)op);
     60      op.Operator.Execute((IExecutionContext)op, CancellationToken);
    6161
    6262      string childName = InnerCrossoverParameter.ActualValue.ChildParameter.ActualName;
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/Manipulators/PrinsPermutationManipulator.cs

    r4752 r5867  
    5656      IAtomicOperation op = this.ExecutionContext.CreateOperation(
    5757        InnerManipulatorParameter.ActualValue, this.ExecutionContext.Scope);
    58       op.Operator.Execute((IExecutionContext)op);
     58      op.Operator.Execute((IExecutionContext)op, CancellationToken);
    5959    }
    6060  }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Crossovers/ZhuPermutationCrossover.cs

    r4752 r5867  
    5858      IAtomicOperation op = this.ExecutionContext.CreateOperation(
    5959        InnerCrossoverParameter.ActualValue, this.ExecutionContext.Scope);
    60       op.Operator.Execute((IExecutionContext)op);
     60      op.Operator.Execute((IExecutionContext)op, CancellationToken);
    6161
    6262      string childName = InnerCrossoverParameter.ActualValue.ChildParameter.ActualName;
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Manipulators/ZhuPermutationManipulator.cs

    r4752 r5867  
    5656      IAtomicOperation op = this.ExecutionContext.CreateOperation(
    5757        InnerManipulatorParameter.ActualValue, this.ExecutionContext.Scope);
    58       op.Operator.Execute((IExecutionContext)op);
     58      op.Operator.Execute((IExecutionContext)op, CancellationToken);
    5959    }
    6060  }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/HeuristicLab.Problems.VehicleRouting-3.4.csproj

    r5127 r5867  
    1818    <UpgradeBackupLocation>
    1919    </UpgradeBackupLocation>
    20     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     20    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    2121    <PublishUrl>publish\</PublishUrl>
    2222    <Install>true</Install>
     
    3434    <UseApplicationTrust>false</UseApplicationTrust>
    3535    <BootstrapperEnabled>true</BootstrapperEnabled>
     36    <TargetFrameworkProfile />
    3637  </PropertyGroup>
    3738  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Interfaces/IVRPProblemInstance.cs

    r4860 r5867  
    3131  public interface IVRPProblemInstance: IItem {
    3232    IValueParameter<IVRPEvaluator> EvaluatorParameter { get; }
     33    IVRPEvaluator MoveEvaluator { get; }
    3334    IValueParameter<IVRPCreator> SolutionCreatorParameter { get; }
    3435    IValueParameter<DoubleValue> BestKnownQualityParameter { get; }
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs

    r5127 r5867  
    3232using HeuristicLab.PluginInfrastructure;
    3333using HeuristicLab.Common;
     34using HeuristicLab.Problems.VehicleRouting.Encodings.General;
    3435
    3536namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances {
     
    3940    public IValueParameter<IVRPEvaluator> EvaluatorParameter {
    4041      get { return (ValueParameter<IVRPEvaluator>)Parameters["Evaluator"]; }
     42    }
     43
     44    IVRPEvaluator moveEvaluator;
     45
     46    public IVRPEvaluator MoveEvaluator {
     47      get {
     48        if (EvaluatorParameter.Value == null)
     49          return null;
     50        else {
     51          if (moveEvaluator == null) {
     52            moveEvaluator = EvaluatorParameter.Value.Clone() as IVRPEvaluator;
     53
     54            foreach (IParameter parameter in moveEvaluator.Parameters) {
     55              if (parameter is ILookupParameter
     56                && parameter != moveEvaluator.ProblemInstanceParameter
     57                && parameter != moveEvaluator.VRPToursParameter) {
     58                (parameter as ILookupParameter).ActualName =
     59                  VRPMoveEvaluator.MovePrefix +
     60                  (parameter as ILookupParameter).ActualName;
     61              }
     62            }
     63          }
     64
     65          return moveEvaluator;
     66        }
     67      }
    4168    }
    4269
     
    253280
    254281    private void AttachEventHandlers() {
     282      EvaluatorParameter.ValueChanged += new EventHandler(EvaluatorParameter_ValueChanged);
    255283      BestKnownSolutionParameter.ValueChanged += new EventHandler(BestKnownSolutionParameter_ValueChanged);
    256284      DistanceFactorParameter.ValueChanged += new EventHandler(DistanceFactorParameter_ValueChanged);
     
    268296
    269297    #region Event handlers
     298    void EvaluatorParameter_ValueChanged(object sender, EventArgs e) {
     299      moveEvaluator = null;
     300    }
     301
    270302    void BestKnownSolutionParameter_ValueChanged(object sender, EventArgs e) {
    271303      EvalBestKnownSolution();
  • branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

    r4860 r5867  
    4141  [Creatable("Problems")]
    4242  [StorableClass]
    43   public sealed class VehicleRoutingProblem : ParameterizedNamedItem, ISingleObjectiveProblem, IStorableContent {
     43  public sealed class VehicleRoutingProblem : ParameterizedNamedItem, ISingleObjectiveHeuristicOptimizationProblem, IStorableContent {
    4444    public string Filename { get; set; }
    4545   
    4646    public override Image ItemImage {
    47       get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Type; }
     47      get { return HeuristicLab.Common.Resources.VSImageLibrary.Type; }
    4848    }
    4949
     
    5252      get { return (ValueParameter<BoolValue>)Parameters["Maximization"]; }
    5353    }
    54     IParameter ISingleObjectiveProblem.MaximizationParameter {
     54    IParameter ISingleObjectiveHeuristicOptimizationProblem.MaximizationParameter {
    5555      get { return MaximizationParameter; }
    5656    }
     
    6161      get { return (OptionalValueParameter<DoubleValue>)Parameters["BestKnownQuality"]; }
    6262    }
    63     IParameter ISingleObjectiveProblem.BestKnownQualityParameter {
     63    IParameter ISingleObjectiveHeuristicOptimizationProblem.BestKnownQualityParameter {
    6464      get { return BestKnownQualityParameter; }
    6565    }
     
    7070      get { return (IValueParameter<IVRPCreator>)Parameters["SolutionCreator"]; }
    7171    }
    72     IParameter IProblem.SolutionCreatorParameter {
     72    IParameter IHeuristicOptimizationProblem.SolutionCreatorParameter {
    7373      get { return SolutionCreatorParameter; }
    7474    }
     
    7676      get { return (IValueParameter<IVRPEvaluator>)Parameters["Evaluator"]; }
    7777    }
    78     IParameter IProblem.EvaluatorParameter {
     78    IParameter IHeuristicOptimizationProblem.EvaluatorParameter {
    7979      get { return EvaluatorParameter; }
    8080    }
     
    9696    }
    9797
    98     IEvaluator IProblem.Evaluator {
     98    IEvaluator IHeuristicOptimizationProblem.Evaluator {
    9999      get { return this.Evaluator; }
    100100    }
  • branches/VRP/HeuristicLab/3.3/Files.txt

    r4752 r5867  
    1111HeuristicLab.Algorithms.SimulatedAnnealing\3.3:HeuristicLab.Algorithms.SimulatedAnnealing-3.3.dll
    1212HeuristicLab.Algorithms.TabuSearch\3.3:HeuristicLab.Algorithms.TabuSearch-3.3.dll
     13HeuristicLab.Algorithms.VariableNeighborhoodSearch\3.3:HeuristicLab.Algorithms.VariableNeighborhoodSearch-3.3.dll
    1314HeuristicLab.Analysis\3.3:HeuristicLab.Analysis-3.3.dll
    1415HeuristicLab.Analysis.Views\3.3:HeuristicLab.Analysis.Views-3.3.dll
Note: See TracChangeset for help on using the changeset viewer.