Changeset 5193 for trunk/sources/HeuristicLab
- Timestamp:
- 01/03/11 00:46:55 (14 years ago)
- Location:
- trunk/sources
- Files:
-
- 4 edited
-
. (modified) (1 prop)
-
HeuristicLab/3.3/Files.txt (modified) (1 diff)
-
HeuristicLab/3.3/Tests/Builder.testsettings (modified) (6 diffs)
-
HeuristicLab/3.3/Tests/HeuristicLab-3.3.Tests.csproj (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources
- Property svn:mergeinfo changed
/branches/ParallelEngine (added) merged: 5175-5178,5183,5185,5187-5188
- Property svn:mergeinfo changed
-
trunk/sources/HeuristicLab/3.3/Files.txt
r5143 r5193 42 42 HeuristicLab.Optimization.Views\3.3:HeuristicLab.Optimization.Views-3.3.dll 43 43 HeuristicLab.Optimizer\3.3:HeuristicLab.Optimizer-3.3.dll 44 HeuristicLab.ParallelEngine\3.3:HeuristicLab.ParallelEngine-3.3.dll 44 45 HeuristicLab.Parameters\3.3:HeuristicLab.Parameters-3.3.dll 45 46 HeuristicLab.Parameters.Views\3.3:HeuristicLab.Parameters.Views-3.3.dll -
trunk/sources/HeuristicLab/3.3/Tests/Builder.testsettings
r5114 r5193 14 14 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Problems.VehicleRouting.Views-3.3.dll" /> 15 15 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Persistence-3.3.dll" /> 16 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab. SequentialEngine-3.3.dll" />16 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Problems.ExternalEvaluation.GP-3.3.dll" /> 17 17 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Algorithms.DataAnalysis.Views-3.3.dll" /> 18 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Problems. DataAnalysis.Classification.Views-3.3.dll" />18 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Problems.Knapsack-3.3.dll" /> 19 19 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\LibSVM-1.6.3.dll" /> 20 20 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Operators.Views.GraphVisualization-3.3.dll" /> 21 21 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.PluginInfrastructure-3.3.dll" /> 22 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.MainForm-3.3.dll" /> 22 23 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Core.Views-3.3.dll" /> 23 24 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Optimizer-3.3.dll" /> … … 27 28 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Tracing-3.3.dll" /> 28 29 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.dll" /> 29 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\Google.ProtocolBuffers-0.9.1.dll" />30 30 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.ALGLIB-2.5.0.dll" /> 31 31 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\ICSharpCode.SharpDevelop.Dom.dll" /> 32 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab. Data.Views-3.3.dll" />32 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Algorithms.TabuSearch-3.3.dll" /> 33 33 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\Netron.Diagramming.Core-3.0.2672.12446.dll" /> 34 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Operators.Views-3.3.dll" /> 34 35 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll" /> 35 36 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Encodings.PermutationEncoding-3.3.dll" /> … … 39 40 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.ProtobufCS-0.9.1.dll" /> 40 41 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Problems.ArtificialAnt.Views-3.3.dll" /> 41 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab. MainForm.WindowsForms-3.3.dll" />42 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Data.Views-3.3.dll" /> 42 43 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Persistence.GUI-3.3.dll" /> 43 44 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Problems.VehicleRouting-3.3.dll" /> 44 45 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Operators.Programmable-3.3.dll" /> 45 46 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Encodings.PermutationEncoding.Views-3.3.dll" /> 46 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab. Algorithms.TabuSearch-3.3.dll" />47 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.ParallelEngine-3.3.dll" /> 47 48 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Problems.TestFunctions.Views-3.3.dll" /> 48 49 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Common-3.3.dll" /> 49 50 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Netron-3.0.2672.12446.dll" /> 51 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.SequentialEngine-3.3.dll" /> 50 52 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\ICSharpCode.SharpZipLib.dll" /> 51 53 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Problems.ArtificialAnt-3.3.dll" /> 52 54 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.dll" /> 53 55 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Operators-3.3.dll" /> 54 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\ Mono.Cecil.dll" />56 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Algorithms.NSGA2-3.3.dll" /> 55 57 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Algorithms.SimulatedAnnealing-3.3.dll" /> 56 58 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Algorithms.DataAnalysis-3.3.dll" /> … … 58 60 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Problems.OneMax-3.3.dll" /> 59 61 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Core-3.3.dll" /> 60 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab. Operators.Views-3.3.dll" />62 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Problems.ExternalEvaluation-3.3.dll" /> 61 63 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Problems.TravelingSalesman-3.3.dll" /> 62 64 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.dll" /> … … 64 66 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Problems.TestFunctions-3.3.dll" /> 65 67 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.dll" /> 66 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab. MainForm-3.3.dll" />68 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Parameters.Views-3.3.dll" /> 67 69 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Collections-3.3.dll" /> 68 70 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\ALGLIB-2.5.0.dll" /> … … 71 73 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Problems.TravelingSalesman.Views-3.3.dll" /> 72 74 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.MainForm.WindowsForms-3.3_Accessor.dll" /> 73 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab. Parameters.Views-3.3.dll" />75 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.LibSVM-1.6.3.dll" /> 74 76 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\ICSharpCode.TextEditor.dll" /> 75 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab .LibSVM-1.6.3.dll" />77 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab-3.3.Tests.dll" /> 76 78 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Analysis.Views-3.3.dll" /> 77 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab. Problems.ExternalEvaluation-3.3.dll" />79 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.MainForm.WindowsForms-3.3.dll" /> 78 80 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Problems.ExternalEvaluation.Views-3.3.dll" /> 79 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Problems.ExternalEvaluation.GP-3.3.dll" />80 81 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Problems.DataAnalysis.Views-3.3.dll" /> 81 82 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.log4net-1.2.10.0.dll" /> 82 83 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Problems.DataAnalysis-3.3.dll" /> 83 84 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Problems.DataAnalysis.Regression-3.3.dll" /> 84 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Problems.Knapsack-3.3.dll" /> 85 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Data-3.3.dll" /> 86 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\Mono.Cecil.dll" /> 85 87 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Optimization-3.3.dll" /> 86 88 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Random-3.3.dll" /> 87 89 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Clients.Common-3.3.dll" /> 88 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\ HeuristicLab.Data-3.3.dll" />90 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\Google.ProtocolBuffers-0.9.1.dll" /> 89 91 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3.dll" /> 90 92 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Algorithms.GeneticAlgorithm-3.3.dll" /> 91 93 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\ALGLIB-3.1.0.dll" /> 92 94 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Problems.OneMax.Views-3.3.dll" /> 93 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab -3.3.Tests.dll" />95 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Problems.DataAnalysis.Classification.Views-3.3.dll" /> 94 96 <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Optimization.Operators-3.3.dll" /> 95 97 </Deployment> -
trunk/sources/HeuristicLab/3.3/Tests/HeuristicLab-3.3.Tests.csproj
r5191 r5193 151 151 <Name>HeuristicLab.Algorithms.LocalSearch-3.3</Name> 152 152 </ProjectReference> 153 <ProjectReference Include="..\..\..\HeuristicLab.Algorithms.NSGA2\3.3\HeuristicLab.Algorithms.NSGA2-3.3.csproj"> 154 <Project>{15452B9F-A436-4139-8EE7-DA72FB8D3664}</Project> 155 <Name>HeuristicLab.Algorithms.NSGA2-3.3</Name> 156 </ProjectReference> 153 157 <ProjectReference Include="..\..\..\HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm\3.3\HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.csproj"> 154 158 <Project>{F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}</Project> … … 331 335 <Name>HeuristicLab.Optimizer-3.3</Name> 332 336 </ProjectReference> 337 <ProjectReference Include="..\..\..\HeuristicLab.ParallelEngine\3.3\HeuristicLab.ParallelEngine-3.3.csproj"> 338 <Project>{00814351-4AB8-4088-9B99-F62787B89E93}</Project> 339 <Name>HeuristicLab.ParallelEngine-3.3</Name> 340 </ProjectReference> 333 341 <ProjectReference Include="..\..\..\HeuristicLab.Parameters.Views\3.3\HeuristicLab.Parameters.Views-3.3.csproj"> 334 342 <Project>{AE5B1CE5-9862-4D6F-A700-D72CD9AEA295}</Project> … … 460 468 </ItemGroup> 461 469 <ItemGroup> 462 <None Include="Builder.testsettings" /> 470 <None Include="Builder.testsettings"> 471 <SubType>Designer</SubType> 472 </None> 463 473 <None Include="GA_TSP.hl"> 464 474 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
Note: See TracChangeset
for help on using the changeset viewer.
