Changeset 7383

Timestamp:

01/20/12 13:52:51 (12 years ago)

Author:

ascheibe

Message:

#1745 merged trunk changes into branch

Location:

branches/HiveHiveEngine

Files:

• . (modified) (view diffs)
• FxCop.cmd (copied) (copied from trunk/sources/FxCop.cmd) (view diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj (modified) (view diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourModel.cs (modified) (view diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.4/Plugin.cs.frame (modified) (view diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorRegression.cs (modified) (view diffs)
• HeuristicLab.Algorithms.NSGA2/3.3/NSGA2.cs (modified) (view diffs)
• HeuristicLab.Analysis (modified) (view diffs)
• HeuristicLab.Analysis.Views/3.3/DataTableView.cs (modified) (view diffs)
• HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs (modified) (view diffs)
• HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj (modified) (view diffs)
• HeuristicLab.Analysis/3.3/Plugin.cs.frame (modified) (view diffs)
• HeuristicLab.Analysis/3.3/ValueAnalysis/MinAverageMaxValueAnalyzer.cs (modified) (view diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/MenuItems/JobManagerMenuItem.cs (modified) (view diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.Designer.cs (modified) (view diffs)
• HeuristicLab.Data.Views/3.3/StringConvertibleArrayView.Designer.cs (modified) (view diffs)
• HeuristicLab.Data.Views/3.3/StringConvertibleArrayView.cs (modified) (view diffs)
• HeuristicLab.ExtLibs.sln (modified) (view diffs)
• HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.1.0 (deleted)
• HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.4.0 (copied) (copied from trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.4.0) (view diffs)
• HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.4.0/ALGLIB-3.4.0 (modified) (view diffs)
• HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.4.0/ALGLIB-3.4.0/Properties (modified) (view diffs)
• HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.4.0/HeuristicLab.ALGLIB-3.4.0 (modified) (view diffs)
• HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.4.0/HeuristicLab.ALGLIB-3.4.0/Properties (modified) (view diffs)
• HeuristicLab.FxCop.dll (copied) (copied from trunk/sources/HeuristicLab.FxCop.dll) (view diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/DragOverTabControl.Designer.cs (modified) (view diffs)
• HeuristicLab.MainForm.WindowsForms/3.3/Controls/DragOverTabControl.cs (modified) (view diffs)
• HeuristicLab.Operators/3.3/StochasticMultiBranch.cs (modified) (view diffs)
• HeuristicLab.Optimization.Operators/3.3/MultiObjective/CrowdingDistanceAssignment.cs (modified) (view diffs)
• HeuristicLab.Optimization/3.3/Problems/UserDefinedProblem.cs (modified) (view diffs)
• HeuristicLab.Problems.ArtificialAnt/3.4/ArtificialAntProblem.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.csproj (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/Plugin.cs.frame (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/Plugin.cs.frame (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Plugin.cs.frame (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisAlleleFrequencyAnalyzer.cs (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Plugin.cs.frame (modified) (view diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartView.cs (modified) (view diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluationProblem.cs (modified) (view diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.3/SolutionMessageBuilder.cs (modified) (view diffs)
• HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs (modified) (view diffs)
• HeuristicLab.Problems.OneMax/3.3/OnemaxProblem.cs (modified) (view diffs)
• HeuristicLab.Problems.QuadraticAssignment (modified) (view diffs)
• HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs (modified) (view diffs)
• HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs (modified) (view diffs)
• HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs (modified) (view diffs)
• HeuristicLab.Problems.VehicleRouting (modified) (view diffs)
• HeuristicLab.Problems.VehicleRouting/3.3/Analyzers/BestVRPSolutionAnalyzer.cs (modified) (view diffs)
• HeuristicLab.Problems.VehicleRouting/3.3/VehicleRoutingProblem.cs (modified) (view diffs)
• HeuristicLab.Tests (modified) (view diffs)
• HeuristicLab.Tests/HeuristicLab.PluginInfraStructure-3.3/InstallationManagerTest.cs (modified) (view diffs)
• HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (view diffs)

branches/HiveHiveEngine

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
@@ -18 +20 @@
 bin
 protoc.exe
-*.user

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
@@ -18 +20 @@
 bin
 protoc.exe
-*.user

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user
@@ -18 +20 @@
 bin
 protoc.exe
-*.user