- Timestamp:
- 03/29/11 15:40:01 (14 years ago)
- Location:
- branches/VRP
- Files:
-
- 38 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/VRP/HeuristicLab 3.3.sln
r4752 r5867 66 66 {25087811-F74C-4128-BC86-8324271DA13E} = {25087811-F74C-4128-BC86-8324271DA13E} 67 67 {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2} = {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2} 68 {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9} = {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}69 68 {E226881D-315F-423D-B419-A766FE0D8685} = {E226881D-315F-423D-B419-A766FE0D8685} 70 {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9} = {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}71 69 {F62BCD22-FB83-4444-9401-8031C2487A86} = {F62BCD22-FB83-4444-9401-8031C2487A86} 72 70 {E0B45023-CB84-48A1-A1B7-8295B64B7BAD} = {E0B45023-CB84-48A1-A1B7-8295B64B7BAD} … … 81 79 {250ADE34-82FD-4BAE-86D5-985FBE589C4A} = {250ADE34-82FD-4BAE-86D5-985FBE589C4A} 82 80 {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1} = {0E27A536-1C4A-4624-A65E-DC4F4F23E3E1} 83 {799B0B38-E384-4A17-A73C-F211EB854592} = {799B0B38-E384-4A17-A73C-F211EB854592}84 81 {678E2145-8152-4E19-9646-07D439D00301} = {678E2145-8152-4E19-9646-07D439D00301} 85 82 {BB994448-2B21-4564-BB2E-38D8FFF8CF18} = {BB994448-2B21-4564-BB2E-38D8FFF8CF18} … … 98 95 {8824925E-3E00-4543-8293-7DDACE4737F8} = {8824925E-3E00-4543-8293-7DDACE4737F8} 99 96 {E10F395F-C8A6-48AD-B470-9AA7A1F43809} = {E10F395F-C8A6-48AD-B470-9AA7A1F43809} 100 {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5} = {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}101 97 {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5} = {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5} 102 98 {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}105 99 {DC3D7072-7999-4719-B65D-3997744D5DC1} = {DC3D7072-7999-4719-B65D-3997744D5DC1} 106 100 {76945D76-CA61-4147-9DC2-0ACDCDDF87F9} = {76945D76-CA61-4147-9DC2-0ACDCDDF87F9} 107 101 {57F38579-409D-4DD8-AB19-3F2C4A665126} = {57F38579-409D-4DD8-AB19-3F2C4A665126} 108 102 {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}111 103 {D767C38D-8014-46B0-9A32-03A3AECCE34A} = {D767C38D-8014-46B0-9A32-03A3AECCE34A} 112 104 {BF7D9494-A586-457B-8DF9-ED599F9E6A71} = {BF7D9494-A586-457B-8DF9-ED599F9E6A71} 113 105 {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58} = {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58} 114 {DE12659F-87C4-48E6-B2E3-4E73DD95A540} = {DE12659F-87C4-48E6-B2E3-4E73DD95A540}115 106 {4FE983A1-AAF8-4977-B9E2-52B3224510CB} = {4FE983A1-AAF8-4977-B9E2-52B3224510CB} 116 107 {30DD3DA2-CA57-49DD-A5BA-50CEF19DB45F} = {30DD3DA2-CA57-49DD-A5BA-50CEF19DB45F} … … 129 120 {6908BDCE-D925-43F3-94AC-A531E6DF2591} = {6908BDCE-D925-43F3-94AC-A531E6DF2591} 130 121 {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}133 122 {EE2034D9-6E27-48A1-B855-42D45F69A4FC} = {EE2034D9-6E27-48A1-B855-42D45F69A4FC} 134 123 {A9EE65D9-405B-4C9C-B470-FC911AAC541B} = {A9EE65D9-405B-4C9C-B470-FC911AAC541B} … … 140 129 {A9E282EA-180F-4233-B809-AEDF0787545C} = {A9E282EA-180F-4233-B809-AEDF0787545C} 141 130 {96AEBBEE-4203-45F3-BCF5-7B73BF256BDA} = {96AEBBEE-4203-45F3-BCF5-7B73BF256BDA} 142 {5A4679EF-A8F3-4647-B722-441A36B3BA6B} = {5A4679EF-A8F3-4647-B722-441A36B3BA6B}143 131 {23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE} = {23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE} 144 132 {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937} = {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937} … … 198 186 Project("{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}" 199 187 EndProject 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 EndProject202 188 Project("{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}" 203 189 EndProject 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 EndProject206 190 Project("{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}" 207 191 EndProject 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 EndProject210 192 Project("{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}" 211 193 EndProject 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 EndProject214 194 Project("{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}" 215 195 EndProject … … 236 216 Project("{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}" 237 217 EndProject 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 EndProject240 218 Project("{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}" 241 219 EndProject … … 246 224 Project("{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}" 247 225 EndProject 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 EndProject250 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 EndProject252 226 Project("{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}" 253 227 EndProject 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 EndProject256 228 Project("{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}" 257 229 EndProject … … 265 237 EndProject 266 238 Project("{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 EndProject268 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 EndProject270 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}"271 239 EndProject 272 240 Project("{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}" … … 283 251 EndProjectSection 284 252 EndProject 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 EndProject287 253 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtocolBuffers", "HeuristicLab.ExtLibs\HeuristicLab.ProtobufCS\0.9.1\ProtobufCS\src\ProtocolBuffers\ProtocolBuffers.csproj", "{6908BDCE-D925-43F3-94AC-A531E6DF2591}" 288 254 EndProject … … 301 267 Project("{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}" 302 268 EndProject 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 EndProject305 269 Project("{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}" 306 270 EndProject … … 314 278 EndProject 315 279 Project("{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}" 280 EndProject 281 Project("{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}" 316 282 EndProject 317 283 Global … … 748 714 {DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}.Release|x86.ActiveCfg = Release|x86 749 715 {DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}.Release|x86.Build.0 = Release|x86 750 {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU751 {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Debug|Any CPU.Build.0 = Debug|Any CPU752 {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Debug|x64.ActiveCfg = Debug|x64753 {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Debug|x64.Build.0 = Debug|x64754 {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Debug|x86.ActiveCfg = Debug|x86755 {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Debug|x86.Build.0 = Debug|x86756 {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Release|Any CPU.ActiveCfg = Release|Any CPU757 {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Release|Any CPU.Build.0 = Release|Any CPU758 {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Release|x64.ActiveCfg = Release|x64759 {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Release|x64.Build.0 = Release|x64760 {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Release|x86.ActiveCfg = Release|x86761 {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}.Release|x86.Build.0 = Release|x86762 716 {BB6D334A-4BB6-4674-9883-31A6EBB32CAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 763 717 {BB6D334A-4BB6-4674-9883-31A6EBB32CAB}.Debug|Any CPU.Build.0 = Debug|Any CPU … … 772 726 {BB6D334A-4BB6-4674-9883-31A6EBB32CAB}.Release|x86.ActiveCfg = Release|x86 773 727 {BB6D334A-4BB6-4674-9883-31A6EBB32CAB}.Release|x86.Build.0 = Release|x86 774 {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU775 {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}.Debug|Any CPU.Build.0 = Debug|Any CPU776 {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}.Debug|x64.ActiveCfg = Debug|x64777 {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}.Debug|x64.Build.0 = Debug|x64778 {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}.Debug|x86.ActiveCfg = Debug|x86779 {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}.Debug|x86.Build.0 = Debug|x86780 {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}.Release|Any CPU.ActiveCfg = Release|Any CPU781 {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}.Release|Any CPU.Build.0 = Release|Any CPU782 {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}.Release|x64.ActiveCfg = Release|x64783 {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}.Release|x64.Build.0 = Release|x64784 {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}.Release|x86.ActiveCfg = Release|x86785 {8FA6898D-E4B0-4E08-A6D6-F9F520E7959F}.Release|x86.Build.0 = Release|x86786 728 {DDFB14DD-2A85-493C-A52D-E69729BBAEB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 787 729 {DDFB14DD-2A85-493C-A52D-E69729BBAEB0}.Debug|Any CPU.Build.0 = Debug|Any CPU … … 796 738 {DDFB14DD-2A85-493C-A52D-E69729BBAEB0}.Release|x86.ActiveCfg = Release|x86 797 739 {DDFB14DD-2A85-493C-A52D-E69729BBAEB0}.Release|x86.Build.0 = Release|x86 798 {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU799 {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}.Debug|Any CPU.Build.0 = Debug|Any CPU800 {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}.Debug|x64.ActiveCfg = Debug|x64801 {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}.Debug|x64.Build.0 = Debug|x64802 {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}.Debug|x86.ActiveCfg = Debug|x86803 {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}.Debug|x86.Build.0 = Debug|x86804 {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}.Release|Any CPU.ActiveCfg = Release|Any CPU805 {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}.Release|Any CPU.Build.0 = Release|Any CPU806 {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}.Release|x64.ActiveCfg = Release|x64807 {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}.Release|x64.Build.0 = Release|x64808 {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}.Release|x86.ActiveCfg = Release|x86809 {6F18ED66-2333-4B5C-B882-AC99FB3CDCE5}.Release|x86.Build.0 = Release|x86810 740 {66D249C3-A01D-42A8-82A2-919BC8EC3D83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 811 741 {66D249C3-A01D-42A8-82A2-919BC8EC3D83}.Debug|Any CPU.Build.0 = Debug|Any CPU … … 820 750 {66D249C3-A01D-42A8-82A2-919BC8EC3D83}.Release|x86.ActiveCfg = Release|x86 821 751 {66D249C3-A01D-42A8-82A2-919BC8EC3D83}.Release|x86.Build.0 = Release|x86 822 {30D6606B-96E7-436C-B5D7-EA1455848E37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU823 {30D6606B-96E7-436C-B5D7-EA1455848E37}.Debug|Any CPU.Build.0 = Debug|Any CPU824 {30D6606B-96E7-436C-B5D7-EA1455848E37}.Debug|x64.ActiveCfg = Debug|x64825 {30D6606B-96E7-436C-B5D7-EA1455848E37}.Debug|x64.Build.0 = Debug|x64826 {30D6606B-96E7-436C-B5D7-EA1455848E37}.Debug|x86.ActiveCfg = Debug|x86827 {30D6606B-96E7-436C-B5D7-EA1455848E37}.Debug|x86.Build.0 = Debug|x86828 {30D6606B-96E7-436C-B5D7-EA1455848E37}.Release|Any CPU.ActiveCfg = Release|Any CPU829 {30D6606B-96E7-436C-B5D7-EA1455848E37}.Release|Any CPU.Build.0 = Release|Any CPU830 {30D6606B-96E7-436C-B5D7-EA1455848E37}.Release|x64.ActiveCfg = Release|x64831 {30D6606B-96E7-436C-B5D7-EA1455848E37}.Release|x64.Build.0 = Release|x64832 {30D6606B-96E7-436C-B5D7-EA1455848E37}.Release|x86.ActiveCfg = Release|x86833 {30D6606B-96E7-436C-B5D7-EA1455848E37}.Release|x86.Build.0 = Release|x86834 752 {F62BCD22-FB83-4444-9401-8031C2487A86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 835 753 {F62BCD22-FB83-4444-9401-8031C2487A86}.Debug|Any CPU.Build.0 = Debug|Any CPU … … 976 894 {A51DA44F-CB35-4F6F-99F5-2A2E904AB93B}.Release|x86.ActiveCfg = Release|x86 977 895 {A51DA44F-CB35-4F6F-99F5-2A2E904AB93B}.Release|x86.Build.0 = Release|x86 978 {DE12659F-87C4-48E6-B2E3-4E73DD95A540}.Debug|Any CPU.ActiveCfg = Debug|Any CPU979 {DE12659F-87C4-48E6-B2E3-4E73DD95A540}.Debug|Any CPU.Build.0 = Debug|Any CPU980 {DE12659F-87C4-48E6-B2E3-4E73DD95A540}.Debug|x64.ActiveCfg = Debug|x64981 {DE12659F-87C4-48E6-B2E3-4E73DD95A540}.Debug|x64.Build.0 = Debug|x64982 {DE12659F-87C4-48E6-B2E3-4E73DD95A540}.Debug|x86.ActiveCfg = Debug|x86983 {DE12659F-87C4-48E6-B2E3-4E73DD95A540}.Debug|x86.Build.0 = Debug|x86984 {DE12659F-87C4-48E6-B2E3-4E73DD95A540}.Release|Any CPU.ActiveCfg = Release|Any CPU985 {DE12659F-87C4-48E6-B2E3-4E73DD95A540}.Release|Any CPU.Build.0 = Release|Any CPU986 {DE12659F-87C4-48E6-B2E3-4E73DD95A540}.Release|x64.ActiveCfg = Release|x64987 {DE12659F-87C4-48E6-B2E3-4E73DD95A540}.Release|x64.Build.0 = Release|x64988 {DE12659F-87C4-48E6-B2E3-4E73DD95A540}.Release|x86.ActiveCfg = Release|x86989 {DE12659F-87C4-48E6-B2E3-4E73DD95A540}.Release|x86.Build.0 = Release|x86990 896 {125D3006-67F5-48CB-913E-73C0548F17FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 991 897 {125D3006-67F5-48CB-913E-73C0548F17FA}.Debug|Any CPU.Build.0 = Debug|Any CPU … … 1036 942 {6F42C5F8-16CD-43EE-8208-FD4573A69D85}.Release|x86.ActiveCfg = Release|x86 1037 943 {6F42C5F8-16CD-43EE-8208-FD4573A69D85}.Release|x86.Build.0 = Release|x86 1038 {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU1039 {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}.Debug|Any CPU.Build.0 = Debug|Any CPU1040 {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}.Debug|x64.ActiveCfg = Debug|x641041 {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}.Debug|x64.Build.0 = Debug|x641042 {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}.Debug|x86.ActiveCfg = Debug|x861043 {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}.Debug|x86.Build.0 = Debug|x861044 {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}.Release|Any CPU.ActiveCfg = Release|Any CPU1045 {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}.Release|Any CPU.Build.0 = Release|Any CPU1046 {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}.Release|x64.ActiveCfg = Release|x641047 {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}.Release|x64.Build.0 = Release|x641048 {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}.Release|x86.ActiveCfg = Release|x861049 {70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}.Release|x86.Build.0 = Release|x861050 {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU1051 {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}.Debug|Any CPU.Build.0 = Debug|Any CPU1052 {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}.Debug|x64.ActiveCfg = Debug|x641053 {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}.Debug|x64.Build.0 = Debug|x641054 {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}.Debug|x86.ActiveCfg = Debug|x861055 {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}.Debug|x86.Build.0 = Debug|x861056 {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}.Release|Any CPU.ActiveCfg = Release|Any CPU1057 {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}.Release|Any CPU.Build.0 = Release|Any CPU1058 {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}.Release|x64.ActiveCfg = Release|x641059 {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}.Release|x64.Build.0 = Release|x641060 {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}.Release|x86.ActiveCfg = Release|x861061 {BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}.Release|x86.Build.0 = Release|x861062 944 {8824925E-3E00-4543-8293-7DDACE4737F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 1063 945 {8824925E-3E00-4543-8293-7DDACE4737F8}.Debug|Any CPU.Build.0 = Debug|Any CPU … … 1072 954 {8824925E-3E00-4543-8293-7DDACE4737F8}.Release|x86.ActiveCfg = Release|x86 1073 955 {8824925E-3E00-4543-8293-7DDACE4737F8}.Release|x86.Build.0 = Release|x86 1074 {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|Any CPU.ActiveCfg = Debug|Any CPU1075 {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|Any CPU.Build.0 = Debug|Any CPU1076 {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|x64.ActiveCfg = Debug|x641077 {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|x64.Build.0 = Debug|x641078 {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|x86.ActiveCfg = Debug|x861079 {799B0B38-E384-4A17-A73C-F211EB854592}.Debug|x86.Build.0 = Debug|x861080 {799B0B38-E384-4A17-A73C-F211EB854592}.Release|Any CPU.ActiveCfg = Release|Any CPU1081 {799B0B38-E384-4A17-A73C-F211EB854592}.Release|Any CPU.Build.0 = Release|Any CPU1082 {799B0B38-E384-4A17-A73C-F211EB854592}.Release|x64.ActiveCfg = Release|x641083 {799B0B38-E384-4A17-A73C-F211EB854592}.Release|x64.Build.0 = Release|x641084 {799B0B38-E384-4A17-A73C-F211EB854592}.Release|x86.ActiveCfg = Release|x861085 {799B0B38-E384-4A17-A73C-F211EB854592}.Release|x86.Build.0 = Release|x861086 956 {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 1087 957 {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}.Debug|Any CPU.Build.0 = Debug|Any CPU … … 1156 1026 {4FE983A1-AAF8-4977-B9E2-52B3224510CB}.Release|x86.ActiveCfg = Release|x86 1157 1027 {4FE983A1-AAF8-4977-B9E2-52B3224510CB}.Release|x86.Build.0 = Release|x86 1158 {5A4679EF-A8F3-4647-B722-441A36B3BA6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU1159 {5A4679EF-A8F3-4647-B722-441A36B3BA6B}.Debug|Any CPU.Build.0 = Debug|Any CPU1160 {5A4679EF-A8F3-4647-B722-441A36B3BA6B}.Debug|x64.ActiveCfg = Debug|x641161 {5A4679EF-A8F3-4647-B722-441A36B3BA6B}.Debug|x64.Build.0 = Debug|x641162 {5A4679EF-A8F3-4647-B722-441A36B3BA6B}.Debug|x86.ActiveCfg = Debug|x861163 {5A4679EF-A8F3-4647-B722-441A36B3BA6B}.Debug|x86.Build.0 = Debug|x861164 {5A4679EF-A8F3-4647-B722-441A36B3BA6B}.Release|Any CPU.ActiveCfg = Release|Any CPU1165 {5A4679EF-A8F3-4647-B722-441A36B3BA6B}.Release|Any CPU.Build.0 = Release|Any CPU1166 {5A4679EF-A8F3-4647-B722-441A36B3BA6B}.Release|x64.ActiveCfg = Release|x641167 {5A4679EF-A8F3-4647-B722-441A36B3BA6B}.Release|x64.Build.0 = Release|x641168 {5A4679EF-A8F3-4647-B722-441A36B3BA6B}.Release|x86.ActiveCfg = Release|x861169 {5A4679EF-A8F3-4647-B722-441A36B3BA6B}.Release|x86.Build.0 = Release|x861170 {71D904D9-233B-44B2-ABB2-1525691228C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU1171 {71D904D9-233B-44B2-ABB2-1525691228C5}.Debug|Any CPU.Build.0 = Debug|Any CPU1172 {71D904D9-233B-44B2-ABB2-1525691228C5}.Debug|x64.ActiveCfg = Debug|x641173 {71D904D9-233B-44B2-ABB2-1525691228C5}.Debug|x64.Build.0 = Debug|x641174 {71D904D9-233B-44B2-ABB2-1525691228C5}.Debug|x86.ActiveCfg = Debug|x861175 {71D904D9-233B-44B2-ABB2-1525691228C5}.Debug|x86.Build.0 = Debug|x861176 {71D904D9-233B-44B2-ABB2-1525691228C5}.Release|Any CPU.ActiveCfg = Release|Any CPU1177 {71D904D9-233B-44B2-ABB2-1525691228C5}.Release|Any CPU.Build.0 = Release|Any CPU1178 {71D904D9-233B-44B2-ABB2-1525691228C5}.Release|x64.ActiveCfg = Release|x641179 {71D904D9-233B-44B2-ABB2-1525691228C5}.Release|x64.Build.0 = Release|x641180 {71D904D9-233B-44B2-ABB2-1525691228C5}.Release|x86.ActiveCfg = Release|x861181 {71D904D9-233B-44B2-ABB2-1525691228C5}.Release|x86.Build.0 = Release|x861182 1028 {29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 1183 1029 {29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}.Debug|Any CPU.Build.0 = Debug|Any CPU … … 1240 1086 {25735DB4-8E54-4A2C-83E3-A60C76565E55}.Release|x86.ActiveCfg = Release|x86 1241 1087 {25735DB4-8E54-4A2C-83E3-A60C76565E55}.Release|x86.Build.0 = Release|x86 1242 {A8D5676D-9662-437A-B44D-ECB4046CDE12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU1243 {A8D5676D-9662-437A-B44D-ECB4046CDE12}.Debug|Any CPU.Build.0 = Debug|Any CPU1244 {A8D5676D-9662-437A-B44D-ECB4046CDE12}.Debug|x64.ActiveCfg = Debug|x641245 {A8D5676D-9662-437A-B44D-ECB4046CDE12}.Debug|x64.Build.0 = Debug|x641246 {A8D5676D-9662-437A-B44D-ECB4046CDE12}.Debug|x86.ActiveCfg = Debug|x861247 {A8D5676D-9662-437A-B44D-ECB4046CDE12}.Debug|x86.Build.0 = Debug|x861248 {A8D5676D-9662-437A-B44D-ECB4046CDE12}.Release|Any CPU.ActiveCfg = Release|Any CPU1249 {A8D5676D-9662-437A-B44D-ECB4046CDE12}.Release|Any CPU.Build.0 = Release|Any CPU1250 {A8D5676D-9662-437A-B44D-ECB4046CDE12}.Release|x64.ActiveCfg = Release|x641251 {A8D5676D-9662-437A-B44D-ECB4046CDE12}.Release|x64.Build.0 = Release|x641252 {A8D5676D-9662-437A-B44D-ECB4046CDE12}.Release|x86.ActiveCfg = Release|x861253 {A8D5676D-9662-437A-B44D-ECB4046CDE12}.Release|x86.Build.0 = Release|x861254 1088 {6908BDCE-D925-43F3-94AC-A531E6DF2591}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 1255 1089 {6908BDCE-D925-43F3-94AC-A531E6DF2591}.Debug|Any CPU.Build.0 = Debug|Any CPU … … 1348 1182 {D1386FE7-682D-4E18-8C4F-CFD423FA5DD0}.Release|x86.ActiveCfg = Release|x86 1349 1183 {D1386FE7-682D-4E18-8C4F-CFD423FA5DD0}.Release|x86.Build.0 = Release|x86 1350 {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU1351 {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Debug|Any CPU.Build.0 = Debug|Any CPU1352 {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Debug|x64.ActiveCfg = Debug|x641353 {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Debug|x64.Build.0 = Debug|x641354 {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Debug|x86.ActiveCfg = Debug|x861355 {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Debug|x86.Build.0 = Debug|x861356 {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Release|Any CPU.ActiveCfg = Release|Any CPU1357 {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Release|Any CPU.Build.0 = Release|Any CPU1358 {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Release|x64.ActiveCfg = Release|x641359 {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Release|x64.Build.0 = Release|x641360 {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Release|x86.ActiveCfg = Release|x861361 {9F3D601F-E39A-42BE-AEF7-2BF5AD2942D9}.Release|x86.Build.0 = Release|x861362 1184 {E86E215D-E3CE-4244-978D-555D4E17AC09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 1363 1185 {E86E215D-E3CE-4244-978D-555D4E17AC09}.Debug|Any CPU.Build.0 = Debug|Any CPU … … 1432 1254 {315BDA09-3F4F-49B3-9790-B37CFC1C5750}.Release|x86.ActiveCfg = Release|x86 1433 1255 {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 1434 1268 EndGlobalSection 1435 1269 GlobalSection(SolutionProperties) = preSolution -
branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/HeuristicLab.Problems.VehicleRouting.Views-3.4.csproj
r4860 r5867 11 11 <RootNamespace>HeuristicLab.Problems.VehicleRouting.Views</RootNamespace> 12 12 <AssemblyName>HeuristicLab.Problems.VehicleRouting.Views-3.4</AssemblyName> 13 <TargetFrameworkVersion>v 3.5</TargetFrameworkVersion>13 <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> 14 14 <FileAlignment>512</FileAlignment> 15 15 <SignAssembly>true</SignAssembly> … … 34 34 <UseApplicationTrust>false</UseApplicationTrust> 35 35 <BootstrapperEnabled>true</BootstrapperEnabled> 36 <TargetFrameworkProfile /> 36 37 </PropertyGroup> 37 38 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> -
branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPImportDialog.Designer.cs
r4860 r5867 100 100 // 101 101 this.openVRPFileButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); 102 this.openVRPFileButton.Image = HeuristicLab.Common.Resources.VS 2008ImageLibrary.Open;102 this.openVRPFileButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Open; 103 103 this.openVRPFileButton.Location = new System.Drawing.Point(520, 10); 104 104 this.openVRPFileButton.Name = "openVRPFileButton"; … … 131 131 // 132 132 this.openTourFileButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); 133 this.openTourFileButton.Image = HeuristicLab.Common.Resources.VS 2008ImageLibrary.Open;133 this.openTourFileButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Open; 134 134 this.openTourFileButton.Location = new System.Drawing.Point(520, 35); 135 135 this.openTourFileButton.Name = "openTourFileButton"; … … 161 161 // 162 162 this.clearTourFileButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); 163 this.clearTourFileButton.Image = HeuristicLab.Common.Resources.VS 2008ImageLibrary.Remove;163 this.clearTourFileButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Remove; 164 164 this.clearTourFileButton.Location = new System.Drawing.Point(550, 35); 165 165 this.clearTourFileButton.Name = "clearTourFileButton"; -
branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/VRPSolutionView.Designer.cs
r4374 r5867 24 24 /// </summary> 25 25 private void InitializeComponent() { 26 this.tabControl1 = new System.Windows.Forms.TabControl();26 this.tabControl1 = new HeuristicLab.MainForm.WindowsForms.DragOverTabControl(); 27 27 this.tabPage1 = new System.Windows.Forms.TabPage(); 28 28 this.problemInstanceView = new HeuristicLab.MainForm.WindowsForms.ViewHost(); … … 119 119 #endregion 120 120 121 private System.Windows.Forms.TabControl tabControl1;121 private HeuristicLab.MainForm.WindowsForms.DragOverTabControl tabControl1; 122 122 private System.Windows.Forms.TabPage tabPage1; 123 123 private MainForm.WindowsForms.ViewHost problemInstanceView; -
branches/VRP/HeuristicLab.Problems.VehicleRouting.Views/3.4/VehicleRoutingProblemView.Designer.cs
r4860 r5867 33 33 this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft); 34 34 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); 35 41 // 36 42 // importButton … … 38 44 this.importButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 39 45 | 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); 41 47 this.importButton.Name = "importButton"; 42 48 this.importButton.Size = new System.Drawing.Size(490, 23); … … 53 59 this.parameterCollectionView.Caption = "ParameterCollection View"; 54 60 this.parameterCollectionView.Content = null; 55 this.parameterCollectionView.Location = new System.Drawing.Point(0, 84);61 this.parameterCollectionView.Location = new System.Drawing.Point(0, 55); 56 62 this.parameterCollectionView.Name = "parameterCollectionView"; 57 63 this.parameterCollectionView.ReadOnly = false; 58 this.parameterCollectionView.Size = new System.Drawing.Size(490, 2 68);64 this.parameterCollectionView.Size = new System.Drawing.Size(490, 210); 59 65 this.parameterCollectionView.TabIndex = 9; 60 66 // … … 65 71 this.Controls.Add(this.importButton); 66 72 this.Name = "VehicleRoutingProblemView"; 67 this.Size = new System.Drawing.Size(490, 352);73 this.Size = new System.Drawing.Size(490, 275); 68 74 this.Controls.SetChildIndex(this.importButton, 0); 69 75 this.Controls.SetChildIndex(this.parameterCollectionView, 0); 70 76 this.Controls.SetChildIndex(this.nameTextBox, 0); 71 77 this.Controls.SetChildIndex(this.nameLabel, 0); 72 this.Controls.SetChildIndex(this.descriptionLabel, 0);73 this.Controls.SetChildIndex(this.descriptionTextBox, 0);74 78 ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit(); 75 79 this.ResumeLayout(false); -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/BestSolution/BestVRPSolutionAnalyzer.cs
r5202 r5867 149 149 validSolution = new VRPSolution(problemInstance, best.Clone() as IVRPEncoding, new DoubleValue(qualities[i].Value)); 150 150 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)); 152 155 } 153 156 } else { -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Analyzer/VRPSolution.cs
r5127 r5867 36 36 public sealed class VRPSolution : Item { 37 37 public override Image ItemImage { 38 get { return HeuristicLab.Common.Resources.VS 2008ImageLibrary.Image; }38 get { return HeuristicLab.Common.Resources.VSImageLibrary.Image; } 39 39 } 40 40 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Crossovers/AlbaPermutationCrossover.cs
r4752 r5867 58 58 IAtomicOperation op = this.ExecutionContext.CreateOperation( 59 59 InnerCrossoverParameter.ActualValue, this.ExecutionContext.Scope); 60 op.Operator.Execute((IExecutionContext)op );60 op.Operator.Execute((IExecutionContext)op, CancellationToken); 61 61 62 62 string childName = InnerCrossoverParameter.ActualValue.ChildParameter.ActualName; -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Manipulators/AlbaPermutationManipulator.cs
r4752 r5867 56 56 IAtomicOperation op = this.ExecutionContext.CreateOperation( 57 57 InnerManipulatorParameter.ActualValue, this.ExecutionContext.Scope); 58 op.Operator.Execute((IExecutionContext)op );58 op.Operator.Execute((IExecutionContext)op, CancellationToken); 59 59 } 60 60 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/IntraRouteInversion/AlbaIntraRouteInversionMove.cs
r4752 r5867 33 33 public class AlbaIntraRouteInversionMove : TwoIndexMove, IVRPMove { 34 34 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 36 43 public AlbaIntraRouteInversionMove() 37 44 : base() { … … 43 50 44 51 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; 46 54 } 47 55 48 56 public override IDeepCloneable Clone(Cloner cloner) { 49 57 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);56 58 } 57 59 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/IntraRouteInversion/AlbaStochasticIntraRouteInversionMutliMoveGenerator.cs
r4752 r5867 30 30 using HeuristicLab.Problems.VehicleRouting.Interfaces; 31 31 using HeuristicLab.Common; 32 using HeuristicLab.Problems.VehicleRouting.Encodings.General; 32 33 33 34 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba { 34 35 [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.")] 35 36 [StorableClass] 36 public sealed class AlbaStochasticIntraRouteInversionMultiMoveGenerator : AlbaIntraRouteInversionMoveGenerator, IStochasticOperator, IMultiMoveGenerator, IAlbaIntraRouteInversionMoveOperator { 37 public sealed class AlbaStochasticIntraRouteInversionMultiMoveGenerator : AlbaIntraRouteInversionMoveGenerator, IStochasticOperator, 38 IMultiMoveGenerator, IAlbaIntraRouteInversionMoveOperator, IMultiVRPMoveGenerator { 37 39 public ILookupParameter<IRandom> RandomParameter { 38 40 get { return (ILookupParameter<IRandom>)Parameters["Random"]; } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/IntraRouteInversion/AlbaStochasticIntraRouteInversionSingleMoveGenerator.cs
r4752 r5867 35 35 [StorableClass] 36 36 public sealed class AlbaStochasticIntraRouteInversionSingleMoveGenerator : AlbaIntraRouteInversionMoveGenerator, 37 IStochasticOperator, ISingleMoveGenerator, IAlbaIntraRouteInversionMoveOperator , IMultiVRPMoveGenerator{37 IStochasticOperator, ISingleMoveGenerator, IAlbaIntraRouteInversionMoveOperator { 38 38 #region IMultiVRPMoveOperator Members 39 39 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/LambdaInterchange/AlbaStochasticLambdaInterchangeMutliMoveGenerator.cs
r4752 r5867 30 30 using HeuristicLab.Problems.VehicleRouting.Interfaces; 31 31 using HeuristicLab.Common; 32 using HeuristicLab.Problems.VehicleRouting.Encodings.General; 32 33 33 34 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Alba { 34 35 [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.")] 35 36 [StorableClass] 36 public sealed class AlbaStochasticLambdaInterchangeMultiMoveGenerator : AlbaLambdaInterchangeMoveGenerator, IStochasticOperator, IMultiMoveGenerator, IAlbaLambdaInterchangeMoveOperator { 37 public sealed class AlbaStochasticLambdaInterchangeMultiMoveGenerator : AlbaLambdaInterchangeMoveGenerator, IStochasticOperator, 38 IMultiMoveGenerator, IAlbaLambdaInterchangeMoveOperator, IMultiVRPMoveGenerator { 37 39 public ILookupParameter<IRandom> RandomParameter { 38 40 get { return (ILookupParameter<IRandom>)Parameters["Random"]; } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/LambdaInterchange/AlbaStochasticLambdaInterchangeSingleMoveGenerator.cs
r5201 r5867 35 35 [StorableClass] 36 36 public sealed class AlbaStochasticLambdaInterchangeSingleMoveGenerator : AlbaLambdaInterchangeMoveGenerator, 37 IStochasticOperator, ISingleMoveGenerator, IAlbaLambdaInterchangeMoveOperator , IMultiVRPMoveGenerator{37 IStochasticOperator, ISingleMoveGenerator, IAlbaLambdaInterchangeMoveOperator { 38 38 #region IMultiVRPMoveOperator Members 39 39 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaStochasticTranslocationSingleMoveGenerator.cs
r5130 r5867 34 34 [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.")] 35 35 [StorableClass] 36 public sealed class AlbaStochasticTranslocationSingleMoveGenerator : AlbaMoveGenerator, IAlbaTranslocationMoveOperator , IMultiVRPMoveGenerator{36 public sealed class AlbaStochasticTranslocationSingleMoveGenerator : AlbaMoveGenerator, IAlbaTranslocationMoveOperator { 37 37 [Storable] 38 38 private TranslocationMoveGenerator generator = new StochasticTranslocationSingleMoveGenerator(); … … 80 80 generator.PermutationParameter.ActualName = VRPToursParameter.ActualName; 81 81 IAtomicOperation op = this.ExecutionContext.CreateChildOperation(generator); 82 op.Operator.Execute((IExecutionContext)op );82 op.Operator.Execute((IExecutionContext)op, CancellationToken); 83 83 84 84 foreach (IScope scope in this.ExecutionContext.Scope.SubScopes) { -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveGenerator.cs
r4752 r5867 101 101 PermutationMoveOperatorParameter.PermutationParameter.ActualName = VRPToursParameter.ActualName; 102 102 IAtomicOperation op = this.ExecutionContext.CreateChildOperation(PermutationMoveOperatorParameter); 103 op.Operator.Execute((IExecutionContext)op );103 op.Operator.Execute((IExecutionContext)op, CancellationToken); 104 104 105 105 return next; -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveHardTabuCriterion.cs
r5130 r5867 78 78 private AlbaTranslocationMoveHardTabuCriterion(AlbaTranslocationMoveHardTabuCriterion original, Cloner cloner) 79 79 : base(original, cloner) { 80 tabuChecker = cloner.Clone(original.tabuChecker); 80 81 } 81 82 … … 87 88 PermutationMoveOperatorParameter.PermutationParameter.ActualName = VRPToursParameter.ActualName; 88 89 IAtomicOperation op = this.ExecutionContext.CreateChildOperation(PermutationMoveOperatorParameter); 89 op.Operator.Execute((IExecutionContext)op );90 op.Operator.Execute((IExecutionContext)op, CancellationToken); 90 91 91 92 return next; -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveMaker.cs
r5130 r5867 61 61 private AlbaTranslocationMoveMaker(AlbaTranslocationMoveMaker original, Cloner cloner) 62 62 : base(original, cloner) { 63 moveMaker = cloner.Clone(original.moveMaker); 63 64 } 64 65 … … 71 72 moveMaker.PermutationParameter.ActualName = VRPToursParameter.ActualName; 72 73 IAtomicOperation op = this.ExecutionContext.CreateChildOperation(moveMaker); 73 op.Operator.Execute((IExecutionContext)op );74 op.Operator.Execute((IExecutionContext)op, CancellationToken); 74 75 } 75 76 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveSoftTabuCriterion.cs
r5130 r5867 78 78 private AlbaTranslocationMoveSoftTabuCriterion(AlbaTranslocationMoveSoftTabuCriterion original, Cloner cloner) 79 79 : base(original, cloner) { 80 tabuChecker = cloner.Clone(original.tabuChecker); 80 81 } 81 82 … … 87 88 PermutationMoveOperatorParameter.PermutationParameter.ActualName = VRPToursParameter.ActualName; 88 89 IAtomicOperation op = this.ExecutionContext.CreateChildOperation(PermutationMoveOperatorParameter); 89 op.Operator.Execute((IExecutionContext)op );90 op.Operator.Execute((IExecutionContext)op, CancellationToken); 90 91 91 92 return next; -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Alba/Moves/ThreeOpt/AlbaTranslocationMoveTabuMaker.cs
r5130 r5867 78 78 private AlbaTranslocationMoveTabuMaker(AlbaTranslocationMoveTabuMaker original, Cloner cloner) 79 79 : base(original, cloner) { 80 moveTabuMaker = cloner.Clone(original.moveTabuMaker); 80 81 } 81 82 … … 87 88 PermutationMoveOperatorParameter.PermutationParameter.ActualName = VRPToursParameter.ActualName; 88 89 IAtomicOperation op = this.ExecutionContext.CreateChildOperation(PermutationMoveOperatorParameter); 89 op.Operator.Execute((IExecutionContext)op );90 op.Operator.Execute((IExecutionContext)op, CancellationToken); 90 91 91 92 return next; -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveEvaluator.cs
r4752 r5867 58 58 moveEvaluator.VRPMoveParameter.ActualName = VRPMoveParameter.Name; 59 59 IAtomicOperation op = this.ExecutionContext.CreateOperation(moveEvaluator); 60 op.Operator.Execute((IExecutionContext)op );60 op.Operator.Execute((IExecutionContext)op, CancellationToken); 61 61 } 62 62 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/MultiVRPMoveOperator/MultiVRPMoveMaker.cs
r4752 r5867 60 60 moveMaker.VRPMoveParameter.ActualName = VRPMoveParameter.Name; 61 61 IAtomicOperation op = this.ExecutionContext.CreateOperation(moveMaker); 62 op.Operator.Execute((IExecutionContext)op );62 op.Operator.Execute((IExecutionContext)op, CancellationToken); 63 63 } 64 64 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/Moves/VRPMoveEvaluator.cs
r5127 r5867 64 64 //helper method to evaluate an updated individual 65 65 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; 82 67 83 68 try { … … 86 71 87 72 IAtomicOperation op = this.ExecutionContext.CreateChildOperation(evaluator); 88 op.Operator.Execute((IExecutionContext)op );73 op.Operator.Execute((IExecutionContext)op, CancellationToken); 89 74 } 90 75 finally { 91 foreach (IParameter parameter in originalName.Keys) {92 (parameter as ILookupParameter).ActualName = originalName[parameter];93 }94 95 76 this.ExecutionContext.Scope.Variables.Remove(evaluator.VRPToursParameter.ActualName); 96 77 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/General/TourEncoding.cs
r5127 r5867 34 34 public abstract class TourEncoding : Item, IVRPEncoding { 35 35 public override Image ItemImage { 36 get { return HeuristicLab.Common.Resources.VS 2008ImageLibrary.Class; }36 get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; } 37 37 } 38 38 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Manipulators/PotvinTwoLevelExchangeManipulator.cs
r4752 r5867 44 44 : base(original, cloner) { 45 45 } 46 46 47 47 protected override void Manipulate(IRandom random, PotvinEncoding individual) { 48 48 int selectedIndex = SelectRandomTourBiasedByLength(random, individual); 49 Tour route1 = 50 individual.Tours[selectedIndex]; 49 Tour route1 = individual.Tours[selectedIndex]; 51 50 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 53 56 foreach (Tour tour in individual.Tours) { 54 57 if (tour != route1) { … … 60 63 tour.Stops[customer2Position] = customer1; 61 64 if (ProblemInstance.Feasible(tour)) { 62 int route , place;65 int routeIdx, place; 63 66 if (FindInsertionPlace(individual, 64 customer2, selectedIndex, out route , out place)) {65 individual.Tours[route].Stops.Insert(place, customer2);66 67 customer2, selectedIndex, out routeIdx, out place)) { 68 individual.Tours[routeIdx].Stops.Insert(place, customer2); 69 route1.Stops.RemoveAt(customer1Position); 67 70 68 71 if (route1.Stops.Count == 0) 69 72 individual.Tours.Remove(route1); 70 73 71 74 //two-level exchange has been performed 72 return; 75 performed = true; 76 break; 73 77 } else { 74 78 tour.Stops[customer2Position] = customer2; … … 79 83 } 80 84 } 85 86 if (performed) 87 break; 81 88 } 89 90 if (!performed) 91 customer1Position++; 82 92 } 83 93 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMoveEvaluator.cs
r5202 r5867 85 85 string key = AdditionFrequencyMemoryKeyParameter.Value.Value; 86 86 87 if (memory .ContainsKey(key)) {87 if (memory != null && memory.ContainsKey(key)) { 88 88 ItemDictionary<PotvinCustomerRelocationMoveAttribute, IntValue> additionFrequency = 89 89 memory[key].Value as ItemDictionary<PotvinCustomerRelocationMoveAttribute, IntValue>; -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMoveMaker.cs
r5202 r5867 101 101 PotvinCustomerRelocationMove move = CustomerRelocationMoveParameter.ActualValue; 102 102 103 PotvinEncoding newSolution = move.Individual as PotvinEncoding;103 PotvinEncoding newSolution = move.Individual.Clone() as PotvinEncoding; 104 104 Apply(newSolution, move); 105 105 VRPToursParameter.ActualValue = newSolution; … … 125 125 string key = AdditionFrequencyMemoryKeyParameter.Value.Value; 126 126 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++; 130 140 } 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++;139 141 } 140 142 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationMultiMoveGenerator.cs
r5127 r5867 29 29 using HeuristicLab.Common; 30 30 using HeuristicLab.Data; 31 using HeuristicLab.Problems.VehicleRouting.Encodings.General; 31 32 32 33 namespace HeuristicLab.Problems.VehicleRouting.Encodings.Potvin { 33 34 [Item("PotvinCustomerRelocationMultiMoveGenerator", "Generates customer relocation moves from a given VRP encoding.")] 34 35 [StorableClass] 35 public sealed class PotvinCustomerRelocationMultiMoveGenerator : PotvinCustomerRelocationMoveGenerator, IMultiMoveGenerator {36 public sealed class PotvinCustomerRelocationMultiMoveGenerator : PotvinCustomerRelocationMoveGenerator, IMultiMoveGenerator, IMultiVRPMoveGenerator { 36 37 public ILookupParameter<IRandom> RandomParameter { 37 38 get { return (ILookupParameter<IRandom>)Parameters["Random"]; } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Potvin/Moves/CustomerRelocation/PotvinCustomerRelocationSingleMoveGenerator.cs
r5127 r5867 35 35 [StorableClass] 36 36 public sealed class PotvinCustomerRelocationSingleMoveGenerator : PotvinCustomerRelocationMoveGenerator, 37 ISingleMoveGenerator , IMultiVRPMoveGenerator{37 ISingleMoveGenerator { 38 38 #region IMultiVRPMoveOperator Members 39 39 -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/Crossovers/PrinsPermutationCrossover.cs
r4752 r5867 58 58 IAtomicOperation op = this.ExecutionContext.CreateOperation( 59 59 InnerCrossoverParameter.ActualValue, this.ExecutionContext.Scope); 60 op.Operator.Execute((IExecutionContext)op );60 op.Operator.Execute((IExecutionContext)op, CancellationToken); 61 61 62 62 string childName = InnerCrossoverParameter.ActualValue.ChildParameter.ActualName; -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Prins/Manipulators/PrinsPermutationManipulator.cs
r4752 r5867 56 56 IAtomicOperation op = this.ExecutionContext.CreateOperation( 57 57 InnerManipulatorParameter.ActualValue, this.ExecutionContext.Scope); 58 op.Operator.Execute((IExecutionContext)op );58 op.Operator.Execute((IExecutionContext)op, CancellationToken); 59 59 } 60 60 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Crossovers/ZhuPermutationCrossover.cs
r4752 r5867 58 58 IAtomicOperation op = this.ExecutionContext.CreateOperation( 59 59 InnerCrossoverParameter.ActualValue, this.ExecutionContext.Scope); 60 op.Operator.Execute((IExecutionContext)op );60 op.Operator.Execute((IExecutionContext)op, CancellationToken); 61 61 62 62 string childName = InnerCrossoverParameter.ActualValue.ChildParameter.ActualName; -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Encodings/Zhu/Manipulators/ZhuPermutationManipulator.cs
r4752 r5867 56 56 IAtomicOperation op = this.ExecutionContext.CreateOperation( 57 57 InnerManipulatorParameter.ActualValue, this.ExecutionContext.Scope); 58 op.Operator.Execute((IExecutionContext)op );58 op.Operator.Execute((IExecutionContext)op, CancellationToken); 59 59 } 60 60 } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/HeuristicLab.Problems.VehicleRouting-3.4.csproj
r5127 r5867 18 18 <UpgradeBackupLocation> 19 19 </UpgradeBackupLocation> 20 <TargetFrameworkVersion>v 3.5</TargetFrameworkVersion>20 <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> 21 21 <PublishUrl>publish\</PublishUrl> 22 22 <Install>true</Install> … … 34 34 <UseApplicationTrust>false</UseApplicationTrust> 35 35 <BootstrapperEnabled>true</BootstrapperEnabled> 36 <TargetFrameworkProfile /> 36 37 </PropertyGroup> 37 38 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Interfaces/IVRPProblemInstance.cs
r4860 r5867 31 31 public interface IVRPProblemInstance: IItem { 32 32 IValueParameter<IVRPEvaluator> EvaluatorParameter { get; } 33 IVRPEvaluator MoveEvaluator { get; } 33 34 IValueParameter<IVRPCreator> SolutionCreatorParameter { get; } 34 35 IValueParameter<DoubleValue> BestKnownQualityParameter { get; } -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs
r5127 r5867 32 32 using HeuristicLab.PluginInfrastructure; 33 33 using HeuristicLab.Common; 34 using HeuristicLab.Problems.VehicleRouting.Encodings.General; 34 35 35 36 namespace HeuristicLab.Problems.VehicleRouting.ProblemInstances { … … 39 40 public IValueParameter<IVRPEvaluator> EvaluatorParameter { 40 41 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 } 41 68 } 42 69 … … 253 280 254 281 private void AttachEventHandlers() { 282 EvaluatorParameter.ValueChanged += new EventHandler(EvaluatorParameter_ValueChanged); 255 283 BestKnownSolutionParameter.ValueChanged += new EventHandler(BestKnownSolutionParameter_ValueChanged); 256 284 DistanceFactorParameter.ValueChanged += new EventHandler(DistanceFactorParameter_ValueChanged); … … 268 296 269 297 #region Event handlers 298 void EvaluatorParameter_ValueChanged(object sender, EventArgs e) { 299 moveEvaluator = null; 300 } 301 270 302 void BestKnownSolutionParameter_ValueChanged(object sender, EventArgs e) { 271 303 EvalBestKnownSolution(); -
branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs
r4860 r5867 41 41 [Creatable("Problems")] 42 42 [StorableClass] 43 public sealed class VehicleRoutingProblem : ParameterizedNamedItem, ISingleObjective Problem, IStorableContent {43 public sealed class VehicleRoutingProblem : ParameterizedNamedItem, ISingleObjectiveHeuristicOptimizationProblem, IStorableContent { 44 44 public string Filename { get; set; } 45 45 46 46 public override Image ItemImage { 47 get { return HeuristicLab.Common.Resources.VS 2008ImageLibrary.Type; }47 get { return HeuristicLab.Common.Resources.VSImageLibrary.Type; } 48 48 } 49 49 … … 52 52 get { return (ValueParameter<BoolValue>)Parameters["Maximization"]; } 53 53 } 54 IParameter ISingleObjective Problem.MaximizationParameter {54 IParameter ISingleObjectiveHeuristicOptimizationProblem.MaximizationParameter { 55 55 get { return MaximizationParameter; } 56 56 } … … 61 61 get { return (OptionalValueParameter<DoubleValue>)Parameters["BestKnownQuality"]; } 62 62 } 63 IParameter ISingleObjective Problem.BestKnownQualityParameter {63 IParameter ISingleObjectiveHeuristicOptimizationProblem.BestKnownQualityParameter { 64 64 get { return BestKnownQualityParameter; } 65 65 } … … 70 70 get { return (IValueParameter<IVRPCreator>)Parameters["SolutionCreator"]; } 71 71 } 72 IParameter I Problem.SolutionCreatorParameter {72 IParameter IHeuristicOptimizationProblem.SolutionCreatorParameter { 73 73 get { return SolutionCreatorParameter; } 74 74 } … … 76 76 get { return (IValueParameter<IVRPEvaluator>)Parameters["Evaluator"]; } 77 77 } 78 IParameter I Problem.EvaluatorParameter {78 IParameter IHeuristicOptimizationProblem.EvaluatorParameter { 79 79 get { return EvaluatorParameter; } 80 80 } … … 96 96 } 97 97 98 IEvaluator I Problem.Evaluator {98 IEvaluator IHeuristicOptimizationProblem.Evaluator { 99 99 get { return this.Evaluator; } 100 100 } -
branches/VRP/HeuristicLab/3.3/Files.txt
r4752 r5867 11 11 HeuristicLab.Algorithms.SimulatedAnnealing\3.3:HeuristicLab.Algorithms.SimulatedAnnealing-3.3.dll 12 12 HeuristicLab.Algorithms.TabuSearch\3.3:HeuristicLab.Algorithms.TabuSearch-3.3.dll 13 HeuristicLab.Algorithms.VariableNeighborhoodSearch\3.3:HeuristicLab.Algorithms.VariableNeighborhoodSearch-3.3.dll 13 14 HeuristicLab.Analysis\3.3:HeuristicLab.Analysis-3.3.dll 14 15 HeuristicLab.Analysis.Views\3.3:HeuristicLab.Analysis.Views-3.3.dll
Note: See TracChangeset
for help on using the changeset viewer.