Context Navigation

← Previous Change
Next Change →

NearestNeighbour

Timestamp:

08/06/18 18:15:29 (6 years ago)

Author:

jkarder

Message:

#2839:

merged [15377-15681/trunk/sources] into branch
merged [15683-16056/trunk] into branch

Location:

branches/2839_HiveProjectManagement

Files:

: 8 edited

. (modified) (1 prop)
HeuristicLab.Algorithms.DataAnalysis (modified) (1 prop)
HeuristicLab.Algorithms.DataAnalysis/3.4 (modified) (1 prop)
HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourClassification.cs (modified) (1 diff)
HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourClassificationSolution.cs (modified) (1 diff)
HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourModel.cs (modified) (2 diffs)
HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourRegression.cs (modified) (1 diff)
HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourRegressionSolution.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/2839_HiveProjectManagement

Property svn:mergeinfo changed

/stable	merged: 15587-15588
/trunk (added)	merged: 15706-15708,15727-15730,15738-15739,15751-15755,15766,15769,15782-15783,15785-15787,15789-15790,15793,15796-15799,15802,15810,15818,15829,15839,15845,15853-15855,15869,15871,15882,15891,15902,15931-15932,15934,15940,15951-15952,15972,15983,15998-15999,16015,16021,16023-16025,16032-16033,16054
/trunk/sources (added)	merged: 15383,15388,15390,15395-15398,15400,15402,15408-15409,15419,15427,15447-15448,15452,15461,15464,15478,15480-15481,15483,15486,15498-15499,15502,15505,15513,15517-15518,15532,15534,15545,15548,15551,15556,15560,15566,15581,15583,15589-15591,15594,15596,15598,15607,15610-15611,15619,15621-15623,15626,15637-15638,15645,15665,15667,15672-15674

branches/2839_HiveProjectManagement/HeuristicLab.Algorithms.DataAnalysis

Property svn:mergeinfo changed

/stable/HeuristicLab.Algorithms.DataAnalysis	merged: 15587
/trunk/HeuristicLab.Algorithms.DataAnalysis (added)	merged: 15739,15769,15783,15786,15854,15869
/trunk/sources/HeuristicLab.Algorithms.DataAnalysis (added)	merged: 15464,15499,15502,15505,15532,15545,15548,15551,15556,15581,15583,15589

branches/2839_HiveProjectManagement/HeuristicLab.Algorithms.DataAnalysis/3.4

Property svn:mergeinfo set to (toggle deleted branches)

/stable/HeuristicLab.Algorithms.DataAnalysis/3.4	merged	eligible
/trunk/HeuristicLab.Algorithms.DataAnalysis/3.4	merged	eligible
/branches/1721-RandomForestPersistence/HeuristicLab.Algorithms.DataAnalysis/3.4	10321-10322
/branches/Async/HeuristicLab.Algorithms.DataAnalysis/3.4	13329-15286
/branches/Benchmarking/sources/HeuristicLab.Algorithms.DataAnalysis/3.4	6917-7005
/branches/ClassificationModelComparison/HeuristicLab.Algorithms.DataAnalysis/3.4	9070-13099
/branches/CloningRefactoring/HeuristicLab.Algorithms.DataAnalysis/3.4	4656-4721
/branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis/3.4	5471-5808
/branches/DataAnalysis SolutionEnsembles/HeuristicLab.Algorithms.DataAnalysis/3.4	5815-6180
/branches/DataAnalysis/HeuristicLab.Algorithms.DataAnalysis/3.4	4458-4459,4462,4464
/branches/DataPreprocessing/HeuristicLab.Algorithms.DataAnalysis/3.4	10085-11101
/branches/GP.Grammar.Editor/HeuristicLab.Algorithms.DataAnalysis/3.4	6284-6795
/branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Algorithms.DataAnalysis/3.4	5060
/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Algorithms.DataAnalysis/3.4	11570-12508
/branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Algorithms.DataAnalysis/3.4	11130-12721
/branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Algorithms.DataAnalysis/3.4	13819-14091
/branches/HeuristicLab.TimeSeries/HeuristicLab.Algorithms.DataAnalysis/3.4	8116-8789
/branches/LogResidualEvaluator/HeuristicLab.Algorithms.DataAnalysis/3.4	10202-10483
/branches/NET40/sources/HeuristicLab.Algorithms.DataAnalysis/3.4	5138-5162
/branches/ParallelEngine/HeuristicLab.Algorithms.DataAnalysis/3.4	5175-5192
/branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Algorithms.DataAnalysis/3.4	7773-7810
/branches/QAPAlgorithms/HeuristicLab.Algorithms.DataAnalysis/3.4	6350-6627
/branches/Restructure trunk solution/HeuristicLab.Algorithms.DataAnalysis/3.4	6828
/branches/SpectralKernelForGaussianProcesses/HeuristicLab.Algorithms.DataAnalysis/3.4	10204-10479
/branches/SuccessProgressAnalysis/HeuristicLab.Algorithms.DataAnalysis/3.4	5370-5682
/branches/Trunk/HeuristicLab.Algorithms.DataAnalysis/3.4	6829-6865
/branches/VNS/HeuristicLab.Algorithms.DataAnalysis/3.4	5594-5752
/branches/Weighted TSNE/3.4	15451-15531
/branches/histogram/HeuristicLab.Algorithms.DataAnalysis/3.4	5959-6341
/branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis/3.4	14232-14825
/trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4	15377-15681

branches/2839_HiveProjectManagement/HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourClassification.cs

r14523	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourClassificationSolution.cs

r14185	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourModel.cs

-                      r14843
+                      r16057
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
+      }
       if (inputMatrix.Cast<double>().Any(x => double.IsNaN(x) || double.IsInfinity(x)))
+      if (inputMatrix.ContainsNanOrInfinity())
         throw new NotSupportedException(
           "Nearest neighbour model does not support NaN or infinity values in the input dataset.");

branches/2839_HiveProjectManagement/HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourRegression.cs

r14523	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2839_HiveProjectManagement/HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour/NearestNeighbourRegressionSolution.cs

r14185	r16057
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

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

Context Navigation

Changeset 16057 for branches/2839_HiveProjectManagement/HeuristicLab.Algorithms.DataAnalysis/3.4/NearestNeighbour

Legend:

Download in other formats: