Context Navigation

HeuristicLab.Algorithms.DataAnalysis

Timestamp:

02/20/14 14:56:39 (11 years ago)

Author:

gkronber

Message:

#2093: merged trunk changes to prepare for reintegration

Location:

branches/LogResidualEvaluator

Files:

Property svn:mergeinfo changed

/branches/HLScript (added)	merged: 10331-10332,10358
/branches/SpectralKernelForGaussianProcesses (added)	merged: 10204-10205,10473,10479
/trunk/sources (added)	merged: 10212-10213,10231,10261,10273,10291-10292,10295,10298,10323-10324,10346,10348,10355,10359-10360,10362-10363,10365-10366,10368,10375,10378,10391,10401,10406-10407,10414,10417-10418,10428,10432-10433,10435,10440,10448,10453,10460,10465-10466,10469-10470,10472,10474-10477,10480

r9534	r10483
124	124	</Compile>
125	125	<Compile Include="FixedDataAnalysisAlgorithm.cs" />
	126	<Compile Include="GaussianProcess\CovarianceFunctions\CovarianceSpectralMixture.cs" />
126	127	<Compile Include="GaussianProcess\CovarianceFunctions\CovariancePiecewisePolynomial.cs" />
127	128	<Compile Include="GaussianProcess\CovarianceFunctions\CovarianceNeuralNetwork.cs" />

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

/branches/SpectralKernelForGaussianProcesses/HeuristicLab.Algorithms.DataAnalysis (added)	merged: 10205,10473
/trunk/sources/HeuristicLab.Algorithms.DataAnalysis (added)	merged: 10480