Context Navigation

← Previous Changeset
Next Changeset →

Changeset 8451

Timestamp:

08/08/12 23:59:16 (12 years ago)

Author:

ascheibe

Message:

#1861 merged changes from trunk into branch

Location:

branches/HeuristicLab.Mono

Files:

: 73 edited
: 19 copied

. (modified) (view diffs)
HeuristicLab 3.3.sln (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CovarianceProdView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CovarianceProdView.Designer.cs) (view diffs)
HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CovarianceProdView.cs (copied) (copied from trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CovarianceProdView.cs) (view diffs)
HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CovarianceSumView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CovarianceSumView.Designer.cs) (view diffs)
HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CovarianceSumView.cs (copied) (copied from trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/CovarianceSumView.cs) (view diffs)
HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GaussianProcessModelView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GaussianProcessModelView.Designer.cs) (view diffs)
HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GaussianProcessModelView.cs (copied) (copied from trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GaussianProcessModelView.cs) (view diffs)
HeuristicLab.Algorithms.DataAnalysis.Views/3.4/HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4 (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceLinear.cs (copied) (copied from trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceLinear.cs) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovariancePeriodic.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceProd.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceSEard.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceSEiso.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/CovarianceSum.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessHyperparameterInitializer.cs (copied) (copied from trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessHyperparameterInitializer.cs) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessModel.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessModelCreator.cs (copied) (copied from trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessModelCreator.cs) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessRegression.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessRegressionModelCreator.cs (copied) (copied from trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessRegressionModelCreator.cs) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessRegressionSolution.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessRegressionSolutionCreator.cs (copied) (copied from trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessRegressionSolutionCreator.cs) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/ICovarianceFunction.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/IMeanFunction.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/MeanConst.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/MeanLinear.cs (copied) (copied from trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/MeanLinear.cs) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/MeanProd.cs (copied) (copied from trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/MeanProd.cs) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/MeanSum.cs (copied) (copied from trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/MeanSum.cs) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/MeanZero.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/Util.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/Interfaces/IGaussianProcessModel.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/Interfaces/IGaussianProcessSolution.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/Scaling.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/NeuralNetwork/NeuralNetworkRegression.cs (modified) (view diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/Plugin.cs.frame (modified) (view diffs)
HeuristicLab.Algorithms.GradientDescent (copied) (copied from trunk/sources/HeuristicLab.Algorithms.GradientDescent) (view diffs)
HeuristicLab.Algorithms.GradientDescent/3.3 (modified) (view diffs)
HeuristicLab.Algorithms.GradientDescent/3.3/Properties (modified) (view diffs)
HeuristicLab.Algorithms.ScatterSearch/3.3 (modified) (view diffs)
HeuristicLab.Algorithms.ScatterSearch/3.3/Properties (modified) (view diffs)
HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs (modified) (view diffs)
HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearchMainLoop.cs (modified) (view diffs)
HeuristicLab.Analysis (modified) (view diffs)
HeuristicLab.Analysis.Views/3.3/ScatterPlotView.cs (modified) (view diffs)
HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlot.cs (modified) (view diffs)
HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj (modified) (view diffs)
HeuristicLab.Clients.Access.Administration/3.3 (modified) (view diffs)
HeuristicLab.Clients.Access.Views/3.3 (modified) (view diffs)
HeuristicLab.Clients.Access/3.3 (modified) (view diffs)
HeuristicLab.Clients.OKB.Views/3.3 (modified) (view diffs)
HeuristicLab.Clients.OKB/3.3 (modified) (view diffs)
HeuristicLab.DebugEngine.Views/3.3 (modified) (view diffs)
HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4 (modified) (view diffs)
HeuristicLab.ExtLibs.sln (modified) (view diffs)
HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.6.0 (copied) (copied from trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.6.0) (view diffs)
HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.6.0/ALGLIB-3.6.0 (modified) (view diffs)
HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.6.0/ALGLIB-3.6.0/Properties (modified) (view diffs)
HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.6.0/HeuristicLab.ALGLIB-3.6.0 (modified) (view diffs)
HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.6.0/HeuristicLab.ALGLIB-3.6.0/Properties (modified) (view diffs)
HeuristicLab.ExtLibs/HeuristicLab.DayView/1.0 (modified) (view diffs)
HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/2.4.1/ProtobufCS/src/ProtoGen (modified) (view diffs)
HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/2.4.1/ProtobufCS/src/ProtocolBuffers (modified) (view diffs)
HeuristicLab.Operators.Views.GraphVisualization.Views/3.3 (modified) (view diffs)
HeuristicLab.Operators/3.3/SubScopesCounter.cs (modified) (view diffs)
HeuristicLab.Optimization.Operators/3.3/SolutionSimilarityCalculator.cs (modified) (view diffs)
HeuristicLab.ParallelEngine/3.3 (modified) (view diffs)
HeuristicLab.Problems.ArtificialAnt.Views/3.4 (modified) (view diffs)
HeuristicLab.Problems.ArtificialAnt/3.4 (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Classification (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4 (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.Regression (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4 (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.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Views (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Views/3.4/Clustering/ClusteringSolutionVisualizationView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Clustering/ClusteringSolutionVisualizationView.Designer.cs) (view diffs)
HeuristicLab.Problems.DataAnalysis.Views/3.4/Clustering/ClusteringSolutionVisualizationView.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Clustering/ClusteringSolutionVisualizationView.cs) (view diffs)
HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (view diffs)
HeuristicLab.Problems.DataAnalysis.Views/3.4/Plugin.cs.frame (modified) (view diffs)
HeuristicLab.Problems.LawnMower.Views/3.3 (modified) (view diffs)
HeuristicLab.Problems.LinearAssignment.Views/3.3 (modified) (view diffs)
HeuristicLab.Problems.LinearAssignment/3.3 (modified) (view diffs)
HeuristicLab.Tests (modified) (view diffs)
HeuristicLab.Tests/HeuristicLab-3.3/GaussianProcessRegressionTest.cs (modified) (view diffs)
HeuristicLab.Tests/HeuristicLab.Algorithms.DataAnalysis-3.4 (copied) (copied from trunk/sources/HeuristicLab.Tests/HeuristicLab.Algorithms.DataAnalysis-3.4) (view diffs)
HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (view diffs)

branches/HeuristicLab.Mono

Property svn:mergeinfo changed

/branches/Algorithms.GradientDescent (added)	merged: 5516,5518,5520
/trunk/sources (added)	merged: 8366-8368,8371-8372,8375,8380-8381,8386,8396-8399,8401,8403-8405,8413,8416-8419,8421,8433,8435,8439,8448

branches/HeuristicLab.Mono/HeuristicLab.Algorithms.DataAnalysis
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Algorithms.DataAnalysis (added) merged: 8366-8368,8371-8372,8375,8396-8397,8399,8401,8403,8416-8417,8419,8421,8439,8448

branches/HeuristicLab.Mono/HeuristicLab.Algorithms.DataAnalysis/3.4

Property svn:ignore

old	new
5	5	*.vs10x
6	6	Plugin.cs
	7	*.user

branches/HeuristicLab.Mono/HeuristicLab.Algorithms.ScatterSearch/3.3
- Property svn:ignore set to
  *.user
  Plugin.cs
  obj
branches/HeuristicLab.Mono/HeuristicLab.Algorithms.ScatterSearch/3.3/Properties
- Property svn:ignore set to
  AssemblyInfo.cs
branches/HeuristicLab.Mono/HeuristicLab.Analysis
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Analysis (added) merged: 8404-8405,8448

branches/HeuristicLab.Mono/HeuristicLab.Clients.Access.Administration/3.3

Property svn:ignore

old	new
1	1	Plugin.cs
2	2	obj
	3	*.user

branches/HeuristicLab.Mono/HeuristicLab.Clients.Access.Views/3.3

Property svn:ignore

old	new
1	1	Plugin.cs
2	2	obj
	3	*.user

branches/HeuristicLab.Mono/HeuristicLab.Clients.Access/3.3

Property svn:ignore

old	new
1	1	Plugin.cs
2	2	obj
	3	*.user

branches/HeuristicLab.Mono/HeuristicLab.Clients.OKB.Views/3.3

Property svn:ignore

old	new
1	1	Plugin.cs
2	2	obj
	3	*.user

branches/HeuristicLab.Mono/HeuristicLab.Clients.OKB/3.3

Property svn:ignore

old	new
1	1	Plugin.cs
2	2	obj
	3	*.user

branches/HeuristicLab.Mono/HeuristicLab.DebugEngine.Views/3.3

Property svn:ignore

old	new
2	2	obj
3	3	Plugin.cs
	4	*.user

branches/HeuristicLab.Mono/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4

Property svn:ignore

old	new
5	5	HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj.user
6	6	Plugin.cs
	7	*.user

branches/HeuristicLab.Mono/HeuristicLab.ExtLibs/HeuristicLab.DayView/1.0

Property svn:ignore

old	new
3	3	HeuristicLab.DayView-1.0.csproj.user
4	4	*.vs10x
	5	*.user

branches/HeuristicLab.Mono/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/2.4.1/ProtobufCS/src/ProtoGen

Property svn:ignore

old	new
1	1	bin
2	2	obj
	3	*.user

branches/HeuristicLab.Mono/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/2.4.1/ProtobufCS/src/ProtocolBuffers

Property svn:ignore

old	new
1	1	bin
2	2	obj
	3	*.user

branches/HeuristicLab.Mono/HeuristicLab.Operators.Views.GraphVisualization.Views/3.3

Property svn:ignore

old	new
4	4	HeuristicLab.Operators.Views.GraphVisualization.Views-3.3.csproj.user
5	5	*.vs10x
	6	*.user

branches/HeuristicLab.Mono/HeuristicLab.ParallelEngine/3.3

Property svn:ignore

old	new
5	5	HeuristicLab.ParallelEngine-3.3.csproj.user
6	6	Plugin.cs
	7	*.user

branches/HeuristicLab.Mono/HeuristicLab.Problems.ArtificialAnt.Views/3.4

Property svn:ignore

old	new
5	5	HeuristicLab.Problems.ArtificialAnt.Views-3.4.csproj.user
6	6	Plugin.cs
	7	*.user

branches/HeuristicLab.Mono/HeuristicLab.Problems.ArtificialAnt/3.4

Property svn:ignore

old	new
5	5	HeuristicLab.Problems.ArtificialAnt-3.4.csproj.user
6	6	Plugin.cs
	7	*.user

branches/HeuristicLab.Mono/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic (added) merged: 8448
branches/HeuristicLab.Mono/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification (added) merged: 8448

branches/HeuristicLab.Mono/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4

Property svn:ignore

old	new
5	5	*.vs10x
6	6	Plugin.cs
	7	*.user

branches/HeuristicLab.Mono/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (added) merged: 8448

branches/HeuristicLab.Mono/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4

Property svn:ignore

old	new
5	5	*.vs10x
6	6	Plugin.cs
	7	*.user

branches/HeuristicLab.Mono/HeuristicLab.Problems.DataAnalysis.Views
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Problems.DataAnalysis.Views (added) merged: 8435

branches/HeuristicLab.Mono/HeuristicLab.Problems.LawnMower.Views/3.3

Property svn:ignore

old	new
2	2	obj
3	3	Plugin.cs
	4	*.user

branches/HeuristicLab.Mono/HeuristicLab.Problems.LinearAssignment.Views/3.3

Property svn:ignore

old	new
2	2	Plugin.cs
3	3	bin
	4	*.user

branches/HeuristicLab.Mono/HeuristicLab.Problems.LinearAssignment/3.3

Property svn:ignore

old	new
2	2	Plugin.cs
3	3	bin
	4	*.user

branches/HeuristicLab.Mono/HeuristicLab.Tests

Property svn:ignore

old	new
4	4	*.vs10x
5	5	_ReSharper.HeuristicLab 3.3 Tests
	6	*.user

Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Tests (added) merged: 8367,8371,8439

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 8451

Download in other formats: