Changeset 5163
- Timestamp:
- 12/23/10 00:07:58 (14 years ago)
- Location:
- trunk
- Files:
-
- 4 deleted
- 117 edited
- 5 copied
-
. (modified) (view diffs)
-
sources (modified) (view diffs)
-
sources/ConfigMerger.exe (modified) (view diffs)
-
sources/HeuristicLab 3.3 Services.sln (modified) (view diffs)
-
sources/HeuristicLab 3.3 Services.vsmdi (modified) (view diffs)
-
sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.3/HeuristicLab.Algorithms.DataAnalysis.Views-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Algorithms.DataAnalysis/3.3/HeuristicLab.Algorithms.DataAnalysis-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Algorithms.EvolutionStrategy/3.3/HeuristicLab.Algorithms.EvolutionStrategy-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/HeuristicLab.Algorithms.GeneticAlgorithm-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Algorithms.LocalSearch/3.3/HeuristicLab.Algorithms.LocalSearch-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Algorithms.NSGA2/3.3/HeuristicLab.Algorithms.NSGA2-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/HeuristicLab.Algorithms.SimulatedAnnealing-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Algorithms.TabuSearch/3.3/HeuristicLab.Algorithms.TabuSearch-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Clients.Common/3.3/HeuristicLab.Clients.Common-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.CodeEditor/3.3/HeuristicLab.CodeEditor-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Collections/3.3/HeuristicLab.Collections-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Common.Resources/3.3/HeuristicLab.Common.Resources-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Common/3.3/HeuristicLab.Common-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Core.Views/3.3/Properties/AssemblyInfo.frame (modified) (view diffs)
-
sources/HeuristicLab.Core/3.3/HeuristicLab.Core-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Core/3.3/Properties/AssemblyInfo.frame (modified) (view diffs)
-
sources/HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.DebugEngine/3.3/HeuristicLab.DebugEngine-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/HeuristicLab.Encodings.BinaryVectorEncoding-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Tests/HeuristicLab.Encodings.BinaryVectorEncoding-3.3.Tests.csproj (modified) (view diffs)
-
sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Tests/Test References/HeuristicLab.Encodings.BinaryVectorEncoding-3.3.accessor (copied) (copied from branches/NET40/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Tests/Test References/HeuristicLab.Encodings.BinaryVectorEncoding-3.3.accessor) (view diffs)
-
sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Tests/Test References/HeuristicLab.Encodings.BinaryVectors-3.3.accessor (deleted)
-
sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/HeuristicLab.Encodings.IntegerVectorEncoding-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Tests/HeuristicLab.Encodings.IntegerVectorEncoding-3.3.Tests.csproj (modified) (view diffs)
-
sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Tests/Test References/HeuristicLab.Encodings.IntVector-3.3.accessor (deleted)
-
sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Tests/Test References/HeuristicLab.Encodings.IntegerVectorEncoding-3.3.accessor (copied) (copied from branches/NET40/sources/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Tests/Test References/HeuristicLab.Encodings.IntegerVectorEncoding-3.3.accessor) (view diffs)
-
sources/HeuristicLab.Encodings.PermutationEncoding.Views/3.3/HeuristicLab.Encodings.PermutationEncoding.Views-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Encodings.PermutationEncoding/3.3/HeuristicLab.Encodings.PermutationEncoding-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Tests/HeuristicLab.Encodings.PermutationEncoding-3.3.Tests.csproj (modified) (view diffs)
-
sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Tests/Test References/HeuristicLab.Encodings.Permutation-3.3.accessor (deleted)
-
sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Tests/Test References/HeuristicLab.Encodings.PermutationEncoding-3.3.accessor (copied) (copied from branches/NET40/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Tests/Test References/HeuristicLab.Encodings.PermutationEncoding-3.3.accessor) (view diffs)
-
sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Tests/HeuristicLab.Encodings.RealVectorEncoding-3.3.Tests.csproj (modified) (view diffs)
-
sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Tests/Test References/HeuristicLab.Encodings.RealVector-3.3.accessor (deleted)
-
sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Tests/Test References/HeuristicLab.Encodings.RealVectorEncoding-3.3.accessor (copied) (copied from branches/NET40/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Tests/Test References/HeuristicLab.Encodings.RealVectorEncoding-3.3.accessor) (view diffs)
-
sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/2.5.0/ALGLIB-2.5.0/ALGLIB-2.5.0.csproj (modified) (view diffs)
-
sources/HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/2.5.0/HeuristicLab.ALGLIB-2.5.0/HeuristicLab.ALGLIB-2.5.0.csproj (modified) (view diffs)
-
sources/HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.1.0/ALGLIB-3.1.0/ALGLIB-3.1.0.csproj (modified) (view diffs)
-
sources/HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.1.0/HeuristicLab.ALGLIB-3.1.0/HeuristicLab.ALGLIB-3.1.0.csproj (modified) (view diffs)
-
sources/HeuristicLab.ExtLibs/HeuristicLab.LibSVM/1.6.3/HeuristicLab.LibSVM-1.6.3/HeuristicLab.LibSVM-1.6.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.ExtLibs/HeuristicLab.LibSVM/1.6.3/LibSVM-1.6.3/LibSVM-1.6.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446.csproj (modified) (view diffs)
-
sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446.csproj (modified) (view diffs)
-
sources/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Resources/Resource1.Designer.cs (modified) (view diffs)
-
sources/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/HeuristicLab.ProtobufCS/HeuristicLab.ProtobufCS-0.9.1.csproj (modified) (view diffs)
-
sources/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/AddressBook/AddressBook.csproj (modified) (view diffs)
-
sources/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtoBench/ProtoBench.csproj (modified) (view diffs)
-
sources/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtoDump/ProtoDump.csproj (modified) (view diffs)
-
sources/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtoGen.Test/ProtoGen.Test.csproj (modified) (view diffs)
-
sources/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtoGen/ProtoGen.csproj (modified) (view diffs)
-
sources/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtoMunge/ProtoMunge.csproj (modified) (view diffs)
-
sources/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj (modified) (view diffs)
-
sources/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtocolBuffers/ProtocolBuffers.csproj (modified) (view diffs)
-
sources/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1/ProtobufCS/src/ProtocolBuffers/ProtocolBuffersCF.csproj (modified) (view diffs)
-
sources/HeuristicLab.ExtLibs/HeuristicLab.SharpDevelop/3.1.1.5327/HeuristicLab.SharpDevelop-3.1.1.5327.csproj (modified) (view diffs)
-
sources/HeuristicLab.ExtLibs/HeuristicLab.WinFormsUI/2.3.1/HeuristicLab.WinFormsUI-2.3.1/HeuristicLab.WinFormsUI-2.3.1.csproj (modified) (view diffs)
-
sources/HeuristicLab.ExtLibs/HeuristicLab.WinFormsUI/2.3.1/WinFormsUI-2.3.1/Docking/Resources.Designer.cs (modified) (view diffs)
-
sources/HeuristicLab.ExtLibs/HeuristicLab.WinFormsUI/2.3.1/WinFormsUI-2.3.1/Docking/Strings.Designer.cs (modified) (view diffs)
-
sources/HeuristicLab.ExtLibs/HeuristicLab.WinFormsUI/2.3.1/WinFormsUI-2.3.1/WinFormsUI-2.3.1.csproj (modified) (view diffs)
-
sources/HeuristicLab.ExtLibs/HeuristicLab.log4net/1.2.10.0/HeuristicLab.log4net-1.2.10.0.csproj (modified) (view diffs)
-
sources/HeuristicLab.MainForm.WindowsForms/3.3/HeuristicLab.MainForm.WindowsForms-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.MainForm/3.3/HeuristicLab.MainForm-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Operators.Programmable/3.3/HeuristicLab.Operators.Programmable-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Operators.Views.GraphVisualization/3.3/HeuristicLab.Operators.Views.GraphVisualization-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Operators.Views/3.3/HeuristicLab.Operators.Views-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Operators/3.3/HeuristicLab.Operators-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Optimization.Operators/3.3/HeuristicLab.Optimization.Operators-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Parameters.Views/3.3/HeuristicLab.Parameters.Views-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Parameters/3.3/HeuristicLab.Parameters-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Persistence.GUI/3.3/HeuristicLab.Persistence.GUI-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Persistence/3.3/HeuristicLab.Persistence-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Persistence/3.3/app.config (modified) (view diffs)
-
sources/HeuristicLab.PluginInfrastructure/3.3/HeuristicLab.PluginInfrastructure-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Problems.ArtificialAnt.Views/3.3/HeuristicLab.Problems.ArtificialAnt.Views-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Problems.ArtificialAnt/3.3/HeuristicLab.Problems.ArtificialAnt-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Problems.DataAnalysis (modified) (view diffs)
-
sources/HeuristicLab.Problems.DataAnalysis.Classification.Views/3.3/HeuristicLab.Problems.DataAnalysis.Classification.Views-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Problems.DataAnalysis.Classification/3.3/HeuristicLab.Problems.DataAnalysis.Classification-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/HeuristicLab.Problems.DataAnalysis.Views-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Problems.DataAnalysis/3.3/HeuristicLab.Problems.DataAnalysis-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Problems.ExternalEvaluation.GP.Views/3.3/HeuristicLab.Problems.ExternalEvaluation.GP.Views-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Problems.ExternalEvaluation.GP/3.3/HeuristicLab.Problems.ExternalEvaluation.GP-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Problems.ExternalEvaluation.Views/3.3/HeuristicLab.Problems.ExternalEvaluation.Views-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Problems.ExternalEvaluation/3.3/HeuristicLab.Problems.ExternalEvaluation-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Problems.Knapsack.Views/3.3/HeuristicLab.Problems.Knapsack.Views-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Problems.Knapsack/3.3/HeuristicLab.Problems.Knapsack-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Problems.OneMax.Views/3.3/HeuristicLab.Problems.OneMax.Views-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Problems.OneMax/3.3/HeuristicLab.Problems.OneMax-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Problems.TestFunctions.Views/3.3/HeuristicLab.Problems.TestFunctions.Views-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Problems.TravelingSalesman.Views/3.3/HeuristicLab.Problems.TravelingSalesman.Views-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Problems.TravelingSalesman/3.3/HeuristicLab.Problems.TravelingSalesman-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Problems.VehicleRouting (modified) (view diffs)
-
sources/HeuristicLab.Problems.VehicleRouting.Views (modified) (view diffs)
-
sources/HeuristicLab.Problems.VehicleRouting.Views/3.3/HeuristicLab.Problems.VehicleRouting.Views-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Problems.VehicleRouting/3.3/HeuristicLab.Problems.VehicleRouting-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Random/3.3/HeuristicLab.Random-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Selection/3.3/HeuristicLab.Selection-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.SequentialEngine/3.3/HeuristicLab.SequentialEngine-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Services.Deployment.DataAccess/3.3/HeuristicLab.Services.Deployment.DataAccess-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Services.Deployment/3.3/HeuristicLab.Services.Deployment-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Tracing/3.3/HeuristicLab.Tracing-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab.Tracing/3.3/app.config (modified) (view diffs)
-
sources/HeuristicLab.Visualization.ChartControlsExtensions/3.3/HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab/3.3/HeuristicLab-3.3.csproj (modified) (view diffs)
-
sources/HeuristicLab/3.3/Properties/Resources.Designer.cs (modified) (view diffs)
-
sources/HeuristicLab/3.3/app.config (modified) (view diffs)
-
tools/ConfigMerger/ConfigMerger.cs (modified) (view diffs)
-
tools/ConfigMerger/ConfigMerger.csproj (modified) (view diffs)
-
tools/ConfigMerger/app.config (copied) (copied from branches/NET40/tools/ConfigMerger/app.config) (view diffs)
-
trunk
-
Property
svn:mergeinfo
set to
/branches/NET40 merged eligible
-
Property
svn:mergeinfo
set to
-
trunk/sources
- Property svn:mergeinfo changed
/branches/NET40/sources (added) merged: 5142
- Property svn:mergeinfo changed
-
trunk/sources/HeuristicLab.Problems.DataAnalysis
- Property svn:mergeinfo changed
/branches/NET40/sources/HeuristicLab.Problems.DataAnalysis (added) merged: 5142
- Property svn:mergeinfo changed
-
trunk/sources/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed
/branches/NET40/sources/HeuristicLab.Problems.VehicleRouting (added) merged: 5142
- Property svn:mergeinfo changed
-
trunk/sources/HeuristicLab.Problems.VehicleRouting.Views
- Property svn:mergeinfo changed
/branches/NET40/sources/HeuristicLab.Problems.VehicleRouting.Views (added) merged: 5142
- Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.
