From f6852af3a0329d1a4ccdf7f2a75e0180f1442992 Mon Sep 17 00:00:00 2001 From: Heiko Strathmann Date: Sun, 15 Apr 2018 01:37:40 +0200 Subject: [PATCH] final stab at GPL->BSD conversion (#4253) --- .../random_fourier_classification.cpp | 2 +- benchmarks/sparse_test.cpp | 2 +- .../undocumented/libshogun/CMakeLists.txt | 1 + .../classifier_bagging_liblinear.cpp | 2 +- ...gaussian_process_binary_classification.cpp | 2 +- .../libshogun/converter_jade_bss.cpp | 2 +- ...converter_stochasticproximityembedding.cpp | 2 +- .../evaluation_cross_validation_knn.cpp | 2 +- .../libshogun/io_libsvm_multilabel.cpp | 2 +- .../libshogun/minibatchKMeans.cpp | 2 +- .../modelselection_grid_search_krr.cpp | 2 +- .../preprocessor_randomfouriergauss.cpp | 2 +- .../libshogun/random_fourier_features.cpp | 2 +- .../regression_gaussian_process_ard.cpp | 2 +- .../regression_gaussian_process_fitc.cpp | 2 +- .../regression_gaussian_process_laplace.cpp | 2 +- .../regression_gaussian_process_product.cpp | 2 +- .../regression_gaussian_process_sum.cpp | 2 +- .../libshogun/so_fg_multilabel.cpp | 2 +- .../libshogun/so_multiclass_BMRM.cpp | 2 +- .../splitting_LOO_crossvalidation.cpp | 2 +- .../streaming_onlineliblinear_sparse.cpp | 2 +- examples/undocumented/python/CMakeLists.txt | 2 + .../undocumented/python/classifier_ssk.py | 12 +- ...ion_cross_validation_mkl_weight_storage.py | 11 +- ...ion_cross_validation_multiclass_storage.py | 9 +- .../evaluation_cross_validation_regression.py | 10 +- ..._gaussian_process_binary_classification.py | 9 +- .../graphical/interactive_clustering_demo.py | 6 +- .../python/graphical/interactive_gp_demo.py | 13 +- .../python/graphical/interactive_kmm_demo.py | 11 +- .../python/graphical/statistics_hsic.py | 8 +- .../graphical/statistics_linear_time_mmd.py | 8 +- .../statistics_quadratic_time_mmd.py | 8 +- .../undocumented/python/kernel_ssk_string.py | 9 +- .../modelselection_grid_search_kernel.py | 7 +- .../python/modelselection_grid_search_krr.py | 9 +- .../modelselection_grid_search_liblinear.py | 9 +- .../modelselection_grid_search_libsvr.py | 11 +- .../python/modelselection_parameter_tree.py | 9 +- .../modelselection_random_search_liblinear.py | 7 +- src/gpl | 2 +- src/interfaces/perl/pdl.i | 2 +- src/interfaces/swig/Classifier.i | 2 +- src/interfaces/swig/Classifier_includes.i | 2 +- src/interfaces/swig/Multiclass.i | 3 +- src/interfaces/swig/Multiclass_includes.i | 2 +- src/shogun/base/DynArray.h | 2 +- src/shogun/base/Parameter.cpp | 2 +- src/shogun/base/SGObject.h | 2 +- src/shogun/base/Version.cpp | 2 +- src/shogun/base/init.cpp | 2 +- src/shogun/classifier/LDA.cpp | 2 +- src/shogun/classifier/LDA.h | 2 +- src/shogun/classifier/NearestCentroid.cpp | 2 +- src/shogun/classifier/NearestCentroid.h | 2 +- src/shogun/classifier/mkl/MKL.cpp | 2 +- src/shogun/classifier/mkl/MKL.h | 2 +- src/shogun/classifier/mkl/MKLMulticlass.cpp | 2 +- src/shogun/classifier/mkl/MKLMulticlass.h | 2 +- src/shogun/classifier/mkl/MKLMulticlassGLPK.h | 2 +- .../classifier/mkl/MKLMulticlassGradient.cpp | 2 +- .../classifier/mkl/MKLMulticlassGradient.h | 2 +- .../mkl/MKLMulticlassOptimizationBase.cpp | 2 +- .../mkl/MKLMulticlassOptimizationBase.h | 2 +- src/shogun/classifier/svm/LibLinear.cpp | 2 +- src/shogun/classifier/svm/NewtonSVM.h | 2 +- src/shogun/classifier/svm/OnlineLibLinear.h | 2 +- src/shogun/classifier/svm/OnlineSVMSGD.cpp | 2 +- src/shogun/classifier/svm/OnlineSVMSGD.h | 2 +- src/shogun/classifier/svm/SGDQN.cpp | 2 +- src/shogun/classifier/svm/SGDQN.h | 2 +- src/shogun/classifier/svm/SVM.h | 2 +- .../classifier/svm/SVMLightOneClass.cpp | 2 +- src/shogun/classifier/svm/SVMOcas.h | 10 +- src/shogun/classifier/svm/SVMSGD.cpp | 226 ---- src/shogun/classifier/svm/SVMSGD.h | 174 --- src/shogun/clustering/Hierarchical.h | 2 +- src/shogun/clustering/KMeans.cpp | 2 +- src/shogun/clustering/KMeans.h | 2 +- src/shogun/converter/DiffusionMaps.h | 2 +- src/shogun/converter/FactorAnalysis.h | 2 +- src/shogun/converter/HashedDocConverter.cpp | 2 +- src/shogun/converter/HashedDocConverter.h | 2 +- src/shogun/converter/Isomap.cpp | 2 +- .../LinearLocalTangentSpaceAlignment.h | 2 +- .../LocalityPreservingProjections.cpp | 2 +- src/shogun/converter/ManifoldSculpting.cpp | 2 +- src/shogun/converter/ManifoldSculpting.h | 2 +- .../converter/MultidimensionalScaling.cpp | 2 +- .../StochasticProximityEmbedding.cpp | 2 +- .../converter/StochasticProximityEmbedding.h | 2 +- ...DistributedStochasticNeighborEmbedding.cpp | 2 +- .../TDistributedStochasticNeighborEmbedding.h | 2 +- src/shogun/converter/ica/FFSep.cpp | 2 +- src/shogun/converter/ica/FFSep.h | 2 +- src/shogun/converter/ica/FastICA.cpp | 2 +- src/shogun/converter/ica/FastICA.h | 2 +- src/shogun/converter/ica/ICAConverter.cpp | 2 +- src/shogun/converter/ica/ICAConverter.h | 2 +- src/shogun/converter/ica/Jade.cpp | 2 +- src/shogun/converter/ica/Jade.h | 2 +- src/shogun/converter/ica/JediSep.cpp | 2 +- src/shogun/converter/ica/JediSep.h | 2 +- src/shogun/converter/ica/SOBI.cpp | 2 +- src/shogun/converter/ica/SOBI.h | 2 +- src/shogun/converter/ica/UWedgeSep.cpp | 2 +- src/shogun/converter/ica/UWedgeSep.h | 2 +- src/shogun/distance/DirectorDistance.h | 2 +- src/shogun/distance/Distance.h | 2 +- src/shogun/distance/EuclideanDistance.cpp | 2 +- src/shogun/distance/EuclideanDistance.h | 2 +- src/shogun/distributions/Distribution.h | 2 +- src/shogun/distributions/Gaussian.cpp | 2 +- src/shogun/distributions/HMM.cpp | 2 +- src/shogun/distributions/HMM.h | 2 +- src/shogun/ensemble/CombinationRule.h | 2 +- src/shogun/ensemble/MajorityVote.cpp | 2 +- src/shogun/ensemble/MajorityVote.h | 2 +- src/shogun/ensemble/MeanRule.cpp | 2 +- src/shogun/ensemble/MeanRule.h | 2 +- src/shogun/ensemble/WeightedMajorityVote.cpp | 2 +- src/shogun/ensemble/WeightedMajorityVote.h | 2 +- .../evaluation/ClusteringEvaluation.cpp | 2 +- .../DirectorContingencyTableEvaluation.h | 2 +- src/shogun/evaluation/MeanAbsoluteError.h | 2 +- src/shogun/evaluation/MeanSquaredError.h | 2 +- src/shogun/evaluation/MeanSquaredLogError.h | 2 +- src/shogun/evaluation/MulticlassAccuracy.h | 2 +- .../evaluation/MulticlassOVREvaluation.cpp | 2 +- src/shogun/features/Alphabet.cpp | 2 +- src/shogun/features/BinnedDotFeatures.h | 2 +- src/shogun/features/CombinedDotFeatures.cpp | 2 +- src/shogun/features/CombinedDotFeatures.h | 2 +- src/shogun/features/CombinedFeatures.cpp | 2 +- src/shogun/features/CombinedFeatures.h | 2 +- src/shogun/features/DataGenerator.cpp | 2 +- src/shogun/features/DataGenerator.h | 2 +- src/shogun/features/DenseFeatures.cpp | 2 +- src/shogun/features/DenseFeatures.h | 2 +- src/shogun/features/DenseSubsetFeatures.h | 2 +- src/shogun/features/DirectorDotFeatures.h | 2 +- src/shogun/features/DotFeatures.h | 2 +- src/shogun/features/ExplicitSpecFeatures.h | 2 +- src/shogun/features/FKFeatures.cpp | 2 +- src/shogun/features/FactorGraphFeatures.h | 2 +- src/shogun/features/Features.cpp | 2 +- src/shogun/features/Features.h | 2 +- .../features/ImplicitWeightedSpecFeatures.h | 2 +- src/shogun/features/LBPPyrDotFeatures.cpp | 2 +- src/shogun/features/LBPPyrDotFeatures.h | 2 +- src/shogun/features/MatrixFeatures.cpp | 2 +- src/shogun/features/PolyFeatures.h | 2 +- .../features/RandomFourierDotFeatures.cpp | 2 +- .../features/RandomFourierDotFeatures.h | 2 +- .../RandomKitchenSinksDotFeatures.cpp | 2 +- .../features/RandomKitchenSinksDotFeatures.h | 2 +- src/shogun/features/SNPFeatures.h | 2 +- src/shogun/features/SparseFeatures.h | 2 +- src/shogun/features/SparsePolyFeatures.h | 2 +- src/shogun/features/StringFeatures.h | 2 +- src/shogun/features/StringFileFeatures.h | 2 +- src/shogun/features/SubsetStack.h | 2 +- src/shogun/features/TOPFeatures.cpp | 2 +- src/shogun/features/WDFeatures.h | 2 +- .../StreamingHashedDenseFeatures.cpp | 2 +- .../streaming/StreamingHashedDenseFeatures.h | 2 +- .../StreamingHashedDocDotFeatures.cpp | 2 +- .../streaming/StreamingHashedDocDotFeatures.h | 2 +- .../StreamingHashedSparseFeatures.cpp | 2 +- .../streaming/StreamingHashedSparseFeatures.h | 2 +- .../streaming/StreamingSparseFeatures.cpp | 2 +- .../streaming/StreamingSparseFeatures.h | 2 +- src/shogun/io/BinaryFile.cpp | 2 +- src/shogun/io/BinaryStream.h | 2 +- src/shogun/io/CSVFile.cpp | 2 +- src/shogun/io/CSVFile.h | 2 +- src/shogun/io/File.h | 2 +- src/shogun/io/HDF5File.cpp | 2 +- src/shogun/io/LibSVMFile.cpp | 2 +- src/shogun/io/LibSVMFile.h | 2 +- src/shogun/io/LineReader.cpp | 2 +- src/shogun/io/LineReader.h | 2 +- src/shogun/io/MLDataHDF5File.cpp | 2 +- src/shogun/io/MLDataHDF5File.h | 2 +- src/shogun/io/MemoryMappedFile.h | 2 +- src/shogun/io/Parser.cpp | 2 +- src/shogun/io/Parser.h | 2 +- src/shogun/io/ProtobufFile.cpp | 2 +- src/shogun/io/ProtobufFile.h | 2 +- src/shogun/io/SGIO.cpp | 2 +- src/shogun/io/SGIO.h | 2 +- src/shogun/io/SerializableAsciiReader00.cpp | 2 +- src/shogun/io/SerializableHdf5File.cpp | 2 +- src/shogun/io/SerializableJsonFile.cpp | 2 +- src/shogun/io/SerializableXmlFile.cpp | 2 +- src/shogun/io/UAIFile.cpp | 2 +- src/shogun/io/UAIFile.h | 2 +- src/shogun/kernel/ANOVAKernel.h | 2 +- src/shogun/kernel/AUCKernel.cpp | 2 +- src/shogun/kernel/BesselKernel.h | 2 +- src/shogun/kernel/CauchyKernel.h | 2 +- src/shogun/kernel/CircularKernel.h | 2 +- src/shogun/kernel/DirectorKernel.h | 2 +- src/shogun/kernel/DistanceKernel.cpp | 2 +- src/shogun/kernel/GaussianARDKernel.cpp | 2 +- src/shogun/kernel/Kernel.cpp | 3 - src/shogun/kernel/Kernel.h | 3 - src/shogun/kernel/LinearKernel.h | 2 +- src/shogun/kernel/LogKernel.h | 2 +- src/shogun/kernel/PowerKernel.h | 2 +- src/shogun/kernel/PyramidChi2.h | 2 +- src/shogun/kernel/RationalQuadraticKernel.h | 2 +- src/shogun/kernel/SphericalKernel.cpp | 2 +- src/shogun/kernel/SphericalKernel.h | 2 +- src/shogun/kernel/TStudentKernel.h | 2 +- src/shogun/kernel/WaveKernel.h | 2 +- .../kernel/string/CommUlongStringKernel.h | 2 +- .../kernel/string/CommWordStringKernel.cpp | 2 +- .../kernel/string/CommWordStringKernel.h | 2 +- .../string/HistogramWordStringKernel.cpp | 2 +- src/shogun/kernel/string/LinearStringKernel.h | 2 +- .../string/LocalAlignmentStringKernel.h | 2 +- .../kernel/string/OligoStringKernel.cpp | 2 +- src/shogun/kernel/string/OligoStringKernel.h | 2 +- .../kernel/string/SalzbergWordStringKernel.h | 2 +- .../kernel/string/SpectrumRBFKernel.cpp | 2 +- .../string/WeightedCommWordStringKernel.h | 2 +- .../WeightedDegreePositionStringKernel.cpp | 2 +- .../WeightedDegreePositionStringKernel.h | 2 +- .../string/WeightedDegreeStringKernel.cpp | 2 +- .../string/WeightedDegreeStringKernel.h | 2 +- src/shogun/labels/FactorGraphLabels.h | 2 +- src/shogun/labels/LabelsFactory.h | 2 +- src/shogun/labels/LatentLabels.cpp | 2 +- src/shogun/labels/MulticlassLabels.h | 2 +- src/shogun/labels/StructuredLabels.cpp | 2 +- src/shogun/labels/StructuredLabels.h | 2 +- src/shogun/latent/DirectorLatentModel.h | 2 +- src/shogun/latent/LatentModel.h | 2 +- src/shogun/lib/CircularBuffer.cpp | 2 +- src/shogun/lib/CircularBuffer.h | 2 +- src/shogun/lib/DataType.cpp | 2 +- src/shogun/lib/DelimiterTokenizer.h | 2 +- src/shogun/lib/DynamicArray.h | 2 +- src/shogun/lib/DynamicObjectArray.h | 2 +- src/shogun/lib/IndexBlock.cpp | 2 +- src/shogun/lib/IndexBlock.h | 2 +- src/shogun/lib/IndexBlockGroup.h | 2 +- src/shogun/lib/IndexBlockRelation.cpp | 2 +- src/shogun/lib/IndexBlockTree.cpp | 2 +- src/shogun/lib/IndexBlockTree.h | 2 +- src/shogun/lib/JLCoverTree.h | 866 ------------- src/shogun/lib/JLCoverTreePoint.h | 214 ---- src/shogun/lib/Map.h | 2 +- src/shogun/lib/NGramTokenizer.cpp | 2 +- src/shogun/lib/NGramTokenizer.h | 2 +- src/shogun/lib/SGCachedVector.h | 2 +- src/shogun/lib/SGMatrixList.h | 2 +- src/shogun/lib/SGNDArray.cpp | 2 +- src/shogun/lib/SGNDArray.h | 2 +- src/shogun/lib/SGSparseMatrix.h | 2 +- src/shogun/lib/SGSparseVector.h | 2 +- src/shogun/lib/SGString.h | 2 +- src/shogun/lib/SGStringList.h | 2 +- src/shogun/lib/SGVector.cpp | 2 +- src/shogun/lib/SGVector.h | 2 +- src/shogun/lib/Set.h | 2 +- src/shogun/lib/StructuredData.h | 2 +- src/shogun/lib/Tokenizer.h | 2 +- src/shogun/lib/Trie.h | 2 +- src/shogun/lib/memory.cpp | 2 +- src/shogun/lib/memory.h | 2 +- src/shogun/loss/HingeLoss.h | 2 +- src/shogun/loss/LogLoss.h | 2 +- src/shogun/loss/LogLossMargin.h | 2 +- src/shogun/loss/LossFunction.h | 2 +- src/shogun/loss/SmoothHingeLoss.h | 2 +- src/shogun/loss/SquaredHingeLoss.h | 2 +- src/shogun/loss/SquaredLoss.h | 2 +- src/shogun/machine/BaggingMachine.cpp | 2 +- src/shogun/machine/BaggingMachine.h | 2 +- src/shogun/machine/BaseMulticlassMachine.h | 2 +- src/shogun/machine/DirectorKernelMachine.h | 2 +- src/shogun/machine/DirectorLinearMachine.h | 2 +- src/shogun/machine/KernelMachine.h | 2 +- .../machine/KernelStructuredOutputMachine.h | 2 +- src/shogun/machine/LinearLatentMachine.h | 2 +- src/shogun/machine/LinearMachine.cpp | 2 +- src/shogun/machine/LinearMachine.h | 2 +- .../machine/LinearStructuredOutputMachine.cpp | 2 +- .../machine/LinearStructuredOutputMachine.h | 2 +- src/shogun/machine/MulticlassMachine.h | 2 +- src/shogun/machine/OnlineLinearMachine.h | 2 +- .../machine/StructuredOutputMachine.cpp | 2 +- src/shogun/machine/StructuredOutputMachine.h | 2 +- src/shogun/machine/gp/FITCInferenceMethod.h | 2 +- src/shogun/mathematics/Cplex.h | 2 +- src/shogun/mathematics/Math.h | 2 +- src/shogun/mathematics/Mosek.cpp | 2 +- src/shogun/mathematics/Mosek.h | 2 +- src/shogun/mathematics/Random.cpp | 2 +- src/shogun/mathematics/Random.h | 2 +- src/shogun/mathematics/Statistics.cpp | 2 +- src/shogun/mathematics/Statistics.h | 2 +- .../mathematics/ajd/ApproxJointDiagonalizer.h | 2 +- src/shogun/mathematics/ajd/FFDiag.h | 2 +- src/shogun/mathematics/ajd/JADiag.h | 2 +- src/shogun/mathematics/ajd/JADiagOrth.h | 2 +- src/shogun/mathematics/ajd/JediDiag.h | 2 +- src/shogun/mathematics/ajd/QDiag.h | 2 +- src/shogun/mathematics/ajd/UWedge.h | 2 +- src/shogun/mathematics/eigen3.cpp | 2 +- src/shogun/mathematics/eigen3.h | 2 +- src/shogun/mathematics/lapack.h | 2 +- .../linalg/eigsolver/DirectEigenSolver.cpp | 2 +- .../linalg/eigsolver/DirectEigenSolver.h | 2 +- .../linalg/eigsolver/EigenSolver.h | 2 +- .../linalg/eigsolver/LanczosEigenSolver.cpp | 2 +- .../linalg/eigsolver/LanczosEigenSolver.h | 2 +- .../linalg/linop/DenseMatrixOperator.cpp | 2 +- .../linalg/linop/DenseMatrixOperator.h | 2 +- .../linalg/linop/LinearOperator.cpp | 2 +- .../mathematics/linalg/linop/LinearOperator.h | 2 +- .../linalg/linop/MatrixOperator.cpp | 2 +- .../mathematics/linalg/linop/MatrixOperator.h | 2 +- .../linalg/linop/SparseMatrixOperator.cpp | 2 +- .../linalg/linop/SparseMatrixOperator.h | 2 +- .../linsolver/CGMShiftedFamilySolver.cpp | 2 +- .../linalg/linsolver/CGMShiftedFamilySolver.h | 2 +- .../linsolver/ConjugateGradientSolver.cpp | 2 +- .../linsolver/ConjugateGradientSolver.h | 2 +- .../linsolver/ConjugateOrthogonalCGSolver.cpp | 2 +- .../linsolver/ConjugateOrthogonalCGSolver.h | 2 +- .../linsolver/DirectLinearSolverComplex.cpp | 2 +- .../linsolver/DirectLinearSolverComplex.h | 2 +- .../linsolver/DirectSparseLinearSolver.cpp | 2 +- .../linsolver/DirectSparseLinearSolver.h | 2 +- .../linsolver/IterativeLinearSolver.cpp | 2 +- .../linalg/linsolver/IterativeLinearSolver.h | 2 +- .../IterativeShiftedLinearFamilySolver.cpp | 2 +- .../IterativeShiftedLinearFamilySolver.h | 2 +- .../linsolver/IterativeSolverIterator.h | 2 +- .../linalg/linsolver/LinearSolver.cpp | 2 +- .../linalg/linsolver/LinearSolver.h | 2 +- .../ratapprox/logdet/LogDetEstimator.cpp | 2 +- .../linalg/ratapprox/logdet/LogDetEstimator.h | 2 +- .../logdet/opfunc/DenseMatrixExactLog.cpp | 2 +- .../logdet/opfunc/DenseMatrixExactLog.h | 2 +- .../opfunc/LogRationalApproximationCGM.cpp | 2 +- .../opfunc/LogRationalApproximationCGM.h | 2 +- .../LogRationalApproximationIndividual.cpp | 2 +- .../LogRationalApproximationIndividual.h | 2 +- .../ratapprox/opfunc/OperatorFunction.cpp | 2 +- .../ratapprox/opfunc/OperatorFunction.h | 2 +- .../opfunc/RationalApproximation.cpp | 2 +- .../ratapprox/opfunc/RationalApproximation.h | 2 +- .../ratapprox/tracesampler/NormalSampler.cpp | 2 +- .../ratapprox/tracesampler/NormalSampler.h | 2 +- .../ratapprox/tracesampler/ProbingSampler.cpp | 2 +- .../ratapprox/tracesampler/ProbingSampler.h | 2 +- .../ratapprox/tracesampler/TraceSampler.h | 2 +- src/shogun/mathematics/munkres.cpp | 2 +- src/shogun/mathematics/munkres.h | 2 +- .../modelselection/GradientModelSelection.cpp | 2 +- .../ModelSelectionParameters.cpp | 2 +- .../modelselection/ParameterCombination.cpp | 2 +- src/shogun/multiclass/CoverTreeKNNSolver.cpp | 122 -- src/shogun/multiclass/CoverTreeKNNSolver.h | 54 - src/shogun/multiclass/GMNPSVM.h | 2 +- src/shogun/multiclass/GaussianNaiveBayes.cpp | 2 +- src/shogun/multiclass/GaussianNaiveBayes.h | 2 +- src/shogun/multiclass/KNN.cpp | 6 +- src/shogun/multiclass/KNN.h | 4 +- src/shogun/multiclass/LaRank.cpp | 1077 ----------------- src/shogun/multiclass/LaRank.h | 517 -------- src/shogun/multiclass/MCLDA.cpp | 2 +- src/shogun/multiclass/MCLDA.h | 2 +- src/shogun/multiclass/MulticlassLibLinear.h | 2 +- src/shogun/multiclass/MulticlassLibSVM.cpp | 2 +- .../multiclass/MulticlassOneVsOneStrategy.cpp | 2 +- .../multiclass/MulticlassOneVsOneStrategy.h | 2 +- .../MulticlassOneVsRestStrategy.cpp | 2 +- .../multiclass/MulticlassOneVsRestStrategy.h | 2 +- src/shogun/multiclass/MulticlassSVM.h | 2 +- src/shogun/multiclass/MulticlassStrategy.h | 2 +- src/shogun/multiclass/QDA.cpp | 2 +- src/shogun/multiclass/RejectionStrategy.h | 2 +- src/shogun/multiclass/ShareBoost.cpp | 2 +- src/shogun/multiclass/ShareBoost.h | 2 +- src/shogun/multiclass/ShareBoostOptimizer.cpp | 2 +- src/shogun/multiclass/ShareBoostOptimizer.h | 2 +- src/shogun/multiclass/ecoc/ECOCAEDDecoder.h | 2 +- .../ecoc/ECOCDiscriminantEncoder.cpp | 2 +- .../multiclass/ecoc/ECOCDiscriminantEncoder.h | 2 +- src/shogun/multiclass/ecoc/ECOCEDDecoder.h | 2 +- .../multiclass/ecoc/ECOCForestEncoder.h | 2 +- src/shogun/multiclass/ecoc/ECOCIHDDecoder.cpp | 2 +- src/shogun/multiclass/ecoc/ECOCLLBDecoder.h | 2 +- .../multiclass/ecoc/ECOCSimpleDecoder.h | 2 +- .../tree/BalancedConditionalProbabilityTree.h | 2 +- .../tree/ConditionalProbabilityTree.h | 2 +- .../tree/ConditionalProbabilityTreeNodeData.h | 2 +- .../tree/RandomConditionalProbabilityTree.h | 2 +- src/shogun/multiclass/tree/RelaxedTree.cpp | 2 +- src/shogun/multiclass/tree/RelaxedTree.h | 2 +- .../multiclass/tree/RelaxedTreeNodeData.h | 2 +- src/shogun/multiclass/tree/RelaxedTreeUtil.h | 2 +- .../preprocessor/HomogeneousKernelMap.cpp | 2 +- src/shogun/preprocessor/PCA.cpp | 2 +- src/shogun/preprocessor/PCA.h | 2 +- src/shogun/preprocessor/PNorm.cpp | 2 +- src/shogun/preprocessor/PNorm.h | 2 +- src/shogun/preprocessor/PruneVarSubMean.cpp | 2 +- .../RandomFourierGaussPreproc.cpp | 2 +- .../preprocessor/RandomFourierGaussPreproc.h | 2 +- src/shogun/preprocessor/RescaleFeatures.cpp | 2 +- src/shogun/preprocessor/RescaleFeatures.h | 2 +- .../regression/LeastAngleRegression.cpp | 2 +- .../regression/svr/LibLinearRegression.cpp | 2 +- src/shogun/regression/svr/LibSVR.h | 2 +- src/shogun/regression/svr/SVRLight.cpp | 2 +- src/shogun/regression/svr/SVRLight.h | 2 +- src/shogun/structure/BeliefPropagation.cpp | 2 +- src/shogun/structure/BeliefPropagation.h | 2 +- src/shogun/structure/CCSOSVM.cpp | 2 +- src/shogun/structure/CCSOSVM.h | 2 +- .../structure/DirectorStructuredModel.h | 2 +- src/shogun/structure/DisjointSet.cpp | 2 +- src/shogun/structure/DisjointSet.h | 2 +- src/shogun/structure/DynProg.cpp | 2 +- src/shogun/structure/DynProg.h | 2 +- src/shogun/structure/FWSOSVM.cpp | 2 +- src/shogun/structure/FWSOSVM.h | 2 +- src/shogun/structure/Factor.cpp | 2 +- src/shogun/structure/Factor.h | 2 +- src/shogun/structure/FactorGraph.cpp | 2 +- src/shogun/structure/FactorGraph.h | 2 +- src/shogun/structure/FactorGraphModel.cpp | 2 +- src/shogun/structure/FactorGraphModel.h | 2 +- src/shogun/structure/FactorType.cpp | 2 +- src/shogun/structure/FactorType.h | 2 +- src/shogun/structure/GEMPLP.cpp | 2 +- src/shogun/structure/GEMPLP.h | 2 +- src/shogun/structure/GraphCut.cpp | 2 +- src/shogun/structure/GraphCut.h | 2 +- src/shogun/structure/MAPInference.cpp | 2 +- src/shogun/structure/MAPInference.h | 2 +- src/shogun/structure/MulticlassModel.h | 2 +- src/shogun/structure/MulticlassSOLabels.cpp | 2 +- src/shogun/structure/MulticlassSOLabels.h | 2 +- src/shogun/structure/Plif.cpp | 2 +- src/shogun/structure/Plif.h | 2 +- src/shogun/structure/PlifArray.cpp | 2 +- src/shogun/structure/PlifArray.h | 2 +- src/shogun/structure/PrimalMosekSOSVM.cpp | 2 +- src/shogun/structure/PrimalMosekSOSVM.h | 2 +- src/shogun/structure/SOSVMHelper.cpp | 2 +- src/shogun/structure/SOSVMHelper.h | 2 +- src/shogun/structure/SegmentLoss.h | 2 +- src/shogun/structure/StateModel.h | 2 +- src/shogun/structure/StochasticSOSVM.cpp | 2 +- src/shogun/structure/StochasticSOSVM.h | 2 +- src/shogun/structure/StructuredModel.h | 2 +- .../DomainAdaptationMulticlassLibLinear.h | 2 +- .../DomainAdaptationSVMLinear.cpp | 2 +- .../transfer/multitask/LibLinearMTL.cpp | 2 +- src/shogun/transfer/multitask/LibLinearMTL.h | 2 +- .../multitask/MultitaskKernelTreeNormalizer.h | 2 +- src/shogun/transfer/multitask/Task.cpp | 2 +- src/shogun/transfer/multitask/Task.h | 2 +- src/shogun/transfer/multitask/TaskGroup.cpp | 2 +- src/shogun/transfer/multitask/TaskGroup.h | 2 +- src/shogun/transfer/multitask/TaskRelation.h | 2 +- src/shogun/transfer/multitask/TaskTree.cpp | 2 +- src/shogun/transfer/multitask/TaskTree.h | 2 +- tests/unit/base/Parameter_unittest.cc | 2 +- tests/unit/clustering/kmeans_unittest.cc | 2 +- .../distance/EuclideanDistance_unittest.cc | 2 +- .../evaluation/SplittingStrategy_unittest.cc | 2 +- .../features/CombinedDotFeatures_unittest.cc | 2 +- .../features/CombinedFeatures_unittest.cc | 2 +- .../unit/features/DataGenerators_unittest.cc | 2 +- .../features/HashedDocDotFeatures_unittest.cc | 2 +- .../features/HashedSparseFeatures_unittest.cc | 2 +- .../features/LBPPyrDotFeatures_unittest.cc | 2 +- .../StreamingDenseFeatures_unittest.cc | 2 +- .../StreamingHashedDenseFeatures_unittest.cc | 2 +- .../StreamingHashedDocDotFeatures_unittest.cc | 2 +- .../StreamingHashedSparseFeatures_unittest.cc | 2 +- .../StreamingSparseFeatures_unittest.cc | 2 +- .../unit/integration/CV2SGFactory_unittest.cc | 2 +- tests/unit/integration/OpenCV_unittest.cc | 2 +- .../unit/integration/SG2CVFactory_unittest.cc | 2 +- tests/unit/io/LineReader_unittest.cc | 2 +- .../unit/labels/MulticlassLabels_unittest.cc | 2 +- tests/unit/lib/SGSparseMatrix_unittest.cc | 2 +- tests/unit/lib/SGSparseVector_unittest.cc | 2 +- .../machine/gp/ProbitLikelihood_unittest.cc | 2 +- tests/unit/mathematics/Complex_unittest.cc | 2 +- .../JacobiEllipticFunctions_unittest.cc | 2 +- .../unit/mathematics/Lapack_wrapper_dstemr.cc | 2 +- tests/unit/mathematics/Math_unittest.cc | 2 +- .../linalg/CGMShiftedFamilySolver_unittest.cc | 2 +- .../ConjugateGradientSolver_unittest.cc | 2 +- .../ConjugateOrthogonalCGSolver_unittest.cc | 2 +- .../linalg/DenseMatrixExactLog_unittest.cc | 2 +- .../linalg/DenseMatrixOperator_unittest.cc | 2 +- .../linalg/DirectEigenSolver_unittest.cc | 2 +- .../DirectLinearSolverComplex_unittest.cc | 2 +- .../DirectSparseLinearSolver_unittest.cc | 2 +- .../linalg/LanczosEigenSolver_unittest.cc | 2 +- .../linalg/LogDetEstimator_unittest.cc | 2 +- .../linalg/MatrixOperator_unittest.cc | 2 +- .../linalg/NormalSampler_unittest.cc | 2 +- .../linalg/ProbingSampler_unittest.cc | 2 +- .../linalg/RationalApproximation_unittest.cc | 2 +- .../linalg/SparseMatrixOperator_unittest.cc | 2 +- tests/unit/multiclass/LaRank_unittest.cc | 3 + 519 files changed, 545 insertions(+), 3874 deletions(-) delete mode 100644 src/shogun/classifier/svm/SVMSGD.cpp delete mode 100644 src/shogun/classifier/svm/SVMSGD.h delete mode 100644 src/shogun/lib/JLCoverTree.h delete mode 100644 src/shogun/lib/JLCoverTreePoint.h delete mode 100644 src/shogun/multiclass/CoverTreeKNNSolver.cpp delete mode 100644 src/shogun/multiclass/CoverTreeKNNSolver.h delete mode 100644 src/shogun/multiclass/LaRank.cpp delete mode 100644 src/shogun/multiclass/LaRank.h diff --git a/applications/classification/random_fourier_classification.cpp b/applications/classification/random_fourier_classification.cpp index bcd085407c7..41cb6b01d0a 100644 --- a/applications/classification/random_fourier_classification.cpp +++ b/applications/classification/random_fourier_classification.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Björn Esser, Evangelos Anagnostopoulos + * Authors: Bjoern Esser, Evangelos Anagnostopoulos */ #include #include diff --git a/benchmarks/sparse_test.cpp b/benchmarks/sparse_test.cpp index 8849ea68e69..cbc9e6e2c5b 100644 --- a/benchmarks/sparse_test.cpp +++ b/benchmarks/sparse_test.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Pan Deng, Soumyajit De, Björn Esser + * Authors: Soeren Sonnenburg, Pan Deng, Soumyajit De, Bjoern Esser */ #include diff --git a/examples/undocumented/libshogun/CMakeLists.txt b/examples/undocumented/libshogun/CMakeLists.txt index 4f420820718..3ea7d3fbd5b 100644 --- a/examples/undocumented/libshogun/CMakeLists.txt +++ b/examples/undocumented/libshogun/CMakeLists.txt @@ -11,6 +11,7 @@ IF (NOT USE_GPL_SHOGUN) "modelselection_grid_search_string_kernel.cpp" "parameter_modsel_parameters.cpp" "classifier_svmlight_string_features_precomputed_kernel.cpp" + "classifier_larank.cpp" ) ENDIF() diff --git a/examples/undocumented/libshogun/classifier_bagging_liblinear.cpp b/examples/undocumented/libshogun/classifier_bagging_liblinear.cpp index 5e669d30167..3e0389c1589 100644 --- a/examples/undocumented/libshogun/classifier_bagging_liblinear.cpp +++ b/examples/undocumented/libshogun/classifier_bagging_liblinear.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Viktor Gal, Björn Esser + * Authors: Viktor Gal, Bjoern Esser */ #include diff --git a/examples/undocumented/libshogun/classifier_gaussian_process_binary_classification.cpp b/examples/undocumented/libshogun/classifier_gaussian_process_binary_classification.cpp index 86756356efc..93b24f87605 100644 --- a/examples/undocumented/libshogun/classifier_gaussian_process_binary_classification.cpp +++ b/examples/undocumented/libshogun/classifier_gaussian_process_binary_classification.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Roman Votyakov, Heiko Strathmann, Wu Lin, Pan Deng, Björn Esser + * Authors: Roman Votyakov, Heiko Strathmann, Wu Lin, Pan Deng, Bjoern Esser */ #ifdef USE_GPL_SHOGUN diff --git a/examples/undocumented/libshogun/converter_jade_bss.cpp b/examples/undocumented/libshogun/converter_jade_bss.cpp index 866ab20d882..b121ff7890f 100644 --- a/examples/undocumented/libshogun/converter_jade_bss.cpp +++ b/examples/undocumented/libshogun/converter_jade_bss.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Kevin Hughes, Soeren Sonnenburg, Evgeniy Andreev, Viktor Gal, - * Björn Esser, Pan Deng + * Bjoern Esser, Pan Deng */ #include diff --git a/examples/undocumented/libshogun/converter_stochasticproximityembedding.cpp b/examples/undocumented/libshogun/converter_stochasticproximityembedding.cpp index 86051813145..bf3e51cab6f 100644 --- a/examples/undocumented/libshogun/converter_stochasticproximityembedding.cpp +++ b/examples/undocumented/libshogun/converter_stochasticproximityembedding.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Sergey Lisitsyn, Soeren Sonnenburg, Heiko Strathmann, - * Fernando Iglesias, Björn Esser, Pan Deng + * Fernando Iglesias, Bjoern Esser, Pan Deng */ #include diff --git a/examples/undocumented/libshogun/evaluation_cross_validation_knn.cpp b/examples/undocumented/libshogun/evaluation_cross_validation_knn.cpp index 18a6076e2ca..2a6b64e37d4 100644 --- a/examples/undocumented/libshogun/evaluation_cross_validation_knn.cpp +++ b/examples/undocumented/libshogun/evaluation_cross_validation_knn.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Saurabh Mahindre, Soumyajit De, Björn Esser + * Authors: Saurabh Mahindre, Soumyajit De, Bjoern Esser */ #include diff --git a/examples/undocumented/libshogun/io_libsvm_multilabel.cpp b/examples/undocumented/libshogun/io_libsvm_multilabel.cpp index 9c1528485d1..418beb1733a 100644 --- a/examples/undocumented/libshogun/io_libsvm_multilabel.cpp +++ b/examples/undocumented/libshogun/io_libsvm_multilabel.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Jiaolong Xu, Björn Esser + * Authors: Jiaolong Xu, Bjoern Esser */ #include #include diff --git a/examples/undocumented/libshogun/minibatchKMeans.cpp b/examples/undocumented/libshogun/minibatchKMeans.cpp index 9c983cb8c0c..22d0791a35f 100644 --- a/examples/undocumented/libshogun/minibatchKMeans.cpp +++ b/examples/undocumented/libshogun/minibatchKMeans.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Björn Esser + * Authors: Bjoern Esser */ #include diff --git a/examples/undocumented/libshogun/modelselection_grid_search_krr.cpp b/examples/undocumented/libshogun/modelselection_grid_search_krr.cpp index 97c33dbdf01..ce29f139807 100644 --- a/examples/undocumented/libshogun/modelselection_grid_search_krr.cpp +++ b/examples/undocumented/libshogun/modelselection_grid_search_krr.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Heiko Strathmann, Jacob Walker, Soumyajit De, Björn Esser, + * Authors: Heiko Strathmann, Jacob Walker, Soumyajit De, Bjoern Esser, * Sergey Lisitsyn, Soeren Sonnenburg */ diff --git a/examples/undocumented/libshogun/preprocessor_randomfouriergauss.cpp b/examples/undocumented/libshogun/preprocessor_randomfouriergauss.cpp index 71410ce86dc..19cefb22ebe 100644 --- a/examples/undocumented/libshogun/preprocessor_randomfouriergauss.cpp +++ b/examples/undocumented/libshogun/preprocessor_randomfouriergauss.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sergey Lisitsyn, Björn Esser + * Authors: Sergey Lisitsyn, Bjoern Esser */ #include #include diff --git a/examples/undocumented/libshogun/random_fourier_features.cpp b/examples/undocumented/libshogun/random_fourier_features.cpp index a25f409e299..e6bbc4da39d 100644 --- a/examples/undocumented/libshogun/random_fourier_features.cpp +++ b/examples/undocumented/libshogun/random_fourier_features.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Björn Esser, Evangelos Anagnostopoulos + * Authors: Bjoern Esser, Evangelos Anagnostopoulos */ #include diff --git a/examples/undocumented/libshogun/regression_gaussian_process_ard.cpp b/examples/undocumented/libshogun/regression_gaussian_process_ard.cpp index 51e2903d973..232d1c09c67 100644 --- a/examples/undocumented/libshogun/regression_gaussian_process_ard.cpp +++ b/examples/undocumented/libshogun/regression_gaussian_process_ard.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Jacob Walker, Sergey Lisitsyn, Roman Votyakov, Viktor Gal, - * Björn Esser, Pan Deng + * Bjoern Esser, Pan Deng */ #include diff --git a/examples/undocumented/libshogun/regression_gaussian_process_fitc.cpp b/examples/undocumented/libshogun/regression_gaussian_process_fitc.cpp index d318fed85e3..800bdd8e98f 100644 --- a/examples/undocumented/libshogun/regression_gaussian_process_fitc.cpp +++ b/examples/undocumented/libshogun/regression_gaussian_process_fitc.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Sergey Lisitsyn, Heiko Strathmann, Roman Votyakov, Jacob Walker, - * Viktor Gal, Björn Esser, Soeren Sonnenburg, Pan Deng + * Viktor Gal, Bjoern Esser, Soeren Sonnenburg, Pan Deng */ #ifdef USE_GPL_SHOGUN diff --git a/examples/undocumented/libshogun/regression_gaussian_process_laplace.cpp b/examples/undocumented/libshogun/regression_gaussian_process_laplace.cpp index e24a373faeb..3961999cba6 100644 --- a/examples/undocumented/libshogun/regression_gaussian_process_laplace.cpp +++ b/examples/undocumented/libshogun/regression_gaussian_process_laplace.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Sergey Lisitsyn, Roman Votyakov, Jacob Walker, Viktor Gal, - * Björn Esser, Pan Deng + * Bjoern Esser, Pan Deng */ #include diff --git a/examples/undocumented/libshogun/regression_gaussian_process_product.cpp b/examples/undocumented/libshogun/regression_gaussian_process_product.cpp index 95974324716..59f2438eb7f 100644 --- a/examples/undocumented/libshogun/regression_gaussian_process_product.cpp +++ b/examples/undocumented/libshogun/regression_gaussian_process_product.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Heiko Strathmann, Jacob Walker, Sergey Lisitsyn, - * Viktor Gal, Björn Esser, Roman Votyakov, Pan Deng + * Viktor Gal, Bjoern Esser, Roman Votyakov, Pan Deng */ diff --git a/examples/undocumented/libshogun/regression_gaussian_process_sum.cpp b/examples/undocumented/libshogun/regression_gaussian_process_sum.cpp index f9ee554cc5d..da43923a850 100644 --- a/examples/undocumented/libshogun/regression_gaussian_process_sum.cpp +++ b/examples/undocumented/libshogun/regression_gaussian_process_sum.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Jacob Walker, Heiko Strathmann, Viktor Gal, - * Björn Esser, Sergey Lisitsyn, Roman Votyakov, Pan Deng + * Bjoern Esser, Sergey Lisitsyn, Roman Votyakov, Pan Deng */ #ifdef USE_GPL_SHOGUN diff --git a/examples/undocumented/libshogun/so_fg_multilabel.cpp b/examples/undocumented/libshogun/so_fg_multilabel.cpp index ca7b3da50bc..1ad6d427cb5 100644 --- a/examples/undocumented/libshogun/so_fg_multilabel.cpp +++ b/examples/undocumented/libshogun/so_fg_multilabel.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Jiaolong Xu, Heiko Strathmann, Björn Esser, Viktor Gal + * Authors: Jiaolong Xu, Heiko Strathmann, Bjoern Esser, Viktor Gal */ #include #ifdef USE_GPL_SHOGUN diff --git a/examples/undocumented/libshogun/so_multiclass_BMRM.cpp b/examples/undocumented/libshogun/so_multiclass_BMRM.cpp index 5c60ad47ded..66a3b18f288 100644 --- a/examples/undocumented/libshogun/so_multiclass_BMRM.cpp +++ b/examples/undocumented/libshogun/so_multiclass_BMRM.cpp @@ -3,7 +3,7 @@ * * Authors: Michal Uricar, Fernando Iglesias, Soeren Sonnenburg, * Heiko Strathmann, Evgeniy Andreev, Shell Hu, Thoralf Klein, - * Björn Esser, Sergey Lisitsyn, Sanuj Sharma, Viktor Gal + * Bjoern Esser, Sergey Lisitsyn, Sanuj Sharma, Viktor Gal */ #include diff --git a/examples/undocumented/libshogun/splitting_LOO_crossvalidation.cpp b/examples/undocumented/libshogun/splitting_LOO_crossvalidation.cpp index 5380a709373..70e710e9526 100644 --- a/examples/undocumented/libshogun/splitting_LOO_crossvalidation.cpp +++ b/examples/undocumented/libshogun/splitting_LOO_crossvalidation.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Saurabh Mahindre, Björn Esser + * Authors: Saurabh Mahindre, Bjoern Esser */ #include diff --git a/examples/undocumented/libshogun/streaming_onlineliblinear_sparse.cpp b/examples/undocumented/libshogun/streaming_onlineliblinear_sparse.cpp index 3dc6d2c3b02..2c7b869ab44 100644 --- a/examples/undocumented/libshogun/streaming_onlineliblinear_sparse.cpp +++ b/examples/undocumented/libshogun/streaming_onlineliblinear_sparse.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Thoralf Klein, Viktor Gal, Dawei Chen, Vladimir Perić, - * Sergey Lisitsyn, Björn Esser + * Sergey Lisitsyn, Bjoern Esser */ #include diff --git a/examples/undocumented/python/CMakeLists.txt b/examples/undocumented/python/CMakeLists.txt index 3ded2f7410e..5f72624549b 100644 --- a/examples/undocumented/python/CMakeLists.txt +++ b/examples/undocumented/python/CMakeLists.txt @@ -10,6 +10,8 @@ IF (NOT USE_GPL_SHOGUN) "modelselection_parameter_tree.py" "variational_classifier.py" "evaluation_cross_validation_multiclass_storage.py" + "classifier_larank.py" + "classifier_svmsgd.py" ) ENDIF() diff --git a/examples/undocumented/python/classifier_ssk.py b/examples/undocumented/python/classifier_ssk.py index ccb983a62b7..cc5646ff21b 100644 --- a/examples/undocumented/python/classifier_ssk.py +++ b/examples/undocumented/python/classifier_ssk.py @@ -1,13 +1,7 @@ -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# Written (W) 2014 Soumyajit De -# - #!/usr/bin/env python +# This software is distributed under BSD 3-clause license (see LICENSE file). +# +# Authors: Soumyajit De from tools.load import LoadMatrix diff --git a/examples/undocumented/python/evaluation_cross_validation_mkl_weight_storage.py b/examples/undocumented/python/evaluation_cross_validation_mkl_weight_storage.py index 27a0378dbfb..42e7e0de7a5 100644 --- a/examples/undocumented/python/evaluation_cross_validation_mkl_weight_storage.py +++ b/examples/undocumented/python/evaluation_cross_validation_mkl_weight_storage.py @@ -1,13 +1,8 @@ #!/usr/bin/env python + +# This software is distributed under BSD 3-clause license (see LICENSE file). # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# Written (W) 2012 Heiko Strathmann -# Copyright (C) 2012 Berlin Institute of Technology and Max-Planck-Society -# +# Authors: Heiko Strathmann from numpy.random import randn from numpy import * diff --git a/examples/undocumented/python/evaluation_cross_validation_multiclass_storage.py b/examples/undocumented/python/evaluation_cross_validation_multiclass_storage.py index 8a622c731f5..db3a5bdeb57 100644 --- a/examples/undocumented/python/evaluation_cross_validation_multiclass_storage.py +++ b/examples/undocumented/python/evaluation_cross_validation_multiclass_storage.py @@ -1,13 +1,8 @@ #!/usr/bin/env python # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# Written (W) 2012 Heiko Strathmann -# Copyright (C) 2012 Berlin Institute of Technology and Max-Planck-Society +# This software is distributed under BSD 3-clause license (see LICENSE file). # +# Authors: Heiko Strathmann from numpy.random import randn, seed from numpy import * diff --git a/examples/undocumented/python/evaluation_cross_validation_regression.py b/examples/undocumented/python/evaluation_cross_validation_regression.py index f124809b6ca..4224903ef11 100644 --- a/examples/undocumented/python/evaluation_cross_validation_regression.py +++ b/examples/undocumented/python/evaluation_cross_validation_regression.py @@ -1,13 +1,9 @@ #!/usr/bin/env python # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# Written (W) 2012 Heiko Strathmann -# Copyright (C) 2012 Berlin Institute of Technology and Max-Planck-Society +# This software is distributed under BSD 3-clause license (see LICENSE file). # +# Authors: Heiko Strathmann + traindat = '../data/fm_train_real.dat' label_traindat = '../data/label_train_twoclass.dat' diff --git a/examples/undocumented/python/graphical/classifier_gaussian_process_binary_classification.py b/examples/undocumented/python/graphical/classifier_gaussian_process_binary_classification.py index 2d88b9693c6..5b29774f84f 100644 --- a/examples/undocumented/python/graphical/classifier_gaussian_process_binary_classification.py +++ b/examples/undocumented/python/graphical/classifier_gaussian_process_binary_classification.py @@ -1,11 +1,6 @@ +# This software is distributed under BSD 3-clause license (see LICENSE file). # -# This program is free software you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation either version 3 of the License, or -# (at your option) any later version. -# -# Written (W) 2013 Roman Votyakov -# +# Authors: Roman Votyakov from pylab import * from numpy import * diff --git a/examples/undocumented/python/graphical/interactive_clustering_demo.py b/examples/undocumented/python/graphical/interactive_clustering_demo.py index 38c14597cae..8c96a378477 100644 --- a/examples/undocumented/python/graphical/interactive_clustering_demo.py +++ b/examples/undocumented/python/graphical/interactive_clustering_demo.py @@ -1,9 +1,9 @@ """ Shogun demo, based on PyQT Demo by Eli Bendersky -Christian Widmer -Soeren Sonnenburg -License: GPLv3 +# This software is distributed under BSD 3-clause license (see LICENSE file). +# +# Authors: Christian Widmer, Soeren Sonnenburg """ import numpy import sys, os, csv diff --git a/examples/undocumented/python/graphical/interactive_gp_demo.py b/examples/undocumented/python/graphical/interactive_gp_demo.py index 9e1846eb52c..59eae2afa8f 100644 --- a/examples/undocumented/python/graphical/interactive_gp_demo.py +++ b/examples/undocumented/python/graphical/interactive_gp_demo.py @@ -1,21 +1,12 @@ +# This software is distributed under BSD 3-clause license (see LICENSE file). # -# This program is free software you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation either version 3 of the License, or -# (at your option) any later version. -# -# Written (C) 2012 Heiko Strathmann, based on interactive_svm_demo by Christian -# Widmer which itself is based on PyQT Demo by Eli Bendersky -# +# Authors: Heiko Strathmann, Cameron Lai """ Shogun Gaussian processes demo based on interactive SVM demo by Christian \ Widmer and Soeren Sonnenburg which itself is based on PyQT Demo by Eli Bendersky Work to be done on parameter (e.g. kernel width) optimization. - -Heiko Strathmann/Cameron Lai -License: GPLv3 """ import sys, os, csv import scipy as SP diff --git a/examples/undocumented/python/graphical/interactive_kmm_demo.py b/examples/undocumented/python/graphical/interactive_kmm_demo.py index 9eae0833371..ef1f825598e 100644 --- a/examples/undocumented/python/graphical/interactive_kmm_demo.py +++ b/examples/undocumented/python/graphical/interactive_kmm_demo.py @@ -1,12 +1,7 @@ +# This software is distributed under BSD 3-clause license (see LICENSE file). # -# This program is free software you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation either version 3 of the License, or -# (at your option) any later version. -# -# Written (C) 2013 Cameron Lai, based on interactive_svm_demo by Christian -# Widmer which itself is based on PyQT Demo by Eli Bendersky -# +# Authors: Cameron Lai + """ Shogun KMM demo based on interactive SVM demo by Christian \ Widmer and Soeren Sonnenburg which itself is based on PyQT Demo by Eli Bendersky diff --git a/examples/undocumented/python/graphical/statistics_hsic.py b/examples/undocumented/python/graphical/statistics_hsic.py index a0e44f24d3b..b79715a9bf9 100644 --- a/examples/undocumented/python/graphical/statistics_hsic.py +++ b/examples/undocumented/python/graphical/statistics_hsic.py @@ -1,10 +1,6 @@ +# This software is distributed under BSD 3-clause license (see LICENSE file). # -# This program is free software you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation either version 3 of the License, or -# (at your option) any later version. -# -# Written (C) 2012 Heiko Strathmann +# Authors: Heiko Strathmann # from numpy import * from pylab import * diff --git a/examples/undocumented/python/graphical/statistics_linear_time_mmd.py b/examples/undocumented/python/graphical/statistics_linear_time_mmd.py index c2e001dc399..9689f3953c0 100644 --- a/examples/undocumented/python/graphical/statistics_linear_time_mmd.py +++ b/examples/undocumented/python/graphical/statistics_linear_time_mmd.py @@ -1,10 +1,6 @@ +# This software is distributed under BSD 3-clause license (see LICENSE file). # -# This program is free software you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation either version 3 of the License, or -# (at your option) any later version. -# -# Written (C) 2012-2013 Heiko Strathmann +# Authors: Heiko Strathmann # from numpy import * from pylab import * diff --git a/examples/undocumented/python/graphical/statistics_quadratic_time_mmd.py b/examples/undocumented/python/graphical/statistics_quadratic_time_mmd.py index 1fc33ff41f6..ba3fdad84bb 100644 --- a/examples/undocumented/python/graphical/statistics_quadratic_time_mmd.py +++ b/examples/undocumented/python/graphical/statistics_quadratic_time_mmd.py @@ -1,10 +1,6 @@ +# This software is distributed under BSD 3-clause license (see LICENSE file). # -# This program is free software you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation either version 3 of the License, or -# (at your option) any later version. -# -# Written (C) 2012-2013 Heiko Strathmann +# Authors: Heiko Strathmann # from numpy import * from pylab import * diff --git a/examples/undocumented/python/kernel_ssk_string.py b/examples/undocumented/python/kernel_ssk_string.py index bfa5e28ed1a..7a05d0affd5 100644 --- a/examples/undocumented/python/kernel_ssk_string.py +++ b/examples/undocumented/python/kernel_ssk_string.py @@ -1,11 +1,6 @@ +# This software is distributed under BSD 3-clause license (see LICENSE file). # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# Written (W) 2014 Soumyajit De -# +# Authors: Soumyajit De #!/usr/bin/env python diff --git a/examples/undocumented/python/modelselection_grid_search_kernel.py b/examples/undocumented/python/modelselection_grid_search_kernel.py index 3163ed5acce..f5605ef2401 100644 --- a/examples/undocumented/python/modelselection_grid_search_kernel.py +++ b/examples/undocumented/python/modelselection_grid_search_kernel.py @@ -1,11 +1,8 @@ #!/usr/bin/env python # -# This program is free software you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation either version 3 of the License, or -# (at your option) any later version. +# This software is distributed under BSD 3-clause license (see LICENSE file). # -# Written (C) 2012-2013 Heiko Strathmann +# Authors: Heiko Strathmann # from numpy import array diff --git a/examples/undocumented/python/modelselection_grid_search_krr.py b/examples/undocumented/python/modelselection_grid_search_krr.py index dd673c53ede..ef433ea1f0a 100644 --- a/examples/undocumented/python/modelselection_grid_search_krr.py +++ b/examples/undocumented/python/modelselection_grid_search_krr.py @@ -1,13 +1,8 @@ #!/usr/bin/env python # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# Written (W) 2012 Heiko Strathmann -# Copyright (C) 2012 Berlin Institute of Technology and Max-Planck-Society +# This software is distributed under BSD 3-clause license (see LICENSE file). # +# Authors: Heiko Strathmann from numpy import array from numpy.random import seed, rand diff --git a/examples/undocumented/python/modelselection_grid_search_liblinear.py b/examples/undocumented/python/modelselection_grid_search_liblinear.py index dd267c97f32..7554ff9c349 100644 --- a/examples/undocumented/python/modelselection_grid_search_liblinear.py +++ b/examples/undocumented/python/modelselection_grid_search_liblinear.py @@ -1,13 +1,8 @@ #!/usr/bin/env python # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# Written (W) 2011 Heiko Strathmann -# Copyright (C) 2011 Berlin Institute of Technology and Max-Planck-Society +# This software is distributed under BSD 3-clause license (see LICENSE file). # +# Authors: Heiko Strathmann from numpy.random import randn from numpy import * diff --git a/examples/undocumented/python/modelselection_grid_search_libsvr.py b/examples/undocumented/python/modelselection_grid_search_libsvr.py index deaf18a7495..835f14aca26 100644 --- a/examples/undocumented/python/modelselection_grid_search_libsvr.py +++ b/examples/undocumented/python/modelselection_grid_search_libsvr.py @@ -1,13 +1,8 @@ #!/usr/bin/env python + +# This software is distributed under BSD 3-clause license (see LICENSE file). # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# Written (W) 2012 Heiko Strathmann -# Copyright (C) 2012 Berlin Institute of Technology and Max-Planck-Society -# +# Authors: Heiko Strathmann from numpy import array from numpy.random import seed, rand diff --git a/examples/undocumented/python/modelselection_parameter_tree.py b/examples/undocumented/python/modelselection_parameter_tree.py index d1b221bbdb8..4fb1649eefc 100644 --- a/examples/undocumented/python/modelselection_parameter_tree.py +++ b/examples/undocumented/python/modelselection_parameter_tree.py @@ -1,13 +1,8 @@ #!/usr/bin/env python # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# Written (W) 2011-2012 Heiko Strathmann -# Copyright (C) 2011 Berlin Institute of Technology and Max-Planck-Society +# This software is distributed under BSD 3-clause license (see LICENSE file). # +# Authors: Heiko Strathmann parameter_list=[[None]] diff --git a/examples/undocumented/python/modelselection_random_search_liblinear.py b/examples/undocumented/python/modelselection_random_search_liblinear.py index 3eef55e44ba..7b785a43362 100644 --- a/examples/undocumented/python/modelselection_random_search_liblinear.py +++ b/examples/undocumented/python/modelselection_random_search_liblinear.py @@ -1,11 +1,8 @@ #!/usr/bin/env python # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. +# This software is distributed under BSD 3-clause license (see LICENSE file). # -# Copyright (C) 2012 Sergey Lisitsyn +# Authors: Sergey Lisitsyn from numpy import * from numpy.random import randn diff --git a/src/gpl b/src/gpl index e4c3e29dc51..758e5e75d6d 160000 --- a/src/gpl +++ b/src/gpl @@ -1 +1 @@ -Subproject commit e4c3e29dc5143966127fb4fb9cf72c9b906711a3 +Subproject commit 758e5e75d6d7b87edfc15cfd901e75665e74166a diff --git a/src/interfaces/perl/pdl.i b/src/interfaces/perl/pdl.i index c32c8b69ae4..6758099057c 100644 --- a/src/interfaces/perl/pdl.i +++ b/src/interfaces/perl/pdl.i @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sergey Lisitsyn + * Authors: Christian Montanari */ diff --git a/src/interfaces/swig/Classifier.i b/src/interfaces/swig/Classifier.i index 9086d9ac436..887fa642dc6 100644 --- a/src/interfaces/swig/Classifier.i +++ b/src/interfaces/swig/Classifier.i @@ -115,8 +115,8 @@ #ifdef USE_GPL_SHOGUN %include %include -#endif //USE_GPL_SHOGUN %include +#endif //USE_GPL_SHOGUN %include #ifdef USE_GPL_SHOGUN %include diff --git a/src/interfaces/swig/Classifier_includes.i b/src/interfaces/swig/Classifier_includes.i index 6d075c90109..816f51bba0b 100644 --- a/src/interfaces/swig/Classifier_includes.i +++ b/src/interfaces/swig/Classifier_includes.i @@ -28,8 +28,8 @@ #ifdef USE_GPL_SHOGUN #include #include -#endif //USE_GPL_SHOGUN #include +#endif //USE_GPL_SHOGUN #include #ifdef USE_GPL_SHOGUN #include diff --git a/src/interfaces/swig/Multiclass.i b/src/interfaces/swig/Multiclass.i index d24cec187ba..1bc6cc7bb7d 100644 --- a/src/interfaces/swig/Multiclass.i +++ b/src/interfaces/swig/Multiclass.i @@ -55,6 +55,7 @@ %rename(MulticlassLibLinear) CMulticlassLibLinear; %rename(MulticlassSVM) CMulticlassSVM; %rename(MulticlassLibSVM) CMulticlassLibSVM; + %rename(LaRank) CLaRank; %rename(ScatterSVM) CScatterSVM; %rename(GMNPSVM) CGMNPSVM; @@ -122,11 +123,11 @@ namespace shogun %include %include %include +%include #endif // USE_GPL_SHOGUN %include %include %include -%include %include %include %include diff --git a/src/interfaces/swig/Multiclass_includes.i b/src/interfaces/swig/Multiclass_includes.i index 872ea16586f..ca7f7604a24 100644 --- a/src/interfaces/swig/Multiclass_includes.i +++ b/src/interfaces/swig/Multiclass_includes.i @@ -50,10 +50,10 @@ #include #include #include + #include #endif //USE_GPL_SHOGUN #include #include - #include #include #include #include diff --git a/src/shogun/base/DynArray.h b/src/shogun/base/DynArray.h index a0c19c2f0be..cecbf3ce674 100644 --- a/src/shogun/base/DynArray.h +++ b/src/shogun/base/DynArray.h @@ -3,7 +3,7 @@ * * Authors: Soeren Sonnenburg, Heiko Strathmann, Evgeniy Andreev, Thoralf Klein, * Evan Shelhamer, Yuyu Zhang, Weijie Lin, Fernando Iglesias, - * Björn Esser, Sergey Lisitsyn + * Bjoern Esser, Sergey Lisitsyn */ #ifndef _DYNARRAY_H_ diff --git a/src/shogun/base/Parameter.cpp b/src/shogun/base/Parameter.cpp index cc9adeba7b1..205b4848202 100644 --- a/src/shogun/base/Parameter.cpp +++ b/src/shogun/base/Parameter.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Heiko Strathmann, Soeren Sonnenburg, Soumyajit De, Jacob Walker, - * Thoralf Klein, Sergey Lisitsyn, Björn Esser, Viktor Gal, + * Thoralf Klein, Sergey Lisitsyn, Bjoern Esser, Viktor Gal, * Weijie Lin, Yori Zwols, Leon Kuchenbecker */ diff --git a/src/shogun/base/SGObject.h b/src/shogun/base/SGObject.h index 2c5c45cb8f4..cdb73304ab7 100644 --- a/src/shogun/base/SGObject.h +++ b/src/shogun/base/SGObject.h @@ -4,7 +4,7 @@ * Authors: Heiko Strathmann, Soeren Sonnenburg, Sergey Lisitsyn, * Giovanni De Toni, Jacob Walker, Thoralf Klein, Chiyuan Zhang, * Fernando Iglesias, Sanuj Sharma, Roman Votyakov, Yuyu Zhang, - * Viktor Gal, Björn Esser, Evangelos Anagnostopoulos, Pan Deng + * Viktor Gal, Bjoern Esser, Evangelos Anagnostopoulos, Pan Deng */ #ifndef __SGOBJECT_H__ diff --git a/src/shogun/base/Version.cpp b/src/shogun/base/Version.cpp index c87fe6c6671..096c523436d 100644 --- a/src/shogun/base/Version.cpp +++ b/src/shogun/base/Version.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Viktor Gal, Heiko Strathmann, Thoralf Klein, - * Evan Shelhamer, Björn Esser, Evangelos Anagnostopoulos + * Evan Shelhamer, Bjoern Esser, Evangelos Anagnostopoulos */ #include diff --git a/src/shogun/base/init.cpp b/src/shogun/base/init.cpp index 0bf0540e745..9e7f07ee6e7 100644 --- a/src/shogun/base/init.cpp +++ b/src/shogun/base/init.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Thoralf Klein, Pan Deng, Evgeniy Andreev, - * Viktor Gal, Giovanni De Toni, Heiko Strathmann, Björn Esser + * Viktor Gal, Giovanni De Toni, Heiko Strathmann, Bjoern Esser */ #include diff --git a/src/shogun/classifier/LDA.cpp b/src/shogun/classifier/LDA.cpp index 1708f7df7d2..71008896a23 100644 --- a/src/shogun/classifier/LDA.cpp +++ b/src/shogun/classifier/LDA.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Heiko Strathmann, Sergey Lisitsyn, - * Michele Mazzoni, Björn Esser, Fernando Iglesias, Abhijeet Kislay, + * Michele Mazzoni, Bjoern Esser, Fernando Iglesias, Abhijeet Kislay, * Viktor Gal, Evan Shelhamer, Giovanni De Toni, * Christopher Goldsworthy */ diff --git a/src/shogun/classifier/LDA.h b/src/shogun/classifier/LDA.h index bba4f460159..0105008a1bb 100644 --- a/src/shogun/classifier/LDA.h +++ b/src/shogun/classifier/LDA.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Michele Mazzoni, Heiko Strathmann, - * Fernando Iglesias, Sergey Lisitsyn, Abhijeet Kislay, Björn Esser, + * Fernando Iglesias, Sergey Lisitsyn, Abhijeet Kislay, Bjoern Esser, * Christopher Goldsworthy, Sanuj Sharma */ diff --git a/src/shogun/classifier/NearestCentroid.cpp b/src/shogun/classifier/NearestCentroid.cpp index 4bffb093ac2..fb353be373c 100644 --- a/src/shogun/classifier/NearestCentroid.cpp +++ b/src/shogun/classifier/NearestCentroid.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Philippe Tillet, Soeren Sonnenburg, Björn Esser, Sergey Lisitsyn + * Authors: Philippe Tillet, Soeren Sonnenburg, Bjoern Esser, Sergey Lisitsyn */ #include diff --git a/src/shogun/classifier/NearestCentroid.h b/src/shogun/classifier/NearestCentroid.h index b555af35e59..36895901a94 100644 --- a/src/shogun/classifier/NearestCentroid.h +++ b/src/shogun/classifier/NearestCentroid.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Philippe Tillet, Sergey Lisitsyn, Viktor Gal, Fernando Iglesias, - * Björn Esser, Soeren Sonnenburg, Saurabh Goyal + * Bjoern Esser, Soeren Sonnenburg, Saurabh Goyal */ #ifndef _NEAREST_CENTROID_H__ diff --git a/src/shogun/classifier/mkl/MKL.cpp b/src/shogun/classifier/mkl/MKL.cpp index cab3ccae7a4..27262ef8187 100644 --- a/src/shogun/classifier/mkl/MKL.cpp +++ b/src/shogun/classifier/mkl/MKL.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Heiko Strathmann, Sergey Lisitsyn, Viktor Gal, - * Fernando Iglesias, Giovanni De Toni, Evan Shelhamer, Björn Esser, + * Fernando Iglesias, Giovanni De Toni, Evan Shelhamer, Bjoern Esser, * Evangelos Anagnostopoulos, Leon Kuchenbecker, Saurabh Goyal */ diff --git a/src/shogun/classifier/mkl/MKL.h b/src/shogun/classifier/mkl/MKL.h index b7c434514d8..34093018ca4 100644 --- a/src/shogun/classifier/mkl/MKL.h +++ b/src/shogun/classifier/mkl/MKL.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Heiko Strathmann, Viktor Gal, Evan Shelhamer, - * Sergey Lisitsyn, Björn Esser, Leon Kuchenbecker + * Sergey Lisitsyn, Bjoern Esser, Leon Kuchenbecker */ #ifndef __MKL_H__ #define __MKL_H__ diff --git a/src/shogun/classifier/mkl/MKLMulticlass.cpp b/src/shogun/classifier/mkl/MKLMulticlass.cpp index a3f8f7cd7e5..35f4cb21738 100644 --- a/src/shogun/classifier/mkl/MKLMulticlass.cpp +++ b/src/shogun/classifier/mkl/MKLMulticlass.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Chiyuan Zhang, Giovanni De Toni, - * Heiko Strathmann, Sergey Lisitsyn, Björn Esser, Saurabh Goyal + * Heiko Strathmann, Sergey Lisitsyn, Bjoern Esser, Saurabh Goyal */ #include diff --git a/src/shogun/classifier/mkl/MKLMulticlass.h b/src/shogun/classifier/mkl/MKLMulticlass.h index a0cebe440d2..4138b1bd93f 100644 --- a/src/shogun/classifier/mkl/MKLMulticlass.h +++ b/src/shogun/classifier/mkl/MKLMulticlass.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Chiyuan Zhang, Viktor Gal, - * Björn Esser, Saurabh Goyal + * Bjoern Esser, Saurabh Goyal */ #ifndef MKLMulticlass_H_ diff --git a/src/shogun/classifier/mkl/MKLMulticlassGLPK.h b/src/shogun/classifier/mkl/MKLMulticlassGLPK.h index b816681e19b..5075ba830de 100644 --- a/src/shogun/classifier/mkl/MKLMulticlassGLPK.h +++ b/src/shogun/classifier/mkl/MKLMulticlassGLPK.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Saurabh Goyal, Chiyuan Zhang, Björn Esser + * Authors: Soeren Sonnenburg, Saurabh Goyal, Chiyuan Zhang, Bjoern Esser */ #ifndef MKLMulticlassGLPK_H_ diff --git a/src/shogun/classifier/mkl/MKLMulticlassGradient.cpp b/src/shogun/classifier/mkl/MKLMulticlassGradient.cpp index e271fbba32f..f0c93593c1d 100644 --- a/src/shogun/classifier/mkl/MKLMulticlassGradient.cpp +++ b/src/shogun/classifier/mkl/MKLMulticlassGradient.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Björn Esser, Saurabh Goyal, Chiyuan Zhang, + * Authors: Soeren Sonnenburg, Bjoern Esser, Saurabh Goyal, Chiyuan Zhang, * Viktor Gal */ diff --git a/src/shogun/classifier/mkl/MKLMulticlassGradient.h b/src/shogun/classifier/mkl/MKLMulticlassGradient.h index fbb91983cb1..60c8a65724e 100644 --- a/src/shogun/classifier/mkl/MKLMulticlassGradient.h +++ b/src/shogun/classifier/mkl/MKLMulticlassGradient.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Saurabh Goyal, Chiyuan Zhang, Björn Esser + * Authors: Soeren Sonnenburg, Saurabh Goyal, Chiyuan Zhang, Bjoern Esser */ #ifndef MKLMulticlassGRADIENT_H_ diff --git a/src/shogun/classifier/mkl/MKLMulticlassOptimizationBase.cpp b/src/shogun/classifier/mkl/MKLMulticlassOptimizationBase.cpp index 9bd041f5c8a..13f36966cb0 100644 --- a/src/shogun/classifier/mkl/MKLMulticlassOptimizationBase.cpp +++ b/src/shogun/classifier/mkl/MKLMulticlassOptimizationBase.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Thoralf Klein, Soeren Sonnenburg, Björn Esser, Chiyuan Zhang + * Authors: Thoralf Klein, Soeren Sonnenburg, Bjoern Esser, Chiyuan Zhang */ #include "MKLMulticlassOptimizationBase.h" diff --git a/src/shogun/classifier/mkl/MKLMulticlassOptimizationBase.h b/src/shogun/classifier/mkl/MKLMulticlassOptimizationBase.h index c39f437b79a..e62d26e05aa 100644 --- a/src/shogun/classifier/mkl/MKLMulticlassOptimizationBase.h +++ b/src/shogun/classifier/mkl/MKLMulticlassOptimizationBase.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Björn Esser, Chiyuan Zhang + * Authors: Soeren Sonnenburg, Bjoern Esser, Chiyuan Zhang */ #ifndef MKLMulticlassOPTIMIZATIONBASE_H_ diff --git a/src/shogun/classifier/svm/LibLinear.cpp b/src/shogun/classifier/svm/LibLinear.cpp index 2d87a52f460..48e884ab2d1 100644 --- a/src/shogun/classifier/svm/LibLinear.cpp +++ b/src/shogun/classifier/svm/LibLinear.cpp @@ -3,7 +3,7 @@ * * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Giovanni De Toni, Liang Pang, * Heiko Strathmann, Weijie Lin, Youssef Emad El-Din, Thoralf Klein, - * Björn Esser + * Bjoern Esser */ #include diff --git a/src/shogun/classifier/svm/NewtonSVM.h b/src/shogun/classifier/svm/NewtonSVM.h index bbe61be55e5..14f8dd5f6d2 100644 --- a/src/shogun/classifier/svm/NewtonSVM.h +++ b/src/shogun/classifier/svm/NewtonSVM.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Harshit Syal, Fernando Iglesias, Björn Esser, + * Authors: Soeren Sonnenburg, Harshit Syal, Fernando Iglesias, Bjoern Esser, * Sergey Lisitsyn */ diff --git a/src/shogun/classifier/svm/OnlineLibLinear.h b/src/shogun/classifier/svm/OnlineLibLinear.h index 1d2c7e0682e..2c1b20d2c6f 100644 --- a/src/shogun/classifier/svm/OnlineLibLinear.h +++ b/src/shogun/classifier/svm/OnlineLibLinear.h @@ -3,7 +3,7 @@ * * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Heiko Strathmann, Chiyuan Zhang, * Thoralf Klein, Shashwat Lal Das, Viktor Gal, Fernando Iglesias, - * Björn Esser + * Bjoern Esser */ #ifndef _ONLINELIBLINEAR_H__ diff --git a/src/shogun/classifier/svm/OnlineSVMSGD.cpp b/src/shogun/classifier/svm/OnlineSVMSGD.cpp index 7732caaf7aa..4abfe431b1d 100644 --- a/src/shogun/classifier/svm/OnlineSVMSGD.cpp +++ b/src/shogun/classifier/svm/OnlineSVMSGD.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Shashwat Lal Das, Soeren Sonnenburg, Giovanni De Toni, Sanuj Sharma, - * Thoralf Klein, Viktor Gal, Evan Shelhamer, Björn Esser + * Thoralf Klein, Viktor Gal, Evan Shelhamer, Bjoern Esser */ #include diff --git a/src/shogun/classifier/svm/OnlineSVMSGD.h b/src/shogun/classifier/svm/OnlineSVMSGD.h index 60ef10bb53a..1f7616c9f45 100644 --- a/src/shogun/classifier/svm/OnlineSVMSGD.h +++ b/src/shogun/classifier/svm/OnlineSVMSGD.h @@ -4,7 +4,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Shashwat Lal Das, Sergey Lisitsyn, - * Fernando Iglesias, Evan Shelhamer, Björn Esser + * Fernando Iglesias, Evan Shelhamer, Bjoern Esser */ #include diff --git a/src/shogun/classifier/svm/SGDQN.cpp b/src/shogun/classifier/svm/SGDQN.cpp index 9ec72a0ec95..9e4cd9c9b49 100644 --- a/src/shogun/classifier/svm/SGDQN.cpp +++ b/src/shogun/classifier/svm/SGDQN.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Shashwat Lal Das, Giovanni De Toni, - * Sergey Lisitsyn, Thoralf Klein, Evan Shelhamer, Björn Esser + * Sergey Lisitsyn, Thoralf Klein, Evan Shelhamer, Bjoern Esser */ #include diff --git a/src/shogun/classifier/svm/SGDQN.h b/src/shogun/classifier/svm/SGDQN.h index bcf67f58a09..4cfd546b8fa 100644 --- a/src/shogun/classifier/svm/SGDQN.h +++ b/src/shogun/classifier/svm/SGDQN.h @@ -5,7 +5,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Shashwat Lal Das, Sergey Lisitsyn, - * Fernando Iglesias, Björn Esser + * Fernando Iglesias, Bjoern Esser */ #include diff --git a/src/shogun/classifier/svm/SVM.h b/src/shogun/classifier/svm/SVM.h index 6cb402d2925..2dde4d66e64 100644 --- a/src/shogun/classifier/svm/SVM.h +++ b/src/shogun/classifier/svm/SVM.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Chiyuan Zhang, Heiko Strathmann, Evgeniy Andreev, - * Weijie Lin, Fernando Iglesias, Björn Esser, Sergey Lisitsyn + * Weijie Lin, Fernando Iglesias, Bjoern Esser, Sergey Lisitsyn */ #ifndef _SVM_H___ diff --git a/src/shogun/classifier/svm/SVMLightOneClass.cpp b/src/shogun/classifier/svm/SVMLightOneClass.cpp index 6dcf1a63767..930fd885c40 100644 --- a/src/shogun/classifier/svm/SVMLightOneClass.cpp +++ b/src/shogun/classifier/svm/SVMLightOneClass.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Heiko Strathmann, Sergey Lisitsyn, Viktor Gal, - * Björn Esser, Evangelos Anagnostopoulos + * Bjoern Esser, Evangelos Anagnostopoulos */ #include diff --git a/src/shogun/classifier/svm/SVMOcas.h b/src/shogun/classifier/svm/SVMOcas.h index 0f04ebcba55..bd276e73c07 100644 --- a/src/shogun/classifier/svm/SVMOcas.h +++ b/src/shogun/classifier/svm/SVMOcas.h @@ -1,12 +1,8 @@ /* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Written (W) 2007-2009 Vojtech Franc - * Written (W) 2007-2009 Soeren Sonnenburg - * Copyright (C) 2007-2009 Fraunhofer Institute FIRST and Max-Planck-Society + * Authors: Vojtech Franc, Soeren Sonnenburg, Sergey Lisitsyn, Heiko Strathmann, + * Viktor Gal, Fernando Iglesias, Bjoern Esser */ diff --git a/src/shogun/classifier/svm/SVMSGD.cpp b/src/shogun/classifier/svm/SVMSGD.cpp deleted file mode 100644 index bad90f8b9fc..00000000000 --- a/src/shogun/classifier/svm/SVMSGD.cpp +++ /dev/null @@ -1,226 +0,0 @@ -/* - SVM with stochastic gradient - Copyright (C) 2007- Leon Bottou - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - $Id: svmsgd.cpp,v 1.13 2007/10/02 20:40:06 cvs Exp $ - - Shogun adjustments (w) 2008-2009 Soeren Sonnenburg -*/ - -#include -#include -#include -#include -#include -#include -#include - -using namespace shogun; - -CSVMSGD::CSVMSGD() -: CLinearMachine() -{ - init(); -} - -CSVMSGD::CSVMSGD(float64_t C) -: CLinearMachine() -{ - init(); - - C1=C; - C2=C; -} - -CSVMSGD::CSVMSGD(float64_t C, CDotFeatures* traindat, CLabels* trainlab) -: CLinearMachine() -{ - init(); - C1=C; - C2=C; - - set_features(traindat); - set_labels(trainlab); -} - -CSVMSGD::~CSVMSGD() -{ - SG_UNREF(loss); -} - -void CSVMSGD::set_loss_function(CLossFunction* loss_func) -{ - SG_REF(loss_func); - SG_UNREF(loss); - loss=loss_func; -} - -bool CSVMSGD::train_machine(CFeatures* data) -{ - // allocate memory for w and initialize everyting w and bias with 0 - ASSERT(m_labels) - ASSERT(m_labels->get_label_type() == LT_BINARY) - - if (data) - { - if (!data->has_property(FP_DOT)) - SG_ERROR("Specified features are not of type CDotFeatures\n") - set_features((CDotFeatures*) data); - } - - ASSERT(features) - - int32_t num_train_labels=m_labels->get_num_labels(); - int32_t num_vec=features->get_num_vectors(); - - ASSERT(num_vec==num_train_labels) - ASSERT(num_vec>0) - - SGVector w(features->get_dim_feature_space()); - w.zero(); - bias=0; - - float64_t lambda= 1.0/(C1*num_vec); - - // Shift t in order to have a - // reasonable initial learning rate. - // This assumes |x| \approx 1. - float64_t maxw = 1.0 / sqrt(lambda); - float64_t typw = sqrt(maxw); - float64_t eta0 = typw / CMath::max(1.0,-loss->first_derivative(-typw,1)); - t = 1 / (eta0 * lambda); - - SG_INFO("lambda=%f, epochs=%d, eta0=%f\n", lambda, epochs, eta0) - - - //do the sgd - calibrate(); - - SG_INFO("Training on %d vectors\n", num_vec) - - ELossType loss_type = loss->get_loss_type(); - bool is_log_loss = false; - if ((loss_type == L_LOGLOSS) || (loss_type == L_LOGLOSSMARGIN)) - is_log_loss = true; - - for (int32_t e = 0; e < epochs && (!cancel_computation()); e++) - { - count = skip; - for (int32_t i=0; iget_label(i); - float64_t z = y * (features->dense_dot(i, w.vector, w.vlen) + bias); - - if (z < 1 || is_log_loss) - { - float64_t etd = -eta * loss->first_derivative(z,1); - features->add_to_dense_vec(etd * y / wscale, i, w.vector, w.vlen); - - if (use_bias) - { - if (use_regularized_bias) - bias *= 1 - eta * lambda * bscale; - bias += etd * y * bscale; - } - } - - if (--count <= 0) - { - float64_t r = 1 - eta * lambda * skip; - if (r < 0.8) - r = pow(1 - eta * lambda, skip); - linalg::scale(w, w, r); - count = skip; - } - t++; - } - } - - float64_t wnorm = linalg::dot(w, w); - SG_INFO("Norm: %.6f, Bias: %.6f\n", wnorm, bias) - - set_w(w); - - return true; -} - -void CSVMSGD::calibrate() -{ - ASSERT(features) - int32_t num_vec=features->get_num_vectors(); - int32_t c_dim=features->get_dim_feature_space(); - - ASSERT(num_vec>0) - ASSERT(c_dim>0) - - float64_t* c=SG_MALLOC(float64_t, c_dim); - memset(c, 0, c_dim*sizeof(float64_t)); - - SG_INFO("Estimating sparsity and bscale num_vec=%d num_feat=%d.\n", num_vec, c_dim) - - // compute average gradient size - int32_t n = 0; - float64_t m = 0; - float64_t r = 0; - - for (int32_t j=0; jget_nnz_features_for_vector(j); - features->add_to_dense_vec(1, j, c, c_dim, true); - - //waste cpu cycles for readability - //(only changed dims need checking) - m=CMath::max(c, c_dim); - } - - // bias update scaling - bscale = 0.5*m/n; - - // compute weight decay skip - skip = (int32_t) ((16 * n * c_dim) / r); - SG_INFO("using %d examples. skip=%d bscale=%.6f\n", n, skip, bscale) - - SG_FREE(c); -} - -void CSVMSGD::init() -{ - t=1; - C1=1; - C2=1; - wscale=1; - bscale=1; - epochs=5; - skip=1000; - count=1000; - use_bias=true; - - use_regularized_bias=false; - - loss=new CHingeLoss(); - SG_REF(loss); - - m_parameters->add(&C1, "C1", "Cost constant 1."); - m_parameters->add(&C2, "C2", "Cost constant 2."); - m_parameters->add(&wscale, "wscale", "W scale"); - m_parameters->add(&bscale, "bscale", "b scale"); - m_parameters->add(&epochs, "epochs", "epochs"); - m_parameters->add(&skip, "skip", "skip"); - m_parameters->add(&count, "count", "count"); - m_parameters->add(&use_bias, "use_bias", "Indicates if bias is used."); - m_parameters->add(&use_regularized_bias, "use_regularized_bias", "Indicates if bias is regularized."); -} diff --git a/src/shogun/classifier/svm/SVMSGD.h b/src/shogun/classifier/svm/SVMSGD.h deleted file mode 100644 index d8158f0857e..00000000000 --- a/src/shogun/classifier/svm/SVMSGD.h +++ /dev/null @@ -1,174 +0,0 @@ -#ifndef _SVMSGD_H___ -#define _SVMSGD_H___ - -/* - SVM with stochastic gradient - Copyright (C) 2007- Leon Bottou - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - Shogun adjustments (w) 2008 Soeren Sonnenburg -*/ - -#include - -#include -#include -#include -#include -#include - -namespace shogun -{ -/** @brief class SVMSGD */ -class CSVMSGD : public CLinearMachine -{ - public: - - /** problem type */ - MACHINE_PROBLEM_TYPE(PT_BINARY); - - /** default constructor */ - CSVMSGD(); - - /** constructor - * - * @param C constant C - */ - CSVMSGD(float64_t C); - - /** constructor - * - * @param C constant C - * @param traindat training features - * @param trainlab labels for training features - */ - CSVMSGD( - float64_t C, CDotFeatures* traindat, - CLabels* trainlab); - - virtual ~CSVMSGD(); - - /** get classifier type - * - * @return classifier type SVMOCAS - */ - virtual EMachineType get_classifier_type() { return CT_SVMSGD; } - - /** set C - * - * @param c_neg new C constant for negatively labeled examples - * @param c_pos new C constant for positively labeled examples - * - */ - inline void set_C(float64_t c_neg, float64_t c_pos) { C1=c_neg; C2=c_pos; } - - /** get C1 - * - * @return C1 - */ - inline float64_t get_C1() { return C1; } - - /** get C2 - * - * @return C2 - */ - inline float64_t get_C2() { return C2; } - - /** set epochs - * - * @param e new number of training epochs - */ - inline void set_epochs(int32_t e) { epochs=e; } - - /** get epochs - * - * @return the number of training epochs - */ - inline int32_t get_epochs() { return epochs; } - - /** set if bias shall be enabled - * - * @param enable_bias if bias shall be enabled - */ - inline void set_bias_enabled(bool enable_bias) { use_bias=enable_bias; } - - /** check if bias is enabled - * - * @return if bias is enabled - */ - inline bool get_bias_enabled() { return use_bias; } - - /** set if regularized bias shall be enabled - * - * @param enable_bias if regularized bias shall be enabled - */ - inline void set_regularized_bias_enabled(bool enable_bias) { use_regularized_bias=enable_bias; } - - /** check if regularized bias is enabled - * - * @return if regularized bias is enabled - */ - inline bool get_regularized_bias_enabled() { return use_regularized_bias; } - - /** Set the loss function to use - * - * @param loss_func object derived from CLossFunction - */ - void set_loss_function(CLossFunction* loss_func); - - /** Return the loss function - * - * @return loss function as CLossFunction* - */ - inline CLossFunction* get_loss_function() { SG_REF(loss); return loss; } - - /** @return object name */ - virtual const char* get_name() const { return "SVMSGD"; } - - protected: - /** calibrate */ - void calibrate(); - - /** train classifier - * - * @param data training data (parameter can be avoided if distance or - * kernel-based classifiers are used and distance/kernels are - * initialized with train data) - * - * @return whether training was successful - */ - virtual bool train_machine(CFeatures* data=NULL); - - private: - void init(); - - private: - float64_t t; - float64_t C1; - float64_t C2; - float64_t wscale; - float64_t bscale; - int32_t epochs; - int32_t skip; - int32_t count; - - bool use_bias; - bool use_regularized_bias; - - CLossFunction* loss; -}; -} -#endif diff --git a/src/shogun/clustering/Hierarchical.h b/src/shogun/clustering/Hierarchical.h index 7cb10919255..b4036199ef7 100644 --- a/src/shogun/clustering/Hierarchical.h +++ b/src/shogun/clustering/Hierarchical.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Heiko Strathmann, Yuyu Zhang, - * Björn Esser, Saurabh Goyal + * Bjoern Esser, Saurabh Goyal */ #ifndef _HIERARCHICAL_H__ diff --git a/src/shogun/clustering/KMeans.cpp b/src/shogun/clustering/KMeans.cpp index 525e89d3cf2..d41563251a7 100644 --- a/src/shogun/clustering/KMeans.cpp +++ b/src/shogun/clustering/KMeans.cpp @@ -3,7 +3,7 @@ * * Authors: Heiko Strathmann, Soeren Sonnenburg, Saurabh Mahindre, * Sergey Lisitsyn, Evan Shelhamer, Soumyajit De, Fernando Iglesias, - * Björn Esser, parijat + * Bjoern Esser, parijat */ #include diff --git a/src/shogun/clustering/KMeans.h b/src/shogun/clustering/KMeans.h index 15bb0180c0b..9ffdb55bc08 100644 --- a/src/shogun/clustering/KMeans.h +++ b/src/shogun/clustering/KMeans.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Heiko Strathmann, Soeren Sonnenburg, Saurabh Mahindre, - * Sergey Lisitsyn, Björn Esser, Evan Shelhamer, Yuyu Zhang, + * Sergey Lisitsyn, Bjoern Esser, Evan Shelhamer, Yuyu Zhang, * Fernando Iglesias, parijat */ diff --git a/src/shogun/converter/DiffusionMaps.h b/src/shogun/converter/DiffusionMaps.h index b7d5dba603f..aa6bac287dd 100644 --- a/src/shogun/converter/DiffusionMaps.h +++ b/src/shogun/converter/DiffusionMaps.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sergey Lisitsyn, Heiko Strathmann, Evan Shelhamer, Björn Esser + * Authors: Sergey Lisitsyn, Heiko Strathmann, Evan Shelhamer, Bjoern Esser */ #ifndef DIFFUSIONMAPS_H_ diff --git a/src/shogun/converter/FactorAnalysis.h b/src/shogun/converter/FactorAnalysis.h index 98409e50f5f..f299cb1a84e 100644 --- a/src/shogun/converter/FactorAnalysis.h +++ b/src/shogun/converter/FactorAnalysis.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Björn Esser, Kunal Arora, Heiko Strathmann, Fernando Iglesias, + * Authors: Bjoern Esser, Kunal Arora, Heiko Strathmann, Fernando Iglesias, * Sergey Lisitsyn, Soeren Sonnenburg */ diff --git a/src/shogun/converter/HashedDocConverter.cpp b/src/shogun/converter/HashedDocConverter.cpp index d048f63f3c5..6ca9e33d21a 100644 --- a/src/shogun/converter/HashedDocConverter.cpp +++ b/src/shogun/converter/HashedDocConverter.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Evangelos Anagnostopoulos, Sergey Lisitsyn, Björn Esser + * Authors: Evangelos Anagnostopoulos, Sergey Lisitsyn, Bjoern Esser */ #include diff --git a/src/shogun/converter/HashedDocConverter.h b/src/shogun/converter/HashedDocConverter.h index 215b597fbf8..c94eaa133ea 100644 --- a/src/shogun/converter/HashedDocConverter.h +++ b/src/shogun/converter/HashedDocConverter.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Evangelos Anagnostopoulos, Fernando Iglesias, Yuyu Zhang, - * Björn Esser + * Bjoern Esser */ #ifndef _HASHEDDOCCONVERTER__H__ diff --git a/src/shogun/converter/Isomap.cpp b/src/shogun/converter/Isomap.cpp index d4512a4acd7..1ef2076e815 100644 --- a/src/shogun/converter/Isomap.cpp +++ b/src/shogun/converter/Isomap.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Sergey Lisitsyn, Soeren Sonnenburg, Evan Shelhamer, - * Heiko Strathmann, Björn Esser + * Heiko Strathmann, Bjoern Esser */ #include diff --git a/src/shogun/converter/LinearLocalTangentSpaceAlignment.h b/src/shogun/converter/LinearLocalTangentSpaceAlignment.h index b13ecae58e3..764a178ce44 100644 --- a/src/shogun/converter/LinearLocalTangentSpaceAlignment.h +++ b/src/shogun/converter/LinearLocalTangentSpaceAlignment.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sergey Lisitsyn, Heiko Strathmann, Evan Shelhamer, Björn Esser + * Authors: Sergey Lisitsyn, Heiko Strathmann, Evan Shelhamer, Bjoern Esser */ #ifndef LINEARLOCALTANGENTSPACEALIGNMENT_H_ diff --git a/src/shogun/converter/LocalityPreservingProjections.cpp b/src/shogun/converter/LocalityPreservingProjections.cpp index 9d077c89f37..9771db7e400 100644 --- a/src/shogun/converter/LocalityPreservingProjections.cpp +++ b/src/shogun/converter/LocalityPreservingProjections.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Sergey Lisitsyn, Heiko Strathmann, Soeren Sonnenburg, - * Evan Shelhamer, Björn Esser + * Evan Shelhamer, Bjoern Esser */ #include diff --git a/src/shogun/converter/ManifoldSculpting.cpp b/src/shogun/converter/ManifoldSculpting.cpp index e4350ec3a43..24378af0269 100644 --- a/src/shogun/converter/ManifoldSculpting.cpp +++ b/src/shogun/converter/ManifoldSculpting.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Heiko Strathmann, Vladislav Horbatiuk, Björn Esser + * Authors: Heiko Strathmann, Vladislav Horbatiuk, Bjoern Esser */ #include diff --git a/src/shogun/converter/ManifoldSculpting.h b/src/shogun/converter/ManifoldSculpting.h index 8ab9cf99fb5..ec13b6bfe8f 100644 --- a/src/shogun/converter/ManifoldSculpting.h +++ b/src/shogun/converter/ManifoldSculpting.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Heiko Strathmann, Vladislav Horbatiuk, Soeren Sonnenburg, - * Björn Esser + * Bjoern Esser */ #ifndef MANIFOLDSCULPTING_H_ diff --git a/src/shogun/converter/MultidimensionalScaling.cpp b/src/shogun/converter/MultidimensionalScaling.cpp index 22a225d56c9..183c31c8d71 100644 --- a/src/shogun/converter/MultidimensionalScaling.cpp +++ b/src/shogun/converter/MultidimensionalScaling.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Sergey Lisitsyn, Soeren Sonnenburg, Heiko Strathmann, - * Evan Shelhamer, Chiyuan Zhang, Björn Esser + * Evan Shelhamer, Chiyuan Zhang, Bjoern Esser */ #include diff --git a/src/shogun/converter/StochasticProximityEmbedding.cpp b/src/shogun/converter/StochasticProximityEmbedding.cpp index f0142a2bc5a..ed0c196e465 100644 --- a/src/shogun/converter/StochasticProximityEmbedding.cpp +++ b/src/shogun/converter/StochasticProximityEmbedding.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Fernando Iglesias, Soeren Sonnenburg, Sergey Lisitsyn, - * Chiyuan Zhang, Heiko Strathmann, Björn Esser + * Chiyuan Zhang, Heiko Strathmann, Bjoern Esser */ #include diff --git a/src/shogun/converter/StochasticProximityEmbedding.h b/src/shogun/converter/StochasticProximityEmbedding.h index cbd898de659..b7faab6d6e1 100644 --- a/src/shogun/converter/StochasticProximityEmbedding.h +++ b/src/shogun/converter/StochasticProximityEmbedding.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Fernando Iglesias, Sergey Lisitsyn, Chiyuan Zhang, Heiko Strathmann, - * Björn Esser, Soeren Sonnenburg + * Bjoern Esser, Soeren Sonnenburg */ #ifndef STOCHASTICPROXIMITYEMBEDDING_H_ diff --git a/src/shogun/converter/TDistributedStochasticNeighborEmbedding.cpp b/src/shogun/converter/TDistributedStochasticNeighborEmbedding.cpp index fe77920f22a..66919f4ccae 100644 --- a/src/shogun/converter/TDistributedStochasticNeighborEmbedding.cpp +++ b/src/shogun/converter/TDistributedStochasticNeighborEmbedding.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Heiko Strathmann, Vladislav Horbatiuk, Björn Esser + * Authors: Heiko Strathmann, Vladislav Horbatiuk, Bjoern Esser */ #include diff --git a/src/shogun/converter/TDistributedStochasticNeighborEmbedding.h b/src/shogun/converter/TDistributedStochasticNeighborEmbedding.h index 4a5a7f15f24..63425c1b243 100644 --- a/src/shogun/converter/TDistributedStochasticNeighborEmbedding.h +++ b/src/shogun/converter/TDistributedStochasticNeighborEmbedding.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Heiko Strathmann, Vladislav Horbatiuk, Soeren Sonnenburg, - * Björn Esser + * Bjoern Esser */ #ifndef TDISTRIBUTEDSTOCHASTICNEIGHBOREMBEDDING_H_ diff --git a/src/shogun/converter/ica/FFSep.cpp b/src/shogun/converter/ica/FFSep.cpp index 404734c7d34..737bd2cfd68 100644 --- a/src/shogun/converter/ica/FFSep.cpp +++ b/src/shogun/converter/ica/FFSep.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Kevin Hughes, Heiko Strathmann, Björn Esser + * Authors: Kevin Hughes, Heiko Strathmann, Bjoern Esser */ #include diff --git a/src/shogun/converter/ica/FFSep.h b/src/shogun/converter/ica/FFSep.h index b77068a6c9b..b3218ce1771 100644 --- a/src/shogun/converter/ica/FFSep.h +++ b/src/shogun/converter/ica/FFSep.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Kevin Hughes, Heiko Strathmann, Björn Esser + * Authors: Kevin Hughes, Heiko Strathmann, Bjoern Esser */ #ifndef FFSEP_H_ diff --git a/src/shogun/converter/ica/FastICA.cpp b/src/shogun/converter/ica/FastICA.cpp index 299a5f2816c..70affd5559e 100644 --- a/src/shogun/converter/ica/FastICA.cpp +++ b/src/shogun/converter/ica/FastICA.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Kevin Hughes, Weijie Lin, Heiko Strathmann, Björn Esser + * Authors: Kevin Hughes, Weijie Lin, Heiko Strathmann, Bjoern Esser */ #include diff --git a/src/shogun/converter/ica/FastICA.h b/src/shogun/converter/ica/FastICA.h index b6574322802..5f1620ea510 100644 --- a/src/shogun/converter/ica/FastICA.h +++ b/src/shogun/converter/ica/FastICA.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Kevin Hughes, Heiko Strathmann, Björn Esser + * Authors: Kevin Hughes, Heiko Strathmann, Bjoern Esser */ #ifndef FASTICA_H_ diff --git a/src/shogun/converter/ica/ICAConverter.cpp b/src/shogun/converter/ica/ICAConverter.cpp index 698a35745f7..92718f89b65 100644 --- a/src/shogun/converter/ica/ICAConverter.cpp +++ b/src/shogun/converter/ica/ICAConverter.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Kevin Hughes, Heiko Strathmann, Björn Esser + * Authors: Kevin Hughes, Heiko Strathmann, Bjoern Esser */ #include diff --git a/src/shogun/converter/ica/ICAConverter.h b/src/shogun/converter/ica/ICAConverter.h index 2d2e06cd9e1..f0df6901ea1 100644 --- a/src/shogun/converter/ica/ICAConverter.h +++ b/src/shogun/converter/ica/ICAConverter.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Kevin Hughes, Heiko Strathmann, Thoralf Klein, Björn Esser + * Authors: Kevin Hughes, Heiko Strathmann, Thoralf Klein, Bjoern Esser */ #ifndef ICACONVERTER_H_ diff --git a/src/shogun/converter/ica/Jade.cpp b/src/shogun/converter/ica/Jade.cpp index b8b52924085..75fce0020ba 100644 --- a/src/shogun/converter/ica/Jade.cpp +++ b/src/shogun/converter/ica/Jade.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Kevin Hughes, Heiko Strathmann, Björn Esser + * Authors: Kevin Hughes, Heiko Strathmann, Bjoern Esser */ #include diff --git a/src/shogun/converter/ica/Jade.h b/src/shogun/converter/ica/Jade.h index a23c9dc169d..cbdfcec593e 100644 --- a/src/shogun/converter/ica/Jade.h +++ b/src/shogun/converter/ica/Jade.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Kevin Hughes, Heiko Strathmann, Björn Esser + * Authors: Kevin Hughes, Heiko Strathmann, Bjoern Esser */ #ifndef JADE_H_ diff --git a/src/shogun/converter/ica/JediSep.cpp b/src/shogun/converter/ica/JediSep.cpp index f34fe329c6d..312621dbcd0 100644 --- a/src/shogun/converter/ica/JediSep.cpp +++ b/src/shogun/converter/ica/JediSep.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Kevin Hughes, Heiko Strathmann, Björn Esser + * Authors: Kevin Hughes, Heiko Strathmann, Bjoern Esser */ #include diff --git a/src/shogun/converter/ica/JediSep.h b/src/shogun/converter/ica/JediSep.h index d9001c75f76..6d8a6cc1331 100644 --- a/src/shogun/converter/ica/JediSep.h +++ b/src/shogun/converter/ica/JediSep.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Kevin Hughes, Heiko Strathmann, Björn Esser + * Authors: Kevin Hughes, Heiko Strathmann, Bjoern Esser */ #ifndef JEDISEP_H_ diff --git a/src/shogun/converter/ica/SOBI.cpp b/src/shogun/converter/ica/SOBI.cpp index a0579e6258f..9bff3cf5080 100644 --- a/src/shogun/converter/ica/SOBI.cpp +++ b/src/shogun/converter/ica/SOBI.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Kevin Hughes, Heiko Strathmann, Björn Esser + * Authors: Kevin Hughes, Heiko Strathmann, Bjoern Esser */ #include diff --git a/src/shogun/converter/ica/SOBI.h b/src/shogun/converter/ica/SOBI.h index 01235854b01..4a4dd9475de 100644 --- a/src/shogun/converter/ica/SOBI.h +++ b/src/shogun/converter/ica/SOBI.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Kevin Hughes, Heiko Strathmann, Björn Esser + * Authors: Kevin Hughes, Heiko Strathmann, Bjoern Esser */ #ifndef SOBI_H_ diff --git a/src/shogun/converter/ica/UWedgeSep.cpp b/src/shogun/converter/ica/UWedgeSep.cpp index ef0867024ca..1bc06ea0418 100644 --- a/src/shogun/converter/ica/UWedgeSep.cpp +++ b/src/shogun/converter/ica/UWedgeSep.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Kevin Hughes, Heiko Strathmann, Björn Esser + * Authors: Kevin Hughes, Heiko Strathmann, Bjoern Esser */ #include diff --git a/src/shogun/converter/ica/UWedgeSep.h b/src/shogun/converter/ica/UWedgeSep.h index 48dbc61252d..2c09a8ecc99 100644 --- a/src/shogun/converter/ica/UWedgeSep.h +++ b/src/shogun/converter/ica/UWedgeSep.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Kevin Hughes, Heiko Strathmann, Björn Esser + * Authors: Kevin Hughes, Heiko Strathmann, Bjoern Esser */ #ifndef UWEDGESEP_H_ diff --git a/src/shogun/distance/DirectorDistance.h b/src/shogun/distance/DirectorDistance.h index 190c34dc473..a1471c7c930 100644 --- a/src/shogun/distance/DirectorDistance.h +++ b/src/shogun/distance/DirectorDistance.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Evgeniy Andreev, Yuyu Zhang, Chiyuan Zhang, - * Viktor Gal, Sergey Lisitsyn, Björn Esser + * Viktor Gal, Sergey Lisitsyn, Bjoern Esser */ #ifndef _DIRECTORDISTANCE_H___ diff --git a/src/shogun/distance/Distance.h b/src/shogun/distance/Distance.h index 18952465179..43c1d5b5df3 100644 --- a/src/shogun/distance/Distance.h +++ b/src/shogun/distance/Distance.h @@ -4,7 +4,7 @@ * Authors: Soeren Sonnenburg, Fernando Iglesias, Sergey Lisitsyn, * Saurabh Mahindre, Chiyuan Zhang, Michele Mazzoni, Evgeniy Andreev, * Evan Shelhamer, Yuyu Zhang, Heiko Strathmann, Thoralf Klein, - * Björn Esser, Soumyajit De, Saurabh Goyal + * Bjoern Esser, Soumyajit De, Saurabh Goyal */ #ifndef _DISTANCE_H___ diff --git a/src/shogun/distance/EuclideanDistance.cpp b/src/shogun/distance/EuclideanDistance.cpp index 98dfc9c8e68..e60af41e816 100644 --- a/src/shogun/distance/EuclideanDistance.cpp +++ b/src/shogun/distance/EuclideanDistance.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Saurabh Mahindre, Soumyajit De, Chiyuan Zhang, Viktor Gal, - * Björn Esser, Soeren Sonnenburg + * Bjoern Esser, Soeren Sonnenburg */ #include diff --git a/src/shogun/distance/EuclideanDistance.h b/src/shogun/distance/EuclideanDistance.h index 9c272f4d7c3..739e7756a74 100644 --- a/src/shogun/distance/EuclideanDistance.h +++ b/src/shogun/distance/EuclideanDistance.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Saurabh Mahindre, Chiyuan Zhang, Yuyu Zhang, Björn Esser, + * Authors: Saurabh Mahindre, Chiyuan Zhang, Yuyu Zhang, Bjoern Esser, * Soeren Sonnenburg, Soumyajit De, Sanuj Sharma */ diff --git a/src/shogun/distributions/Distribution.h b/src/shogun/distributions/Distribution.h index 954fcb034e4..50518e61273 100644 --- a/src/shogun/distributions/Distribution.h +++ b/src/shogun/distributions/Distribution.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Björn Esser, Thoralf Klein, Fernando Iglesias, + * Authors: Soeren Sonnenburg, Bjoern Esser, Thoralf Klein, Fernando Iglesias, * Yuyu Zhang */ diff --git a/src/shogun/distributions/Gaussian.cpp b/src/shogun/distributions/Gaussian.cpp index bbc2c540f7a..9ee3c0b9d8f 100644 --- a/src/shogun/distributions/Gaussian.cpp +++ b/src/shogun/distributions/Gaussian.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Weijie Lin, Alesis Novik, Heiko Strathmann, - * Evgeniy Andreev, Viktor Gal, Evan Shelhamer, Björn Esser + * Evgeniy Andreev, Viktor Gal, Evan Shelhamer, Bjoern Esser */ #include diff --git a/src/shogun/distributions/HMM.cpp b/src/shogun/distributions/HMM.cpp index cc624e8ec63..167344e1e46 100644 --- a/src/shogun/distributions/HMM.cpp +++ b/src/shogun/distributions/HMM.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Viktor Gal, Björn Esser, Heiko Strathmann, + * Authors: Soeren Sonnenburg, Viktor Gal, Bjoern Esser, Heiko Strathmann, * Evan Shelhamer, Thoralf Klein, Elijah Rippeth, Roman Votyakov, * Giovanni De Toni */ diff --git a/src/shogun/distributions/HMM.h b/src/shogun/distributions/HMM.h index acbba68e8ce..5d2e52a4653 100644 --- a/src/shogun/distributions/HMM.h +++ b/src/shogun/distributions/HMM.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Evan Shelhamer, Elijah Rippeth, Saurabh Goyal, - * Björn Esser + * Bjoern Esser */ #ifndef __CHMM_H__ diff --git a/src/shogun/ensemble/CombinationRule.h b/src/shogun/ensemble/CombinationRule.h index e5cb38e1df6..08d64d4e253 100644 --- a/src/shogun/ensemble/CombinationRule.h +++ b/src/shogun/ensemble/CombinationRule.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Yuyu Zhang, Björn Esser, Viktor Gal + * Authors: Yuyu Zhang, Bjoern Esser, Viktor Gal */ #ifndef _COMBINATION_RULE_H_ diff --git a/src/shogun/ensemble/MajorityVote.cpp b/src/shogun/ensemble/MajorityVote.cpp index 0c2ab3a18ae..8a4b83299e7 100644 --- a/src/shogun/ensemble/MajorityVote.cpp +++ b/src/shogun/ensemble/MajorityVote.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Björn Esser, Viktor Gal + * Authors: Bjoern Esser, Viktor Gal */ #include diff --git a/src/shogun/ensemble/MajorityVote.h b/src/shogun/ensemble/MajorityVote.h index 3f521341124..64938609c4f 100644 --- a/src/shogun/ensemble/MajorityVote.h +++ b/src/shogun/ensemble/MajorityVote.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Yuyu Zhang, Björn Esser, Viktor Gal + * Authors: Yuyu Zhang, Bjoern Esser, Viktor Gal */ #ifndef _MAJORITY_VOTE_H_ diff --git a/src/shogun/ensemble/MeanRule.cpp b/src/shogun/ensemble/MeanRule.cpp index d1210f89ebf..c8b13101ede 100644 --- a/src/shogun/ensemble/MeanRule.cpp +++ b/src/shogun/ensemble/MeanRule.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Björn Esser, Viktor Gal + * Authors: Bjoern Esser, Viktor Gal */ #include diff --git a/src/shogun/ensemble/MeanRule.h b/src/shogun/ensemble/MeanRule.h index 4e6f4435641..0eec370934e 100644 --- a/src/shogun/ensemble/MeanRule.h +++ b/src/shogun/ensemble/MeanRule.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Yuyu Zhang, Björn Esser, Viktor Gal + * Authors: Yuyu Zhang, Bjoern Esser, Viktor Gal */ #ifndef _MEAN_RULE_H_ diff --git a/src/shogun/ensemble/WeightedMajorityVote.cpp b/src/shogun/ensemble/WeightedMajorityVote.cpp index 53f5373bd62..623230ae800 100644 --- a/src/shogun/ensemble/WeightedMajorityVote.cpp +++ b/src/shogun/ensemble/WeightedMajorityVote.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Viktor Gal, Björn Esser + * Authors: Viktor Gal, Bjoern Esser */ #include diff --git a/src/shogun/ensemble/WeightedMajorityVote.h b/src/shogun/ensemble/WeightedMajorityVote.h index be1884f0fa5..eb2a833d4ca 100644 --- a/src/shogun/ensemble/WeightedMajorityVote.h +++ b/src/shogun/ensemble/WeightedMajorityVote.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Yuyu Zhang, Björn Esser, Viktor Gal + * Authors: Soeren Sonnenburg, Yuyu Zhang, Bjoern Esser, Viktor Gal */ #ifndef _WEIGHTED_MAJORITY_VOTE_H_ diff --git a/src/shogun/evaluation/ClusteringEvaluation.cpp b/src/shogun/evaluation/ClusteringEvaluation.cpp index 667428d4ebb..afe4a9f04c1 100644 --- a/src/shogun/evaluation/ClusteringEvaluation.cpp +++ b/src/shogun/evaluation/ClusteringEvaluation.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Chiyuan Zhang, Soeren Sonnenburg, Björn Esser + * Authors: Chiyuan Zhang, Soeren Sonnenburg, Bjoern Esser */ #include diff --git a/src/shogun/evaluation/DirectorContingencyTableEvaluation.h b/src/shogun/evaluation/DirectorContingencyTableEvaluation.h index ceef297eb34..d0a475ddae5 100644 --- a/src/shogun/evaluation/DirectorContingencyTableEvaluation.h +++ b/src/shogun/evaluation/DirectorContingencyTableEvaluation.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Björn Esser, Viktor Gal + * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Bjoern Esser, Viktor Gal */ #ifndef DIRECTORCONTINGENCYTABLEEVALUATION_H_ diff --git a/src/shogun/evaluation/MeanAbsoluteError.h b/src/shogun/evaluation/MeanAbsoluteError.h index bcf6da47937..70da8d5f4eb 100644 --- a/src/shogun/evaluation/MeanAbsoluteError.h +++ b/src/shogun/evaluation/MeanAbsoluteError.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Roman Votyakov, Evan Shelhamer, Yuyu Zhang, - * Björn Esser + * Bjoern Esser */ #ifndef MEANABSOLUTEERROR_H_ diff --git a/src/shogun/evaluation/MeanSquaredError.h b/src/shogun/evaluation/MeanSquaredError.h index 5bc9d8c667f..9e1cc0eff64 100644 --- a/src/shogun/evaluation/MeanSquaredError.h +++ b/src/shogun/evaluation/MeanSquaredError.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Yuyu Zhang, Evan Shelhamer, Björn Esser, + * Authors: Soeren Sonnenburg, Yuyu Zhang, Evan Shelhamer, Bjoern Esser, * Sergey Lisitsyn, Roman Votyakov */ diff --git a/src/shogun/evaluation/MeanSquaredLogError.h b/src/shogun/evaluation/MeanSquaredLogError.h index f27c655b1ee..cd8ac7ac594 100644 --- a/src/shogun/evaluation/MeanSquaredLogError.h +++ b/src/shogun/evaluation/MeanSquaredLogError.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Heiko Strathmann, Soeren Sonnenburg, Roman Votyakov, Yuyu Zhang, - * Björn Esser + * Bjoern Esser */ #ifndef __MEANSQUAREDLOGERROR__ diff --git a/src/shogun/evaluation/MulticlassAccuracy.h b/src/shogun/evaluation/MulticlassAccuracy.h index 42837702a7e..c9fd107c961 100644 --- a/src/shogun/evaluation/MulticlassAccuracy.h +++ b/src/shogun/evaluation/MulticlassAccuracy.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Sergey Lisitsyn, Soeren Sonnenburg, Yuyu Zhang, Chiyuan Zhang, - * Evan Shelhamer, Björn Esser, Roman Votyakov + * Evan Shelhamer, Bjoern Esser, Roman Votyakov */ #ifndef MULTICLASSACCURACY_H_ diff --git a/src/shogun/evaluation/MulticlassOVREvaluation.cpp b/src/shogun/evaluation/MulticlassOVREvaluation.cpp index f3cf80a870b..dd39b9cb164 100644 --- a/src/shogun/evaluation/MulticlassOVREvaluation.cpp +++ b/src/shogun/evaluation/MulticlassOVREvaluation.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Björn Esser, Sergey Lisitsyn, Soeren Sonnenburg + * Authors: Bjoern Esser, Sergey Lisitsyn, Soeren Sonnenburg */ #include diff --git a/src/shogun/features/Alphabet.cpp b/src/shogun/features/Alphabet.cpp index 856a6bd8afc..ca8ec8bddbf 100644 --- a/src/shogun/features/Alphabet.cpp +++ b/src/shogun/features/Alphabet.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Heiko Strathmann, Weijie Lin, Björn Esser, + * Authors: Soeren Sonnenburg, Heiko Strathmann, Weijie Lin, Bjoern Esser, * Evangelos Anagnostopoulos, Leon Kuchenbecker, Saurabh Goyal */ diff --git a/src/shogun/features/BinnedDotFeatures.h b/src/shogun/features/BinnedDotFeatures.h index 4d3c7578f05..c76de740139 100644 --- a/src/shogun/features/BinnedDotFeatures.h +++ b/src/shogun/features/BinnedDotFeatures.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Vladislav Horbatiuk, Evgeniy Andreev, Yuyu Zhang, - * Evan Shelhamer, Björn Esser, Sergey Lisitsyn + * Evan Shelhamer, Bjoern Esser, Sergey Lisitsyn */ #ifndef _BINNED_DOTFEATURES_H___ diff --git a/src/shogun/features/CombinedDotFeatures.cpp b/src/shogun/features/CombinedDotFeatures.cpp index 90f0788dd5c..6765397134e 100644 --- a/src/shogun/features/CombinedDotFeatures.cpp +++ b/src/shogun/features/CombinedDotFeatures.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Evangelos Anagnostopoulos, Evan Shelhamer, - * Sergey Lisitsyn, Björn Esser + * Sergey Lisitsyn, Bjoern Esser */ #include diff --git a/src/shogun/features/CombinedDotFeatures.h b/src/shogun/features/CombinedDotFeatures.h index 77684089ca2..73009038b22 100644 --- a/src/shogun/features/CombinedDotFeatures.h +++ b/src/shogun/features/CombinedDotFeatures.h @@ -3,7 +3,7 @@ * * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Heiko Strathmann, * Vladislav Horbatiuk, Evgeniy Andreev, Yuyu Zhang, Evan Shelhamer, - * Björn Esser, Evangelos Anagnostopoulos + * Bjoern Esser, Evangelos Anagnostopoulos */ #ifndef _COMBINEDDOTFEATURES_H___ diff --git a/src/shogun/features/CombinedFeatures.cpp b/src/shogun/features/CombinedFeatures.cpp index 05aa66ee4a0..7c9f7bd6178 100644 --- a/src/shogun/features/CombinedFeatures.cpp +++ b/src/shogun/features/CombinedFeatures.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Heiko Strathmann, Evangelos Anagnostopoulos, - * Vladislav Horbatiuk, Evgeniy Andreev, Evan Shelhamer, Björn Esser + * Vladislav Horbatiuk, Evgeniy Andreev, Evan Shelhamer, Bjoern Esser */ #include diff --git a/src/shogun/features/CombinedFeatures.h b/src/shogun/features/CombinedFeatures.h index 6a779c53b7f..56327d4a87b 100644 --- a/src/shogun/features/CombinedFeatures.h +++ b/src/shogun/features/CombinedFeatures.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Heiko Strathmann, Evangelos Anagnostopoulos, - * Vladislav Horbatiuk, Yuyu Zhang, Evgeniy Andreev, Björn Esser + * Vladislav Horbatiuk, Yuyu Zhang, Evgeniy Andreev, Bjoern Esser */ #ifndef _CCOMBINEDFEATURES__H__ diff --git a/src/shogun/features/DataGenerator.cpp b/src/shogun/features/DataGenerator.cpp index 7a40c2fea25..6322a834759 100644 --- a/src/shogun/features/DataGenerator.cpp +++ b/src/shogun/features/DataGenerator.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Heiko Strathmann, Viktor Gal, Weijie Lin, Sergey Lisitsyn, - * Björn Esser, Soeren Sonnenburg, Evangelos Anagnostopoulos + * Bjoern Esser, Soeren Sonnenburg, Evangelos Anagnostopoulos */ #include diff --git a/src/shogun/features/DataGenerator.h b/src/shogun/features/DataGenerator.h index 9ac21832397..9a549f8cc09 100644 --- a/src/shogun/features/DataGenerator.h +++ b/src/shogun/features/DataGenerator.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Heiko Strathmann, Viktor Gal, Yuyu Zhang, Weijie Lin, - * Sergey Lisitsyn, Björn Esser, Soeren Sonnenburg, + * Sergey Lisitsyn, Bjoern Esser, Soeren Sonnenburg, * Evangelos Anagnostopoulos */ diff --git a/src/shogun/features/DenseFeatures.cpp b/src/shogun/features/DenseFeatures.cpp index 96b08c6a400..a2d6b7c8038 100644 --- a/src/shogun/features/DenseFeatures.cpp +++ b/src/shogun/features/DenseFeatures.cpp @@ -4,7 +4,7 @@ * Authors: Soeren Sonnenburg, Saurabh Mahindre, Soumyajit De, Heiko Strathmann, * Sergey Lisitsyn, Sanuj Sharma, Chiyuan Zhang, Viktor Gal, * Michele Mazzoni, Vladislav Horbatiuk, Kevin Hughes, Weijie Lin, - * Fernando Iglesias, Björn Esser, Evgeniy Andreev, + * Fernando Iglesias, Bjoern Esser, Evgeniy Andreev, * Christopher Goldsworthy */ diff --git a/src/shogun/features/DenseFeatures.h b/src/shogun/features/DenseFeatures.h index 51b60edefa1..ab34eff1683 100644 --- a/src/shogun/features/DenseFeatures.h +++ b/src/shogun/features/DenseFeatures.h @@ -3,7 +3,7 @@ * * Authors: Soumyajit De, Heiko Strathmann, Saurabh Mahindre, Soeren Sonnenburg, * Vladislav Horbatiuk, Yuyu Zhang, Kevin Hughes, Evgeniy Andreev, - * Thoralf Klein, Fernando Iglesias, Björn Esser, Sergey Lisitsyn + * Thoralf Klein, Fernando Iglesias, Bjoern Esser, Sergey Lisitsyn */ #ifndef _DENSEFEATURES__H__ diff --git a/src/shogun/features/DenseSubsetFeatures.h b/src/shogun/features/DenseSubsetFeatures.h index f37ea256c17..58c19ee4ba6 100644 --- a/src/shogun/features/DenseSubsetFeatures.h +++ b/src/shogun/features/DenseSubsetFeatures.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Chiyuan Zhang, Heiko Strathmann, Vladislav Horbatiuk, Yuyu Zhang, - * Björn Esser, Soeren Sonnenburg + * Bjoern Esser, Soeren Sonnenburg */ #ifndef DENSESUBSETFEATURES_H__ diff --git a/src/shogun/features/DirectorDotFeatures.h b/src/shogun/features/DirectorDotFeatures.h index 69041013a7a..71593e5082a 100644 --- a/src/shogun/features/DirectorDotFeatures.h +++ b/src/shogun/features/DirectorDotFeatures.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Vladislav Horbatiuk, Björn Esser, + * Authors: Soeren Sonnenburg, Vladislav Horbatiuk, Bjoern Esser, * Sergey Lisitsyn */ diff --git a/src/shogun/features/DotFeatures.h b/src/shogun/features/DotFeatures.h index 118f0eca032..2001fe916fb 100644 --- a/src/shogun/features/DotFeatures.h +++ b/src/shogun/features/DotFeatures.h @@ -3,7 +3,7 @@ * * Authors: Soeren Sonnenburg, Michele Mazzoni, Evgeniy Andreev, * Fernando Iglesias, Yuyu Zhang, Heiko Strathmann, Thoralf Klein, - * Evan Shelhamer, Björn Esser, Alesis Novik, Giovanni De Toni + * Evan Shelhamer, Bjoern Esser, Alesis Novik, Giovanni De Toni */ #ifndef _DOTFEATURES_H___ diff --git a/src/shogun/features/ExplicitSpecFeatures.h b/src/shogun/features/ExplicitSpecFeatures.h index 2843ece3e5c..8ad46d4728e 100644 --- a/src/shogun/features/ExplicitSpecFeatures.h +++ b/src/shogun/features/ExplicitSpecFeatures.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Heiko Strathmann, Vladislav Horbatiuk, - * Evgeniy Andreev, Yuyu Zhang, Björn Esser, Sergey Lisitsyn + * Evgeniy Andreev, Yuyu Zhang, Bjoern Esser, Sergey Lisitsyn */ #ifndef _EXPLICITSPECFEATURES_H___ diff --git a/src/shogun/features/FKFeatures.cpp b/src/shogun/features/FKFeatures.cpp index 5a3f3d1e7ed..e8863dd75dd 100644 --- a/src/shogun/features/FKFeatures.cpp +++ b/src/shogun/features/FKFeatures.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Evan Shelhamer, Björn Esser, Sergey Lisitsyn + * Authors: Soeren Sonnenburg, Evan Shelhamer, Bjoern Esser, Sergey Lisitsyn */ #include diff --git a/src/shogun/features/FactorGraphFeatures.h b/src/shogun/features/FactorGraphFeatures.h index 23e2bac3371..1f06bb354e1 100644 --- a/src/shogun/features/FactorGraphFeatures.h +++ b/src/shogun/features/FactorGraphFeatures.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Yuyu Zhang, Björn Esser, Shell Hu + * Authors: Yuyu Zhang, Bjoern Esser, Shell Hu */ #ifndef __FACTORGRAPH_FEATURES_H__ diff --git a/src/shogun/features/Features.cpp b/src/shogun/features/Features.cpp index 0a465b75b1c..a54fbb65a7e 100644 --- a/src/shogun/features/Features.cpp +++ b/src/shogun/features/Features.cpp @@ -3,7 +3,7 @@ * * Authors: Soeren Sonnenburg, Heiko Strathmann, Evgeniy Andreev, * Sergey Lisitsyn, Soumyajit De, Shashwat Lal Das, Fernando Iglesias, - * Björn Esser, Wu Lin + * Bjoern Esser, Wu Lin */ #include diff --git a/src/shogun/features/Features.h b/src/shogun/features/Features.h index a8da5e76e4c..9dd59b2aa01 100644 --- a/src/shogun/features/Features.h +++ b/src/shogun/features/Features.h @@ -3,7 +3,7 @@ * * Authors: Heiko Strathmann, Soeren Sonnenburg, Sergey Lisitsyn, * Saurabh Mahindre, Evgeniy Andreev, Wu Lin, Vladislav Horbatiuk, - * Yuyu Zhang, Björn Esser, Soumyajit De + * Yuyu Zhang, Bjoern Esser, Soumyajit De */ #ifndef _CFEATURES__H__ diff --git a/src/shogun/features/ImplicitWeightedSpecFeatures.h b/src/shogun/features/ImplicitWeightedSpecFeatures.h index 3365f165d46..6c751e2eb97 100644 --- a/src/shogun/features/ImplicitWeightedSpecFeatures.h +++ b/src/shogun/features/ImplicitWeightedSpecFeatures.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Heiko Strathmann, Vladislav Horbatiuk, - * Evgeniy Andreev, Yuyu Zhang, Evan Shelhamer, Björn Esser, + * Evgeniy Andreev, Yuyu Zhang, Evan Shelhamer, Bjoern Esser, * Sergey Lisitsyn */ diff --git a/src/shogun/features/LBPPyrDotFeatures.cpp b/src/shogun/features/LBPPyrDotFeatures.cpp index 92801c38896..77e7217862c 100644 --- a/src/shogun/features/LBPPyrDotFeatures.cpp +++ b/src/shogun/features/LBPPyrDotFeatures.cpp @@ -3,7 +3,7 @@ * * Authors: Vojtech Franc, Soeren Sonnenburg, Evangelos Anagnostopoulos, * Vladislav Horbatiuk, Evgeniy Andreev, Viktor Gal, Weijie Lin, - * Evan Shelhamer, Björn Esser, Sergey Lisitsyn, Sanuj Sharma + * Evan Shelhamer, Bjoern Esser, Sergey Lisitsyn, Sanuj Sharma */ #include #include diff --git a/src/shogun/features/LBPPyrDotFeatures.h b/src/shogun/features/LBPPyrDotFeatures.h index 40f05aff5ba..a64d32e844e 100644 --- a/src/shogun/features/LBPPyrDotFeatures.h +++ b/src/shogun/features/LBPPyrDotFeatures.h @@ -3,7 +3,7 @@ * * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Heiko Strathmann, * Vladislav Horbatiuk, Evgeniy Andreev, Yuyu Zhang, Evan Shelhamer, - * Björn Esser, Evangelos Anagnostopoulos + * Bjoern Esser, Evangelos Anagnostopoulos */ #ifndef _LBP_PYR_DOTFEATURES__H__ #define _LBP_PYR_DOTFEATURES__H__ diff --git a/src/shogun/features/MatrixFeatures.cpp b/src/shogun/features/MatrixFeatures.cpp index 852c080ed56..b35e5d28b2b 100644 --- a/src/shogun/features/MatrixFeatures.cpp +++ b/src/shogun/features/MatrixFeatures.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Fernando Iglesias, Heiko Strathmann, Vladislav Horbatiuk, - * Björn Esser + * Bjoern Esser */ #include diff --git a/src/shogun/features/PolyFeatures.h b/src/shogun/features/PolyFeatures.h index 77f97e67922..d41ef07f741 100644 --- a/src/shogun/features/PolyFeatures.h +++ b/src/shogun/features/PolyFeatures.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Heiko Strathmann, Sergey Lisitsyn, - * Vladislav Horbatiuk, Evgeniy Andreev, Yuyu Zhang, Björn Esser + * Vladislav Horbatiuk, Evgeniy Andreev, Yuyu Zhang, Bjoern Esser */ #ifndef _POLYFEATURES__H__ #define _POLYFEATURES__H__ diff --git a/src/shogun/features/RandomFourierDotFeatures.cpp b/src/shogun/features/RandomFourierDotFeatures.cpp index 360f45d0732..0c6e1b11dd7 100644 --- a/src/shogun/features/RandomFourierDotFeatures.cpp +++ b/src/shogun/features/RandomFourierDotFeatures.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Evangelos Anagnostopoulos, Björn Esser + * Authors: Evangelos Anagnostopoulos, Bjoern Esser */ #include diff --git a/src/shogun/features/RandomFourierDotFeatures.h b/src/shogun/features/RandomFourierDotFeatures.h index b915f758de8..b38fd802730 100644 --- a/src/shogun/features/RandomFourierDotFeatures.h +++ b/src/shogun/features/RandomFourierDotFeatures.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Evangelos Anagnostopoulos, Yuyu Zhang, Björn Esser + * Authors: Evangelos Anagnostopoulos, Yuyu Zhang, Bjoern Esser */ #ifndef _RANDOMFOURIER_DOTFEATURES__H__ diff --git a/src/shogun/features/RandomKitchenSinksDotFeatures.cpp b/src/shogun/features/RandomKitchenSinksDotFeatures.cpp index 674e59313c0..c16990baf22 100644 --- a/src/shogun/features/RandomKitchenSinksDotFeatures.cpp +++ b/src/shogun/features/RandomKitchenSinksDotFeatures.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Björn Esser, Evangelos Anagnostopoulos + * Authors: Bjoern Esser, Evangelos Anagnostopoulos */ #include diff --git a/src/shogun/features/RandomKitchenSinksDotFeatures.h b/src/shogun/features/RandomKitchenSinksDotFeatures.h index 7341b5c5620..37d9b3f90f6 100644 --- a/src/shogun/features/RandomKitchenSinksDotFeatures.h +++ b/src/shogun/features/RandomKitchenSinksDotFeatures.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Yuyu Zhang, Björn Esser, Evangelos Anagnostopoulos + * Authors: Yuyu Zhang, Bjoern Esser, Evangelos Anagnostopoulos */ #ifndef _RANDOMKITCHENSINKS_DOT_FEATURES_H__ diff --git a/src/shogun/features/SNPFeatures.h b/src/shogun/features/SNPFeatures.h index 4d6cd6c5236..2f975a49a98 100644 --- a/src/shogun/features/SNPFeatures.h +++ b/src/shogun/features/SNPFeatures.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Heiko Strathmann, Vladislav Horbatiuk, - * Evgeniy Andreev, Yuyu Zhang, Evan Shelhamer, Björn Esser + * Evgeniy Andreev, Yuyu Zhang, Evan Shelhamer, Bjoern Esser */ #ifndef _SNPFEATURES_H___ diff --git a/src/shogun/features/SparseFeatures.h b/src/shogun/features/SparseFeatures.h index cbb5970f671..4cc3bed5557 100644 --- a/src/shogun/features/SparseFeatures.h +++ b/src/shogun/features/SparseFeatures.h @@ -3,7 +3,7 @@ * * Authors: Heiko Strathmann, Soeren Sonnenburg, Sergey Lisitsyn, * Evgeniy Andreev, Vladislav Horbatiuk, Yuyu Zhang, Viktor Gal, - * Thoralf Klein, Björn Esser, Soumyajit De + * Thoralf Klein, Bjoern Esser, Soumyajit De */ #ifndef _SPARSEFEATURES__H__ diff --git a/src/shogun/features/SparsePolyFeatures.h b/src/shogun/features/SparsePolyFeatures.h index c08de3dbafc..695a3f27e36 100644 --- a/src/shogun/features/SparsePolyFeatures.h +++ b/src/shogun/features/SparsePolyFeatures.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Heiko Strathmann, Vladislav Horbatiuk, - * Evgeniy Andreev, Yuyu Zhang, Evan Shelhamer, Björn Esser, + * Evgeniy Andreev, Yuyu Zhang, Evan Shelhamer, Bjoern Esser, * Sergey Lisitsyn */ #ifndef _SPARSEPOLYFEATURES__H__ diff --git a/src/shogun/features/StringFeatures.h b/src/shogun/features/StringFeatures.h index 36e98c2279b..f5faa9793d2 100644 --- a/src/shogun/features/StringFeatures.h +++ b/src/shogun/features/StringFeatures.h @@ -3,7 +3,7 @@ * * Authors: Soeren Sonnenburg, Heiko Strathmann, Sergey Lisitsyn, * Evgeniy Andreev, Vladislav Horbatiuk, Evan Shelhamer, Yuyu Zhang, - * Thoralf Klein, Fernando Iglesias, Björn Esser + * Thoralf Klein, Fernando Iglesias, Bjoern Esser */ #ifndef _CSTRINGFEATURES__H__ diff --git a/src/shogun/features/StringFileFeatures.h b/src/shogun/features/StringFileFeatures.h index a926dea3d49..bc5137c43e3 100644 --- a/src/shogun/features/StringFileFeatures.h +++ b/src/shogun/features/StringFileFeatures.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Heiko Strathmann, Yuyu Zhang, Viktor Gal, - * Evan Shelhamer, Björn Esser + * Evan Shelhamer, Bjoern Esser */ #ifndef _CSTRINGFILEFEATURES__H__ diff --git a/src/shogun/features/SubsetStack.h b/src/shogun/features/SubsetStack.h index ca7baa17f82..0624940f919 100644 --- a/src/shogun/features/SubsetStack.h +++ b/src/shogun/features/SubsetStack.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Heiko Strathmann, Sergey Lisitsyn, Soeren Sonnenburg, Soumyajit De, - * Chiyuan Zhang, Viktor Gal, Fernando Iglesias, Björn Esser, + * Chiyuan Zhang, Viktor Gal, Fernando Iglesias, Bjoern Esser, * Yuyu Zhang */ diff --git a/src/shogun/features/TOPFeatures.cpp b/src/shogun/features/TOPFeatures.cpp index 16ac0a3373e..671b4b74ce6 100644 --- a/src/shogun/features/TOPFeatures.cpp +++ b/src/shogun/features/TOPFeatures.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Evan Shelhamer, Björn Esser + * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Evan Shelhamer, Bjoern Esser */ #include diff --git a/src/shogun/features/WDFeatures.h b/src/shogun/features/WDFeatures.h index df9aa05e44a..55b4bfa5a9a 100644 --- a/src/shogun/features/WDFeatures.h +++ b/src/shogun/features/WDFeatures.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Evgeniy Andreev, Heiko Strathmann, - * Vladislav Horbatiuk, Yuyu Zhang, Björn Esser, Sergey Lisitsyn + * Vladislav Horbatiuk, Yuyu Zhang, Bjoern Esser, Sergey Lisitsyn */ #ifndef _WDFEATURES_H___ diff --git a/src/shogun/features/streaming/StreamingHashedDenseFeatures.cpp b/src/shogun/features/streaming/StreamingHashedDenseFeatures.cpp index 7d0c4b81dcf..b225ea24b83 100644 --- a/src/shogun/features/streaming/StreamingHashedDenseFeatures.cpp +++ b/src/shogun/features/streaming/StreamingHashedDenseFeatures.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Evangelos Anagnostopoulos, Heiko Strathmann, Björn Esser, + * Authors: Evangelos Anagnostopoulos, Heiko Strathmann, Bjoern Esser, * Sergey Lisitsyn, Viktor Gal */ diff --git a/src/shogun/features/streaming/StreamingHashedDenseFeatures.h b/src/shogun/features/streaming/StreamingHashedDenseFeatures.h index b1cf7cb5ac1..636dcd57872 100644 --- a/src/shogun/features/streaming/StreamingHashedDenseFeatures.h +++ b/src/shogun/features/streaming/StreamingHashedDenseFeatures.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Evangelos Anagnostopoulos, Yuyu Zhang, Björn Esser, Viktor Gal + * Authors: Evangelos Anagnostopoulos, Yuyu Zhang, Bjoern Esser, Viktor Gal */ #ifndef _STREAMING_HASHED_DENSEFEATURES__H__ diff --git a/src/shogun/features/streaming/StreamingHashedDocDotFeatures.cpp b/src/shogun/features/streaming/StreamingHashedDocDotFeatures.cpp index dc691428aa6..840bae2a8cf 100644 --- a/src/shogun/features/streaming/StreamingHashedDocDotFeatures.cpp +++ b/src/shogun/features/streaming/StreamingHashedDocDotFeatures.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Evangelos Anagnostopoulos, Heiko Strathmann, Björn Esser, + * Authors: Evangelos Anagnostopoulos, Heiko Strathmann, Bjoern Esser, * Sergey Lisitsyn, Viktor Gal */ diff --git a/src/shogun/features/streaming/StreamingHashedDocDotFeatures.h b/src/shogun/features/streaming/StreamingHashedDocDotFeatures.h index 3eb429927c1..87db369a025 100644 --- a/src/shogun/features/streaming/StreamingHashedDocDotFeatures.h +++ b/src/shogun/features/streaming/StreamingHashedDocDotFeatures.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Evangelos Anagnostopoulos, Yuyu Zhang, Björn Esser, Viktor Gal + * Authors: Evangelos Anagnostopoulos, Yuyu Zhang, Bjoern Esser, Viktor Gal */ #ifndef _STREAMING_HASHEDDOCDOTFEATURES__H__ #define _STREAMING_HASHEDDOCDOTFEATURES__H__ diff --git a/src/shogun/features/streaming/StreamingHashedSparseFeatures.cpp b/src/shogun/features/streaming/StreamingHashedSparseFeatures.cpp index be124387fa7..c0c69785ce1 100644 --- a/src/shogun/features/streaming/StreamingHashedSparseFeatures.cpp +++ b/src/shogun/features/streaming/StreamingHashedSparseFeatures.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Evangelos Anagnostopoulos, Heiko Strathmann, Björn Esser, + * Authors: Evangelos Anagnostopoulos, Heiko Strathmann, Bjoern Esser, * Sergey Lisitsyn, Viktor Gal */ diff --git a/src/shogun/features/streaming/StreamingHashedSparseFeatures.h b/src/shogun/features/streaming/StreamingHashedSparseFeatures.h index 300bbcf3409..cdf3c9a049e 100644 --- a/src/shogun/features/streaming/StreamingHashedSparseFeatures.h +++ b/src/shogun/features/streaming/StreamingHashedSparseFeatures.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Evangelos Anagnostopoulos, Yuyu Zhang, Björn Esser, Viktor Gal + * Authors: Evangelos Anagnostopoulos, Yuyu Zhang, Bjoern Esser, Viktor Gal */ #ifndef _STREAMING_HASHED_SPARSEFEATURES__H__ diff --git a/src/shogun/features/streaming/StreamingSparseFeatures.cpp b/src/shogun/features/streaming/StreamingSparseFeatures.cpp index 10a82d3aaef..24678be4a1e 100644 --- a/src/shogun/features/streaming/StreamingSparseFeatures.cpp +++ b/src/shogun/features/streaming/StreamingSparseFeatures.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Thoralf Klein, Viktor Gal, Soeren Sonnenburg, Heiko Strathmann, - * Vladislav Horbatiuk, Björn Esser, Sergey Lisitsyn + * Vladislav Horbatiuk, Bjoern Esser, Sergey Lisitsyn */ #include diff --git a/src/shogun/features/streaming/StreamingSparseFeatures.h b/src/shogun/features/streaming/StreamingSparseFeatures.h index 28cd523e006..66d44b2038b 100644 --- a/src/shogun/features/streaming/StreamingSparseFeatures.h +++ b/src/shogun/features/streaming/StreamingSparseFeatures.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Thoralf Klein, Viktor Gal, Vladislav Horbatiuk, Yuyu Zhang, - * Björn Esser, Sergey Lisitsyn, Soeren Sonnenburg + * Bjoern Esser, Sergey Lisitsyn, Soeren Sonnenburg */ #ifndef _STREAMING_SPARSEFEATURES__H__ #define _STREAMING_SPARSEFEATURES__H__ diff --git a/src/shogun/io/BinaryFile.cpp b/src/shogun/io/BinaryFile.cpp index 38f083a2727..746083ff0ac 100644 --- a/src/shogun/io/BinaryFile.cpp +++ b/src/shogun/io/BinaryFile.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Thoralf Klein, Sergey Lisitsyn, Heiko Strathmann, - * Chiyuan Zhang, Viktor Gal, Björn Esser + * Chiyuan Zhang, Viktor Gal, Bjoern Esser */ #include diff --git a/src/shogun/io/BinaryStream.h b/src/shogun/io/BinaryStream.h index eda68dc4d9b..077a0058e3c 100644 --- a/src/shogun/io/BinaryStream.h +++ b/src/shogun/io/BinaryStream.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Thoralf Klein, Heiko Strathmann, Yuyu Zhang, - * Evan Shelhamer, Björn Esser + * Evan Shelhamer, Bjoern Esser */ #ifndef __BINARYSTREAM_H__ diff --git a/src/shogun/io/CSVFile.cpp b/src/shogun/io/CSVFile.cpp index 6220d602d5c..e975d6d73e3 100644 --- a/src/shogun/io/CSVFile.cpp +++ b/src/shogun/io/CSVFile.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Evgeniy Andreev, Soeren Sonnenburg, Thoralf Klein, Viktor Gal, - * Fernando Iglesias, Sergey Lisitsyn, Björn Esser + * Fernando Iglesias, Sergey Lisitsyn, Bjoern Esser */ #include diff --git a/src/shogun/io/CSVFile.h b/src/shogun/io/CSVFile.h index 1b26121e39c..c61f5364e37 100644 --- a/src/shogun/io/CSVFile.h +++ b/src/shogun/io/CSVFile.h @@ -3,7 +3,7 @@ * * Authors: Evgeniy Andreev, Fernando Iglesias, Sergey Lisitsyn, * Heiko Strathmann, Yuyu Zhang, Viktor Gal, Thoralf Klein, - * Björn Esser, Soeren Sonnenburg + * Bjoern Esser, Soeren Sonnenburg */ #ifndef __CSVFILE_H__ diff --git a/src/shogun/io/File.h b/src/shogun/io/File.h index 0afdbba95cd..38788a8cc44 100644 --- a/src/shogun/io/File.h +++ b/src/shogun/io/File.h @@ -3,7 +3,7 @@ * * Authors: Soeren Sonnenburg, Heiko Strathmann, Viktor Gal, Sergey Lisitsyn, * Yuyu Zhang, Chiyuan Zhang, Thoralf Klein, Evan Shelhamer, - * Björn Esser, Abhinav Agarwalla + * Bjoern Esser, Abhinav Agarwalla */ #ifndef __FILE_H__ diff --git a/src/shogun/io/HDF5File.cpp b/src/shogun/io/HDF5File.cpp index 9f981c270f0..f87c99f5407 100644 --- a/src/shogun/io/HDF5File.cpp +++ b/src/shogun/io/HDF5File.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Soumyajit De, Viktor Gal, Thoralf Klein, - * Evan Shelhamer, Björn Esser, Abhinav Agarwalla + * Evan Shelhamer, Bjoern Esser, Abhinav Agarwalla */ #include diff --git a/src/shogun/io/LibSVMFile.cpp b/src/shogun/io/LibSVMFile.cpp index daa7acf3687..854aaa4906d 100644 --- a/src/shogun/io/LibSVMFile.cpp +++ b/src/shogun/io/LibSVMFile.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Evgeniy Andreev, Jiaolong Xu, Thoralf Klein, Björn Esser, + * Authors: Evgeniy Andreev, Jiaolong Xu, Thoralf Klein, Bjoern Esser, * Giovanni De Toni, Fernando Iglesias */ diff --git a/src/shogun/io/LibSVMFile.h b/src/shogun/io/LibSVMFile.h index bec906e5b0b..fc7c91ed4a0 100644 --- a/src/shogun/io/LibSVMFile.h +++ b/src/shogun/io/LibSVMFile.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Jiaolong Xu, Evgeniy Andreev, Björn Esser, Soeren Sonnenburg, + * Authors: Jiaolong Xu, Evgeniy Andreev, Bjoern Esser, Soeren Sonnenburg, * Heiko Strathmann, Yuyu Zhang, Thoralf Klein, Evan Shelhamer, * Abhinav Agarwalla */ diff --git a/src/shogun/io/LineReader.cpp b/src/shogun/io/LineReader.cpp index 80bf1999fa1..a6d479eecae 100644 --- a/src/shogun/io/LineReader.cpp +++ b/src/shogun/io/LineReader.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Evgeniy Andreev, Thoralf Klein, Viktor Gal, Björn Esser, + * Authors: Evgeniy Andreev, Thoralf Klein, Viktor Gal, Bjoern Esser, * Heiko Strathmann */ diff --git a/src/shogun/io/LineReader.h b/src/shogun/io/LineReader.h index bf61824402e..f07c37d7ce8 100644 --- a/src/shogun/io/LineReader.h +++ b/src/shogun/io/LineReader.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Evgeniy Andreev, Thoralf Klein, Heiko Strathmann, Yuyu Zhang, - * Fernando Iglesias, Björn Esser, Soeren Sonnenburg, Saurabh Goyal + * Fernando Iglesias, Bjoern Esser, Soeren Sonnenburg, Saurabh Goyal */ #ifndef __LINE_READER_H__ diff --git a/src/shogun/io/MLDataHDF5File.cpp b/src/shogun/io/MLDataHDF5File.cpp index 4e69c85f324..19b1f4b4b74 100644 --- a/src/shogun/io/MLDataHDF5File.cpp +++ b/src/shogun/io/MLDataHDF5File.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Liu Zhengyang, Soumyajit De, Viktor Gal, Thoralf Klein, - * Björn Esser, Soeren Sonnenburg, Abhinav Agarwalla + * Bjoern Esser, Soeren Sonnenburg, Abhinav Agarwalla */ #include diff --git a/src/shogun/io/MLDataHDF5File.h b/src/shogun/io/MLDataHDF5File.h index cd53737d88c..1544e507351 100644 --- a/src/shogun/io/MLDataHDF5File.h +++ b/src/shogun/io/MLDataHDF5File.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Liu Zhengyang, Viktor Gal, Thoralf Klein, Abhinav Agarwalla, - * Björn Esser + * Bjoern Esser */ #ifndef __MLDATA_HDF5_FILE_H__ #define __MLDATA_HDF5_FILE_H__ diff --git a/src/shogun/io/MemoryMappedFile.h b/src/shogun/io/MemoryMappedFile.h index 77cbb64f37d..f8bc95871b2 100644 --- a/src/shogun/io/MemoryMappedFile.h +++ b/src/shogun/io/MemoryMappedFile.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Heiko Strathmann, Yuyu Zhang, Viktor Gal, - * Evan Shelhamer, Björn Esser, Roman Votyakov + * Evan Shelhamer, Bjoern Esser, Roman Votyakov */ #ifndef __MEMORYMAPPEDFILE_H__ diff --git a/src/shogun/io/Parser.cpp b/src/shogun/io/Parser.cpp index 063077b27ee..0efe1879bf3 100644 --- a/src/shogun/io/Parser.cpp +++ b/src/shogun/io/Parser.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Evgeniy Andreev, Soeren Sonnenburg, Thoralf Klein, Björn Esser + * Authors: Evgeniy Andreev, Soeren Sonnenburg, Thoralf Klein, Bjoern Esser */ #include diff --git a/src/shogun/io/Parser.h b/src/shogun/io/Parser.h index a4fe053206b..db9f3e7b22e 100644 --- a/src/shogun/io/Parser.h +++ b/src/shogun/io/Parser.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Evgeniy Andreev, Thoralf Klein, Soeren Sonnenburg, Yuyu Zhang, - * Björn Esser + * Bjoern Esser */ #ifndef __PARSER_H__ diff --git a/src/shogun/io/ProtobufFile.cpp b/src/shogun/io/ProtobufFile.cpp index c8485ae7d81..d0e3d805469 100644 --- a/src/shogun/io/ProtobufFile.cpp +++ b/src/shogun/io/ProtobufFile.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Evgeniy Andreev, Soeren Sonnenburg, Viktor Gal, Thoralf Klein, - * Björn Esser, Saurabh Goyal + * Bjoern Esser, Saurabh Goyal */ #include diff --git a/src/shogun/io/ProtobufFile.h b/src/shogun/io/ProtobufFile.h index a56de8c8bbf..85b107ec730 100644 --- a/src/shogun/io/ProtobufFile.h +++ b/src/shogun/io/ProtobufFile.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Evgeniy Andreev, Sergey Lisitsyn, - * Heiko Strathmann, Yuyu Zhang, Viktor Gal, Björn Esser, + * Heiko Strathmann, Yuyu Zhang, Viktor Gal, Bjoern Esser, * Saurabh Goyal */ diff --git a/src/shogun/io/SGIO.cpp b/src/shogun/io/SGIO.cpp index 503c44d484b..100ccaf97ef 100644 --- a/src/shogun/io/SGIO.cpp +++ b/src/shogun/io/SGIO.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Giovanni De Toni, Viktor Gal, Heiko Strathmann, - * Thoralf Klein, Evangelos Anagnostopoulos, Weijie Lin, Björn Esser, + * Thoralf Klein, Evangelos Anagnostopoulos, Weijie Lin, Bjoern Esser, * Saurabh Goyal */ diff --git a/src/shogun/io/SGIO.h b/src/shogun/io/SGIO.h index 5bcd61f6a91..5165eebdc2a 100644 --- a/src/shogun/io/SGIO.h +++ b/src/shogun/io/SGIO.h @@ -3,7 +3,7 @@ * * Authors: Soeren Sonnenburg, Viktor Gal, Giovanni De Toni, Sergey Lisitsyn, * Heiko Strathmann, Yuyu Zhang, Shashwat Lal Das, Thoralf Klein, - * Björn Esser, Evangelos Anagnostopoulos, Sanuj Sharma, + * Bjoern Esser, Evangelos Anagnostopoulos, Sanuj Sharma, * Saurabh Goyal */ diff --git a/src/shogun/io/SerializableAsciiReader00.cpp b/src/shogun/io/SerializableAsciiReader00.cpp index 6a79ecfdfd0..b3a909d11a4 100644 --- a/src/shogun/io/SerializableAsciiReader00.cpp +++ b/src/shogun/io/SerializableAsciiReader00.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Soumyajit De, Heiko Strathmann, Viktor Gal, - * Thoralf Klein, Björn Esser + * Thoralf Klein, Bjoern Esser */ #include diff --git a/src/shogun/io/SerializableHdf5File.cpp b/src/shogun/io/SerializableHdf5File.cpp index 81a9f7b14b9..125c5efe9fb 100644 --- a/src/shogun/io/SerializableHdf5File.cpp +++ b/src/shogun/io/SerializableHdf5File.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Soumyajit De, Heiko Strathmann, Thoralf Klein, - * Björn Esser, Sergey Lisitsyn + * Bjoern Esser, Sergey Lisitsyn */ #include diff --git a/src/shogun/io/SerializableJsonFile.cpp b/src/shogun/io/SerializableJsonFile.cpp index af00971c08d..00ae4e51951 100644 --- a/src/shogun/io/SerializableJsonFile.cpp +++ b/src/shogun/io/SerializableJsonFile.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Heiko Strathmann, Soumyajit De, Björn Esser, + * Authors: Soeren Sonnenburg, Heiko Strathmann, Soumyajit De, Bjoern Esser, * Viktor Gal */ diff --git a/src/shogun/io/SerializableXmlFile.cpp b/src/shogun/io/SerializableXmlFile.cpp index 80b73f7bac9..b3c24a0630c 100644 --- a/src/shogun/io/SerializableXmlFile.cpp +++ b/src/shogun/io/SerializableXmlFile.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Soumyajit De, Heiko Strathmann, Björn Esser + * Authors: Soeren Sonnenburg, Soumyajit De, Heiko Strathmann, Bjoern Esser */ #include diff --git a/src/shogun/io/UAIFile.cpp b/src/shogun/io/UAIFile.cpp index b651373b3df..b89f02aa1b8 100644 --- a/src/shogun/io/UAIFile.cpp +++ b/src/shogun/io/UAIFile.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Abinash Panda, Luis Franca, Björn Esser, Sergey Lisitsyn + * Authors: Abinash Panda, Luis Franca, Bjoern Esser, Sergey Lisitsyn */ #include diff --git a/src/shogun/io/UAIFile.h b/src/shogun/io/UAIFile.h index 33ef4aed477..3d1aca0ce64 100644 --- a/src/shogun/io/UAIFile.h +++ b/src/shogun/io/UAIFile.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Heiko Strathmann, Abinash Panda, Abhinav Agarwalla, Björn Esser, + * Authors: Heiko Strathmann, Abinash Panda, Abhinav Agarwalla, Bjoern Esser, * Sergey Lisitsyn */ diff --git a/src/shogun/kernel/ANOVAKernel.h b/src/shogun/kernel/ANOVAKernel.h index 683e0a9dbb8..6b79b86ece5 100644 --- a/src/shogun/kernel/ANOVAKernel.h +++ b/src/shogun/kernel/ANOVAKernel.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Sergey Lisitsyn, Soeren Sonnenburg, Heiko Strathmann, - * Evan Shelhamer, Björn Esser + * Evan Shelhamer, Bjoern Esser */ #include diff --git a/src/shogun/kernel/AUCKernel.cpp b/src/shogun/kernel/AUCKernel.cpp index 485ecf93419..7a3de97861d 100644 --- a/src/shogun/kernel/AUCKernel.cpp +++ b/src/shogun/kernel/AUCKernel.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Evan Shelhamer, Chiyuan Zhang, Björn Esser, + * Authors: Soeren Sonnenburg, Evan Shelhamer, Chiyuan Zhang, Bjoern Esser, * Sergey Lisitsyn */ diff --git a/src/shogun/kernel/BesselKernel.h b/src/shogun/kernel/BesselKernel.h index 7a0f88ade75..d3034e68ccd 100644 --- a/src/shogun/kernel/BesselKernel.h +++ b/src/shogun/kernel/BesselKernel.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sergey Lisitsyn, Soeren Sonnenburg, Yuyu Zhang, Björn Esser + * Authors: Sergey Lisitsyn, Soeren Sonnenburg, Yuyu Zhang, Bjoern Esser */ #ifndef BESSELKERNEL_H_ diff --git a/src/shogun/kernel/CauchyKernel.h b/src/shogun/kernel/CauchyKernel.h index 0643632f82d..d1138876d20 100644 --- a/src/shogun/kernel/CauchyKernel.h +++ b/src/shogun/kernel/CauchyKernel.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Björn Esser + * Authors: Soeren Sonnenburg, Bjoern Esser */ #include diff --git a/src/shogun/kernel/CircularKernel.h b/src/shogun/kernel/CircularKernel.h index daf058a3795..0fdc8dd940c 100644 --- a/src/shogun/kernel/CircularKernel.h +++ b/src/shogun/kernel/CircularKernel.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Björn Esser, Sergey Lisitsyn + * Authors: Soeren Sonnenburg, Bjoern Esser, Sergey Lisitsyn */ #include diff --git a/src/shogun/kernel/DirectorKernel.h b/src/shogun/kernel/DirectorKernel.h index 9557dfede9a..4b946d3d0ab 100644 --- a/src/shogun/kernel/DirectorKernel.h +++ b/src/shogun/kernel/DirectorKernel.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Evgeniy Andreev, Pan Deng, Björn Esser, + * Authors: Soeren Sonnenburg, Evgeniy Andreev, Pan Deng, Bjoern Esser, * Sergey Lisitsyn */ diff --git a/src/shogun/kernel/DistanceKernel.cpp b/src/shogun/kernel/DistanceKernel.cpp index 4f9b6f76943..573b427b530 100644 --- a/src/shogun/kernel/DistanceKernel.cpp +++ b/src/shogun/kernel/DistanceKernel.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Evan Shelhamer, Björn Esser, Sergey Lisitsyn + * Authors: Soeren Sonnenburg, Evan Shelhamer, Bjoern Esser, Sergey Lisitsyn */ #include diff --git a/src/shogun/kernel/GaussianARDKernel.cpp b/src/shogun/kernel/GaussianARDKernel.cpp index 93bee21083c..0ade24842b1 100644 --- a/src/shogun/kernel/GaussianARDKernel.cpp +++ b/src/shogun/kernel/GaussianARDKernel.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Wu Lin, Jacob Walker, Roman Votyakov, Pan Deng, Heiko Strathmann, - * Soumyajit De, Viktor Gal, Björn Esser, Soeren Sonnenburg + * Soumyajit De, Viktor Gal, Bjoern Esser, Soeren Sonnenburg */ #include diff --git a/src/shogun/kernel/Kernel.cpp b/src/shogun/kernel/Kernel.cpp index 0bb237b2d31..2927313f9c7 100644 --- a/src/shogun/kernel/Kernel.cpp +++ b/src/shogun/kernel/Kernel.cpp @@ -1,7 +1,4 @@ /* - * EXCEPT FOR THE KERNEL CACHING FUNCTIONS WHICH ARE (W) THORSTEN JOACHIMS - * COPYRIGHT (C) 1999 UNIVERSITAET DORTMUND - ALL RIGHTS RESERVED - * * this program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or diff --git a/src/shogun/kernel/Kernel.h b/src/shogun/kernel/Kernel.h index 139340e5d5b..5d6c0b00a8b 100644 --- a/src/shogun/kernel/Kernel.h +++ b/src/shogun/kernel/Kernel.h @@ -1,7 +1,4 @@ /* - * EXCEPT FOR THE KERNEL CACHING FUNCTIONS WHICH ARE (W) THORSTEN JOACHIMS - * COPYRIGHT (C) 1999 UNIVERSITAET DORTMUND - ALL RIGHTS RESERVED - * * this program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or diff --git a/src/shogun/kernel/LinearKernel.h b/src/shogun/kernel/LinearKernel.h index 7ab3f7508c5..d37934174c0 100644 --- a/src/shogun/kernel/LinearKernel.h +++ b/src/shogun/kernel/LinearKernel.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Yuyu Zhang, Björn Esser + * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Yuyu Zhang, Bjoern Esser */ #ifndef _LINEARKERNEL_H___ diff --git a/src/shogun/kernel/LogKernel.h b/src/shogun/kernel/LogKernel.h index cf520213671..258038af6ea 100644 --- a/src/shogun/kernel/LogKernel.h +++ b/src/shogun/kernel/LogKernel.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Björn Esser + * Authors: Soeren Sonnenburg, Bjoern Esser */ #include diff --git a/src/shogun/kernel/PowerKernel.h b/src/shogun/kernel/PowerKernel.h index 0a4ead1879e..c4aca26f2a6 100644 --- a/src/shogun/kernel/PowerKernel.h +++ b/src/shogun/kernel/PowerKernel.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Evan Shelhamer, Björn Esser + * Authors: Soeren Sonnenburg, Evan Shelhamer, Bjoern Esser */ #include diff --git a/src/shogun/kernel/PyramidChi2.h b/src/shogun/kernel/PyramidChi2.h index d0ad68f0ea4..c458aa9cbb7 100644 --- a/src/shogun/kernel/PyramidChi2.h +++ b/src/shogun/kernel/PyramidChi2.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Heiko Strathmann, Yuyu Zhang, Evan Shelhamer, - * Björn Esser, Sergey Lisitsyn + * Bjoern Esser, Sergey Lisitsyn */ #ifndef PYRAMIDCHI2_H_ diff --git a/src/shogun/kernel/RationalQuadraticKernel.h b/src/shogun/kernel/RationalQuadraticKernel.h index fc9492138ee..a3d2c697d66 100644 --- a/src/shogun/kernel/RationalQuadraticKernel.h +++ b/src/shogun/kernel/RationalQuadraticKernel.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Björn Esser, Sergey Lisitsyn + * Authors: Soeren Sonnenburg, Bjoern Esser, Sergey Lisitsyn */ #include diff --git a/src/shogun/kernel/SphericalKernel.cpp b/src/shogun/kernel/SphericalKernel.cpp index 279e2abba5e..afc9c3dcb26 100644 --- a/src/shogun/kernel/SphericalKernel.cpp +++ b/src/shogun/kernel/SphericalKernel.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Evan Shelhamer, Björn Esser + * Authors: Soeren Sonnenburg, Evan Shelhamer, Bjoern Esser */ #include diff --git a/src/shogun/kernel/SphericalKernel.h b/src/shogun/kernel/SphericalKernel.h index 2ba0123a84f..b1180bc7b8d 100644 --- a/src/shogun/kernel/SphericalKernel.h +++ b/src/shogun/kernel/SphericalKernel.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Evan Shelhamer, Björn Esser + * Authors: Soeren Sonnenburg, Evan Shelhamer, Bjoern Esser */ #include diff --git a/src/shogun/kernel/TStudentKernel.h b/src/shogun/kernel/TStudentKernel.h index 220976d117a..1208313912c 100644 --- a/src/shogun/kernel/TStudentKernel.h +++ b/src/shogun/kernel/TStudentKernel.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Björn Esser + * Authors: Soeren Sonnenburg, Bjoern Esser */ #include diff --git a/src/shogun/kernel/WaveKernel.h b/src/shogun/kernel/WaveKernel.h index 98c8450f2b3..8e224193634 100644 --- a/src/shogun/kernel/WaveKernel.h +++ b/src/shogun/kernel/WaveKernel.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Björn Esser + * Authors: Soeren Sonnenburg, Bjoern Esser */ #include diff --git a/src/shogun/kernel/string/CommUlongStringKernel.h b/src/shogun/kernel/string/CommUlongStringKernel.h index 6e53f5bbdfa..af4109314e3 100644 --- a/src/shogun/kernel/string/CommUlongStringKernel.h +++ b/src/shogun/kernel/string/CommUlongStringKernel.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Yuyu Zhang, Björn Esser, + * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Yuyu Zhang, Bjoern Esser, * Evangelos Anagnostopoulos */ diff --git a/src/shogun/kernel/string/CommWordStringKernel.cpp b/src/shogun/kernel/string/CommWordStringKernel.cpp index f70f684ecb1..7f6f3c25e1c 100644 --- a/src/shogun/kernel/string/CommWordStringKernel.cpp +++ b/src/shogun/kernel/string/CommWordStringKernel.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Giovanni De Toni, Heiko Strathmann, Viktor Gal, - * Weijie Lin, Björn Esser, Sergey Lisitsyn + * Weijie Lin, Bjoern Esser, Sergey Lisitsyn */ #include diff --git a/src/shogun/kernel/string/CommWordStringKernel.h b/src/shogun/kernel/string/CommWordStringKernel.h index 9403b0bc6cf..04bdeb7d203 100644 --- a/src/shogun/kernel/string/CommWordStringKernel.h +++ b/src/shogun/kernel/string/CommWordStringKernel.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Yuyu Zhang, Björn Esser, + * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Yuyu Zhang, Bjoern Esser, * Viktor Gal */ diff --git a/src/shogun/kernel/string/HistogramWordStringKernel.cpp b/src/shogun/kernel/string/HistogramWordStringKernel.cpp index 4224b015c33..3484b9445e4 100644 --- a/src/shogun/kernel/string/HistogramWordStringKernel.cpp +++ b/src/shogun/kernel/string/HistogramWordStringKernel.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Björn Esser, Sergey Lisitsyn + * Authors: Soeren Sonnenburg, Bjoern Esser, Sergey Lisitsyn */ #include diff --git a/src/shogun/kernel/string/LinearStringKernel.h b/src/shogun/kernel/string/LinearStringKernel.h index 10d287a1e6e..8f466846420 100644 --- a/src/shogun/kernel/string/LinearStringKernel.h +++ b/src/shogun/kernel/string/LinearStringKernel.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sergey Lisitsyn, Yuyu Zhang, Björn Esser, Viktor Gal + * Authors: Sergey Lisitsyn, Yuyu Zhang, Bjoern Esser, Viktor Gal */ #ifndef _LINEARSTRINGKERNEL_H___ diff --git a/src/shogun/kernel/string/LocalAlignmentStringKernel.h b/src/shogun/kernel/string/LocalAlignmentStringKernel.h index 2b218509d68..6d072541304 100644 --- a/src/shogun/kernel/string/LocalAlignmentStringKernel.h +++ b/src/shogun/kernel/string/LocalAlignmentStringKernel.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Yuyu Zhang, Björn Esser, Sergey Lisitsyn + * Authors: Soeren Sonnenburg, Yuyu Zhang, Bjoern Esser, Sergey Lisitsyn */ #ifndef _LOCALALIGNMENTSTRINGKERNEL_H___ diff --git a/src/shogun/kernel/string/OligoStringKernel.cpp b/src/shogun/kernel/string/OligoStringKernel.cpp index f2bb34c633d..614aa914565 100644 --- a/src/shogun/kernel/string/OligoStringKernel.cpp +++ b/src/shogun/kernel/string/OligoStringKernel.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Björn Esser + * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Bjoern Esser */ #include #include diff --git a/src/shogun/kernel/string/OligoStringKernel.h b/src/shogun/kernel/string/OligoStringKernel.h index 10bdaa4acd9..23fb95a33ad 100644 --- a/src/shogun/kernel/string/OligoStringKernel.h +++ b/src/shogun/kernel/string/OligoStringKernel.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Yuyu Zhang, Björn Esser, Sergey Lisitsyn + * Authors: Soeren Sonnenburg, Yuyu Zhang, Bjoern Esser, Sergey Lisitsyn */ #ifndef _OLIGOSTRINGKERNEL_H_ #define _OLIGOSTRINGKERNEL_H_ diff --git a/src/shogun/kernel/string/SalzbergWordStringKernel.h b/src/shogun/kernel/string/SalzbergWordStringKernel.h index 2d4a3fc0807..9ff2c1ef403 100644 --- a/src/shogun/kernel/string/SalzbergWordStringKernel.h +++ b/src/shogun/kernel/string/SalzbergWordStringKernel.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Yuyu Zhang, Björn Esser, Sergey Lisitsyn + * Authors: Soeren Sonnenburg, Yuyu Zhang, Bjoern Esser, Sergey Lisitsyn */ #ifndef _SALZBERGWORDSTRINGKERNEL_H___ diff --git a/src/shogun/kernel/string/SpectrumRBFKernel.cpp b/src/shogun/kernel/string/SpectrumRBFKernel.cpp index 105a73ca03a..efd97e0be90 100644 --- a/src/shogun/kernel/string/SpectrumRBFKernel.cpp +++ b/src/shogun/kernel/string/SpectrumRBFKernel.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Sergey Lisitsyn, Heiko Strathmann, Viktor Gal, Soeren Sonnenburg, - * Weijie Lin, Björn Esser, Saurabh Goyal + * Weijie Lin, Bjoern Esser, Saurabh Goyal */ #include diff --git a/src/shogun/kernel/string/WeightedCommWordStringKernel.h b/src/shogun/kernel/string/WeightedCommWordStringKernel.h index ca336946fdc..c3b45979bee 100644 --- a/src/shogun/kernel/string/WeightedCommWordStringKernel.h +++ b/src/shogun/kernel/string/WeightedCommWordStringKernel.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Yuyu Zhang, Björn Esser, Sergey Lisitsyn + * Authors: Soeren Sonnenburg, Yuyu Zhang, Bjoern Esser, Sergey Lisitsyn */ #ifndef _WEIGHTEDCOMMWORDSTRINGKERNEL_H___ diff --git a/src/shogun/kernel/string/WeightedDegreePositionStringKernel.cpp b/src/shogun/kernel/string/WeightedDegreePositionStringKernel.cpp index 9ae0c11f822..5b74a408876 100644 --- a/src/shogun/kernel/string/WeightedDegreePositionStringKernel.cpp +++ b/src/shogun/kernel/string/WeightedDegreePositionStringKernel.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Giovanni De Toni, Soeren Sonnenburg, Sergey Lisitsyn, - * Heiko Strathmann, Viktor Gal, Weijie Lin, Björn Esser + * Heiko Strathmann, Viktor Gal, Weijie Lin, Bjoern Esser */ #include diff --git a/src/shogun/kernel/string/WeightedDegreePositionStringKernel.h b/src/shogun/kernel/string/WeightedDegreePositionStringKernel.h index ea02a09d93b..16a7f254074 100644 --- a/src/shogun/kernel/string/WeightedDegreePositionStringKernel.h +++ b/src/shogun/kernel/string/WeightedDegreePositionStringKernel.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Patrick Pletscher, Yuyu Zhang, - * Björn Esser + * Bjoern Esser */ #ifndef _WEIGHTEDDEGREEPOSITIONSTRINGKERNEL_H___ diff --git a/src/shogun/kernel/string/WeightedDegreeStringKernel.cpp b/src/shogun/kernel/string/WeightedDegreeStringKernel.cpp index 8254cb07df3..9ef74372852 100644 --- a/src/shogun/kernel/string/WeightedDegreeStringKernel.cpp +++ b/src/shogun/kernel/string/WeightedDegreeStringKernel.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Giovanni De Toni, Soeren Sonnenburg, Sergey Lisitsyn, Björn Esser, + * Authors: Giovanni De Toni, Soeren Sonnenburg, Sergey Lisitsyn, Bjoern Esser, * Viktor Gal */ diff --git a/src/shogun/kernel/string/WeightedDegreeStringKernel.h b/src/shogun/kernel/string/WeightedDegreeStringKernel.h index df8be6e1452..ed668ecfce7 100644 --- a/src/shogun/kernel/string/WeightedDegreeStringKernel.h +++ b/src/shogun/kernel/string/WeightedDegreeStringKernel.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Yuyu Zhang, Björn Esser, Sergey Lisitsyn + * Authors: Soeren Sonnenburg, Yuyu Zhang, Bjoern Esser, Sergey Lisitsyn */ #ifndef _WEIGHTEDDEGREESTRINGKERNEL_H___ diff --git a/src/shogun/labels/FactorGraphLabels.h b/src/shogun/labels/FactorGraphLabels.h index 74da694a8b9..f62db8589f5 100644 --- a/src/shogun/labels/FactorGraphLabels.h +++ b/src/shogun/labels/FactorGraphLabels.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Shell Hu, Fernando Iglesias, Yuyu Zhang, Björn Esser + * Authors: Shell Hu, Fernando Iglesias, Yuyu Zhang, Bjoern Esser */ #ifndef __FACTORGRAPH_LABELS_H__ diff --git a/src/shogun/labels/LabelsFactory.h b/src/shogun/labels/LabelsFactory.h index 1d09ee06ad9..fe96ee45bc7 100644 --- a/src/shogun/labels/LabelsFactory.h +++ b/src/shogun/labels/LabelsFactory.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Jiaolong Xu, Soeren Sonnenburg, Heiko Strathmann, Evgeniy Andreev, - * Yuyu Zhang, Fernando Iglesias, Björn Esser + * Yuyu Zhang, Fernando Iglesias, Bjoern Esser */ #ifndef _LABELS_FACTORY__H__ diff --git a/src/shogun/labels/LatentLabels.cpp b/src/shogun/labels/LatentLabels.cpp index 8efe908e8e9..a0cc41b6e06 100644 --- a/src/shogun/labels/LatentLabels.cpp +++ b/src/shogun/labels/LatentLabels.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Viktor Gal, Soeren Sonnenburg, Evgeniy Andreev, Thoralf Klein, - * Fernando Iglesias, Björn Esser + * Fernando Iglesias, Bjoern Esser */ #include diff --git a/src/shogun/labels/MulticlassLabels.h b/src/shogun/labels/MulticlassLabels.h index c03a2f4e616..d38491f35b8 100644 --- a/src/shogun/labels/MulticlassLabels.h +++ b/src/shogun/labels/MulticlassLabels.h @@ -4,7 +4,7 @@ * Authors: Fernando Iglesias, Soeren Sonnenburg, Sergey Lisitsyn, * Saurabh Mahindre, Olivier NGuyen, Thoralf Klein, Giovanni De Toni, * Heiko Strathmann, Michele Mazzoni, Evgeniy Andreev, Yuyu Zhang, - * Chiyuan Zhang, Viktor Gal, Björn Esser + * Chiyuan Zhang, Viktor Gal, Bjoern Esser */ #ifndef _MULTICLASS_LABELS__H__ diff --git a/src/shogun/labels/StructuredLabels.cpp b/src/shogun/labels/StructuredLabels.cpp index 40d98b479a3..f43c32446f3 100644 --- a/src/shogun/labels/StructuredLabels.cpp +++ b/src/shogun/labels/StructuredLabels.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Fernando Iglesias, Thoralf Klein, Evgeniy Andreev, - * Soeren Sonnenburg, Björn Esser + * Soeren Sonnenburg, Bjoern Esser */ #include diff --git a/src/shogun/labels/StructuredLabels.h b/src/shogun/labels/StructuredLabels.h index c00c8a03b93..9ec6ec9ee75 100644 --- a/src/shogun/labels/StructuredLabels.h +++ b/src/shogun/labels/StructuredLabels.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Fernando Iglesias, Thoralf Klein, Evgeniy Andreev, Yuyu Zhang, - * Björn Esser + * Bjoern Esser */ #ifndef _STRUCTURED_LABELS__H__ diff --git a/src/shogun/latent/DirectorLatentModel.h b/src/shogun/latent/DirectorLatentModel.h index 38094e5c24f..aefc1e0b5c1 100644 --- a/src/shogun/latent/DirectorLatentModel.h +++ b/src/shogun/latent/DirectorLatentModel.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Björn Esser, Viktor Gal + * Authors: Bjoern Esser, Viktor Gal */ #ifndef _DIRECTOR_LATENT_MODEL_H_ diff --git a/src/shogun/latent/LatentModel.h b/src/shogun/latent/LatentModel.h index 87f3e78caad..dad4e8cc64c 100644 --- a/src/shogun/latent/LatentModel.h +++ b/src/shogun/latent/LatentModel.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Viktor Gal, Sergey Lisitsyn, Yuyu Zhang, Björn Esser + * Authors: Viktor Gal, Sergey Lisitsyn, Yuyu Zhang, Bjoern Esser */ #ifndef __LATENTMODEL_H__ diff --git a/src/shogun/lib/CircularBuffer.cpp b/src/shogun/lib/CircularBuffer.cpp index e71e8dc4f66..09c51488c3d 100644 --- a/src/shogun/lib/CircularBuffer.cpp +++ b/src/shogun/lib/CircularBuffer.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Evgeniy Andreev, Thoralf Klein, Weijie Lin, Björn Esser, + * Authors: Evgeniy Andreev, Thoralf Klein, Weijie Lin, Bjoern Esser, * Viktor Gal */ diff --git a/src/shogun/lib/CircularBuffer.h b/src/shogun/lib/CircularBuffer.h index 87b27abf777..5a593a666ad 100644 --- a/src/shogun/lib/CircularBuffer.h +++ b/src/shogun/lib/CircularBuffer.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Evgeniy Andreev, Heiko Strathmann, Yuyu Zhang, Thoralf Klein, - * Fernando Iglesias, Björn Esser + * Fernando Iglesias, Bjoern Esser */ #ifndef __CIRCULARBUFFER_H_ diff --git a/src/shogun/lib/DataType.cpp b/src/shogun/lib/DataType.cpp index 8ebbfe5dba4..d2d88914d42 100644 --- a/src/shogun/lib/DataType.cpp +++ b/src/shogun/lib/DataType.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Heiko Strathmann, Soeren Sonnenburg, Soumyajit De, Thoralf Klein, - * Björn Esser + * Bjoern Esser */ #include diff --git a/src/shogun/lib/DelimiterTokenizer.h b/src/shogun/lib/DelimiterTokenizer.h index f364436d85a..b63c00c2061 100644 --- a/src/shogun/lib/DelimiterTokenizer.h +++ b/src/shogun/lib/DelimiterTokenizer.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Evangelos Anagnostopoulos, Thoralf Klein, Evgeniy Andreev, - * Yuyu Zhang, Fernando Iglesias, Björn Esser + * Yuyu Zhang, Fernando Iglesias, Bjoern Esser */ #ifndef _DELIMITERTOKENIZER__H__ diff --git a/src/shogun/lib/DynamicArray.h b/src/shogun/lib/DynamicArray.h index 29fdc01bd1e..31ec0df3baa 100644 --- a/src/shogun/lib/DynamicArray.h +++ b/src/shogun/lib/DynamicArray.h @@ -3,7 +3,7 @@ * * Authors: Soeren Sonnenburg, Evgeniy Andreev, Heiko Strathmann, * Sergey Lisitsyn, Leon Kuchenbecker, Yuyu Zhang, Thoralf Klein, - * Fernando Iglesias, Björn Esser + * Fernando Iglesias, Bjoern Esser */ #ifndef _DYNAMIC_ARRAY_H_ diff --git a/src/shogun/lib/DynamicObjectArray.h b/src/shogun/lib/DynamicObjectArray.h index ffae2c7805c..de39407a518 100644 --- a/src/shogun/lib/DynamicObjectArray.h +++ b/src/shogun/lib/DynamicObjectArray.h @@ -3,7 +3,7 @@ * * Authors: Soeren Sonnenburg, Heiko Strathmann, Evgeniy Andreev, * Sergey Lisitsyn, Leon Kuchenbecker, Yuyu Zhang, Thoralf Klein, - * Fernando Iglesias, Björn Esser + * Fernando Iglesias, Bjoern Esser */ #ifndef _DYNAMIC_OBJECT_ARRAY_H_ diff --git a/src/shogun/lib/IndexBlock.cpp b/src/shogun/lib/IndexBlock.cpp index 87ef21f65a7..a58babf1b77 100644 --- a/src/shogun/lib/IndexBlock.cpp +++ b/src/shogun/lib/IndexBlock.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Thoralf Klein, Björn Esser, Sergey Lisitsyn + * Authors: Soeren Sonnenburg, Thoralf Klein, Bjoern Esser, Sergey Lisitsyn */ #include diff --git a/src/shogun/lib/IndexBlock.h b/src/shogun/lib/IndexBlock.h index c3e17df46ca..23905c17937 100644 --- a/src/shogun/lib/IndexBlock.h +++ b/src/shogun/lib/IndexBlock.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Sergey Lisitsyn, Heiko Strathmann, Yuyu Zhang, Thoralf Klein, - * Björn Esser, Soeren Sonnenburg + * Bjoern Esser, Soeren Sonnenburg */ #ifndef INDEXBLOCK_H_ diff --git a/src/shogun/lib/IndexBlockGroup.h b/src/shogun/lib/IndexBlockGroup.h index fd4071ab627..8ef1fe9775d 100644 --- a/src/shogun/lib/IndexBlockGroup.h +++ b/src/shogun/lib/IndexBlockGroup.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sergey Lisitsyn, Thoralf Klein, Yuyu Zhang, Björn Esser + * Authors: Sergey Lisitsyn, Thoralf Klein, Yuyu Zhang, Bjoern Esser */ #ifndef INDEXBLOCKGROUP_H_ diff --git a/src/shogun/lib/IndexBlockRelation.cpp b/src/shogun/lib/IndexBlockRelation.cpp index df10457f9a3..066e796e827 100644 --- a/src/shogun/lib/IndexBlockRelation.cpp +++ b/src/shogun/lib/IndexBlockRelation.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Thoralf Klein, Soeren Sonnenburg, Björn Esser, Sergey Lisitsyn + * Authors: Thoralf Klein, Soeren Sonnenburg, Bjoern Esser, Sergey Lisitsyn */ #include diff --git a/src/shogun/lib/IndexBlockTree.cpp b/src/shogun/lib/IndexBlockTree.cpp index bd217e1e816..b907a2f249b 100644 --- a/src/shogun/lib/IndexBlockTree.cpp +++ b/src/shogun/lib/IndexBlockTree.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sergey Lisitsyn, Thoralf Klein, Soeren Sonnenburg, Björn Esser + * Authors: Sergey Lisitsyn, Thoralf Klein, Soeren Sonnenburg, Bjoern Esser */ #include diff --git a/src/shogun/lib/IndexBlockTree.h b/src/shogun/lib/IndexBlockTree.h index c22fa00b5f0..6f9aca44f32 100644 --- a/src/shogun/lib/IndexBlockTree.h +++ b/src/shogun/lib/IndexBlockTree.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sergey Lisitsyn, Thoralf Klein, Yuyu Zhang, Björn Esser + * Authors: Sergey Lisitsyn, Thoralf Klein, Yuyu Zhang, Bjoern Esser */ #ifndef INDEXBLOCKTREE_H_ diff --git a/src/shogun/lib/JLCoverTree.h b/src/shogun/lib/JLCoverTree.h deleted file mode 100644 index b270b0be418..00000000000 --- a/src/shogun/lib/JLCoverTree.h +++ /dev/null @@ -1,866 +0,0 @@ -#ifndef JLCOVERTREE_H -#define JLCOVERTREE_H - -#include - -#include -#include - -#include -#include -#ifndef NDEBUG -#define NDEBUG -#endif // NDEBUG -#include -#ifdef _WIN32 -#undef far -#undef near -#endif - -/* First written by John Langford jl@hunch.net - Templatization by Dinoj Surendran dinojs@gmail.com - Adaptation to Shogun by Fernando José Iglesias García -*/ - -// the files below may not need to be included - -/* Whatever structure/class/type is used for P, it must have the following functions defined: - - float distance(P v1, P v2, float upper_bound); - : this returns the distance between two P objects - : the distance does not have to be calculated fully if it's more than upper_bound - - v_array

parse_points(char *filename); - : this fills up a v_array of P objects from the input file - - void print(point &P); - : this prints out the contents of a P object. -*/ - -using namespace shogun; - -/** - * Cover tree node TODO better doc - */ -template -struct node { - - /** Point */ - P p; - - /** The maximum distance to any grandchild */ - float max_dist; - - /** The distance to the parent */ - float parent_dist; - - /** Pointer to the list of children of this node */ - node

* children; - - /** The number of children nodes of this node */ - unsigned short int num_children; - - /** Essentially, an upper bound on the distance to any child */ - short int scale; - -}; - -//template -//node

insert(P newpoint, node

*top_node); // not yet implemented -// -//template -//void remove(P byepoint, node

*top_node); // not yet implemented -//query - -/** - * Cover tree node with an associated set of distances TODO better doc - */ -template -struct ds_node { - - /** Vector of distances TODO better doc*/ - v_array dist; - - /** Point TODO better doc */ - P p; - -}; - -static float base = 1.3; - - -static float il2 = 1. / log(base); - -inline float dist_of_scale (int s) -{ - return CMath::pow(base, s); -} - -inline int get_scale(float d) -{ - return (int)std::ceil(il2 * log(d)); -} - -template -node

new_node(const P &p) -{ - node

new_node; - new_node.p = p; - return new_node; -} - -template -node

new_leaf(const P &p) -{ - node

new_leaf = {p,0.,0.,NULL,0,100}; - return new_leaf; -} - -template -float max_set(v_array > &v) -{ - float max = 0.; - for (int i = 0; i < v.index; i++) - if ( max < v[i].dist.last()) - max = v[i].dist.last(); - return max; -} - -void print_space(int s) -{ - for (int i = 0; i < s; i++) - SG_SPRINT(" ") -} - -template -void print(int depth, node

&top_node) -{ - print_space(depth); - print(top_node.p); - if ( top_node.num_children > 0 ) - { - print_space(depth); - SG_SPRINT("scale = %i\n",top_node.scale) - print_space(depth); - SG_SPRINT("max_dist = %f\n",top_node.max_dist) - print_space(depth); - SG_SPRINT("num children = %i\n",top_node.num_children) - for (int i = 0; i < top_node.num_children;i++) - print(depth+1, top_node.children[i]); - } -} - -template -void split(v_array >& point_set, v_array >& far_set, int max_scale) -{ - unsigned int new_index = 0; - float fmax = dist_of_scale(max_scale); - for (int i = 0; i < point_set.index; i++) - { - if (point_set[i].dist.last() <= fmax) - { - point_set[new_index++] = point_set[i]; - } - else - push(far_set,point_set[i]); - } - point_set.index=new_index; -} - -template -void dist_split(v_array >& point_set, - v_array >& new_point_set, - P new_point, - int max_scale) -{ - unsigned int new_index = 0; - float fmax = dist_of_scale(max_scale); - for(int i = 0; i < point_set.index; i++) - { - float new_d; - new_d = distance(new_point, point_set[i].p, fmax); - if (new_d <= fmax ) - { - push(point_set[i].dist, new_d); - push(new_point_set,point_set[i]); - } - else - point_set[new_index++] = point_set[i]; - } - point_set.index = new_index; -} - - - - -/* - max_scale is the maximum scale of the node we might create here. - point_set contains points which are 2*max_scale or less away. -*/ - -template -node

batch_insert(const P& p, - int max_scale, - int top_scale, - v_array >& point_set, - v_array >& consumed_set, - v_array > >& stack) -{ - if (point_set.index == 0) - return new_leaf(p); - else { - float max_dist = max_set(point_set); //O(|point_set|) - int next_scale = CMath::min(max_scale - 1, get_scale(max_dist)); - if (next_scale == -2147483647-1) // We have points with distance 0. - { - v_array > children; - push(children,new_leaf(p)); - while (point_set.index > 0) - { - push(children,new_leaf(point_set.last().p)); - push(consumed_set,point_set.last()); - point_set.decr(); - } - node

n = new_node(p); - n.scale = 100; // A magic number meant to be larger than all scales. - n.max_dist = 0; - alloc(children,children.index); - n.num_children = children.index; - n.children = children.elements; - return n; - } - else - { - v_array > far = pop(stack); - split(point_set,far,max_scale); //O(|point_set|) - - node

child = batch_insert(p, next_scale, top_scale, point_set, consumed_set, stack); - - if (point_set.index == 0) - { - push(stack,point_set); - point_set=far; - return child; - } - else { - node

n = new_node(p); - v_array > children; - push(children, child); - v_array > new_point_set = pop(stack); - v_array > new_consumed_set = pop(stack); - while (point_set.index != 0) { //O(|point_set| * num_children) - P new_point = point_set.last().p; - float new_dist = point_set.last().dist.last(); - push(consumed_set, point_set.last()); - point_set.decr(); - - dist_split(point_set, new_point_set, new_point, max_scale); //O(|point_saet|) - dist_split(far,new_point_set,new_point,max_scale); //O(|far|) - - node

new_child = - batch_insert(new_point, next_scale, top_scale, new_point_set, new_consumed_set, stack); - new_child.parent_dist = new_dist; - - push(children, new_child); - - float fmax = dist_of_scale(max_scale); - for(int i = 0; i< new_point_set.index; i++) //O(|new_point_set|) - { - new_point_set[i].dist.decr(); - if (new_point_set[i].dist.last() <= fmax) - push(point_set, new_point_set[i]); - else - push(far, new_point_set[i]); - } - for(int i = 0; i< new_consumed_set.index; i++) //O(|new_point_set|) - { - new_consumed_set[i].dist.decr(); - push(consumed_set, new_consumed_set[i]); - } - new_point_set.index = 0; - new_consumed_set.index = 0; - } - push(stack,new_point_set); - push(stack,new_consumed_set); - push(stack,point_set); - point_set=far; - n.scale = top_scale - max_scale; - n.max_dist = max_set(consumed_set); - alloc(children,children.index); - n.num_children = children.index; - n.children = children.elements; - return n; - } - } - } -} - -template -node

batch_create(v_array

points) -{ - assert(points.index > 0); - v_array > point_set; - v_array > > stack; - - for (int i = 1; i < points.index; i++) { - ds_node

temp; - push(temp.dist, distance(points[0], points[i], FLT_MAX)); - temp.p = points[i]; - push(point_set,temp); - } - - v_array > consumed_set; - - float max_dist = max_set(point_set); - - node

top = batch_insert (points[0], - get_scale(max_dist), - get_scale(max_dist), - point_set, - consumed_set, - stack); - for (int i = 0; i &heights) -{ - if (heights.index <= d) - for(;heights.index <= d;) - push(heights,0); - heights[d] = heights[d] + 1; -} - -template -int height_dist(const node

top_node,v_array &heights) -{ - if (top_node.num_children == 0) - { - add_height(0,heights); - return 0; - } - else - { - int max_v=0; - for (int i = 0; i max_v) - max_v = d; - } - add_height(1 + max_v, heights); - return (1 + max_v); - } -} - -template -void depth_dist(int top_scale, const node

top_node,v_array &depths) -{ - if (top_node.num_children > 0) - for (int i = 0; i -void breadth_dist(const node

top_node,v_array &breadths) -{ - if (top_node.num_children == 0) - add_height(0,breadths); - else - { - for (int i = 0; i -struct d_node { - - /** Distance TODO better doc*/ - float dist; - - /** List of nodes TODO better doc*/ - const node

*n; -}; - -template -inline float compare(const d_node

*p1, const d_node

* p2) -{ - return p1 -> dist - p2 -> dist; -} - -template -void halfsort (v_array > cover_set) -{ - - if (cover_set.index <= 1) - return; - register d_node

*base_ptr = cover_set.elements; - - d_node

*hi = &base_ptr[cover_set.index - 1]; - d_node

*right_ptr = hi; - d_node

*left_ptr; - - while (right_ptr > base_ptr) - { - d_node

*mid = base_ptr + ((hi - base_ptr) >> 1); - - if (compare ( mid, base_ptr) < 0.) - CMath::swap(*mid, *base_ptr); - if (compare ( hi, mid) < 0.) - CMath::swap(*mid, *hi); - else - goto jump_over; - if (compare ( mid, base_ptr) < 0.) - CMath::swap(*mid, *base_ptr); - jump_over:; - - left_ptr = base_ptr + 1; - right_ptr = hi - 1; - - do - { - while (compare (left_ptr, mid) < 0.) - left_ptr ++; - - while (compare (mid, right_ptr) < 0.) - right_ptr --; - - if (left_ptr < right_ptr) - { - CMath::swap(*left_ptr, *right_ptr); - if (mid == left_ptr) - mid = right_ptr; - else if (mid == right_ptr) - mid = left_ptr; - left_ptr ++; - right_ptr --; - } - else if (left_ptr == right_ptr) - { - left_ptr ++; - right_ptr --; - break; - } - } - while (left_ptr <= right_ptr); - - hi = right_ptr; - } -} - - -template -v_array > > get_cover_sets(v_array > > > &spare_cover_sets) -{ - v_array > > ret = pop(spare_cover_sets); - while (ret.index < 101) - { - v_array > temp; - push(ret, temp); - } - return ret; -} - -inline bool shell(float parent_query_dist, float child_parent_dist, float upper_bound) -{ - return parent_query_dist - child_parent_dist <= upper_bound; - // && child_parent_dist - parent_query_dist <= upper_bound; -} - -int internal_k =1; -void update_k(float *k_upper_bound, float upper_bound) -{ - float *end = k_upper_bound + internal_k-1; - float *begin = k_upper_bound; - for (;end != begin; begin++) - { - if (upper_bound < *(begin+1)) - *begin = *(begin+1); - else { - *begin = upper_bound; - break; - } - } - if (end == begin) - *begin = upper_bound; -} -float *alloc_k() -{ - return (float *)malloc(sizeof(float) * internal_k); -} -void set_k(float* begin, float max) -{ - for(float *end = begin+internal_k;end != begin; begin++) - *begin = max; -} - -float internal_epsilon =0.; -void update_epsilon(float *upper_bound, float new_dist) {} -float *alloc_epsilon() -{ - return (float *)malloc(sizeof(float)); -} -void set_epsilon(float* begin, float max) -{ - *begin = internal_epsilon; -} - -void update_unequal(float *upper_bound, float new_dist) -{ - if (new_dist != 0.) - *upper_bound = new_dist; -} -float* (*alloc_unequal)() = alloc_epsilon; -void set_unequal(float* begin, float max) -{ - *begin = max; -} - -void (*update)(float *foo, float bar) = update_k; -void (*setter)(float *foo, float bar) = set_k; -float* (*alloc_upper)() = alloc_k; - -template -inline void copy_zero_set(node

* query_chi, float* new_upper_bound, - v_array > &zero_set, v_array > &new_zero_set) -{ - new_zero_set.index = 0; - d_node

*end = zero_set.elements + zero_set.index; - for (d_node

*ele = zero_set.elements; ele != end ; ele++) - { - float upper_dist = *new_upper_bound + query_chi->max_dist; - if (shell(ele->dist, query_chi->parent_dist, upper_dist)) - { - float d = distance(query_chi->p, ele->n->p, upper_dist); - - if (d <= upper_dist) - { - if (d < *new_upper_bound) - update(new_upper_bound, d); - d_node

temp = {d, ele->n}; - push(new_zero_set,temp); - } - } - } -} - -template -inline void copy_cover_sets(node

* query_chi, float* new_upper_bound, - v_array > > &cover_sets, - v_array > > &new_cover_sets, - int current_scale, int max_scale) -{ - for (; current_scale <= max_scale; current_scale++) - { - d_node

* ele = cover_sets[current_scale].elements; - d_node

* end = cover_sets[current_scale].elements + cover_sets[current_scale].index; - for (; ele != end; ele++) - { - float upper_dist = *new_upper_bound + query_chi->max_dist + ele->n->max_dist; - if (shell(ele->dist, query_chi->parent_dist, upper_dist)) - { - float d = distance(query_chi->p, ele->n->p, upper_dist); - - if (d <= upper_dist) - { - if (d < *new_upper_bound) - update(new_upper_bound,d); - d_node

temp = {d, ele->n}; - push(new_cover_sets[current_scale],temp); - } - } - } - } -} - -template -void print_query(const node

*top_node) -{ - SG_SPRINT ("query = \n") - print(top_node->p); - if ( top_node->num_children > 0 ) { - SG_SPRINT("scale = %i\n",top_node->scale) - SG_SPRINT("max_dist = %f\n",top_node->max_dist) - SG_SPRINT("num children = %i\n",top_node->num_children) - } -} - -template -void print_cover_sets(v_array > > &cover_sets, - v_array > &zero_set, - int current_scale, int max_scale) -{ - SG_SPRINT("cover set = \n") - for (; current_scale <= max_scale; current_scale++) - { - d_node

*ele = cover_sets[current_scale].elements; - d_node

*end = cover_sets[current_scale].elements + cover_sets[current_scale].index; - SG_SPRINT ("%i\n", current_scale) - for (; ele != end; ele++) - { - node

*n = (node

*)ele->n; - print(n->p); - } - } - d_node

*end = zero_set.elements + zero_set.index; - SG_SPRINT ("infinity\n") - for (d_node

*ele = zero_set.elements; ele != end ; ele++) - { - node

*n = (node

*)ele->n; - print(n->p); - } -} - - -/* - An optimization to consider: - Make all distance evaluations occur in descend. - - Instead of passing a cover_set, pass a stack of cover sets. The - last element holds d_nodes with your distance. The next lower - element holds a d_node with the distance to your query parent, - next = query grand parent, etc.. - - Compute distances in the presence of the tighter upper bound. - */ - -template -inline -void descend(const node

* query, float* upper_bound, - int current_scale, - int &max_scale, v_array > > &cover_sets, - v_array > &zero_set) -{ - d_node

*end = cover_sets[current_scale].elements + cover_sets[current_scale].index; - for (d_node

*parent = cover_sets[current_scale].elements; parent != end; parent++) - { - const node

*par = parent->n; - float upper_dist = *upper_bound + query->max_dist + query->max_dist; - if (parent->dist <= upper_dist + par->max_dist) - { - node

*chi = par->children; - if (parent->dist <= upper_dist + chi->max_dist) - { - if (chi->num_children > 0) - { - if (max_scale < chi->scale) - max_scale = chi->scale; - d_node

temp = {parent->dist, chi}; - push(cover_sets[chi->scale], temp); - } - else if (parent->dist <= upper_dist) - { - d_node

temp = {parent->dist, chi}; - push(zero_set, temp); - } - } - node

*child_end = par->children + par->num_children; - for (chi++; chi != child_end; chi++) - { - float upper_chi = *upper_bound + chi->max_dist + query->max_dist + query->max_dist; - if (shell(parent->dist, chi->parent_dist, upper_chi)) - { - float d = distance(query->p, chi->p, upper_chi); - if (d <= upper_chi) - { - if (d < *upper_bound) - update(upper_bound, d); - if (chi->num_children > 0) - { - if (max_scale < chi->scale) - max_scale = chi->scale; - d_node

temp = {d, chi}; - push(cover_sets[chi->scale],temp); - } - else - if (d <= upper_chi - chi->max_dist) - { - d_node

temp = {d, chi}; - push(zero_set, temp); - } - } - } - } - } - } -} - -template -void brute_nearest(const node

* query,v_array > zero_set, - float* upper_bound, - v_array > &results, - v_array > > &spare_zero_sets) -{ - if (query->num_children > 0) - { - v_array > new_zero_set = pop(spare_zero_sets); - node

* query_chi = query->children; - brute_nearest(query_chi, zero_set, upper_bound, results, spare_zero_sets); - float* new_upper_bound = alloc_upper(); - - node

*child_end = query->children + query->num_children; - for (query_chi++;query_chi != child_end; query_chi++) - { - setter(new_upper_bound,*upper_bound + query_chi->parent_dist); - copy_zero_set(query_chi, new_upper_bound, zero_set, new_zero_set); - brute_nearest(query_chi, new_zero_set, new_upper_bound, results, spare_zero_sets); - } - free (new_upper_bound); - new_zero_set.index = 0; - push(spare_zero_sets, new_zero_set); - } - else - { - v_array

temp; - push(temp, query->p); - d_node

*end = zero_set.elements + zero_set.index; - for (d_node

*ele = zero_set.elements; ele != end ; ele++) - if (ele->dist <= *upper_bound) - push(temp, ele->n->p); - push(results,temp); - } -} - -template -void internal_batch_nearest_neighbor(const node

*query, - v_array > > &cover_sets, - v_array > &zero_set, - int current_scale, - int max_scale, - float* upper_bound, - v_array > &results, - v_array > > > &spare_cover_sets, - v_array > > &spare_zero_sets) -{ - if (current_scale > max_scale) // All remaining points are in the zero set. - brute_nearest(query, zero_set, upper_bound, results, spare_zero_sets); - else - if (query->scale <= current_scale && query->scale != 100) - // Our query has too much scale. Reduce. - { - node

*query_chi = query->children; - v_array > new_zero_set = pop(spare_zero_sets); - v_array > > new_cover_sets = get_cover_sets(spare_cover_sets); - float* new_upper_bound = alloc_upper(); - - node

*child_end = query->children + query->num_children; - for (query_chi++; query_chi != child_end; query_chi++) - { - setter(new_upper_bound,*upper_bound + query_chi->parent_dist); - copy_zero_set(query_chi, new_upper_bound, zero_set, new_zero_set); - copy_cover_sets(query_chi, new_upper_bound, cover_sets, new_cover_sets, - current_scale, max_scale); - internal_batch_nearest_neighbor(query_chi, new_cover_sets, new_zero_set, - current_scale, max_scale, new_upper_bound, - results, spare_cover_sets, spare_zero_sets); - } - free (new_upper_bound); - new_zero_set.index = 0; - push(spare_zero_sets, new_zero_set); - push(spare_cover_sets, new_cover_sets); - internal_batch_nearest_neighbor(query->children, cover_sets, zero_set, - current_scale, max_scale, upper_bound, results, - spare_cover_sets, spare_zero_sets); - } - else // reduce cover set scale - { - halfsort(cover_sets[current_scale]); - descend(query, upper_bound, current_scale, max_scale,cover_sets, zero_set); - cover_sets[current_scale++].index = 0; - internal_batch_nearest_neighbor(query, cover_sets, zero_set, - current_scale, max_scale, upper_bound, results, - spare_cover_sets, spare_zero_sets); - } -} - -template -void batch_nearest_neighbor(const node

&top_node, const node

&query, - v_array > &results) -{ - v_array > > > spare_cover_sets; - v_array > > spare_zero_sets; - - v_array > > cover_sets = get_cover_sets(spare_cover_sets); - v_array > zero_set = pop(spare_zero_sets); - - float* upper_bound = alloc_upper(); - setter(upper_bound,FLT_MAX); - - float top_dist = distance(query.p, top_node.p, FLT_MAX); - update(upper_bound, top_dist); - - d_node

temp = {top_dist, &top_node}; - push(cover_sets[0], temp); - - internal_batch_nearest_neighbor(&query,cover_sets,zero_set,0,0,upper_bound,results, - spare_cover_sets,spare_zero_sets); - - free(upper_bound); - push(spare_cover_sets, cover_sets); - - for (int i = 0; i < spare_cover_sets.index; i++) - { - v_array > > cover_sets2 = spare_cover_sets[i]; - for (int j = 0; j < cover_sets2.index; j++) - free (cover_sets2[j].elements); - free(cover_sets2.elements); - } - free(spare_cover_sets.elements); - - push(spare_zero_sets, zero_set); - - for (int i = 0; i < spare_zero_sets.index; i++) - free(spare_zero_sets[i].elements); - free(spare_zero_sets.elements); -} - -template -void k_nearest_neighbor(const node

&top_node, const node

&query, - v_array > &results, int k) -{ - internal_k = k; - update = update_k; - setter = set_k; - alloc_upper = alloc_k; - - batch_nearest_neighbor(top_node, query,results); -} - -template -void epsilon_nearest_neighbor(const node

&top_node, const node

&query, - v_array > &results, float epsilon) -{ - internal_epsilon = epsilon; - update = update_epsilon; - setter = set_epsilon; - alloc_upper = alloc_epsilon; - - batch_nearest_neighbor(top_node, query,results); -} - -template -void unequal_nearest_neighbor(const node

&top_node, const node

&query, - v_array > &results) -{ - update = update_unequal; - setter = set_unequal; - alloc_upper = alloc_unequal; - - batch_nearest_neighbor(top_node, query, results); -} - -#endif diff --git a/src/shogun/lib/JLCoverTreePoint.h b/src/shogun/lib/JLCoverTreePoint.h deleted file mode 100644 index 409d40950ff..00000000000 --- a/src/shogun/lib/JLCoverTreePoint.h +++ /dev/null @@ -1,214 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * Written (W) 2012 Fernando José Iglesias García - * Written (W) John Langford and Dinoj Surendran, v_array and its templatization - * Copyright (C) 2012 Fernando José Iglesias García - */ - -#ifndef _JLCTPOINT_H__ -#define _JLCTPOINT_H__ - -#include -#include -#include - -namespace shogun -{ - -/** @brief Class v_array taken directly from JL's implementation */ -template -class v_array{ - - public: - /** Getter for the the last element of the v_array - * @return the last element of the array */ - T last() { return elements[index-1];} - - /** Decrement the pointer to the last element */ - void decr() { index--;} - - /** Create an empty v_array */ - v_array() { index = 0; length=0; elements = NULL;} - - /** Element access operator - * @param i of the element to be read - * @return the corresponding element */ - T& operator[](unsigned int i) { return elements[i]; } - - public: - /** Pointer to the last element of the v_array */ - int index; - - /** Length of the v_array */ - int length; - - /** Pointer to the beginning of the v_array elements */ - T* elements; - -}; - -/** - * Insert a new element at the end of the vector - * - * @param v vector - * @param new_ele element to insert - */ -template -void push(v_array& v, const T &new_ele) -{ - while(v.index >= v.length) - { - v.length = 2*v.length + 3; - v.elements = (T *)realloc(v.elements,sizeof(T) * v.length); - } - v[v.index++] = new_ele; -} - -/** - * Used to modify the capacity of the vector - * - * @param v vector - * @param length the new length of the vector - */ -template -void alloc(v_array& v, int length) -{ - v.elements = (T *)realloc(v.elements, sizeof(T) * length); - v.length = length; -} - -/** - * Returns the vector previous to the pointed one in the stack of - * vectors and decrements the index of the stack. No memory is - * freed here. If there are no vectors stored in the stack, create - * and return a new empty vector - * - * @param stack of vectors - * @return the adequate vector according to the previous conditions - */ -template -v_array pop(v_array > &stack) -{ - if (stack.index > 0) - return stack[--stack.index]; - else - return v_array(); -} - -/** - * Type used to indicate where to find (either lhs or rhs) the - * coordinate information of this point in the CDistance object - * associated - */ -enum EFeaturesContainer -{ - FC_LHS = 0, - FC_RHS = 1, -}; - -/** @brief Class Point to use with John Langford's CoverTree. This - * class must have some assoficated functions defined (distance, - * parse_points and print, see below) so it can be used with the - * CoverTree implementation. - */ -class CJLCoverTreePoint -{ - - public: - - /** Distance object where to find the coordinate information of - * this point */ - CDistance* m_distance; - - /** Index of this point in m_distance */ - int32_t m_index; - - /** If the point is stored in rhs or lhs in m_distance */ - EFeaturesContainer m_features_container; - -}; /* class JLCoverTreePoint */ - -/** Functions declared out of the class definition to respect JLCoverTree - * structure */ - -float distance(CJLCoverTreePoint p1, CJLCoverTreePoint p2, float64_t upper_bound) -{ - /** Call m_distance->distance() with the proper index order depending on - * the feature containers in m_distance for each of the points*/ - - if ( p1.m_features_container == p2.m_features_container ) - { - if ( ! p1.m_distance->lhs_equals_rhs() ) - { - SG_SERROR("lhs != rhs but the distance of two points " - "from the same container has been requested\n"); - } - else - { - return p1.m_distance->distance_upper_bounded(p1.m_index, - p2.m_index, upper_bound); - } - } - else - { - if ( p1.m_distance->lhs_equals_rhs() ) - { - SG_SERROR("lhs == rhs but the distance of two points " - "from different containers has been requested\n"); - } - else - { - if ( p1.m_features_container == FC_LHS ) - { - return p1.m_distance->distance_upper_bounded(p1.m_index, - p2.m_index, upper_bound); - } - else - { - return p1.m_distance->distance_upper_bounded(p2.m_index, - p1.m_index, upper_bound); - } - } - } - - SG_SERROR("Something has gone wrong, case not handled\n") - return -1; -} - -/** Fills up a v_array of CJLCoverTreePoint objects */ -v_array< CJLCoverTreePoint > parse_points(CDistance* distance, EFeaturesContainer fc) -{ - CFeatures* features; - if ( fc == FC_LHS ) - features = distance->get_lhs(); - else - features = distance->get_rhs(); - - v_array< CJLCoverTreePoint > parsed; - for ( int32_t i = 0 ; i < features->get_num_vectors() ; ++i ) - { - CJLCoverTreePoint new_point; - - new_point.m_distance = distance; - new_point.m_index = i; - new_point.m_features_container = fc; - - push(parsed, new_point); - } - - return parsed; -} - -/** Print the information of the CoverTree point */ -void print(CJLCoverTreePoint &p) -{ - SG_SERROR("Print JLCoverTreePoint not implemented\n") -} - -} /* namespace shogun */ - -#endif /* _JLCTPOINT_H__*/ diff --git a/src/shogun/lib/Map.h b/src/shogun/lib/Map.h index ebe79e31cab..c43350cf65f 100644 --- a/src/shogun/lib/Map.h +++ b/src/shogun/lib/Map.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Evgeniy Andreev, Jacob Walker, Sergey Lisitsyn, Soeren Sonnenburg, - * Yuyu Zhang, Björn Esser, Wu Lin + * Yuyu Zhang, Bjoern Esser, Wu Lin */ #ifndef _MAP_H_ diff --git a/src/shogun/lib/NGramTokenizer.cpp b/src/shogun/lib/NGramTokenizer.cpp index a8663a3c311..2903a1f57ae 100644 --- a/src/shogun/lib/NGramTokenizer.cpp +++ b/src/shogun/lib/NGramTokenizer.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Evangelos Anagnostopoulos, Thoralf Klein, Björn Esser + * Authors: Evangelos Anagnostopoulos, Thoralf Klein, Bjoern Esser */ #include diff --git a/src/shogun/lib/NGramTokenizer.h b/src/shogun/lib/NGramTokenizer.h index 32c9030e239..073ef8fbc3c 100644 --- a/src/shogun/lib/NGramTokenizer.h +++ b/src/shogun/lib/NGramTokenizer.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Evangelos Anagnostopoulos, Thoralf Klein, Yuyu Zhang, Björn Esser + * Authors: Evangelos Anagnostopoulos, Thoralf Klein, Yuyu Zhang, Bjoern Esser */ #ifndef _NGRAMTOKENIZER__H__ diff --git a/src/shogun/lib/SGCachedVector.h b/src/shogun/lib/SGCachedVector.h index 394514ef09d..de240230020 100644 --- a/src/shogun/lib/SGCachedVector.h +++ b/src/shogun/lib/SGCachedVector.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Björn Esser + * Authors: Soeren Sonnenburg, Bjoern Esser */ //template class SGCachedVector : public SGVector //{ diff --git a/src/shogun/lib/SGMatrixList.h b/src/shogun/lib/SGMatrixList.h index 8077c2fa435..4bae9b0e787 100644 --- a/src/shogun/lib/SGMatrixList.h +++ b/src/shogun/lib/SGMatrixList.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Fernando Iglesias, Thoralf Klein, Yuyu Zhang, - * Björn Esser + * Bjoern Esser */ #ifndef __SGMATRIX_LIST_H__ diff --git a/src/shogun/lib/SGNDArray.cpp b/src/shogun/lib/SGNDArray.cpp index 5ca755cb241..98a43fa304c 100644 --- a/src/shogun/lib/SGNDArray.cpp +++ b/src/shogun/lib/SGNDArray.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Björn Esser, Weijie Lin, Sergey Lisitsyn, + * Authors: Soeren Sonnenburg, Bjoern Esser, Weijie Lin, Sergey Lisitsyn, * Koen van de Sande, Jiaolong Xu */ diff --git a/src/shogun/lib/SGNDArray.h b/src/shogun/lib/SGNDArray.h index 439b7897929..d6dfd745312 100644 --- a/src/shogun/lib/SGNDArray.h +++ b/src/shogun/lib/SGNDArray.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Thoralf Klein, Björn Esser, Soeren Sonnenburg, Yuyu Zhang, + * Authors: Thoralf Klein, Bjoern Esser, Soeren Sonnenburg, Yuyu Zhang, * Fernando Iglesias, Sergey Lisitsyn, Koen van de Sande, Jiaolong Xu */ diff --git a/src/shogun/lib/SGSparseMatrix.h b/src/shogun/lib/SGSparseMatrix.h index f2aaf9f92e5..dd75ca1f3f0 100644 --- a/src/shogun/lib/SGSparseMatrix.h +++ b/src/shogun/lib/SGSparseMatrix.h @@ -3,7 +3,7 @@ * * Authors: Soeren Sonnenburg, Soumyajit De, Sergey Lisitsyn, Yingrui Chang, * Evgeniy Andreev, Yuyu Zhang, Viktor Gal, Thoralf Klein, - * Fernando Iglesias, Björn Esser + * Fernando Iglesias, Bjoern Esser */ #ifndef __SGSPARSEMATRIX_H__ diff --git a/src/shogun/lib/SGSparseVector.h b/src/shogun/lib/SGSparseVector.h index 111eacb7339..12c8b81a403 100644 --- a/src/shogun/lib/SGSparseVector.h +++ b/src/shogun/lib/SGSparseVector.h @@ -3,7 +3,7 @@ * * Authors: Thoralf Klein, Soeren Sonnenburg, Christian Widmer, * Heiko Strathmann, Viktor Gal, Sergey Lisitsyn, Soumyajit De, - * Yuyu Zhang, Fernando Iglesias, Björn Esser, Abinash Panda + * Yuyu Zhang, Fernando Iglesias, Bjoern Esser, Abinash Panda */ #ifndef __SGSPARSEVECTOR_H__ diff --git a/src/shogun/lib/SGString.h b/src/shogun/lib/SGString.h index 4cf9337b5bc..2d39ce94c8f 100644 --- a/src/shogun/lib/SGString.h +++ b/src/shogun/lib/SGString.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Jacob Walker, Thoralf Klein, - * Björn Esser + * Bjoern Esser */ #ifndef __SGSTRING_H__ #define __SGSTRING_H__ diff --git a/src/shogun/lib/SGStringList.h b/src/shogun/lib/SGStringList.h index deef84c2526..1c8853d85d2 100644 --- a/src/shogun/lib/SGStringList.h +++ b/src/shogun/lib/SGStringList.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Thoralf Klein, Yuyu Zhang, - * Björn Esser + * Bjoern Esser */ #ifndef __SGSTRINGLIST_H__ #define __SGSTRINGLIST_H__ diff --git a/src/shogun/lib/SGVector.cpp b/src/shogun/lib/SGVector.cpp index f55d4bae02d..099bc6aa566 100644 --- a/src/shogun/lib/SGVector.cpp +++ b/src/shogun/lib/SGVector.cpp @@ -4,7 +4,7 @@ * Authors: Soeren Sonnenburg, Viktor Gal, Heiko Strathmann, Fernando Iglesias, * Sanuj Sharma, Pan Deng, Sergey Lisitsyn, Thoralf Klein, * Soumyajit De, Michele Mazzoni, Evgeniy Andreev, Chiyuan Zhang, - * Björn Esser, Weijie Lin, Khaled Nasr, Koen van de Sande, + * Bjoern Esser, Weijie Lin, Khaled Nasr, Koen van de Sande, * Somya Anand */ diff --git a/src/shogun/lib/SGVector.h b/src/shogun/lib/SGVector.h index a7f6b6bbadf..a985d7999d8 100644 --- a/src/shogun/lib/SGVector.h +++ b/src/shogun/lib/SGVector.h @@ -4,7 +4,7 @@ * Authors: Soeren Sonnenburg, Heiko Strathmann, Fernando Iglesias, Viktor Gal, * Sergey Lisitsyn, Sanuj Sharma, Soumyajit De, Koen van de Sande, * Pan Deng, Chiyuan Zhang, Thoralf Klein, Khaled Nasr, - * Evgeniy Andreev, Michele Mazzoni, Björn Esser, Yuyu Zhang + * Evgeniy Andreev, Michele Mazzoni, Bjoern Esser, Yuyu Zhang */ #ifndef __SGVECTOR_H__ #define __SGVECTOR_H__ diff --git a/src/shogun/lib/Set.h b/src/shogun/lib/Set.h index ec69619a856..f4118c4fe9a 100644 --- a/src/shogun/lib/Set.h +++ b/src/shogun/lib/Set.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Evgeniy Andreev, Soeren Sonnenburg, Heiko Strathmann, Jacob Walker, - * Yuyu Zhang, Evan Shelhamer, Björn Esser, Sergey Lisitsyn + * Yuyu Zhang, Evan Shelhamer, Bjoern Esser, Sergey Lisitsyn */ #ifndef _SET_H_ diff --git a/src/shogun/lib/StructuredData.h b/src/shogun/lib/StructuredData.h index fb70e9cdd9b..b3e92d01712 100644 --- a/src/shogun/lib/StructuredData.h +++ b/src/shogun/lib/StructuredData.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Fernando Iglesias, Yuyu Zhang, Björn Esser + * Authors: Fernando Iglesias, Yuyu Zhang, Bjoern Esser */ #ifndef _STRUCTUREDDATA_H__ diff --git a/src/shogun/lib/Tokenizer.h b/src/shogun/lib/Tokenizer.h index 1d6b8cfb324..265934311e8 100644 --- a/src/shogun/lib/Tokenizer.h +++ b/src/shogun/lib/Tokenizer.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Evangelos Anagnostopoulos, Yuyu Zhang, Björn Esser + * Authors: Evangelos Anagnostopoulos, Yuyu Zhang, Bjoern Esser */ #ifndef _TOKENIZER__H__ diff --git a/src/shogun/lib/Trie.h b/src/shogun/lib/Trie.h index b48128b9d59..96549358897 100644 --- a/src/shogun/lib/Trie.h +++ b/src/shogun/lib/Trie.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Yuyu Zhang, Weijie Lin, - * Evan Shelhamer, Björn Esser, Saurabh Goyal + * Evan Shelhamer, Bjoern Esser, Saurabh Goyal */ #ifndef _TRIE_H___ diff --git a/src/shogun/lib/memory.cpp b/src/shogun/lib/memory.cpp index ec64502e803..3c9e52a01c6 100644 --- a/src/shogun/lib/memory.cpp +++ b/src/shogun/lib/memory.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Evgeniy Andreev, Viktor Gal, Soumyajit De, - * Weijie Lin, Björn Esser, Sergey Lisitsyn, Thoralf Klein + * Weijie Lin, Bjoern Esser, Sergey Lisitsyn, Thoralf Klein */ #include diff --git a/src/shogun/lib/memory.h b/src/shogun/lib/memory.h index 183722959a8..095ab2f352b 100644 --- a/src/shogun/lib/memory.h +++ b/src/shogun/lib/memory.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Soumyajit De, Evgeniy Andreev, Sergey Lisitsyn, - * Evan Shelhamer, Weijie Lin, Fernando Iglesias, Björn Esser, + * Evan Shelhamer, Weijie Lin, Fernando Iglesias, Bjoern Esser, * Thoralf Klein */ diff --git a/src/shogun/loss/HingeLoss.h b/src/shogun/loss/HingeLoss.h index 8d11f7dbc39..bc9331ebc92 100644 --- a/src/shogun/loss/HingeLoss.h +++ b/src/shogun/loss/HingeLoss.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Shashwat Lal Das, Fernando Iglesias, Yuyu Zhang, Björn Esser + * Authors: Shashwat Lal Das, Fernando Iglesias, Yuyu Zhang, Bjoern Esser */ #ifndef _HINGELOSS_H__ diff --git a/src/shogun/loss/LogLoss.h b/src/shogun/loss/LogLoss.h index afcc23ffc11..d2e6f1c8a59 100644 --- a/src/shogun/loss/LogLoss.h +++ b/src/shogun/loss/LogLoss.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Shashwat Lal Das, Fernando Iglesias, Yuyu Zhang, Björn Esser + * Authors: Shashwat Lal Das, Fernando Iglesias, Yuyu Zhang, Bjoern Esser */ #ifndef _LOGLOSS_H__ diff --git a/src/shogun/loss/LogLossMargin.h b/src/shogun/loss/LogLossMargin.h index bf7ca315116..f2d7d84615c 100644 --- a/src/shogun/loss/LogLossMargin.h +++ b/src/shogun/loss/LogLossMargin.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Shashwat Lal Das, Fernando Iglesias, Yuyu Zhang, Björn Esser + * Authors: Shashwat Lal Das, Fernando Iglesias, Yuyu Zhang, Bjoern Esser */ #ifndef _LOGLOSSMARGIN_H__ diff --git a/src/shogun/loss/LossFunction.h b/src/shogun/loss/LossFunction.h index d46ad520b04..a60ac15909b 100644 --- a/src/shogun/loss/LossFunction.h +++ b/src/shogun/loss/LossFunction.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Shashwat Lal Das, Fernando Iglesias, Yuyu Zhang, Saurabh Goyal, - * Björn Esser + * Bjoern Esser */ #ifndef _LOSSFUNCTION_H__ diff --git a/src/shogun/loss/SmoothHingeLoss.h b/src/shogun/loss/SmoothHingeLoss.h index 279de978e1a..dc76ddb8f99 100644 --- a/src/shogun/loss/SmoothHingeLoss.h +++ b/src/shogun/loss/SmoothHingeLoss.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Shashwat Lal Das, Fernando Iglesias, Yuyu Zhang, Björn Esser + * Authors: Shashwat Lal Das, Fernando Iglesias, Yuyu Zhang, Bjoern Esser */ #ifndef _SMOOTHHINGELOSS_H__ diff --git a/src/shogun/loss/SquaredHingeLoss.h b/src/shogun/loss/SquaredHingeLoss.h index 6619803acb7..a6b21217e8f 100644 --- a/src/shogun/loss/SquaredHingeLoss.h +++ b/src/shogun/loss/SquaredHingeLoss.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Shashwat Lal Das, Fernando Iglesias, Yuyu Zhang, Björn Esser, + * Authors: Shashwat Lal Das, Fernando Iglesias, Yuyu Zhang, Bjoern Esser, * Sergey Lisitsyn */ diff --git a/src/shogun/loss/SquaredLoss.h b/src/shogun/loss/SquaredLoss.h index d6c7c90b6fb..0062bc75542 100644 --- a/src/shogun/loss/SquaredLoss.h +++ b/src/shogun/loss/SquaredLoss.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Shashwat Lal Das, Fernando Iglesias, Yuyu Zhang, Björn Esser + * Authors: Shashwat Lal Das, Fernando Iglesias, Yuyu Zhang, Bjoern Esser */ #ifndef _SQUAREDLOSS_H__ diff --git a/src/shogun/machine/BaggingMachine.cpp b/src/shogun/machine/BaggingMachine.cpp index 4e8cf73d398..3ceb59a3367 100644 --- a/src/shogun/machine/BaggingMachine.cpp +++ b/src/shogun/machine/BaggingMachine.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Viktor Gal, Saurabh Mahindre, Heiko Strathmann, Thoralf Klein, - * Olivier NGuyen, Björn Esser, Weijie Lin + * Olivier NGuyen, Bjoern Esser, Weijie Lin */ #include diff --git a/src/shogun/machine/BaggingMachine.h b/src/shogun/machine/BaggingMachine.h index c2343224965..71fdf2f8bee 100644 --- a/src/shogun/machine/BaggingMachine.h +++ b/src/shogun/machine/BaggingMachine.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Viktor Gal, Fernando Iglesias, Heiko Strathmann, Yuyu Zhang, - * Olivier NGuyen, Björn Esser, Thoralf Klein, Soeren Sonnenburg, + * Olivier NGuyen, Bjoern Esser, Thoralf Klein, Soeren Sonnenburg, * Soumyajit De */ diff --git a/src/shogun/machine/BaseMulticlassMachine.h b/src/shogun/machine/BaseMulticlassMachine.h index 5bc21ac83ad..3c1ff4be3e3 100644 --- a/src/shogun/machine/BaseMulticlassMachine.h +++ b/src/shogun/machine/BaseMulticlassMachine.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Chiyuan Zhang, Yuyu Zhang, Thoralf Klein, Björn Esser, + * Authors: Chiyuan Zhang, Yuyu Zhang, Thoralf Klein, Bjoern Esser, * Sergey Lisitsyn, Soeren Sonnenburg */ diff --git a/src/shogun/machine/DirectorKernelMachine.h b/src/shogun/machine/DirectorKernelMachine.h index ebf2f2898b8..9703b95394c 100644 --- a/src/shogun/machine/DirectorKernelMachine.h +++ b/src/shogun/machine/DirectorKernelMachine.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Tejas Jogi, Evgeniy Andreev, Soeren Sonnenburg, Yuyu Zhang, - * Björn Esser + * Bjoern Esser */ #ifndef _DIRECTORKERNELMACHINE_H___ diff --git a/src/shogun/machine/DirectorLinearMachine.h b/src/shogun/machine/DirectorLinearMachine.h index 03c680dfb4f..da719d58236 100644 --- a/src/shogun/machine/DirectorLinearMachine.h +++ b/src/shogun/machine/DirectorLinearMachine.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Evgeniy Andreev, Tejas Jogi, Soeren Sonnenburg, Yuyu Zhang, - * Viktor Gal, Björn Esser + * Viktor Gal, Bjoern Esser */ #ifndef _DIRECTORLINEARMACHINE_H___ diff --git a/src/shogun/machine/KernelMachine.h b/src/shogun/machine/KernelMachine.h index 0e45247eb22..2129852c1e9 100644 --- a/src/shogun/machine/KernelMachine.h +++ b/src/shogun/machine/KernelMachine.h @@ -3,7 +3,7 @@ * * Authors: Heiko Strathmann, Sergey Lisitsyn, Soeren Sonnenburg, Tejas Jogi, * Evgeniy Andreev, Evan Shelhamer, Yuyu Zhang, Chiyuan Zhang, - * Weijie Lin, Fernando Iglesias, Björn Esser, Thoralf Klein, + * Weijie Lin, Fernando Iglesias, Bjoern Esser, Thoralf Klein, * Saurabh Goyal */ diff --git a/src/shogun/machine/KernelStructuredOutputMachine.h b/src/shogun/machine/KernelStructuredOutputMachine.h index 9d9650c7909..b747725bec7 100644 --- a/src/shogun/machine/KernelStructuredOutputMachine.h +++ b/src/shogun/machine/KernelStructuredOutputMachine.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Fernando Iglesias, Yuyu Zhang, Shell Hu, Thoralf Klein, - * Björn Esser, Soeren Sonnenburg + * Bjoern Esser, Soeren Sonnenburg */ #ifndef _KERNEL_STRUCTURED_OUTPUT_MACHINE__H__ diff --git a/src/shogun/machine/LinearLatentMachine.h b/src/shogun/machine/LinearLatentMachine.h index 8e1900d087a..634190658c9 100644 --- a/src/shogun/machine/LinearLatentMachine.h +++ b/src/shogun/machine/LinearLatentMachine.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Viktor Gal, Yuyu Zhang, Thoralf Klein, Sergey Lisitsyn, - * Björn Esser, Soeren Sonnenburg + * Bjoern Esser, Soeren Sonnenburg */ #ifndef __LATENTLINEARMACHINE_H__ diff --git a/src/shogun/machine/LinearMachine.cpp b/src/shogun/machine/LinearMachine.cpp index e5a90868692..fed07a6c526 100644 --- a/src/shogun/machine/LinearMachine.cpp +++ b/src/shogun/machine/LinearMachine.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Evan Shelhamer, - * Youssef Emad El-Din, Evgeniy Andreev, Thoralf Klein, Björn Esser + * Youssef Emad El-Din, Evgeniy Andreev, Thoralf Klein, Bjoern Esser */ #include diff --git a/src/shogun/machine/LinearMachine.h b/src/shogun/machine/LinearMachine.h index 73d82e5adab..3c7443a2eab 100644 --- a/src/shogun/machine/LinearMachine.h +++ b/src/shogun/machine/LinearMachine.h @@ -3,7 +3,7 @@ * * Authors: Sergey Lisitsyn, Soeren Sonnenburg, Heiko Strathmann, * Evgeniy Andreev, Yuyu Zhang, Chiyuan Zhang, Thoralf Klein, - * Evan Shelhamer, Youssef Emad El-Din, Björn Esser, Sanuj Sharma, + * Evan Shelhamer, Youssef Emad El-Din, Bjoern Esser, Sanuj Sharma, * Saurabh Goyal */ diff --git a/src/shogun/machine/LinearStructuredOutputMachine.cpp b/src/shogun/machine/LinearStructuredOutputMachine.cpp index cb48b5b305e..75e3e7e3694 100644 --- a/src/shogun/machine/LinearStructuredOutputMachine.cpp +++ b/src/shogun/machine/LinearStructuredOutputMachine.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Fernando Iglesias, Shell Hu, Thoralf Klein, Sergey Lisitsyn, - * Björn Esser, Soeren Sonnenburg + * Bjoern Esser, Soeren Sonnenburg */ #include diff --git a/src/shogun/machine/LinearStructuredOutputMachine.h b/src/shogun/machine/LinearStructuredOutputMachine.h index 2db8a1bb596..b9a9d81bb77 100644 --- a/src/shogun/machine/LinearStructuredOutputMachine.h +++ b/src/shogun/machine/LinearStructuredOutputMachine.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Fernando Iglesias, Shell Hu, Thoralf Klein, Yuyu Zhang, - * Björn Esser, Sergey Lisitsyn, Soeren Sonnenburg + * Bjoern Esser, Sergey Lisitsyn, Soeren Sonnenburg */ #ifndef _LINEAR_STRUCTURED_OUTPUT_MACHINE__H__ diff --git a/src/shogun/machine/MulticlassMachine.h b/src/shogun/machine/MulticlassMachine.h index 2be58dc9a67..fa2451b453b 100644 --- a/src/shogun/machine/MulticlassMachine.h +++ b/src/shogun/machine/MulticlassMachine.h @@ -3,7 +3,7 @@ * * Authors: Sergey Lisitsyn, Chiyuan Zhang, Soeren Sonnenburg, * Fernando Iglesias, Jiaolong Xu, Heiko Strathmann, Evan Shelhamer, - * Yuyu Zhang, Shell Hu, Thoralf Klein, Björn Esser + * Yuyu Zhang, Shell Hu, Thoralf Klein, Bjoern Esser */ #ifndef _MULTICLASSMACHINE_H___ diff --git a/src/shogun/machine/OnlineLinearMachine.h b/src/shogun/machine/OnlineLinearMachine.h index 5fac623549e..42f51c3552a 100644 --- a/src/shogun/machine/OnlineLinearMachine.h +++ b/src/shogun/machine/OnlineLinearMachine.h @@ -3,7 +3,7 @@ * * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Shashwat Lal Das, Thoralf Klein, * Evgeniy Andreev, Yuyu Zhang, Chiyuan Zhang, Viktor Gal, Weijie Lin, - * Björn Esser, Saurabh Goyal + * Bjoern Esser, Saurabh Goyal */ #ifndef _ONLINELINEARCLASSIFIER_H__ diff --git a/src/shogun/machine/StructuredOutputMachine.cpp b/src/shogun/machine/StructuredOutputMachine.cpp index 484f1b13327..a08a6e82f35 100644 --- a/src/shogun/machine/StructuredOutputMachine.cpp +++ b/src/shogun/machine/StructuredOutputMachine.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Fernando Iglesias, Thoralf Klein, Shell Hu, Björn Esser, + * Authors: Fernando Iglesias, Thoralf Klein, Shell Hu, Bjoern Esser, * Viktor Gal */ diff --git a/src/shogun/machine/StructuredOutputMachine.h b/src/shogun/machine/StructuredOutputMachine.h index a7ce698fc01..d048f2949f1 100644 --- a/src/shogun/machine/StructuredOutputMachine.h +++ b/src/shogun/machine/StructuredOutputMachine.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Fernando Iglesias, Shell Hu, Yuyu Zhang, Thoralf Klein, - * Björn Esser, Sergey Lisitsyn, Viktor Gal + * Bjoern Esser, Sergey Lisitsyn, Viktor Gal */ #ifndef _STRUCTURED_OUTPUT_MACHINE__H__ diff --git a/src/shogun/machine/gp/FITCInferenceMethod.h b/src/shogun/machine/gp/FITCInferenceMethod.h index 2de09fb4030..e861c57d370 100644 --- a/src/shogun/machine/gp/FITCInferenceMethod.h +++ b/src/shogun/machine/gp/FITCInferenceMethod.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Roman Votyakov, Wu Lin, Heiko Strathmann, Björn Esser + * Authors: Roman Votyakov, Wu Lin, Heiko Strathmann, Bjoern Esser */ #ifndef CFITCINFERENCEMETHOD_H diff --git a/src/shogun/mathematics/Cplex.h b/src/shogun/mathematics/Cplex.h index 83d0b981c51..20981222f4c 100644 --- a/src/shogun/mathematics/Cplex.h +++ b/src/shogun/mathematics/Cplex.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Evan Shelhamer, Björn Esser + * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Evan Shelhamer, Bjoern Esser */ #ifndef CCPLEX_H__ diff --git a/src/shogun/mathematics/Math.h b/src/shogun/mathematics/Math.h index 80ee0a2f73a..aaaf6dbcab7 100644 --- a/src/shogun/mathematics/Math.h +++ b/src/shogun/mathematics/Math.h @@ -4,7 +4,7 @@ * Authors: Soeren Sonnenburg, Heiko Strathmann, Viktor Gal, Fernando Iglesias, * Sergey Lisitsyn, Sanuj Sharma, Soumyajit De, Shashwat Lal Das, * Thoralf Klein, Wu Lin, Chiyuan Zhang, Harshit Syal, Evan Shelhamer, - * Philippe Tillet, Björn Esser, Yuyu Zhang, Abhinav Agarwalla, + * Philippe Tillet, Bjoern Esser, Yuyu Zhang, Abhinav Agarwalla, * Saurabh Goyal */ diff --git a/src/shogun/mathematics/Mosek.cpp b/src/shogun/mathematics/Mosek.cpp index 68e63c9c390..6fabcefcbfd 100644 --- a/src/shogun/mathematics/Mosek.cpp +++ b/src/shogun/mathematics/Mosek.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Fernando Iglesias, Viktor Gal, Soeren Sonnenburg, Björn Esser, + * Authors: Fernando Iglesias, Viktor Gal, Soeren Sonnenburg, Bjoern Esser, * Shell Hu */ diff --git a/src/shogun/mathematics/Mosek.h b/src/shogun/mathematics/Mosek.h index 1ed954a8aee..c163ec9c15d 100644 --- a/src/shogun/mathematics/Mosek.h +++ b/src/shogun/mathematics/Mosek.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Fernando Iglesias, Soeren Sonnenburg, Yuyu Zhang, Björn Esser, + * Authors: Fernando Iglesias, Soeren Sonnenburg, Yuyu Zhang, Bjoern Esser, * Viktor Gal */ diff --git a/src/shogun/mathematics/Random.cpp b/src/shogun/mathematics/Random.cpp index 82cd4d276ec..71d6dd0a5a0 100644 --- a/src/shogun/mathematics/Random.cpp +++ b/src/shogun/mathematics/Random.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Viktor Gal, Björn Esser, Thoralf Klein, Heiko Strathmann, + * Authors: Viktor Gal, Bjoern Esser, Thoralf Klein, Heiko Strathmann, * Soeren Sonnenburg */ #ifdef _WIN32 diff --git a/src/shogun/mathematics/Random.h b/src/shogun/mathematics/Random.h index 45173bebc6f..1b7854ea4b0 100644 --- a/src/shogun/mathematics/Random.h +++ b/src/shogun/mathematics/Random.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Viktor Gal, Soeren Sonnenburg, Heiko Strathmann, Yuyu Zhang, - * Björn Esser + * Bjoern Esser */ #ifndef __RANDOM_H__ diff --git a/src/shogun/mathematics/Statistics.cpp b/src/shogun/mathematics/Statistics.cpp index d8842d6be80..d62b4754485 100644 --- a/src/shogun/mathematics/Statistics.cpp +++ b/src/shogun/mathematics/Statistics.cpp @@ -3,7 +3,7 @@ * * Authors: Heiko Strathmann, Soumyajit De, Soeren Sonnenburg, Sanuj Sharma, * Viktor Gal, Roman Votyakov, Wu Lin, Evgeniy Andreev, Weijie Lin, - * Björn Esser, Sergey Lisitsyn + * Bjoern Esser, Sergey Lisitsyn */ #include diff --git a/src/shogun/mathematics/Statistics.h b/src/shogun/mathematics/Statistics.h index d899aa61a06..7e99c2d112f 100644 --- a/src/shogun/mathematics/Statistics.h +++ b/src/shogun/mathematics/Statistics.h @@ -3,7 +3,7 @@ * * Authors: Heiko Strathmann, Soumyajit De, Soeren Sonnenburg, Roman Votyakov, * Fernando Iglesias, Sanuj Sharma, Sergey Lisitsyn, Wu Lin, - * Evgeniy Andreev, Björn Esser, Saurabh Goyal + * Evgeniy Andreev, Bjoern Esser, Saurabh Goyal */ #ifndef __STATISTICS_H_ diff --git a/src/shogun/mathematics/ajd/ApproxJointDiagonalizer.h b/src/shogun/mathematics/ajd/ApproxJointDiagonalizer.h index 6a5fdd406d8..bfd190de914 100644 --- a/src/shogun/mathematics/ajd/ApproxJointDiagonalizer.h +++ b/src/shogun/mathematics/ajd/ApproxJointDiagonalizer.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Kevin Hughes, Heiko Strathmann, Björn Esser, Sergey Lisitsyn + * Authors: Kevin Hughes, Heiko Strathmann, Bjoern Esser, Sergey Lisitsyn */ #ifndef APPROXJOINTDIAGONALIZER_H_ diff --git a/src/shogun/mathematics/ajd/FFDiag.h b/src/shogun/mathematics/ajd/FFDiag.h index d0e78b31629..54204e81194 100644 --- a/src/shogun/mathematics/ajd/FFDiag.h +++ b/src/shogun/mathematics/ajd/FFDiag.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Kevin Hughes, Heiko Strathmann, Fernando Iglesias, Björn Esser, + * Authors: Kevin Hughes, Heiko Strathmann, Fernando Iglesias, Bjoern Esser, * Sergey Lisitsyn, Soeren Sonnenburg */ diff --git a/src/shogun/mathematics/ajd/JADiag.h b/src/shogun/mathematics/ajd/JADiag.h index c43e6f8a942..89d8c87d854 100644 --- a/src/shogun/mathematics/ajd/JADiag.h +++ b/src/shogun/mathematics/ajd/JADiag.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Kevin Hughes, Heiko Strathmann, Björn Esser, Sergey Lisitsyn + * Authors: Kevin Hughes, Heiko Strathmann, Bjoern Esser, Sergey Lisitsyn */ #ifndef JADIAG_H_ diff --git a/src/shogun/mathematics/ajd/JADiagOrth.h b/src/shogun/mathematics/ajd/JADiagOrth.h index ded9f842f78..2aee8c547e4 100644 --- a/src/shogun/mathematics/ajd/JADiagOrth.h +++ b/src/shogun/mathematics/ajd/JADiagOrth.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Kevin Hughes, Heiko Strathmann, Sergey Lisitsyn, Björn Esser, + * Authors: Kevin Hughes, Heiko Strathmann, Sergey Lisitsyn, Bjoern Esser, * Viktor Gal */ diff --git a/src/shogun/mathematics/ajd/JediDiag.h b/src/shogun/mathematics/ajd/JediDiag.h index 078b3ac52ae..7fde90cad71 100644 --- a/src/shogun/mathematics/ajd/JediDiag.h +++ b/src/shogun/mathematics/ajd/JediDiag.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Kevin Hughes, Heiko Strathmann, Björn Esser + * Authors: Kevin Hughes, Heiko Strathmann, Bjoern Esser */ #ifndef JEDIDIAG_H_ diff --git a/src/shogun/mathematics/ajd/QDiag.h b/src/shogun/mathematics/ajd/QDiag.h index 90d384570df..dec3e7e3941 100644 --- a/src/shogun/mathematics/ajd/QDiag.h +++ b/src/shogun/mathematics/ajd/QDiag.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Kevin Hughes, Heiko Strathmann, Björn Esser, Sergey Lisitsyn + * Authors: Kevin Hughes, Heiko Strathmann, Bjoern Esser, Sergey Lisitsyn */ #ifndef QDIAG_H_ diff --git a/src/shogun/mathematics/ajd/UWedge.h b/src/shogun/mathematics/ajd/UWedge.h index 58cfc687952..2dd795740da 100644 --- a/src/shogun/mathematics/ajd/UWedge.h +++ b/src/shogun/mathematics/ajd/UWedge.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Kevin Hughes, Heiko Strathmann, Sergey Lisitsyn, Björn Esser + * Authors: Kevin Hughes, Heiko Strathmann, Sergey Lisitsyn, Bjoern Esser */ #ifndef UWEDGE_H_ diff --git a/src/shogun/mathematics/eigen3.cpp b/src/shogun/mathematics/eigen3.cpp index 49d597c639f..ac07d9ab9ec 100644 --- a/src/shogun/mathematics/eigen3.cpp +++ b/src/shogun/mathematics/eigen3.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Heiko Strathmann, Björn Esser + * Authors: Soumyajit De, Heiko Strathmann, Bjoern Esser */ #include diff --git a/src/shogun/mathematics/eigen3.h b/src/shogun/mathematics/eigen3.h index e382bd1ebaf..e9e5085cd33 100644 --- a/src/shogun/mathematics/eigen3.h +++ b/src/shogun/mathematics/eigen3.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Sergey Lisitsyn, Soumyajit De, Viktor Gal, Heiko Strathmann, - * Björn Esser, Soeren Sonnenburg + * Bjoern Esser, Soeren Sonnenburg */ #ifndef EIGEN3_H_ diff --git a/src/shogun/mathematics/lapack.h b/src/shogun/mathematics/lapack.h index fc77f0b1b25..5f895d08595 100644 --- a/src/shogun/mathematics/lapack.h +++ b/src/shogun/mathematics/lapack.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Sergey Lisitsyn, Viktor Gal, Soeren Sonnenburg, Soumyajit De, - * Evan Shelhamer, Björn Esser + * Evan Shelhamer, Bjoern Esser */ #ifndef _LAPACK_H__ diff --git a/src/shogun/mathematics/linalg/eigsolver/DirectEigenSolver.cpp b/src/shogun/mathematics/linalg/eigsolver/DirectEigenSolver.cpp index c7485c60002..cc855e18a55 100644 --- a/src/shogun/mathematics/linalg/eigsolver/DirectEigenSolver.cpp +++ b/src/shogun/mathematics/linalg/eigsolver/DirectEigenSolver.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sunil Mahendrakar, Soumyajit De, Heiko Strathmann, Björn Esser + * Authors: Sunil Mahendrakar, Soumyajit De, Heiko Strathmann, Bjoern Esser */ #include diff --git a/src/shogun/mathematics/linalg/eigsolver/DirectEigenSolver.h b/src/shogun/mathematics/linalg/eigsolver/DirectEigenSolver.h index 2da32f9fa7f..78f2a561c28 100644 --- a/src/shogun/mathematics/linalg/eigsolver/DirectEigenSolver.h +++ b/src/shogun/mathematics/linalg/eigsolver/DirectEigenSolver.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Heiko Strathmann, Soumyajit De, Björn Esser + * Authors: Heiko Strathmann, Soumyajit De, Bjoern Esser */ #ifndef DIRECT_EIGEN_SOLVER_H_ diff --git a/src/shogun/mathematics/linalg/eigsolver/EigenSolver.h b/src/shogun/mathematics/linalg/eigsolver/EigenSolver.h index 5bd5b1ff619..05d2e0fe6d9 100644 --- a/src/shogun/mathematics/linalg/eigsolver/EigenSolver.h +++ b/src/shogun/mathematics/linalg/eigsolver/EigenSolver.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sunil Mahendrakar, Soumyajit De, Björn Esser + * Authors: Sunil Mahendrakar, Soumyajit De, Bjoern Esser */ #ifndef EIGEN_SOLVER_H_ diff --git a/src/shogun/mathematics/linalg/eigsolver/LanczosEigenSolver.cpp b/src/shogun/mathematics/linalg/eigsolver/LanczosEigenSolver.cpp index c26611107a2..a73f89881e5 100644 --- a/src/shogun/mathematics/linalg/eigsolver/LanczosEigenSolver.cpp +++ b/src/shogun/mathematics/linalg/eigsolver/LanczosEigenSolver.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Heiko Strathmann, Soumyajit De, Sunil Mahendrakar, Viktor Gal, - * Thoralf Klein, Björn Esser + * Thoralf Klein, Bjoern Esser */ #include diff --git a/src/shogun/mathematics/linalg/eigsolver/LanczosEigenSolver.h b/src/shogun/mathematics/linalg/eigsolver/LanczosEigenSolver.h index 9a48bbc757e..f1b4e8bc3ee 100644 --- a/src/shogun/mathematics/linalg/eigsolver/LanczosEigenSolver.h +++ b/src/shogun/mathematics/linalg/eigsolver/LanczosEigenSolver.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sunil Mahendrakar, Soumyajit De, Heiko Strathmann, Björn Esser + * Authors: Sunil Mahendrakar, Soumyajit De, Heiko Strathmann, Bjoern Esser */ #ifndef LANCZOS_EIGEN_SOLVER_H_ diff --git a/src/shogun/mathematics/linalg/linop/DenseMatrixOperator.cpp b/src/shogun/mathematics/linalg/linop/DenseMatrixOperator.cpp index b9f48863340..b621b6b3af9 100644 --- a/src/shogun/mathematics/linalg/linop/DenseMatrixOperator.cpp +++ b/src/shogun/mathematics/linalg/linop/DenseMatrixOperator.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Heiko Strathmann, Björn Esser + * Authors: Soumyajit De, Heiko Strathmann, Bjoern Esser */ #include diff --git a/src/shogun/mathematics/linalg/linop/DenseMatrixOperator.h b/src/shogun/mathematics/linalg/linop/DenseMatrixOperator.h index 2403bb61e6b..b79b6756c38 100644 --- a/src/shogun/mathematics/linalg/linop/DenseMatrixOperator.h +++ b/src/shogun/mathematics/linalg/linop/DenseMatrixOperator.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Heiko Strathmann, Björn Esser + * Authors: Soumyajit De, Heiko Strathmann, Bjoern Esser */ #ifndef DENSE_MATRIX_OPERATOR_H_ diff --git a/src/shogun/mathematics/linalg/linop/LinearOperator.cpp b/src/shogun/mathematics/linalg/linop/LinearOperator.cpp index e94df563d40..760df7b74a6 100644 --- a/src/shogun/mathematics/linalg/linop/LinearOperator.cpp +++ b/src/shogun/mathematics/linalg/linop/LinearOperator.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Sunil Mahendrakar, Björn Esser + * Authors: Soumyajit De, Sunil Mahendrakar, Bjoern Esser */ #include diff --git a/src/shogun/mathematics/linalg/linop/LinearOperator.h b/src/shogun/mathematics/linalg/linop/LinearOperator.h index 61e710d8747..5ee0459681e 100644 --- a/src/shogun/mathematics/linalg/linop/LinearOperator.h +++ b/src/shogun/mathematics/linalg/linop/LinearOperator.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sunil Mahendrakar, Soumyajit De, Björn Esser + * Authors: Sunil Mahendrakar, Soumyajit De, Bjoern Esser */ #ifndef LINEAR_OPERATOR_H_ diff --git a/src/shogun/mathematics/linalg/linop/MatrixOperator.cpp b/src/shogun/mathematics/linalg/linop/MatrixOperator.cpp index c5a069942b7..010fdded23f 100644 --- a/src/shogun/mathematics/linalg/linop/MatrixOperator.cpp +++ b/src/shogun/mathematics/linalg/linop/MatrixOperator.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Björn Esser + * Authors: Soumyajit De, Bjoern Esser */ #include diff --git a/src/shogun/mathematics/linalg/linop/MatrixOperator.h b/src/shogun/mathematics/linalg/linop/MatrixOperator.h index 679412b1b3c..228b97814a2 100644 --- a/src/shogun/mathematics/linalg/linop/MatrixOperator.h +++ b/src/shogun/mathematics/linalg/linop/MatrixOperator.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sunil Mahendrakar, Soumyajit De, Björn Esser + * Authors: Sunil Mahendrakar, Soumyajit De, Bjoern Esser */ #ifndef MATRIX_OPERATOR_H_ diff --git a/src/shogun/mathematics/linalg/linop/SparseMatrixOperator.cpp b/src/shogun/mathematics/linalg/linop/SparseMatrixOperator.cpp index 396c03e0cc3..281cb1ba361 100644 --- a/src/shogun/mathematics/linalg/linop/SparseMatrixOperator.cpp +++ b/src/shogun/mathematics/linalg/linop/SparseMatrixOperator.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Heiko Strathmann, Björn Esser + * Authors: Soumyajit De, Heiko Strathmann, Bjoern Esser */ #include diff --git a/src/shogun/mathematics/linalg/linop/SparseMatrixOperator.h b/src/shogun/mathematics/linalg/linop/SparseMatrixOperator.h index 62887e4513d..b3bad24a732 100644 --- a/src/shogun/mathematics/linalg/linop/SparseMatrixOperator.h +++ b/src/shogun/mathematics/linalg/linop/SparseMatrixOperator.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Björn Esser + * Authors: Soumyajit De, Bjoern Esser */ #ifndef SPARSE_MATRIX_OPERATOR_H_ diff --git a/src/shogun/mathematics/linalg/linsolver/CGMShiftedFamilySolver.cpp b/src/shogun/mathematics/linalg/linsolver/CGMShiftedFamilySolver.cpp index 1b6c038c14b..b5ff482c38f 100644 --- a/src/shogun/mathematics/linalg/linsolver/CGMShiftedFamilySolver.cpp +++ b/src/shogun/mathematics/linalg/linsolver/CGMShiftedFamilySolver.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Heiko Strathmann, Sunil Mahendrakar, Björn Esser + * Authors: Soumyajit De, Heiko Strathmann, Sunil Mahendrakar, Bjoern Esser */ #include diff --git a/src/shogun/mathematics/linalg/linsolver/CGMShiftedFamilySolver.h b/src/shogun/mathematics/linalg/linsolver/CGMShiftedFamilySolver.h index 0e768159acb..b0e99236d20 100644 --- a/src/shogun/mathematics/linalg/linsolver/CGMShiftedFamilySolver.h +++ b/src/shogun/mathematics/linalg/linsolver/CGMShiftedFamilySolver.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Sunil Mahendrakar, Heiko Strathmann, Björn Esser + * Authors: Soumyajit De, Sunil Mahendrakar, Heiko Strathmann, Bjoern Esser */ #ifndef CG_M_SHIFTED_FAMILY_SOLVER_H_ diff --git a/src/shogun/mathematics/linalg/linsolver/ConjugateGradientSolver.cpp b/src/shogun/mathematics/linalg/linsolver/ConjugateGradientSolver.cpp index c040f14ce4b..c5c0cb54857 100644 --- a/src/shogun/mathematics/linalg/linsolver/ConjugateGradientSolver.cpp +++ b/src/shogun/mathematics/linalg/linsolver/ConjugateGradientSolver.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Sunil Mahendrakar, Heiko Strathmann, Björn Esser + * Authors: Soumyajit De, Sunil Mahendrakar, Heiko Strathmann, Bjoern Esser */ #include diff --git a/src/shogun/mathematics/linalg/linsolver/ConjugateGradientSolver.h b/src/shogun/mathematics/linalg/linsolver/ConjugateGradientSolver.h index ee60a0e20ab..73dfb6351c8 100644 --- a/src/shogun/mathematics/linalg/linsolver/ConjugateGradientSolver.h +++ b/src/shogun/mathematics/linalg/linsolver/ConjugateGradientSolver.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Sunil Mahendrakar, Heiko Strathmann, Björn Esser + * Authors: Soumyajit De, Sunil Mahendrakar, Heiko Strathmann, Bjoern Esser */ #ifndef CONJUGATE_GRADIENT_SOLVER_H_ diff --git a/src/shogun/mathematics/linalg/linsolver/ConjugateOrthogonalCGSolver.cpp b/src/shogun/mathematics/linalg/linsolver/ConjugateOrthogonalCGSolver.cpp index cc8c94929fa..212e1810eaf 100644 --- a/src/shogun/mathematics/linalg/linsolver/ConjugateOrthogonalCGSolver.cpp +++ b/src/shogun/mathematics/linalg/linsolver/ConjugateOrthogonalCGSolver.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Sunil Mahendrakar, Heiko Strathmann, Björn Esser + * Authors: Soumyajit De, Sunil Mahendrakar, Heiko Strathmann, Bjoern Esser */ #include diff --git a/src/shogun/mathematics/linalg/linsolver/ConjugateOrthogonalCGSolver.h b/src/shogun/mathematics/linalg/linsolver/ConjugateOrthogonalCGSolver.h index 7e7a94a91f8..fbd6c98b17f 100644 --- a/src/shogun/mathematics/linalg/linsolver/ConjugateOrthogonalCGSolver.h +++ b/src/shogun/mathematics/linalg/linsolver/ConjugateOrthogonalCGSolver.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Sunil Mahendrakar, Heiko Strathmann, Björn Esser + * Authors: Soumyajit De, Sunil Mahendrakar, Heiko Strathmann, Bjoern Esser */ #ifndef CONJUGATE_ORTHOGONAL_CG_SOLVER_H_ diff --git a/src/shogun/mathematics/linalg/linsolver/DirectLinearSolverComplex.cpp b/src/shogun/mathematics/linalg/linsolver/DirectLinearSolverComplex.cpp index 61c241f33ea..a1d1d62b8ce 100644 --- a/src/shogun/mathematics/linalg/linsolver/DirectLinearSolverComplex.cpp +++ b/src/shogun/mathematics/linalg/linsolver/DirectLinearSolverComplex.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Sunil Mahendrakar, Heiko Strathmann, Björn Esser + * Authors: Soumyajit De, Sunil Mahendrakar, Heiko Strathmann, Bjoern Esser */ #include diff --git a/src/shogun/mathematics/linalg/linsolver/DirectLinearSolverComplex.h b/src/shogun/mathematics/linalg/linsolver/DirectLinearSolverComplex.h index 26adc10dbad..c97d63ef2ce 100644 --- a/src/shogun/mathematics/linalg/linsolver/DirectLinearSolverComplex.h +++ b/src/shogun/mathematics/linalg/linsolver/DirectLinearSolverComplex.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Sunil Mahendrakar, Heiko Strathmann, Björn Esser + * Authors: Soumyajit De, Sunil Mahendrakar, Heiko Strathmann, Bjoern Esser */ #ifndef DIRECT_LINEAR_SOLVER_COMPLEX_H_ diff --git a/src/shogun/mathematics/linalg/linsolver/DirectSparseLinearSolver.cpp b/src/shogun/mathematics/linalg/linsolver/DirectSparseLinearSolver.cpp index ae82aa61aaa..20168388af7 100644 --- a/src/shogun/mathematics/linalg/linsolver/DirectSparseLinearSolver.cpp +++ b/src/shogun/mathematics/linalg/linsolver/DirectSparseLinearSolver.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sunil Mahendrakar, Soumyajit De, Heiko Strathmann, Björn Esser + * Authors: Sunil Mahendrakar, Soumyajit De, Heiko Strathmann, Bjoern Esser */ #include diff --git a/src/shogun/mathematics/linalg/linsolver/DirectSparseLinearSolver.h b/src/shogun/mathematics/linalg/linsolver/DirectSparseLinearSolver.h index a89bd8b48f9..32671d79125 100644 --- a/src/shogun/mathematics/linalg/linsolver/DirectSparseLinearSolver.h +++ b/src/shogun/mathematics/linalg/linsolver/DirectSparseLinearSolver.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sunil Mahendrakar, Soumyajit De, Heiko Strathmann, Björn Esser + * Authors: Sunil Mahendrakar, Soumyajit De, Heiko Strathmann, Bjoern Esser */ #ifndef DIRECT_SPARSE_LINEAR_SOLVER_H_ diff --git a/src/shogun/mathematics/linalg/linsolver/IterativeLinearSolver.cpp b/src/shogun/mathematics/linalg/linsolver/IterativeLinearSolver.cpp index 66918ae1b43..3b0f5252a0c 100644 --- a/src/shogun/mathematics/linalg/linsolver/IterativeLinearSolver.cpp +++ b/src/shogun/mathematics/linalg/linsolver/IterativeLinearSolver.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Björn Esser + * Authors: Soumyajit De, Bjoern Esser */ #include diff --git a/src/shogun/mathematics/linalg/linsolver/IterativeLinearSolver.h b/src/shogun/mathematics/linalg/linsolver/IterativeLinearSolver.h index 04af8258c73..fde9e4d80e3 100644 --- a/src/shogun/mathematics/linalg/linsolver/IterativeLinearSolver.h +++ b/src/shogun/mathematics/linalg/linsolver/IterativeLinearSolver.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Sunil Mahendrakar, Björn Esser, Thoralf Klein + * Authors: Soumyajit De, Sunil Mahendrakar, Bjoern Esser, Thoralf Klein */ #ifndef ITERATIVE_LINEAR_SOLVER_H_ diff --git a/src/shogun/mathematics/linalg/linsolver/IterativeShiftedLinearFamilySolver.cpp b/src/shogun/mathematics/linalg/linsolver/IterativeShiftedLinearFamilySolver.cpp index d8e7cb14c1c..8138a0652c8 100644 --- a/src/shogun/mathematics/linalg/linsolver/IterativeShiftedLinearFamilySolver.cpp +++ b/src/shogun/mathematics/linalg/linsolver/IterativeShiftedLinearFamilySolver.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Björn Esser + * Authors: Soumyajit De, Bjoern Esser */ #include diff --git a/src/shogun/mathematics/linalg/linsolver/IterativeShiftedLinearFamilySolver.h b/src/shogun/mathematics/linalg/linsolver/IterativeShiftedLinearFamilySolver.h index f2d1db84fed..e6d4a7f4df6 100644 --- a/src/shogun/mathematics/linalg/linsolver/IterativeShiftedLinearFamilySolver.h +++ b/src/shogun/mathematics/linalg/linsolver/IterativeShiftedLinearFamilySolver.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Sunil Mahendrakar, Björn Esser + * Authors: Soumyajit De, Sunil Mahendrakar, Bjoern Esser */ #ifndef ITERATIVE_SHIFTED_LINEAR_FAMILY_SOLVER_H_ diff --git a/src/shogun/mathematics/linalg/linsolver/IterativeSolverIterator.h b/src/shogun/mathematics/linalg/linsolver/IterativeSolverIterator.h index 45327ac9db0..286b3e86c3d 100644 --- a/src/shogun/mathematics/linalg/linsolver/IterativeSolverIterator.h +++ b/src/shogun/mathematics/linalg/linsolver/IterativeSolverIterator.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Heiko Strathmann, Björn Esser + * Authors: Soumyajit De, Heiko Strathmann, Bjoern Esser */ #ifndef ITERATIVE_SOLVER_ITERATOR_H_ diff --git a/src/shogun/mathematics/linalg/linsolver/LinearSolver.cpp b/src/shogun/mathematics/linalg/linsolver/LinearSolver.cpp index 4ec03f6300b..7a4d5e2bfcb 100644 --- a/src/shogun/mathematics/linalg/linsolver/LinearSolver.cpp +++ b/src/shogun/mathematics/linalg/linsolver/LinearSolver.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Björn Esser + * Authors: Soumyajit De, Bjoern Esser */ #include diff --git a/src/shogun/mathematics/linalg/linsolver/LinearSolver.h b/src/shogun/mathematics/linalg/linsolver/LinearSolver.h index 2dec73fd890..90b36eb5e16 100644 --- a/src/shogun/mathematics/linalg/linsolver/LinearSolver.h +++ b/src/shogun/mathematics/linalg/linsolver/LinearSolver.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sunil Mahendrakar, Soumyajit De, Björn Esser + * Authors: Sunil Mahendrakar, Soumyajit De, Bjoern Esser */ #ifndef LINEAR_SOLVER_H_ diff --git a/src/shogun/mathematics/linalg/ratapprox/logdet/LogDetEstimator.cpp b/src/shogun/mathematics/linalg/ratapprox/logdet/LogDetEstimator.cpp index de9508fe77e..01f02aa3e61 100644 --- a/src/shogun/mathematics/linalg/ratapprox/logdet/LogDetEstimator.cpp +++ b/src/shogun/mathematics/linalg/ratapprox/logdet/LogDetEstimator.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sunil Mahendrakar, Heiko Strathmann, Soumyajit De, Björn Esser + * Authors: Sunil Mahendrakar, Heiko Strathmann, Soumyajit De, Bjoern Esser */ #include #include diff --git a/src/shogun/mathematics/linalg/ratapprox/logdet/LogDetEstimator.h b/src/shogun/mathematics/linalg/ratapprox/logdet/LogDetEstimator.h index b552f1036ee..f3848f750f9 100644 --- a/src/shogun/mathematics/linalg/ratapprox/logdet/LogDetEstimator.h +++ b/src/shogun/mathematics/linalg/ratapprox/logdet/LogDetEstimator.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sunil Mahendrakar, Soumyajit De, Heiko Strathmann, Björn Esser, + * Authors: Sunil Mahendrakar, Soumyajit De, Heiko Strathmann, Bjoern Esser, * Viktor Gal */ diff --git a/src/shogun/mathematics/linalg/ratapprox/logdet/opfunc/DenseMatrixExactLog.cpp b/src/shogun/mathematics/linalg/ratapprox/logdet/opfunc/DenseMatrixExactLog.cpp index 119e5806da0..108495eb262 100644 --- a/src/shogun/mathematics/linalg/ratapprox/logdet/opfunc/DenseMatrixExactLog.cpp +++ b/src/shogun/mathematics/linalg/ratapprox/logdet/opfunc/DenseMatrixExactLog.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sunil Mahendrakar, Soumyajit De, Heiko Strathmann, Björn Esser, + * Authors: Sunil Mahendrakar, Soumyajit De, Heiko Strathmann, Bjoern Esser, * Viktor Gal */ diff --git a/src/shogun/mathematics/linalg/ratapprox/logdet/opfunc/DenseMatrixExactLog.h b/src/shogun/mathematics/linalg/ratapprox/logdet/opfunc/DenseMatrixExactLog.h index e4af603d078..a5a9ed1f5fc 100644 --- a/src/shogun/mathematics/linalg/ratapprox/logdet/opfunc/DenseMatrixExactLog.h +++ b/src/shogun/mathematics/linalg/ratapprox/logdet/opfunc/DenseMatrixExactLog.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Heiko Strathmann, Soumyajit De, Björn Esser + * Authors: Heiko Strathmann, Soumyajit De, Bjoern Esser */ #ifndef DENSE_MATRIX_EXACT_LOG_H_ diff --git a/src/shogun/mathematics/linalg/ratapprox/logdet/opfunc/LogRationalApproximationCGM.cpp b/src/shogun/mathematics/linalg/ratapprox/logdet/opfunc/LogRationalApproximationCGM.cpp index 0be51e86092..f68968b82db 100644 --- a/src/shogun/mathematics/linalg/ratapprox/logdet/opfunc/LogRationalApproximationCGM.cpp +++ b/src/shogun/mathematics/linalg/ratapprox/logdet/opfunc/LogRationalApproximationCGM.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Sunil Mahendrakar, Heiko Strathmann, Björn Esser + * Authors: Soumyajit De, Sunil Mahendrakar, Heiko Strathmann, Bjoern Esser */ #include diff --git a/src/shogun/mathematics/linalg/ratapprox/logdet/opfunc/LogRationalApproximationCGM.h b/src/shogun/mathematics/linalg/ratapprox/logdet/opfunc/LogRationalApproximationCGM.h index b947d516abf..2ca5450755b 100644 --- a/src/shogun/mathematics/linalg/ratapprox/logdet/opfunc/LogRationalApproximationCGM.h +++ b/src/shogun/mathematics/linalg/ratapprox/logdet/opfunc/LogRationalApproximationCGM.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Sunil Mahendrakar, Heiko Strathmann, Björn Esser + * Authors: Soumyajit De, Sunil Mahendrakar, Heiko Strathmann, Bjoern Esser */ #ifndef LOG_RATIONAL_APPROXIMATION_CGM_H_ diff --git a/src/shogun/mathematics/linalg/ratapprox/logdet/opfunc/LogRationalApproximationIndividual.cpp b/src/shogun/mathematics/linalg/ratapprox/logdet/opfunc/LogRationalApproximationIndividual.cpp index d3a1ad6a4a3..3b982be7ff4 100644 --- a/src/shogun/mathematics/linalg/ratapprox/logdet/opfunc/LogRationalApproximationIndividual.cpp +++ b/src/shogun/mathematics/linalg/ratapprox/logdet/opfunc/LogRationalApproximationIndividual.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Heiko Strathmann, Björn Esser + * Authors: Soumyajit De, Heiko Strathmann, Bjoern Esser */ #include diff --git a/src/shogun/mathematics/linalg/ratapprox/logdet/opfunc/LogRationalApproximationIndividual.h b/src/shogun/mathematics/linalg/ratapprox/logdet/opfunc/LogRationalApproximationIndividual.h index 02cb5ea192d..5057e7cae8e 100644 --- a/src/shogun/mathematics/linalg/ratapprox/logdet/opfunc/LogRationalApproximationIndividual.h +++ b/src/shogun/mathematics/linalg/ratapprox/logdet/opfunc/LogRationalApproximationIndividual.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Heiko Strathmann, Björn Esser + * Authors: Soumyajit De, Heiko Strathmann, Bjoern Esser */ #ifndef LOG_RATIONAL_APPROXIMATION_INDIVIDUAL_H_ diff --git a/src/shogun/mathematics/linalg/ratapprox/opfunc/OperatorFunction.cpp b/src/shogun/mathematics/linalg/ratapprox/opfunc/OperatorFunction.cpp index 1a17f77a734..3444bdd1177 100644 --- a/src/shogun/mathematics/linalg/ratapprox/opfunc/OperatorFunction.cpp +++ b/src/shogun/mathematics/linalg/ratapprox/opfunc/OperatorFunction.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Björn Esser + * Authors: Soumyajit De, Bjoern Esser */ #include diff --git a/src/shogun/mathematics/linalg/ratapprox/opfunc/OperatorFunction.h b/src/shogun/mathematics/linalg/ratapprox/opfunc/OperatorFunction.h index f77e011d1af..353a21209ab 100644 --- a/src/shogun/mathematics/linalg/ratapprox/opfunc/OperatorFunction.h +++ b/src/shogun/mathematics/linalg/ratapprox/opfunc/OperatorFunction.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sunil Mahendrakar, Soumyajit De, Björn Esser + * Authors: Sunil Mahendrakar, Soumyajit De, Bjoern Esser */ #ifndef OPERATOR_FUNCTION_H_ diff --git a/src/shogun/mathematics/linalg/ratapprox/opfunc/RationalApproximation.cpp b/src/shogun/mathematics/linalg/ratapprox/opfunc/RationalApproximation.cpp index 0a45c1dcddd..d1506307883 100644 --- a/src/shogun/mathematics/linalg/ratapprox/opfunc/RationalApproximation.cpp +++ b/src/shogun/mathematics/linalg/ratapprox/opfunc/RationalApproximation.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Heiko Strathmann, Sunil Mahendrakar, Björn Esser + * Authors: Soumyajit De, Heiko Strathmann, Sunil Mahendrakar, Bjoern Esser */ #include diff --git a/src/shogun/mathematics/linalg/ratapprox/opfunc/RationalApproximation.h b/src/shogun/mathematics/linalg/ratapprox/opfunc/RationalApproximation.h index 3d851334b9c..4d5860ab99b 100644 --- a/src/shogun/mathematics/linalg/ratapprox/opfunc/RationalApproximation.h +++ b/src/shogun/mathematics/linalg/ratapprox/opfunc/RationalApproximation.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Sunil Mahendrakar, Björn Esser + * Authors: Soumyajit De, Sunil Mahendrakar, Bjoern Esser */ #ifndef RATIONAL_APPROXIMATION_H_ diff --git a/src/shogun/mathematics/linalg/ratapprox/tracesampler/NormalSampler.cpp b/src/shogun/mathematics/linalg/ratapprox/tracesampler/NormalSampler.cpp index c8feddae7c0..563e95e3d95 100644 --- a/src/shogun/mathematics/linalg/ratapprox/tracesampler/NormalSampler.cpp +++ b/src/shogun/mathematics/linalg/ratapprox/tracesampler/NormalSampler.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Björn Esser + * Authors: Soumyajit De, Bjoern Esser */ #include diff --git a/src/shogun/mathematics/linalg/ratapprox/tracesampler/NormalSampler.h b/src/shogun/mathematics/linalg/ratapprox/tracesampler/NormalSampler.h index 9d6b1105fcb..6a8c1aca378 100644 --- a/src/shogun/mathematics/linalg/ratapprox/tracesampler/NormalSampler.h +++ b/src/shogun/mathematics/linalg/ratapprox/tracesampler/NormalSampler.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Björn Esser + * Authors: Soumyajit De, Bjoern Esser */ #ifndef NORMAL_SAMPLER_H_ diff --git a/src/shogun/mathematics/linalg/ratapprox/tracesampler/ProbingSampler.cpp b/src/shogun/mathematics/linalg/ratapprox/tracesampler/ProbingSampler.cpp index 58bbf4b282d..d9908e02736 100644 --- a/src/shogun/mathematics/linalg/ratapprox/tracesampler/ProbingSampler.cpp +++ b/src/shogun/mathematics/linalg/ratapprox/tracesampler/ProbingSampler.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Heiko Strathmann, Björn Esser, Viktor Gal + * Authors: Soumyajit De, Heiko Strathmann, Bjoern Esser, Viktor Gal */ #include diff --git a/src/shogun/mathematics/linalg/ratapprox/tracesampler/ProbingSampler.h b/src/shogun/mathematics/linalg/ratapprox/tracesampler/ProbingSampler.h index 4d4116594bd..0cde817bd5b 100644 --- a/src/shogun/mathematics/linalg/ratapprox/tracesampler/ProbingSampler.h +++ b/src/shogun/mathematics/linalg/ratapprox/tracesampler/ProbingSampler.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Heiko Strathmann, Björn Esser + * Authors: Soumyajit De, Heiko Strathmann, Bjoern Esser */ #ifndef PROBING_SAMPLER_H_ diff --git a/src/shogun/mathematics/linalg/ratapprox/tracesampler/TraceSampler.h b/src/shogun/mathematics/linalg/ratapprox/tracesampler/TraceSampler.h index 2731f1a1d44..e5d25054ef9 100644 --- a/src/shogun/mathematics/linalg/ratapprox/tracesampler/TraceSampler.h +++ b/src/shogun/mathematics/linalg/ratapprox/tracesampler/TraceSampler.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Björn Esser + * Authors: Soumyajit De, Bjoern Esser */ #ifndef TRACE_SAMPLER_H_ #define TRACE_SAMPLER_H_ diff --git a/src/shogun/mathematics/munkres.cpp b/src/shogun/mathematics/munkres.cpp index a5b612050dc..345e480d8e2 100644 --- a/src/shogun/mathematics/munkres.cpp +++ b/src/shogun/mathematics/munkres.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Björn Esser, Chiyuan Zhang, Soeren Sonnenburg, Sergey Lisitsyn + * Authors: Bjoern Esser, Chiyuan Zhang, Soeren Sonnenburg, Sergey Lisitsyn */ #include diff --git a/src/shogun/mathematics/munkres.h b/src/shogun/mathematics/munkres.h index fde48664415..09a2efd07e4 100644 --- a/src/shogun/mathematics/munkres.h +++ b/src/shogun/mathematics/munkres.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Björn Esser, Chiyuan Zhang, Yuyu Zhang, + * Authors: Soeren Sonnenburg, Bjoern Esser, Chiyuan Zhang, Yuyu Zhang, * Sergey Lisitsyn */ diff --git a/src/shogun/modelselection/GradientModelSelection.cpp b/src/shogun/modelselection/GradientModelSelection.cpp index 2a198daf0d3..46fda8d8cda 100644 --- a/src/shogun/modelselection/GradientModelSelection.cpp +++ b/src/shogun/modelselection/GradientModelSelection.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Jacob Walker, Wu Lin, Heiko Strathmann, Roman Votyakov, Viktor Gal, - * Weijie Lin, Fernando Iglesias, Sergey Lisitsyn, Björn Esser, + * Weijie Lin, Fernando Iglesias, Sergey Lisitsyn, Bjoern Esser, * Soeren Sonnenburg */ diff --git a/src/shogun/modelselection/ModelSelectionParameters.cpp b/src/shogun/modelselection/ModelSelectionParameters.cpp index cc1cf96fa09..5b66ef78498 100644 --- a/src/shogun/modelselection/ModelSelectionParameters.cpp +++ b/src/shogun/modelselection/ModelSelectionParameters.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Jacob Walker, Heiko Strathmann, Evgeniy Andreev, - * Björn Esser, Leon Kuchenbecker + * Bjoern Esser, Leon Kuchenbecker */ #include diff --git a/src/shogun/modelselection/ParameterCombination.cpp b/src/shogun/modelselection/ParameterCombination.cpp index 5266fc58c81..1e16b1278ae 100644 --- a/src/shogun/modelselection/ParameterCombination.cpp +++ b/src/shogun/modelselection/ParameterCombination.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Jacob Walker, Soeren Sonnenburg, Heiko Strathmann, Wu Lin, - * Roman Votyakov, Björn Esser, Esben Sorig, Sanuj Sharma + * Roman Votyakov, Bjoern Esser, Esben Sorig, Sanuj Sharma */ #include diff --git a/src/shogun/multiclass/CoverTreeKNNSolver.cpp b/src/shogun/multiclass/CoverTreeKNNSolver.cpp deleted file mode 100644 index ff05abc7c10..00000000000 --- a/src/shogun/multiclass/CoverTreeKNNSolver.cpp +++ /dev/null @@ -1,122 +0,0 @@ -/* This software is distributed under BSD 3-clause license (see LICENSE file). - * - * Copyright (c) 2012-2013 Sergey Lisitsyn - */ - -#include -#include - -using namespace shogun; - -CCoverTreeKNNSolver::CCoverTreeKNNSolver(const int32_t k, const float64_t q, const int32_t num_classes, const int32_t min_label, const SGVector train_labels): -CKNNSolver(k, q, num_classes, min_label, train_labels) { /* nothing to do */ } - -CMulticlassLabels* CCoverTreeKNNSolver::classify_objects(CDistance* knn_distance, const int32_t num_lab, SGVector& train_lab, SGVector& classes) const -{ - CMulticlassLabels* output=new CMulticlassLabels(num_lab); - - // m_q != 1.0 not supported with cover tree because the neighbors - // are not retrieved in increasing order of distance to the query - if ( m_q != 1.0 ) - SG_INFO("q != 1.0 not supported with cover tree, using q = 1\n") - - // From the sets of features (lhs and rhs) stored in distance, - // build arrays of cover tree points - v_array< CJLCoverTreePoint > set_of_points = - parse_points(knn_distance, FC_LHS); - v_array< CJLCoverTreePoint > set_of_queries = - parse_points(knn_distance, FC_RHS); - - // Build the cover trees, one for the test vectors (rhs features) - // and another for the training vectors (lhs features) - CFeatures* r = knn_distance->replace_rhs( knn_distance->get_lhs() ); - node< CJLCoverTreePoint > top = batch_create(set_of_points); - CFeatures* l = knn_distance->replace_lhs(r); - knn_distance->replace_rhs(r); - node< CJLCoverTreePoint > top_query = batch_create(set_of_queries); - - // Get the k nearest neighbors to all the test vectors (batch method) - knn_distance->replace_lhs(l); - v_array< v_array< CJLCoverTreePoint > > res; - k_nearest_neighbor(top, top_query, res, m_k); - -if (io->get_loglevel()<= MSG_DEBUG) -{ - SG_DEBUG("\nJL Results:\n") - for ( int32_t i = 0 ; i < res.index ; ++i ) - { - for ( int32_t j = 0 ; j < res[i].index ; ++j ) - { - SG_DEBUG("%d ", res[i][j].m_index); - } - SG_DEBUG("\n"); - } - SG_DEBUG("\n") -} - - for ( index_t i = 0 ; i < res.index ; ++i ) - { - // Translate from indices to labels of the nearest neighbors - for ( index_t j = 0; j < m_k; ++j ) - // The first index in res[i] points to the test vector - train_lab[j] = m_train_labels.vector[ res[i][j+1].m_index ]; - - // Get the index of the 'nearest' class - index_t out_idx = choose_class(classes.vector, train_lab.vector); - output->set_label(res[i][0].m_index, out_idx+m_min_label); - } - - - return output; -} - -SGVector CCoverTreeKNNSolver::classify_objects_k(CDistance* knn_distance, int32_t num_lab, SGVector& train_lab, SGVector& classes) const -{ - SGVector output(m_k*num_lab); - - //allocation for distances to nearest neighbors - SGVector dists(m_k); - - // From the sets of features (lhs and rhs) stored in distance, - // build arrays of cover tree points - v_array< CJLCoverTreePoint > set_of_points = - parse_points(knn_distance, FC_LHS); - v_array< CJLCoverTreePoint > set_of_queries = - parse_points(knn_distance, FC_RHS); - - // Build the cover trees, one for the test vectors (rhs features) - // and another for the training vectors (lhs features) - CFeatures* r = knn_distance->replace_rhs( knn_distance->get_lhs() ); - node< CJLCoverTreePoint > top = batch_create(set_of_points); - CFeatures* l = knn_distance->replace_lhs(r); - knn_distance->replace_rhs(r); - node< CJLCoverTreePoint > top_query = batch_create(set_of_queries); - - // Get the k nearest neighbors to all the test vectors (batch method) - knn_distance->replace_lhs(l); - v_array< v_array< CJLCoverTreePoint > > res; - k_nearest_neighbor(top, top_query, res, m_k); - - for ( index_t i = 0 ; i < res.index ; ++i ) - { - // Handle the fact that cover tree doesn't return neighbors - // ordered by distance - - for ( index_t j = 0 ; j < m_k ; ++j ) - { - // The first index in res[i] points to the test vector - dists[j] = knn_distance->distance(res[i][j+1].m_index, - res[i][0].m_index); - train_lab[j] = m_train_labels.vector[ - res[i][j+1].m_index ]; - } - - // Now we get the indices to the neighbors sorted by distance - CMath::qsort_index(dists.vector, train_lab.vector, m_k); - - choose_class_for_multiple_k(output.vector+res[i][0].m_index, classes.vector, - train_lab.vector, num_lab); - } - - return output; -} diff --git a/src/shogun/multiclass/CoverTreeKNNSolver.h b/src/shogun/multiclass/CoverTreeKNNSolver.h deleted file mode 100644 index f9ce3b3144e..00000000000 --- a/src/shogun/multiclass/CoverTreeKNNSolver.h +++ /dev/null @@ -1,54 +0,0 @@ -/* This software is distributed under BSD 3-clause license (see LICENSE file). - * - * Copyright (c) 2012-2013 Sergey Lisitsyn - */ - - -#ifndef COVERTREESOLVER_H__ -#define COVERTREESOLVER_H__ - -#include - -#include -#include -#include - -namespace shogun -{ - -/** - * Cover tree solver. It uses cover trees to speed up the nearest neighbour computation. - * For more information, see https://en.wikipedia.org/wiki/Cover_tree - * - */ -class CCoverTreeKNNSolver : public CKNNSolver -{ - public: - /** default constructor */ - CCoverTreeKNNSolver() : CKNNSolver() - { /* nothing to do */ } - - /** deconstructor */ - virtual ~CCoverTreeKNNSolver() { /* nothing to do */ } - - /** constructor - * - * @param k k - * @param q m_q - * @param num_classes m_num_classes - * @param min_label m_min_label - * @param train_labels m_train_labels - */ - CCoverTreeKNNSolver(const int32_t k, const float64_t q, const int32_t num_classes, const int32_t min_label, const SGVector train_labels); - - virtual CMulticlassLabels* classify_objects(CDistance* d, const int32_t num_lab, SGVector& train_lab, SGVector& classes) const; - - virtual SGVector classify_objects_k(CDistance* d, const int32_t num_lab, SGVector& train_lab, SGVector& classes) const; - - /** @return object name */ - const char* get_name() const { return "CoverTreeKNNSolver"; } - -}; -} - -#endif diff --git a/src/shogun/multiclass/GMNPSVM.h b/src/shogun/multiclass/GMNPSVM.h index e8e5ec4e1c5..569d22f47ad 100644 --- a/src/shogun/multiclass/GMNPSVM.h +++ b/src/shogun/multiclass/GMNPSVM.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sergey Lisitsyn, Soeren Sonnenburg, Yuyu Zhang, Björn Esser + * Authors: Sergey Lisitsyn, Soeren Sonnenburg, Yuyu Zhang, Bjoern Esser */ #ifndef _GMNPSVM_H___ diff --git a/src/shogun/multiclass/GaussianNaiveBayes.cpp b/src/shogun/multiclass/GaussianNaiveBayes.cpp index 5e100b709a6..2ec9a104e6d 100644 --- a/src/shogun/multiclass/GaussianNaiveBayes.cpp +++ b/src/shogun/multiclass/GaussianNaiveBayes.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Sergey Lisitsyn, Viktor Gal, Giovanni De Toni, Soeren Sonnenburg, - * Thoralf Klein, Björn Esser + * Thoralf Klein, Bjoern Esser */ #include diff --git a/src/shogun/multiclass/GaussianNaiveBayes.h b/src/shogun/multiclass/GaussianNaiveBayes.h index 9341f56e68b..95cc8abf900 100644 --- a/src/shogun/multiclass/GaussianNaiveBayes.h +++ b/src/shogun/multiclass/GaussianNaiveBayes.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Sergey Lisitsyn, Yuyu Zhang, Viktor Gal, Fernando Iglesias, - * Björn Esser, Soeren Sonnenburg + * Bjoern Esser, Soeren Sonnenburg */ #ifndef GAUSSIANNAIVEBAYES_H_ diff --git a/src/shogun/multiclass/KNN.cpp b/src/shogun/multiclass/KNN.cpp index 52c80cc4e05..072cb8a32fa 100644 --- a/src/shogun/multiclass/KNN.cpp +++ b/src/shogun/multiclass/KNN.cpp @@ -3,7 +3,7 @@ * * Authors: Soeren Sonnenburg, Fernando Iglesias, Giovanni De Toni, * Saurabh Mahindre, Sergey Lisitsyn, Weijie Lin, Heiko Strathmann, - * Evgeniy Andreev, Viktor Gal, Björn Esser + * Evgeniy Andreev, Viktor Gal, Bjoern Esser */ #include @@ -325,9 +325,13 @@ void CKNN::init_solver(KNN_SOLVER knn_solver) } case KNN_COVER_TREE: { +#ifdef SG_GPL_ONLY solver = new CCoverTreeKNNSolver(m_k, m_q, m_num_classes, m_min_label, m_train_labels); SG_REF(solver); break; +#else + SG_GPL_ONLY +#endif // SG_GPL_ONLY } #ifdef HAVE_CXX11 case KNN_LSH: diff --git a/src/shogun/multiclass/KNN.h b/src/shogun/multiclass/KNN.h index d9708257b33..173247f9dc5 100644 --- a/src/shogun/multiclass/KNN.h +++ b/src/shogun/multiclass/KNN.h @@ -3,7 +3,7 @@ * * Authors: Fernando Iglesias, Soeren Sonnenburg, Saurabh Mahindre, * Sergey Lisitsyn, Heiko Strathmann, Evgeniy Andreev, Yuyu Zhang, - * Weijie Lin, Björn Esser, Saurabh Goyal + * Weijie Lin, Bjoern Esser, Saurabh Goyal */ #ifndef _KNN_H__ @@ -20,7 +20,9 @@ #include #include #include +#ifdef USE_GPL_SHOGUN #include +#endif #include namespace shogun diff --git a/src/shogun/multiclass/LaRank.cpp b/src/shogun/multiclass/LaRank.cpp deleted file mode 100644 index e496709fa61..00000000000 --- a/src/shogun/multiclass/LaRank.cpp +++ /dev/null @@ -1,1077 +0,0 @@ -// -*- C++ -*- -// Main functions of the LaRank algorithm for soving Multiclass SVM -// Copyright (C) 2008- Antoine Bordes -// Shogun specific adjustments (w) 2009 Soeren Sonnenburg - -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -// -/*********************************************************************** - * - * LUSH Lisp Universal Shell - * Copyright (C) 2002 Leon Bottou, Yann Le Cun, AT&T Corp, NECI. - * Includes parts of TL3: - * Copyright (C) 1987-1999 Leon Bottou and Neuristique. - * Includes selected parts of SN3.2: - * Copyright (C) 1991-2001 AT&T Corp. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * aint64_t with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA - * - ***********************************************************************/ - -/*********************************************************************** - * $Id: kcache.c,v 1.9 2007/01/25 22:42:09 leonb Exp $ - **********************************************************************/ - -#include -#include - -#include -#include -#include -#include -#ifndef _MSC_VER -#include -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using namespace shogun; - -namespace shogun -{ - static larank_kcache_t* larank_kcache_create (CKernel* kernelfunc) - { - larank_kcache_t *self; - self = SG_CALLOC (larank_kcache_t, 1); - self->l = 0; - self->maxrowlen = 0; - self->func = kernelfunc; - self->prevbuddy = self; - self->nextbuddy = self; - self->cursize = sizeof (larank_kcache_t); - self->maxsize = 256 * 1024 * 1024; - self->qprev = SG_MALLOC(int32_t, 1); - self->qnext = SG_MALLOC(int32_t, 1); - self->rnext = self->qnext + 1; - self->rprev = self->qprev + 1; - self->rprev[-1] = -1; - self->rnext[-1] = -1; - return self; - } - - static void xtruncate (larank_kcache_t * self, int32_t k, int32_t nlen) - { - int32_t olen = self->rsize[k]; - if (nlen < olen) - { - float32_t *ndata; - float32_t *odata = self->rdata[k]; - if (nlen > 0) - { - ndata = SG_MALLOC(float32_t, nlen); - sg_memcpy (ndata, odata, nlen * sizeof (float32_t)); - } - else - { - ndata = 0; - self->rnext[self->rprev[k]] = self->rnext[k]; - self->rprev[self->rnext[k]] = self->rprev[k]; - self->rnext[k] = self->rprev[k] = k; - } - SG_FREE (odata); - self->rdata[k] = ndata; - self->rsize[k] = nlen; - self->cursize += (int64_t) (nlen - olen) * sizeof (float32_t); - } - } - - static void xpurge (larank_kcache_t * self) - { - if (self->cursize > self->maxsize) - { - int32_t k = self->rprev[-1]; - while (self->cursize > self->maxsize && k != self->rnext[-1]) - { - int32_t pk = self->rprev[k]; - xtruncate (self, k, 0); - k = pk; - } - } - } - - static void larank_kcache_set_maximum_size (larank_kcache_t * self, int64_t entries) - { - ASSERT (self) - ASSERT (entries > 0) - self->maxsize = entries; - xpurge (self); - } - - static void larank_kcache_destroy (larank_kcache_t * self) - { - if (self) - { - int32_t i; - larank_kcache_t *nb = self->nextbuddy; - larank_kcache_t *pb = self->prevbuddy; - pb->nextbuddy = nb; - nb->prevbuddy = pb; - /* delete */ - if (self->i2r) - SG_FREE (self->i2r); - if (self->r2i) - SG_FREE (self->r2i); - if (self->rdata) - for (i = 0; i < self->l; i++) - if (self->rdata[i]) - SG_FREE (self->rdata[i]); - if (self->rdata) - SG_FREE (self->rdata); - if (self->rsize) - SG_FREE (self->rsize); - if (self->rdiag) - SG_FREE (self->rdiag); - if (self->qnext) - SG_FREE (self->qnext); - if (self->qprev) - SG_FREE (self->qprev); - memset (self, 0, sizeof (larank_kcache_t)); - SG_FREE (self); - } - } - - static void xminsize (larank_kcache_t * self, int32_t n) - { - int32_t ol = self->l; - if (n > ol) - { - int32_t i; - int32_t nl = CMath::max (256, ol); - while (nl < n) - nl = nl + nl; - self->i2r = SG_REALLOC (int32_t, self->i2r, self->l, nl); - self->r2i = SG_REALLOC (int32_t, self->r2i, self->l, nl); - self->rsize = SG_REALLOC (int32_t, self->rsize, self->l, nl); - self->qnext = SG_REALLOC (int32_t, self->qnext, 1+self->l, (1 + nl)); - self->qprev = SG_REALLOC (int32_t, self->qprev, 1+self->l, (1 + nl)); - self->rdiag = SG_REALLOC (float32_t, self->rdiag, self->l, nl); - self->rdata = SG_REALLOC (float32_t*, self->rdata, self->l, nl); - self->rnext = self->qnext + 1; - self->rprev = self->qprev + 1; - for (i = ol; i < nl; i++) - { - self->i2r[i] = i; - self->r2i[i] = i; - self->rsize[i] = -1; - self->rnext[i] = i; - self->rprev[i] = i; - self->rdata[i] = 0; - } - self->l = nl; - } - } - - static int32_t* larank_kcache_r2i (larank_kcache_t * self, int32_t n) - { - xminsize (self, n); - return self->r2i; - } - - static void xextend (larank_kcache_t * self, int32_t k, int32_t nlen) - { - int32_t olen = self->rsize[k]; - if (nlen > olen) - { - float32_t *ndata = SG_MALLOC(float32_t, nlen); - if (olen > 0) - { - float32_t *odata = self->rdata[k]; - sg_memcpy (ndata, odata, olen * sizeof (float32_t)); - SG_FREE (odata); - } - self->rdata[k] = ndata; - self->rsize[k] = nlen; - self->cursize += (int64_t) (nlen - olen) * sizeof (float32_t); - self->maxrowlen = CMath::max (self->maxrowlen, nlen); - } - } - - static void xswap (larank_kcache_t * self, int32_t i1, int32_t i2, int32_t r1, int32_t r2) - { - /* swap row data */ - if (r1 < self->maxrowlen || r2 < self->maxrowlen) - { - int32_t mrl = 0; - int32_t k = self->rnext[-1]; - while (k >= 0) - { - int32_t nk = self->rnext[k]; - int32_t n = self->rsize[k]; - int32_t rr = self->i2r[k]; - float32_t *d = self->rdata[k]; - if (r1 < n) - { - if (r2 < n) - { - float32_t t1 = d[r1]; - float32_t t2 = d[r2]; - d[r1] = t2; - d[r2] = t1; - } - else if (rr == r2) - { - d[r1] = self->rdiag[k]; - } - else - { - int32_t arsize = self->rsize[i2]; - if (rr < arsize && rr != r1) - d[r1] = self->rdata[i2][rr]; - else - xtruncate (self, k, r1); - } - } - else if (r2 < n) - { - if (rr == r1) - { - d[r2] = self->rdiag[k]; - } - else - { - int32_t arsize = self->rsize[i1]; - if (rr < arsize && rr != r2) - d[r2] = self->rdata[i1][rr]; - else - xtruncate (self, k, r2); - } - } - mrl = CMath::max (mrl, self->rsize[k]); - k = nk; - } - self->maxrowlen = mrl; - } - /* swap r2i and i2r */ - self->r2i[r1] = i2; - self->r2i[r2] = i1; - self->i2r[i1] = r2; - self->i2r[i2] = r1; - } - - static void larank_kcache_swap_rr (larank_kcache_t * self, int32_t r1, int32_t r2) - { - xminsize (self, 1 + CMath::max(r1, r2)); - xswap (self, self->r2i[r1], self->r2i[r2], r1, r2); - } - - static void larank_kcache_swap_ri (larank_kcache_t * self, int32_t r1, int32_t i2) - { - xminsize (self, 1 + CMath::max (r1, i2)); - xswap (self, self->r2i[r1], i2, r1, self->i2r[i2]); - } - - static float64_t xquery (larank_kcache_t * self, int32_t i, int32_t j) - { - /* search buddies */ - larank_kcache_t *cache = self->nextbuddy; - do - { - int32_t l = cache->l; - if (i < l && j < l) - { - int32_t s = cache->rsize[i]; - int32_t p = cache->i2r[j]; - if (p < s) - return cache->rdata[i][p]; - if (i == j && s >= 0) - return cache->rdiag[i]; - p = cache->i2r[i]; - s = cache->rsize[j]; - if (p < s) - return cache->rdata[j][p]; - } - cache = cache->nextbuddy; - } - while (cache != self); - /* compute */ - return self->func->kernel(i, j); - } - - - static float64_t larank_kcache_query (larank_kcache_t * self, int32_t i, int32_t j) - { - ASSERT (self) - ASSERT (i >= 0) - ASSERT (j >= 0) - return xquery (self, i, j); - } - - - static void larank_kcache_set_buddy (larank_kcache_t * self, larank_kcache_t * buddy) - { - larank_kcache_t *p = self; - larank_kcache_t *selflast = self->prevbuddy; - larank_kcache_t *buddylast = buddy->prevbuddy; - /* check functions are identical */ - ASSERT (self->func == buddy->func) - /* make sure we are not already buddies */ - do - { - if (p == buddy) - return; - p = p->nextbuddy; - } - while (p != self); - /* link */ - selflast->nextbuddy = buddy; - buddy->prevbuddy = selflast; - buddylast->nextbuddy = self; - self->prevbuddy = buddylast; - } - - - static float32_t* larank_kcache_query_row (larank_kcache_t * self, int32_t i, int32_t len) - { - ASSERT (i >= 0) - if (i < self->l && len <= self->rsize[i]) - { - self->rnext[self->rprev[i]] = self->rnext[i]; - self->rprev[self->rnext[i]] = self->rprev[i]; - } - else - { - int32_t olen, p; - float32_t *d; - if (i >= self->l || len >= self->l) - xminsize (self, CMath::max (1 + i, len)); - olen = self->rsize[i]; - if (olen < len) - { - if (olen < 0) - { - self->rdiag[i] = self->func->kernel(i, i); - olen = self->rsize[i] = 0; - } - xextend (self, i, len); - d = self->rdata[i]; - self->rsize[i] = olen; - for (p = olen; p < len; p++) - d[p] = larank_kcache_query (self, self->r2i[p], i); - self->rsize[i] = len; - } - self->rnext[self->rprev[i]] = self->rnext[i]; - self->rprev[self->rnext[i]] = self->rprev[i]; - xpurge (self); - } - self->rprev[i] = -1; - self->rnext[i] = self->rnext[-1]; - self->rnext[self->rprev[i]] = i; - self->rprev[self->rnext[i]] = i; - return self->rdata[i]; - } - -} - - -// Initializing an output class (basically creating a kernel cache for it) -void LaRankOutput::initialize (CKernel* kfunc, int64_t cache) -{ - kernel = larank_kcache_create (kfunc); - larank_kcache_set_maximum_size (kernel, cache * 1024 * 1024); - m_beta = SGVector(1); - g = SG_MALLOC(float32_t, 1); - *g=0; - l = 0; -} - -// Destroying an output class (basically destroying the kernel cache) -void LaRankOutput::destroy () -{ - larank_kcache_destroy (kernel); - kernel=NULL; - SG_FREE(g); - g=NULL; -} - -// !Important! Computing the score of a given input vector for the actual output -float64_t LaRankOutput::computeScore (int32_t x_id) -{ - if (l == 0) - return 0; - else - { - SGVector row(larank_kcache_query_row (kernel, x_id, l), l, false); - return linalg::dot (m_beta, row); - } -} - -// !Important! Computing the gradient of a given input vector for the actual output -float64_t LaRankOutput::computeGradient (int32_t xi_id, int32_t yi, int32_t ythis) -{ - return (yi == ythis ? 1 : 0) - computeScore (xi_id); -} - -// Updating the solution in the actual output -void LaRankOutput::update (int32_t x_id, float64_t lambda, float64_t gp) -{ - int32_t *r2i = larank_kcache_r2i (kernel, l); - int64_t xr = l + 1; - for (int32_t r = 0; r < l; r++) - if (r2i[r] == x_id) - { - xr = r; - break; - } - - // updates the cache order and the beta coefficient - if (xr < l) - { - m_beta[xr]+=lambda; - } - else - { - larank_kcache_swap_ri (kernel, l, x_id); - g = SG_REALLOC(float32_t, g, l, l+1); - m_beta.resize_vector(l+1); - g[l]=gp; - m_beta[l]=lambda; - l++; - } - - // update stored gradients - float32_t *row = larank_kcache_query_row (kernel, x_id, l); - for (int32_t r = 0; r < l; r++) - { - float64_t oldg = g[r]; - g[r]=oldg - lambda * row[r]; - } -} - -// Linking the cahe of this output to the cache of an other "buddy" output -// so that if a requested value is not found in this cache, you can ask your buddy if it has it. -void LaRankOutput::set_kernel_buddy (larank_kcache_t * bud) -{ - larank_kcache_set_buddy (bud, kernel); -} - -// Removing useless support vectors (for which beta=0) -int32_t LaRankOutput::cleanup () -{ - int32_t count = 0; - std::vector < int32_t >idx; - for (int32_t x = 0; x < l; x++) - { - if ((m_beta[x] < FLT_EPSILON) && (m_beta[x] > -FLT_EPSILON)) - { - idx.push_back (x); - count++; - } - } - int32_t new_l = l - count; - for (int32_t xx = 0; xx < count; xx++) - { - int32_t i = idx[xx] - xx; - for (int32_t r = i; r < (l - 1); r++) - { - larank_kcache_swap_rr (kernel, r, int64_t(r) + 1); - m_beta[r]=m_beta[r + 1]; - g[r]=g[r + 1]; - } - } - m_beta.resize_vector(new_l+1); - g = SG_REALLOC(float32_t, g, l, new_l+1); - m_beta[new_l]=0; - g[new_l]=0; - l = new_l; - return count; -} - -// --- Below are information or "get" functions --- // -// -float64_t LaRankOutput::getW2 () -{ - float64_t sum = 0; - int32_t *r2i = larank_kcache_r2i (kernel, l + 1); - for (int32_t r = 0; r < l; r++) - { - SGVector row_r(larank_kcache_query_row (kernel, r2i[r], l), l, false); - sum += m_beta[r] * linalg::dot (m_beta, row_r); - } - return sum; -} - -float64_t LaRankOutput::getKii (int32_t x_id) -{ - return larank_kcache_query (kernel, x_id, x_id); -} - -// -float64_t LaRankOutput::getBeta (int32_t x_id) -{ - int32_t *r2i = larank_kcache_r2i (kernel, l); - int32_t xr = -1; - for (int32_t r = 0; r < l; r++) - if (r2i[r] == x_id) - { - xr = r; - break; - } - return (xr < 0 ? 0 : m_beta[xr]); -} - -// -float64_t LaRankOutput::getGradient (int32_t x_id) -{ - int32_t *r2i = larank_kcache_r2i (kernel, l); - int32_t xr = -1; - for (int32_t r = 0; r < l; r++) - if (r2i[r] == x_id) - { - xr = r; - break; - } - return (xr < 0 ? 0 : g[xr]); -} -bool LaRankOutput::isSupportVector (int32_t x_id) const -{ - int32_t *r2i = larank_kcache_r2i (kernel, l); - int32_t xr = -1; - for (int32_t r = 0; r < l; r++) - if (r2i[r] == x_id) - { - xr = r; - break; - } - return (xr >= 0); -} - -// -int32_t LaRankOutput::getSV (float32_t* &sv) const -{ - sv=SG_MALLOC(float32_t, l); - int32_t *r2i = larank_kcache_r2i (kernel, l); - for (int32_t r = 0; r < l; r++) - sv[r]=r2i[r]; - return l; -} - -CLaRank::CLaRank (): CMulticlassSVM(new CMulticlassOneVsRestStrategy()), - nb_seen_examples (0), nb_removed (0), - n_pro (0), n_rep (0), n_opt (0), - w_pro (1), w_rep (1), w_opt (1), y0 (0), m_dual (0), - batch_mode(true), step(0), max_iteration(1000) -{ -} - -CLaRank::CLaRank (float64_t C, CKernel* k, CLabels* lab): - CMulticlassSVM(new CMulticlassOneVsRestStrategy(), C, k, lab), - nb_seen_examples (0), nb_removed (0), - n_pro (0), n_rep (0), n_opt (0), - w_pro (1), w_rep (1), w_opt (1), y0 (0), m_dual (0), - batch_mode(true), step(0), max_iteration(1000) -{ -} - -CLaRank::~CLaRank () -{ - destroy(); -} - -bool CLaRank::train_machine(CFeatures* data) -{ - tau = 0.0001; - - ASSERT(m_kernel) - ASSERT(m_labels && m_labels->get_num_labels()) - ASSERT(m_labels->get_label_type() == LT_MULTICLASS) - - if (data) - { - if (data->get_num_vectors() != m_labels->get_num_labels()) - { - SG_ERROR("Numbert of vectors (%d) does not match number of labels (%d)\n", - data->get_num_vectors(), m_labels->get_num_labels()); - } - m_kernel->init(data, data); - } - - ASSERT(m_kernel->get_num_vec_lhs() && m_kernel->get_num_vec_rhs()) - - nb_train=m_labels->get_num_labels(); - cache = m_kernel->get_cache_size(); - - int32_t n_it = 1; - float64_t gap = DBL_MAX; - - auto pb = progress(range(0, 10), *this->io); - SG_INFO("Training on %d examples\n", nb_train) - while (gap > get_C() && (!cancel_computation()) && - n_it < max_iteration) // stopping criteria - { - float64_t tr_err = 0; - int32_t ind = step; - for (int32_t i = 0; i < nb_train; i++) - { - int32_t y=((CMulticlassLabels*) m_labels)->get_label(i); - if (add (i, y) != y) // call the add function - tr_err++; - - if (ind && i / ind) - { - SG_DEBUG("Done: %d %% Train error (online): %f%%\n", - (int32_t) (((float64_t) i) / nb_train * 100), (tr_err / ((float64_t) i + 1)) * 100); - ind += step; - } - } - - SG_DEBUG("End of iteration %d\n", n_it) - SG_DEBUG("Train error (online): %f%%\n", (tr_err / nb_train) * 100) - gap = computeGap (); - pb.print_absolute( - gap, -CMath::log10(gap), -CMath::log10(DBL_MAX), - -CMath::log10(get_C())); - - if (!batch_mode) // skip stopping criteria if online mode - gap = 0; - n_it++; - } - pb.complete_absolute(); - - if (n_it >= max_iteration && gap > get_C()) - { - SG_WARNING( - "LaRank did not converge after %d iterations.\n", max_iteration) - } - - int32_t num_classes = outputs.size(); - create_multiclass_svm(num_classes); - SG_DEBUG("%d classes\n", num_classes) - - // Used for saving a model file - int32_t i=0; - for (outputhash_t::const_iterator it = outputs.begin (); it != outputs.end (); ++it) - { - const LaRankOutput* o=&(it->second); - - larank_kcache_t* k=o->getKernel(); - int32_t l=o->get_l(); - SGVector beta=o->getBetas(); - int32_t *r2i = larank_kcache_r2i (k, l); - - ASSERT(l>0) - SG_DEBUG("svm[%d] has %d sv, b=%f\n", i, l, 0.0) - - CSVM* svm=new CSVM(l); - - for (int32_t j=0; jset_alpha(j, beta[j]); - svm->set_support_vector(j, r2i[j]); - } - - svm->set_bias(0); - set_svm(i, svm); - i++; - } - destroy(); - - return true; -} - -// LEARNING FUNCTION: add new patterns and run optimization steps selected with adaptative schedule -int32_t CLaRank::add (int32_t x_id, int32_t yi) -{ - ++nb_seen_examples; - // create a new output object if this one has never been seen before - if (!getOutput (yi)) - { - outputs.insert (std::make_pair (yi, LaRankOutput ())); - LaRankOutput *cur = getOutput (yi); - cur->initialize (m_kernel, cache); - if (outputs.size () == 1) - y0 = outputs.begin ()->first; - // link the cache of this new output to a buddy - if (outputs.size () > 1) - { - LaRankOutput *out0 = getOutput (y0); - cur->set_kernel_buddy (out0->getKernel ()); - } - } - - LaRankPattern tpattern (x_id, yi); - LaRankPattern & pattern = (patterns.isPattern (x_id)) ? patterns.getPattern (x_id) : tpattern; - - // ProcessNew with the "fresh" pattern - float64_t time1 = CTime::get_curtime(); - process_return_t pro_ret = process (pattern, processNew); - float64_t dual_increase = pro_ret.dual_increase; - float64_t duration = (CTime::get_curtime() - time1); - float64_t coeff = dual_increase / (0.00001 + duration); - m_dual += dual_increase; - n_pro++; - w_pro = 0.05 * coeff + (1 - 0.05) * w_pro; - - // ProcessOld & Optimize until ready for a new processnew - // (Adaptative schedule here) - for (;;) - { - float64_t w_sum = w_pro + w_rep + w_opt; - float64_t prop_min = w_sum / 20; - if (w_pro < prop_min) - w_pro = prop_min; - if (w_rep < prop_min) - w_rep = prop_min; - if (w_opt < prop_min) - w_opt = prop_min; - w_sum = w_pro + w_rep + w_opt; - float64_t r = CMath::random(0.0, w_sum); - if (r <= w_pro) - { - break; - } - else if ((r > w_pro) && (r <= w_pro + w_rep)) // ProcessOld here - { - float64_t ltime1 = CTime::get_curtime (); - float64_t ldual_increase = reprocess (); - float64_t lduration = (CTime::get_curtime () - ltime1); - float64_t lcoeff = ldual_increase / (0.00001 + lduration); - m_dual += ldual_increase; - n_rep++; - w_rep = 0.05 * lcoeff + (1 - 0.05) * w_rep; - } - else // Optimize here - { - float64_t ltime1 = CTime::get_curtime (); - float64_t ldual_increase = optimize (); - float64_t lduration = (CTime::get_curtime () - ltime1); - float64_t lcoeff = ldual_increase / (0.00001 + lduration); - m_dual += ldual_increase; - n_opt++; - w_opt = 0.05 * lcoeff + (1 - 0.05) * w_opt; - } - } - if (nb_seen_examples % 100 == 0) // Cleanup useless Support Vectors/Patterns sometimes - nb_removed += cleanup (); - return pro_ret.ypred; -} - -// PREDICTION FUNCTION: main function in la_rank_classify -int32_t CLaRank::predict (int32_t x_id) -{ - int32_t res = -1; - float64_t score_max = -DBL_MAX; - for (outputhash_t::iterator it = outputs.begin (); it != outputs.end ();++it) - { - float64_t score = it->second.computeScore (x_id); - if (score > score_max) - { - score_max = score; - res = it->first; - } - } - return res; -} - -void CLaRank::destroy () -{ - for (outputhash_t::iterator it = outputs.begin (); it != outputs.end ();++it) - it->second.destroy (); - outputs.clear(); -} - - -// Compute Duality gap (costly but used in stopping criteria in batch mode) -float64_t CLaRank::computeGap () -{ - float64_t sum_sl = 0; - float64_t sum_bi = 0; - for (uint32_t i = 0; i < patterns.maxcount (); ++i) - { - const LaRankPattern & p = patterns[i]; - if (!p.exists ()) - continue; - LaRankOutput *out = getOutput (p.y); - if (!out) - continue; - sum_bi += out->getBeta (p.x_id); - float64_t gi = out->computeGradient (p.x_id, p.y, p.y); - float64_t gmin = DBL_MAX; - for (outputhash_t::iterator it = outputs.begin (); it != outputs.end (); ++it) - { - if (it->first != p.y && it->second.isSupportVector (p.x_id)) - { - float64_t g = - it->second.computeGradient (p.x_id, p.y, it->first); - if (g < gmin) - gmin = g; - } - } - sum_sl += CMath::max (0.0, gi - gmin); - } - return CMath::max (0.0, computeW2 () + get_C() * sum_sl - sum_bi); -} - -// Nuber of classes so far -uint32_t CLaRank::getNumOutputs () const -{ - return outputs.size (); -} - -// Set max number of iterations before training is stopped -void CLaRank::set_max_iteration(int32_t max_iter) -{ - REQUIRE(max_iter > 0, - "Max iteration (given: %d) must be positive.\n", - max_iter); - max_iteration = max_iter; -} - -// Number of Support Vectors -int32_t CLaRank::getNSV () -{ - int32_t res = 0; - for (outputhash_t::const_iterator it = outputs.begin (); it != outputs.end (); ++it) - { - float32_t* sv=NULL; - res += it->second.getSV (sv); - SG_FREE(sv); - } - return res; -} - -// Norm of the parameters vector -float64_t CLaRank::computeW2 () -{ - float64_t res = 0; - for (uint32_t i = 0; i < patterns.maxcount (); ++i) - { - const LaRankPattern & p = patterns[i]; - if (!p.exists ()) - continue; - for (outputhash_t::iterator it = outputs.begin (); it != outputs.end (); ++it) - if (it->second.getBeta (p.x_id)) - res += it->second.getBeta (p.x_id) * it->second.computeScore (p.x_id); - } - return res; -} - -// Compute Dual objective value -float64_t CLaRank::getDual () -{ - float64_t res = 0; - for (uint32_t i = 0; i < patterns.maxcount (); ++i) - { - const LaRankPattern & p = patterns[i]; - if (!p.exists ()) - continue; - LaRankOutput *out = getOutput (p.y); - if (!out) - continue; - res += out->getBeta (p.x_id); - } - return res - computeW2 () / 2; -} - -LaRankOutput *CLaRank::getOutput (int32_t index) -{ - outputhash_t::iterator it = outputs.find (index); - return it == outputs.end ()? NULL : &it->second; -} - -// IMPORTANT Main SMO optimization step -CLaRank::process_return_t CLaRank::process (const LaRankPattern & pattern, process_type ptype) -{ - process_return_t pro_ret = process_return_t (0, 0); - - /* - ** compute gradient and sort - */ - std::vector < outputgradient_t > outputgradients(getNumOutputs ()); - std::vector < outputgradient_t > outputscores(getNumOutputs ()); - - for (outputhash_t::iterator it = outputs.begin (); it != outputs.end (); ++it) - { - if (ptype != processOptimize - || it->second.isSupportVector (pattern.x_id)) - { - float64_t g = - it->second.computeGradient (pattern.x_id, pattern.y, it->first); - outputgradients.push_back (outputgradient_t (it->first, g)); - if (it->first == pattern.y) - outputscores.push_back (outputgradient_t (it->first, (1 - g))); - else - outputscores.push_back (outputgradient_t (it->first, -g)); - } - } - - std::sort (outputgradients.begin (), outputgradients.end ()); - - /* - ** determine the prediction - */ - std::sort (outputscores.begin (), outputscores.end ()); - pro_ret.ypred = outputscores[0].output; - - /* - ** Find yp (1st part of the pair) - */ - outputgradient_t ygp; - LaRankOutput *outp = NULL; - uint32_t p; - for (p = 0; p < outputgradients.size (); ++p) - { - outputgradient_t & current = outputgradients[p]; - LaRankOutput *output = getOutput (current.output); - bool support = ptype == processOptimize || output->isSupportVector (pattern.x_id); - bool goodclass = current.output == pattern.y; - if ((!support && goodclass) || - (support && output->getBeta (pattern.x_id) < (goodclass ? get_C() : 0))) - { - ygp = current; - outp = output; - break; - } - } - if (p == outputgradients.size ()) - return pro_ret; - - /* - ** Find ym (2nd part of the pair) - */ - outputgradient_t ygm; - LaRankOutput *outm = NULL; - int32_t m; - for (m = outputgradients.size () - 1; m >= 0; --m) - { - outputgradient_t & current = outputgradients[m]; - LaRankOutput *output = getOutput (current.output); - bool support = ptype == processOptimize || output->isSupportVector (pattern.x_id); - bool goodclass = current.output == pattern.y; - if (!goodclass || (support && output->getBeta (pattern.x_id) > 0)) - { - ygm = current; - outm = output; - break; - } - } - if (m < 0) - return pro_ret; - - /* - ** Throw or Insert pattern - */ - if ((ygp.gradient - ygm.gradient) < tau) - return pro_ret; - if (ptype == processNew) - patterns.insert (pattern); - - /* - ** compute lambda and clip it - */ - float64_t kii = outp->getKii (pattern.x_id); - float64_t lambda = (ygp.gradient - ygm.gradient) / (2 * kii); - if (ptype == processOptimize || outp->isSupportVector (pattern.x_id)) - { - float64_t beta = outp->getBeta (pattern.x_id); - if (ygp.output == pattern.y) - lambda = CMath::min (lambda, get_C() - beta); - else - lambda = CMath::min (lambda, fabs (beta)); - } - else - lambda = CMath::min (lambda, get_C()); - - /* - ** update the solution - */ - outp->update (pattern.x_id, lambda, ygp.gradient); - outm->update (pattern.x_id, -lambda, ygm.gradient); - - pro_ret.dual_increase = lambda * ((ygp.gradient - ygm.gradient) - lambda * kii); - return pro_ret; -} - -// ProcessOld -float64_t CLaRank::reprocess () -{ - if (patterns.size ()) - { - for (int32_t n = 0; n < 10; ++n) - { - process_return_t pro_ret = process (patterns.sample (), processOld); - if (pro_ret.dual_increase) - return pro_ret.dual_increase; - } - } - return 0; -} - -// Optimize -float64_t CLaRank::optimize () -{ - float64_t dual_increase = 0; - if (patterns.size ()) - { - for (int32_t n = 0; n < 10; ++n) - { - process_return_t pro_ret = - process (patterns.sample(), processOptimize); - dual_increase += pro_ret.dual_increase; - } - } - return dual_increase; -} - -// remove patterns and return the number of patterns that were removed -uint32_t CLaRank::cleanup () -{ - /* - for (outputhash_t::iterator it = outputs.begin (); it != outputs.end (); ++it) - it->second.cleanup (); - - uint32_t res = 0; - for (uint32_t i = 0; i < patterns.size (); ++i) - { - LaRankPattern & p = patterns[i]; - if (p.exists () && !outputs[p.y].isSupportVector (p.x_id)) - { - patterns.remove (i); - ++res; - } - } - return res; - */ - return 0; -} diff --git a/src/shogun/multiclass/LaRank.h b/src/shogun/multiclass/LaRank.h deleted file mode 100644 index 554ca76c1c4..00000000000 --- a/src/shogun/multiclass/LaRank.h +++ /dev/null @@ -1,517 +0,0 @@ -// -*- C++ -*- -// Main functions of the LaRank algorithm for soving Multiclass SVM -// Copyright (C) 2008- Antoine Bordes -// Shogun specific adjustments (w) 2009 Soeren Sonnenburg - -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -// -/*********************************************************************** - * - * LUSH Lisp Universal Shell - * Copyright (C) 2002 Leon Bottou, Yann Le Cun, AT&T Corp, NECI. - * Includes parts of TL3: - * Copyright (C) 1987-1999 Leon Bottou and Neuristique. - * Includes selected parts of SN3.2: - * Copyright (C) 1991-2001 AT&T Corp. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA - * - ***********************************************************************/ - -/*********************************************************************** - * $Id: kcache.h,v 1.8 2007/01/25 22:42:09 leonb Exp $ - **********************************************************************/ - -#ifndef LARANK_H -#define LARANK_H - -#include -#include -#include -#define STDEXT_NAMESPACE __gnu_cxx -#define std_hash_map std::map -#define std_hash_set std::set - -#include - -#include -#include -#include - -namespace shogun -{ -#ifndef DOXYGEN_SHOULD_SKIP_THIS - struct larank_kcache_s; - typedef struct larank_kcache_s larank_kcache_t; - struct larank_kcache_s - { - CKernel* func; - larank_kcache_t *prevbuddy; - larank_kcache_t *nextbuddy; - int64_t maxsize; - int64_t cursize; - int32_t l; - int32_t *i2r; - int32_t *r2i; - int32_t maxrowlen; - /* Rows */ - int32_t *rsize; - float32_t *rdiag; - float32_t **rdata; - int32_t *rnext; - int32_t *rprev; - int32_t *qnext; - int32_t *qprev; - }; - - /* - ** OUTPUT: one per class of the raining set, keep tracks of support - * vectors and their beta coefficients - */ - class LaRankOutput - { - public: - LaRankOutput () : g(NULL), kernel(NULL), l(0) - { - } - virtual ~LaRankOutput () - { - destroy(); - } - - // Initializing an output class (basically creating a kernel cache for it) - void initialize (CKernel* kfunc, int64_t cache); - - // Destroying an output class (basically destroying the kernel cache) - void destroy (); - - // !Important! Computing the score of a given input vector for the actual output - float64_t computeScore (int32_t x_id); - - // !Important! Computing the gradient of a given input vector for the actual output - float64_t computeGradient (int32_t xi_id, int32_t yi, int32_t ythis); - - // Updating the solution in the actual output - void update (int32_t x_id, float64_t lambda, float64_t gp); - - // Linking the cache of this output to the cache of an other "buddy" output - // so that if a requested value is not found in this cache, you can - // ask your buddy if it has it. - void set_kernel_buddy (larank_kcache_t * bud); - - // Removing useless support vectors (for which beta=0) - int32_t cleanup (); - - // --- Below are information or "get" functions --- // - - // - inline larank_kcache_t *getKernel () const - { - return kernel; - } - // - inline int32_t get_l () const - { - return l; - } - - // - float64_t getW2 (); - - // - float64_t getKii (int32_t x_id); - - // - float64_t getBeta (int32_t x_id); - - // - inline SGVector getBetas () const - { - return m_beta; - } - - // - float64_t getGradient (int32_t x_id); - - // - bool isSupportVector (int32_t x_id) const; - - // - int32_t getSV (float32_t* &sv) const; - - private: - // the solution of LaRank relative to the actual class is stored in - // this parameters - SGVector m_beta; // Beta coefficiens - float32_t* g; // Strored gradient derivatives - larank_kcache_t *kernel; // Cache for kernel values - int32_t l; // Number of support vectors - }; - - /* - ** LARANKPATTERN: to keep track of the support patterns - */ - class LaRankPattern - { - public: - LaRankPattern (int32_t x_index, int32_t label) - : x_id (x_index), y (label) {} - LaRankPattern () - : x_id (0) {} - - bool exists () const - { - return x_id >= 0; - } - - void clear () - { - x_id = -1; - } - - int32_t x_id; - int32_t y; - }; - - /* - ** LARANKPATTERNS: the collection of support patterns - */ - class LaRankPatterns - { - public: - LaRankPatterns () {} - ~LaRankPatterns () {} - - void insert (const LaRankPattern & pattern) - { - if (!isPattern (pattern.x_id)) - { - if (freeidx.size ()) - { - std_hash_set < uint32_t >::iterator it = freeidx.begin (); - patterns[*it] = pattern; - x_id2rank[pattern.x_id] = *it; - freeidx.erase (it); - } - else - { - patterns.push_back (pattern); - x_id2rank[pattern.x_id] = patterns.size () - 1; - } - } - else - { - int32_t rank = getPatternRank (pattern.x_id); - patterns[rank] = pattern; - } - } - - void remove (uint32_t i) - { - x_id2rank[patterns[i].x_id] = 0; - patterns[i].clear (); - freeidx.insert (i); - } - - bool empty () const - { - return patterns.size () == freeidx.size (); - } - - uint32_t size () const - { - return patterns.size () - freeidx.size (); - } - - LaRankPattern & sample () - { - ASSERT (!empty ()) - while (true) - { - uint32_t r = CMath::random(uint32_t(0), uint32_t(patterns.size ()-1)); - if (patterns[r].exists ()) - return patterns[r]; - } - return patterns[0]; - } - - uint32_t getPatternRank (int32_t x_id) - { - return x_id2rank[x_id]; - } - - bool isPattern (int32_t x_id) - { - return x_id2rank[x_id] != 0; - } - - LaRankPattern & getPattern (int32_t x_id) - { - uint32_t rank = x_id2rank[x_id]; - return patterns[rank]; - } - - uint32_t maxcount () const - { - return patterns.size (); - } - - LaRankPattern & operator [] (uint32_t i) - { - return patterns[i]; - } - - const LaRankPattern & operator [] (uint32_t i) const - { - return patterns[i]; - } - - private: - std_hash_set < uint32_t >freeidx; - std::vector < LaRankPattern > patterns; - std_hash_map < int32_t, uint32_t >x_id2rank; - }; - - -#endif // DOXYGEN_SHOULD_SKIP_THIS - - - /** @brief the LaRank multiclass SVM machine - This implementation uses LaRank algorithm from - Bordes, Antoine, et al., 2007. - "Solving multiclass support vector machines with LaRank." - - Excellent results are usually obtained by performing - just one or two training iterations. - Stopping criterion here is the dual gap as in the original paper, - with an arbitrary max_iteration (default: 1000) - to safeguard against morbid training sets. This upper limit - of training iterations is sufficient for most cases - but can be adjusted with set_max_iteration() method. - The current value of the upper limit can be queried - with get_max_iteration() method. - */ - class CLaRank: public CMulticlassSVM - { - public: - /** Default constructor - */ - CLaRank (); - - /** constructor - * - * @param C constant C - * @param k kernel - * @param lab labels - */ - CLaRank(float64_t C, CKernel* k, CLabels* lab); - - virtual ~CLaRank (); - - // LEARNING FUNCTION: add new patterns and run optimization steps - // selected with adaptative schedule - /** add - * @param x_id - * @param yi - */ - virtual int32_t add (int32_t x_id, int32_t yi); - - // PREDICTION FUNCTION: main function in la_rank_classify - /** predict - * @param x_id - */ - virtual int32_t predict (int32_t x_id); - - /** destroy */ - virtual void destroy (); - - // Compute Duality gap (costly but used in stopping criteria in batch mode) - /** computeGap */ - virtual float64_t computeGap (); - - // Nuber of classes so far - /** get num outputs */ - virtual uint32_t getNumOutputs () const; - - // Number of Support Vectors - /** get NSV */ - int32_t getNSV (); - - // Norm of the parameters vector - /** compute W2 */ - float64_t computeW2 (); - - // Compute Dual objective value - /** get Dual */ - float64_t getDual (); - - /** get classifier type - * - * @return classifier type LIBSVM - */ - virtual EMachineType get_classifier_type() { return CT_LARANK; } - - /** @return object name */ - virtual const char* get_name() const { return "LaRank"; } - - /** set batch mode - * @param enable - */ - void set_batch_mode(bool enable) { batch_mode=enable; }; - /** get batch mode */ - bool get_batch_mode() { return batch_mode; }; - /** set tau - * @param t - */ - void set_tau(float64_t t) { tau=t; }; - /** get tau - * @return tau - */ - float64_t get_tau() { return tau; }; - - /** Set max number of iterations before training is stopped - * @param max_iter - */ - void set_max_iteration(int32_t max_iter); - - /** Get max number of iterations before training is stopped - * @return max_iter - */ - int32_t get_max_iteration() { return max_iteration; } - - protected: - /** train machine */ - bool train_machine(CFeatures* data); - - private: - /* - ** MAIN DARK OPTIMIZATION PROCESSES - */ - - // Hash Table used to store the different outputs - /** output hash */ - typedef std_hash_map < int32_t, LaRankOutput > outputhash_t; // class index -> LaRankOutput - - /** outputs */ - outputhash_t outputs; - - LaRankOutput *getOutput (int32_t index); - - // - LaRankPatterns patterns; - - // Parameters - int32_t nb_seen_examples; - int32_t nb_removed; - - // Numbers of each operation performed so far - int32_t n_pro; - int32_t n_rep; - int32_t n_opt; - - // Running estimates for each operations - float64_t w_pro; - float64_t w_rep; - float64_t w_opt; - - int32_t y0; - float64_t m_dual; - - struct outputgradient_t - { - outputgradient_t (int32_t result_output, float64_t result_gradient) - : output (result_output), gradient (result_gradient) {} - outputgradient_t () - : output (0), gradient (0) {} - - int32_t output; - float64_t gradient; - - bool operator < (const outputgradient_t & og) const - { - return gradient > og.gradient; - } - }; - - //3 types of operations in LaRank - enum process_type - { - processNew, - processOld, - processOptimize - }; - - struct process_return_t - { - process_return_t (float64_t dual, int32_t yprediction) - : dual_increase (dual), ypred (yprediction) {} - process_return_t () {} - float64_t dual_increase; - int32_t ypred; - }; - - // IMPORTANT Main SMO optimization step - process_return_t process (const LaRankPattern & pattern, process_type ptype); - - // ProcessOld - float64_t reprocess (); - - // Optimize - float64_t optimize (); - - // remove patterns and return the number of patterns that were removed - uint32_t cleanup (); - - protected: - - /// classes - std_hash_set < int32_t >classes; - - /// class count - inline uint32_t class_count () const - { - return classes.size (); - } - - /// tau - float64_t tau; - - /// nb train - int32_t nb_train; - /// cache - int64_t cache; - /// whether to use online learning or batch training - bool batch_mode; - - /// progess output - int32_t step; - - /// Max number of iterations before training is stopped - int32_t max_iteration; - }; -} -#endif // LARANK_H diff --git a/src/shogun/multiclass/MCLDA.cpp b/src/shogun/multiclass/MCLDA.cpp index 87501e1bd03..ecd6bd39d51 100644 --- a/src/shogun/multiclass/MCLDA.cpp +++ b/src/shogun/multiclass/MCLDA.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Kevin Hughes, Heiko Strathmann, Michele Mazzoni, Soumyajit De, - * Weijie Lin, Björn Esser, Soeren Sonnenburg, Sanuj Sharma + * Weijie Lin, Bjoern Esser, Soeren Sonnenburg, Sanuj Sharma */ #include diff --git a/src/shogun/multiclass/MCLDA.h b/src/shogun/multiclass/MCLDA.h index ca35ce69013..d91b803f8b2 100644 --- a/src/shogun/multiclass/MCLDA.h +++ b/src/shogun/multiclass/MCLDA.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Kevin Hughes, Heiko Strathmann, Thoralf Klein, Soeren Sonnenburg, - * Björn Esser + * Bjoern Esser */ #ifndef _MCLDA_H__ diff --git a/src/shogun/multiclass/MulticlassLibLinear.h b/src/shogun/multiclass/MulticlassLibLinear.h index 60a035c32cc..6cc7953efdf 100644 --- a/src/shogun/multiclass/MulticlassLibLinear.h +++ b/src/shogun/multiclass/MulticlassLibLinear.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Sergey Lisitsyn, Fernando Iglesias, Yuyu Zhang, Evan Shelhamer, - * Björn Esser, Soeren Sonnenburg + * Bjoern Esser, Soeren Sonnenburg */ #ifndef _MULTICLASSLIBLINEAR_H___ diff --git a/src/shogun/multiclass/MulticlassLibSVM.cpp b/src/shogun/multiclass/MulticlassLibSVM.cpp index ec9018bdd1c..a2ef656d42f 100644 --- a/src/shogun/multiclass/MulticlassLibSVM.cpp +++ b/src/shogun/multiclass/MulticlassLibSVM.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Sergey Lisitsyn, Soeren Sonnenburg, Chiyuan Zhang, Heiko Strathmann, - * Björn Esser, Leon Kuchenbecker + * Bjoern Esser, Leon Kuchenbecker */ #include diff --git a/src/shogun/multiclass/MulticlassOneVsOneStrategy.cpp b/src/shogun/multiclass/MulticlassOneVsOneStrategy.cpp index acf43b41e42..c09a55c96f4 100644 --- a/src/shogun/multiclass/MulticlassOneVsOneStrategy.cpp +++ b/src/shogun/multiclass/MulticlassOneVsOneStrategy.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Chiyuan Zhang, Shell Hu, Sergey Lisitsyn, - * Björn Esser, Sanuj Sharma + * Bjoern Esser, Sanuj Sharma */ #include diff --git a/src/shogun/multiclass/MulticlassOneVsOneStrategy.h b/src/shogun/multiclass/MulticlassOneVsOneStrategy.h index 1d36cf4d562..9de0c055bfd 100644 --- a/src/shogun/multiclass/MulticlassOneVsOneStrategy.h +++ b/src/shogun/multiclass/MulticlassOneVsOneStrategy.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Chiyuan Zhang, Shell Hu, Soeren Sonnenburg, Sergey Lisitsyn, - * Björn Esser + * Bjoern Esser */ #include diff --git a/src/shogun/multiclass/MulticlassOneVsRestStrategy.cpp b/src/shogun/multiclass/MulticlassOneVsRestStrategy.cpp index 1e22ef34def..9501df012f0 100644 --- a/src/shogun/multiclass/MulticlassOneVsRestStrategy.cpp +++ b/src/shogun/multiclass/MulticlassOneVsRestStrategy.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Chiyuan Zhang, Shell Hu, Soeren Sonnenburg, Sergey Lisitsyn, - * Björn Esser, Sanuj Sharma + * Bjoern Esser, Sanuj Sharma */ #include diff --git a/src/shogun/multiclass/MulticlassOneVsRestStrategy.h b/src/shogun/multiclass/MulticlassOneVsRestStrategy.h index 962c45ddead..ad9b9e936ba 100644 --- a/src/shogun/multiclass/MulticlassOneVsRestStrategy.h +++ b/src/shogun/multiclass/MulticlassOneVsRestStrategy.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Chiyuan Zhang, Shell Hu, Sergey Lisitsyn, Yuyu Zhang, Björn Esser, + * Authors: Chiyuan Zhang, Shell Hu, Sergey Lisitsyn, Yuyu Zhang, Bjoern Esser, * Soeren Sonnenburg */ diff --git a/src/shogun/multiclass/MulticlassSVM.h b/src/shogun/multiclass/MulticlassSVM.h index 3da613d03d5..04696f08b3b 100644 --- a/src/shogun/multiclass/MulticlassSVM.h +++ b/src/shogun/multiclass/MulticlassSVM.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Chiyuan Zhang, Sergey Lisitsyn, Soeren Sonnenburg, Heiko Strathmann, - * Yuyu Zhang, Fernando Iglesias, Björn Esser + * Yuyu Zhang, Fernando Iglesias, Bjoern Esser */ #ifndef _MULTICLASSSVM_H___ diff --git a/src/shogun/multiclass/MulticlassStrategy.h b/src/shogun/multiclass/MulticlassStrategy.h index 13ff96adac1..b172a3b499f 100644 --- a/src/shogun/multiclass/MulticlassStrategy.h +++ b/src/shogun/multiclass/MulticlassStrategy.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Chiyuan Zhang, Shell Hu, Sergey Lisitsyn, Soeren Sonnenburg, - * Heiko Strathmann, Yuyu Zhang, Björn Esser + * Heiko Strathmann, Yuyu Zhang, Bjoern Esser */ #ifndef MULTICLASSSTRATEGY_H__ diff --git a/src/shogun/multiclass/QDA.cpp b/src/shogun/multiclass/QDA.cpp index 930b3054acc..b8efa56ec90 100644 --- a/src/shogun/multiclass/QDA.cpp +++ b/src/shogun/multiclass/QDA.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Kevin Hughes, Soeren Sonnenburg, Sergey Lisitsyn, Michele Mazzoni, - * Heiko Strathmann, Sanuj Sharma, Weijie Lin, Björn Esser, + * Heiko Strathmann, Sanuj Sharma, Weijie Lin, Bjoern Esser, * Youssef Emad El-Din, Sourav Singh, Pan Deng */ diff --git a/src/shogun/multiclass/RejectionStrategy.h b/src/shogun/multiclass/RejectionStrategy.h index 0bf60ebcb15..c3c64038f03 100644 --- a/src/shogun/multiclass/RejectionStrategy.h +++ b/src/shogun/multiclass/RejectionStrategy.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Sanuj Sharma, Björn Esser + * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Sanuj Sharma, Bjoern Esser */ #ifndef _REJECTIONSTRATEGY_H___ diff --git a/src/shogun/multiclass/ShareBoost.cpp b/src/shogun/multiclass/ShareBoost.cpp index 1eccbb2f84a..cd9ca4bb6f6 100644 --- a/src/shogun/multiclass/ShareBoost.cpp +++ b/src/shogun/multiclass/ShareBoost.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Chiyuan Zhang, Soeren Sonnenburg, Pan Deng, Björn Esser, + * Authors: Chiyuan Zhang, Soeren Sonnenburg, Pan Deng, Bjoern Esser, * Sanuj Sharma */ diff --git a/src/shogun/multiclass/ShareBoost.h b/src/shogun/multiclass/ShareBoost.h index 3348178ba84..95aa8cc5d06 100644 --- a/src/shogun/multiclass/ShareBoost.h +++ b/src/shogun/multiclass/ShareBoost.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Chiyuan Zhang, Yuyu Zhang, Björn Esser + * Authors: Chiyuan Zhang, Yuyu Zhang, Bjoern Esser */ #ifndef SHAREBOOST_H__ diff --git a/src/shogun/multiclass/ShareBoostOptimizer.cpp b/src/shogun/multiclass/ShareBoostOptimizer.cpp index 4e59aec4e56..86d84e1ae73 100644 --- a/src/shogun/multiclass/ShareBoostOptimizer.cpp +++ b/src/shogun/multiclass/ShareBoostOptimizer.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Chiyuan Zhang, Soeren Sonnenburg, Björn Esser + * Authors: Chiyuan Zhang, Soeren Sonnenburg, Bjoern Esser */ #include diff --git a/src/shogun/multiclass/ShareBoostOptimizer.h b/src/shogun/multiclass/ShareBoostOptimizer.h index 39d5bbc033a..53b9d6e681b 100644 --- a/src/shogun/multiclass/ShareBoostOptimizer.h +++ b/src/shogun/multiclass/ShareBoostOptimizer.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Chiyuan Zhang, Yuyu Zhang, Björn Esser + * Authors: Chiyuan Zhang, Yuyu Zhang, Bjoern Esser */ #ifndef SHAREBOOSTOPTIMIZER_H__ diff --git a/src/shogun/multiclass/ecoc/ECOCAEDDecoder.h b/src/shogun/multiclass/ecoc/ECOCAEDDecoder.h index 13506cac8b9..39754c59a78 100644 --- a/src/shogun/multiclass/ecoc/ECOCAEDDecoder.h +++ b/src/shogun/multiclass/ecoc/ECOCAEDDecoder.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Chiyuan Zhang, Yuyu Zhang, Björn Esser + * Authors: Chiyuan Zhang, Yuyu Zhang, Bjoern Esser */ #ifndef ECOCAEDDECODER_H__ diff --git a/src/shogun/multiclass/ecoc/ECOCDiscriminantEncoder.cpp b/src/shogun/multiclass/ecoc/ECOCDiscriminantEncoder.cpp index e206197798b..e716e8591a1 100644 --- a/src/shogun/multiclass/ecoc/ECOCDiscriminantEncoder.cpp +++ b/src/shogun/multiclass/ecoc/ECOCDiscriminantEncoder.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Chiyuan Zhang, Soeren Sonnenburg, Sanuj Sharma, Björn Esser + * Authors: Chiyuan Zhang, Soeren Sonnenburg, Sanuj Sharma, Bjoern Esser */ #include diff --git a/src/shogun/multiclass/ecoc/ECOCDiscriminantEncoder.h b/src/shogun/multiclass/ecoc/ECOCDiscriminantEncoder.h index 3d55336bfd2..a8add5974ce 100644 --- a/src/shogun/multiclass/ecoc/ECOCDiscriminantEncoder.h +++ b/src/shogun/multiclass/ecoc/ECOCDiscriminantEncoder.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Chiyuan Zhang, Soeren Sonnenburg, Yuyu Zhang, Björn Esser + * Authors: Chiyuan Zhang, Soeren Sonnenburg, Yuyu Zhang, Bjoern Esser */ #ifndef ECOCDISCRIMINANTENCODER_H__ diff --git a/src/shogun/multiclass/ecoc/ECOCEDDecoder.h b/src/shogun/multiclass/ecoc/ECOCEDDecoder.h index 6dd9f4b4395..9803c65d7f7 100644 --- a/src/shogun/multiclass/ecoc/ECOCEDDecoder.h +++ b/src/shogun/multiclass/ecoc/ECOCEDDecoder.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Chiyuan Zhang, Yuyu Zhang, Björn Esser + * Authors: Chiyuan Zhang, Yuyu Zhang, Bjoern Esser */ #ifndef ECOCEDDECODER_H__ diff --git a/src/shogun/multiclass/ecoc/ECOCForestEncoder.h b/src/shogun/multiclass/ecoc/ECOCForestEncoder.h index c5935955bd8..cca4b6e9ab5 100644 --- a/src/shogun/multiclass/ecoc/ECOCForestEncoder.h +++ b/src/shogun/multiclass/ecoc/ECOCForestEncoder.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Yuyu Zhang, Björn Esser, Chiyuan Zhang + * Authors: Yuyu Zhang, Bjoern Esser, Chiyuan Zhang */ #ifndef ECOCFORESTENCODER_H__ diff --git a/src/shogun/multiclass/ecoc/ECOCIHDDecoder.cpp b/src/shogun/multiclass/ecoc/ECOCIHDDecoder.cpp index 950000647c6..5919916cc80 100644 --- a/src/shogun/multiclass/ecoc/ECOCIHDDecoder.cpp +++ b/src/shogun/multiclass/ecoc/ECOCIHDDecoder.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Chiyuan Zhang, Soeren Sonnenburg, Sanuj Sharma, Björn Esser + * Authors: Chiyuan Zhang, Soeren Sonnenburg, Sanuj Sharma, Bjoern Esser */ #include diff --git a/src/shogun/multiclass/ecoc/ECOCLLBDecoder.h b/src/shogun/multiclass/ecoc/ECOCLLBDecoder.h index 091e5e7723f..a5cb368eff6 100644 --- a/src/shogun/multiclass/ecoc/ECOCLLBDecoder.h +++ b/src/shogun/multiclass/ecoc/ECOCLLBDecoder.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Chiyuan Zhang, Yuyu Zhang, Björn Esser + * Authors: Chiyuan Zhang, Yuyu Zhang, Bjoern Esser */ #ifndef ECOCLLBDECODER_H__ diff --git a/src/shogun/multiclass/ecoc/ECOCSimpleDecoder.h b/src/shogun/multiclass/ecoc/ECOCSimpleDecoder.h index 3d653c96dca..a997a47ec95 100644 --- a/src/shogun/multiclass/ecoc/ECOCSimpleDecoder.h +++ b/src/shogun/multiclass/ecoc/ECOCSimpleDecoder.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Chiyuan Zhang, Yuyu Zhang, Björn Esser + * Authors: Chiyuan Zhang, Yuyu Zhang, Bjoern Esser */ #ifndef ECOCSIMPLEDECODER_H__ diff --git a/src/shogun/multiclass/tree/BalancedConditionalProbabilityTree.h b/src/shogun/multiclass/tree/BalancedConditionalProbabilityTree.h index e272bed2bca..182a98b4642 100644 --- a/src/shogun/multiclass/tree/BalancedConditionalProbabilityTree.h +++ b/src/shogun/multiclass/tree/BalancedConditionalProbabilityTree.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Chiyuan Zhang, Björn Esser, Yuyu Zhang + * Authors: Chiyuan Zhang, Bjoern Esser, Yuyu Zhang */ #ifndef BALANCEDCONDITIONALPROBABILITYTREE_H__ diff --git a/src/shogun/multiclass/tree/ConditionalProbabilityTree.h b/src/shogun/multiclass/tree/ConditionalProbabilityTree.h index 35ad6d49ca2..06f544ec29d 100644 --- a/src/shogun/multiclass/tree/ConditionalProbabilityTree.h +++ b/src/shogun/multiclass/tree/ConditionalProbabilityTree.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Chiyuan Zhang, Sergey Lisitsyn, Yuyu Zhang, Viktor Gal, - * Fernando Iglesias, Björn Esser + * Fernando Iglesias, Bjoern Esser */ #ifndef CONDITIONALPROBABILITYTREE_H__ diff --git a/src/shogun/multiclass/tree/ConditionalProbabilityTreeNodeData.h b/src/shogun/multiclass/tree/ConditionalProbabilityTreeNodeData.h index a9d94130726..061745f9673 100644 --- a/src/shogun/multiclass/tree/ConditionalProbabilityTreeNodeData.h +++ b/src/shogun/multiclass/tree/ConditionalProbabilityTreeNodeData.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sergey Lisitsyn, Soeren Sonnenburg, Yuyu Zhang, Björn Esser, + * Authors: Sergey Lisitsyn, Soeren Sonnenburg, Yuyu Zhang, Bjoern Esser, * Chiyuan Zhang */ diff --git a/src/shogun/multiclass/tree/RandomConditionalProbabilityTree.h b/src/shogun/multiclass/tree/RandomConditionalProbabilityTree.h index 72782b23818..3c7c28ff65a 100644 --- a/src/shogun/multiclass/tree/RandomConditionalProbabilityTree.h +++ b/src/shogun/multiclass/tree/RandomConditionalProbabilityTree.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Chiyuan Zhang, Yuyu Zhang, Björn Esser + * Authors: Chiyuan Zhang, Yuyu Zhang, Bjoern Esser */ #ifndef RANDOMCONDITIONALPROBABILITYTREE_H__ diff --git a/src/shogun/multiclass/tree/RelaxedTree.cpp b/src/shogun/multiclass/tree/RelaxedTree.cpp index 4a6129f5150..e28177b83ab 100644 --- a/src/shogun/multiclass/tree/RelaxedTree.cpp +++ b/src/shogun/multiclass/tree/RelaxedTree.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Chiyuan Zhang, Soeren Sonnenburg, Sanuj Sharma, Björn Esser + * Authors: Chiyuan Zhang, Soeren Sonnenburg, Sanuj Sharma, Bjoern Esser */ #include diff --git a/src/shogun/multiclass/tree/RelaxedTree.h b/src/shogun/multiclass/tree/RelaxedTree.h index 3a39e97b604..55738e7812a 100644 --- a/src/shogun/multiclass/tree/RelaxedTree.h +++ b/src/shogun/multiclass/tree/RelaxedTree.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Chiyuan Zhang, Soeren Sonnenburg, Sergey Lisitsyn, Yuyu Zhang, - * Björn Esser + * Bjoern Esser */ #ifndef RELAXEDTREE_H__ diff --git a/src/shogun/multiclass/tree/RelaxedTreeNodeData.h b/src/shogun/multiclass/tree/RelaxedTreeNodeData.h index eb449bcb4f8..29dbaaa3d3e 100644 --- a/src/shogun/multiclass/tree/RelaxedTreeNodeData.h +++ b/src/shogun/multiclass/tree/RelaxedTreeNodeData.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Chiyuan Zhang, Soeren Sonnenburg, Yuyu Zhang, Björn Esser, + * Authors: Chiyuan Zhang, Soeren Sonnenburg, Yuyu Zhang, Bjoern Esser, * Sergey Lisitsyn */ diff --git a/src/shogun/multiclass/tree/RelaxedTreeUtil.h b/src/shogun/multiclass/tree/RelaxedTreeUtil.h index cfe17d74f9b..aeae9084e36 100644 --- a/src/shogun/multiclass/tree/RelaxedTreeUtil.h +++ b/src/shogun/multiclass/tree/RelaxedTreeUtil.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Chiyuan Zhang, Yuyu Zhang, Björn Esser + * Authors: Chiyuan Zhang, Yuyu Zhang, Bjoern Esser */ #ifndef RELAXEDTREEUTIL_H__ diff --git a/src/shogun/preprocessor/HomogeneousKernelMap.cpp b/src/shogun/preprocessor/HomogeneousKernelMap.cpp index 6ca0c09e4bb..70667a255f7 100644 --- a/src/shogun/preprocessor/HomogeneousKernelMap.cpp +++ b/src/shogun/preprocessor/HomogeneousKernelMap.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Viktor Gal, Sergey Lisitsyn, Soeren Sonnenburg, Heiko Strathmann, - * Evgeniy Andreev, Evan Shelhamer, Björn Esser + * Evgeniy Andreev, Evan Shelhamer, Bjoern Esser */ #include diff --git a/src/shogun/preprocessor/PCA.cpp b/src/shogun/preprocessor/PCA.cpp index 9a5e5601e14..983d0602581 100644 --- a/src/shogun/preprocessor/PCA.cpp +++ b/src/shogun/preprocessor/PCA.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Heiko Strathmann, Viktor Gal, - * Evan Shelhamer, Evgeniy Andreev, Marc Zimmermann, Björn Esser + * Evan Shelhamer, Evgeniy Andreev, Marc Zimmermann, Bjoern Esser */ #include diff --git a/src/shogun/preprocessor/PCA.h b/src/shogun/preprocessor/PCA.h index 4fcde74ac91..c652cea742c 100644 --- a/src/shogun/preprocessor/PCA.h +++ b/src/shogun/preprocessor/PCA.h @@ -3,7 +3,7 @@ * * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Heiko Strathmann, * Evgeniy Andreev, Marc Zimmermann, Viktor Gal, Evan Shelhamer, - * Björn Esser, Sanuj Sharma + * Bjoern Esser, Sanuj Sharma */ #ifndef PCA_H_ diff --git a/src/shogun/preprocessor/PNorm.cpp b/src/shogun/preprocessor/PNorm.cpp index af8c2ed5125..32b682884a5 100644 --- a/src/shogun/preprocessor/PNorm.cpp +++ b/src/shogun/preprocessor/PNorm.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Viktor Gal, Soeren Sonnenburg, Evgeniy Andreev, Björn Esser, + * Authors: Viktor Gal, Soeren Sonnenburg, Evgeniy Andreev, Bjoern Esser, * Sergey Lisitsyn */ diff --git a/src/shogun/preprocessor/PNorm.h b/src/shogun/preprocessor/PNorm.h index 7b10dafef9f..d4cf8839b70 100644 --- a/src/shogun/preprocessor/PNorm.h +++ b/src/shogun/preprocessor/PNorm.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Viktor Gal, Soeren Sonnenburg, Evgeniy Andreev, Yuyu Zhang, - * Sergey Lisitsyn, Björn Esser, Saurabh Goyal + * Sergey Lisitsyn, Bjoern Esser, Saurabh Goyal */ #ifndef _PNORM_ONE__H__ diff --git a/src/shogun/preprocessor/PruneVarSubMean.cpp b/src/shogun/preprocessor/PruneVarSubMean.cpp index 5e6d10a0175..91c5dc24d42 100644 --- a/src/shogun/preprocessor/PruneVarSubMean.cpp +++ b/src/shogun/preprocessor/PruneVarSubMean.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Viktor Gal, Evgeniy Andreev, Evan Shelhamer, - * Sergey Lisitsyn, Björn Esser + * Sergey Lisitsyn, Bjoern Esser */ #include diff --git a/src/shogun/preprocessor/RandomFourierGaussPreproc.cpp b/src/shogun/preprocessor/RandomFourierGaussPreproc.cpp index 9c8c2c44f3e..30fcc9adc57 100644 --- a/src/shogun/preprocessor/RandomFourierGaussPreproc.cpp +++ b/src/shogun/preprocessor/RandomFourierGaussPreproc.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Evan Shelhamer, Evgeniy Andreev, Viktor Gal, - * Sergey Lisitsyn, Björn Esser, Sanuj Sharma, Saurabh Goyal + * Sergey Lisitsyn, Bjoern Esser, Sanuj Sharma, Saurabh Goyal */ #include diff --git a/src/shogun/preprocessor/RandomFourierGaussPreproc.h b/src/shogun/preprocessor/RandomFourierGaussPreproc.h index d48bafae9b9..302f8a1e0bf 100644 --- a/src/shogun/preprocessor/RandomFourierGaussPreproc.h +++ b/src/shogun/preprocessor/RandomFourierGaussPreproc.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Evgeniy Andreev, Yuyu Zhang, - * Björn Esser, Saurabh Goyal + * Bjoern Esser, Saurabh Goyal */ #ifndef _RANDOMFOURIERGAUSSPREPROC__H__ diff --git a/src/shogun/preprocessor/RescaleFeatures.cpp b/src/shogun/preprocessor/RescaleFeatures.cpp index 5933749808d..c7311b1eda0 100644 --- a/src/shogun/preprocessor/RescaleFeatures.cpp +++ b/src/shogun/preprocessor/RescaleFeatures.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Viktor Gal, Björn Esser + * Authors: Viktor Gal, Bjoern Esser */ #include diff --git a/src/shogun/preprocessor/RescaleFeatures.h b/src/shogun/preprocessor/RescaleFeatures.h index c169c5a20b8..fc727a988e2 100644 --- a/src/shogun/preprocessor/RescaleFeatures.h +++ b/src/shogun/preprocessor/RescaleFeatures.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Viktor Gal, Soeren Sonnenburg, Yuyu Zhang, Björn Esser + * Authors: Viktor Gal, Soeren Sonnenburg, Yuyu Zhang, Bjoern Esser */ #ifndef __RESCALEFEATURES_H__ diff --git a/src/shogun/regression/LeastAngleRegression.cpp b/src/shogun/regression/LeastAngleRegression.cpp index 7ef7479075b..def87edb050 100644 --- a/src/shogun/regression/LeastAngleRegression.cpp +++ b/src/shogun/regression/LeastAngleRegression.cpp @@ -3,7 +3,7 @@ * * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Giovanni De Toni, * Saurabh Mahindre, Christopher Goldsworthy, Chiyuan Zhang, - * Viktor Gal, Abhinav Rai, Björn Esser, Weijie Lin, Pan Deng + * Viktor Gal, Abhinav Rai, Bjoern Esser, Weijie Lin, Pan Deng */ #include diff --git a/src/shogun/regression/svr/LibLinearRegression.cpp b/src/shogun/regression/svr/LibLinearRegression.cpp index 8222708ca1e..7d52f89b972 100644 --- a/src/shogun/regression/svr/LibLinearRegression.cpp +++ b/src/shogun/regression/svr/LibLinearRegression.cpp @@ -3,7 +3,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Giovanni De Toni, Soeren Sonnenburg, Sergey Lisitsyn, Abhinav Rai, - * Björn Esser + * Bjoern Esser */ #include diff --git a/src/shogun/regression/svr/LibSVR.h b/src/shogun/regression/svr/LibSVR.h index bea84ce187e..434b5d29200 100644 --- a/src/shogun/regression/svr/LibSVR.h +++ b/src/shogun/regression/svr/LibSVR.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Heiko Strathmann, Soeren Sonnenburg, Sergey Lisitsyn, - * Evan Shelhamer, Yuyu Zhang, Fernando Iglesias, Björn Esser, + * Evan Shelhamer, Yuyu Zhang, Fernando Iglesias, Bjoern Esser, * Leon Kuchenbecker, Saurabh Goyal */ diff --git a/src/shogun/regression/svr/SVRLight.cpp b/src/shogun/regression/svr/SVRLight.cpp index c6a341cecbb..127033c0bad 100644 --- a/src/shogun/regression/svr/SVRLight.cpp +++ b/src/shogun/regression/svr/SVRLight.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Heiko Strathmann, Viktor Gal, - * Thoralf Klein, Björn Esser, Evangelos Anagnostopoulos + * Thoralf Klein, Bjoern Esser, Evangelos Anagnostopoulos */ #include diff --git a/src/shogun/regression/svr/SVRLight.h b/src/shogun/regression/svr/SVRLight.h index abdd5531f0e..633be3713fa 100644 --- a/src/shogun/regression/svr/SVRLight.h +++ b/src/shogun/regression/svr/SVRLight.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Heiko Strathmann, - * Fernando Iglesias, Evan Shelhamer, Björn Esser + * Fernando Iglesias, Evan Shelhamer, Bjoern Esser */ #ifndef _SVRLight_H___ diff --git a/src/shogun/structure/BeliefPropagation.cpp b/src/shogun/structure/BeliefPropagation.cpp index 17b92b6bd17..9f3fa7d7d6d 100644 --- a/src/shogun/structure/BeliefPropagation.cpp +++ b/src/shogun/structure/BeliefPropagation.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Shell Hu, Soeren Sonnenburg, Björn Esser + * Authors: Shell Hu, Soeren Sonnenburg, Bjoern Esser */ #include diff --git a/src/shogun/structure/BeliefPropagation.h b/src/shogun/structure/BeliefPropagation.h index 4eac2687272..b449e30e4ea 100644 --- a/src/shogun/structure/BeliefPropagation.h +++ b/src/shogun/structure/BeliefPropagation.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Viktor Gal, Shell Hu, Yuyu Zhang, Björn Esser + * Authors: Viktor Gal, Shell Hu, Yuyu Zhang, Bjoern Esser */ #ifndef __BELIEF_PROPAGATION_H__ diff --git a/src/shogun/structure/CCSOSVM.cpp b/src/shogun/structure/CCSOSVM.cpp index 482cfa3de70..7ca5bb7a5a3 100644 --- a/src/shogun/structure/CCSOSVM.cpp +++ b/src/shogun/structure/CCSOSVM.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Viktor Gal, Soeren Sonnenburg, Abinash Panda, Shell Hu, - * Thoralf Klein, Björn Esser, Sanuj Sharma + * Thoralf Klein, Bjoern Esser, Sanuj Sharma */ #include diff --git a/src/shogun/structure/CCSOSVM.h b/src/shogun/structure/CCSOSVM.h index 5a4dd5a1c58..356dd7dead2 100644 --- a/src/shogun/structure/CCSOSVM.h +++ b/src/shogun/structure/CCSOSVM.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Viktor Gal, Soeren Sonnenburg, Björn Esser + * Authors: Viktor Gal, Soeren Sonnenburg, Bjoern Esser */ #ifndef __CCSOSVM_H__ diff --git a/src/shogun/structure/DirectorStructuredModel.h b/src/shogun/structure/DirectorStructuredModel.h index d90534892dc..7402d13267c 100644 --- a/src/shogun/structure/DirectorStructuredModel.h +++ b/src/shogun/structure/DirectorStructuredModel.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sergey Lisitsyn, Shell Hu, Fernando Iglesias, Björn Esser, + * Authors: Sergey Lisitsyn, Shell Hu, Fernando Iglesias, Bjoern Esser, * Soeren Sonnenburg, Viktor Gal */ diff --git a/src/shogun/structure/DisjointSet.cpp b/src/shogun/structure/DisjointSet.cpp index 77cd06e6431..1b693af4e2d 100644 --- a/src/shogun/structure/DisjointSet.cpp +++ b/src/shogun/structure/DisjointSet.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Shell Hu, Björn Esser + * Authors: Shell Hu, Bjoern Esser */ #include diff --git a/src/shogun/structure/DisjointSet.h b/src/shogun/structure/DisjointSet.h index 020e40ced21..0958db4fb52 100644 --- a/src/shogun/structure/DisjointSet.h +++ b/src/shogun/structure/DisjointSet.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Shell Hu, Yuyu Zhang, Björn Esser + * Authors: Shell Hu, Yuyu Zhang, Bjoern Esser */ #ifndef __DISJOINTSET_H__ diff --git a/src/shogun/structure/DynProg.cpp b/src/shogun/structure/DynProg.cpp index 4afc6c53517..3c67ea98caa 100644 --- a/src/shogun/structure/DynProg.cpp +++ b/src/shogun/structure/DynProg.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Evgeniy Andreev, Heiko Strathmann, Viktor Gal, - * Weijie Lin, Evan Shelhamer, Björn Esser, Giovanni De Toni, + * Weijie Lin, Evan Shelhamer, Bjoern Esser, Giovanni De Toni, * Leon Kuchenbecker, Saurabh Goyal */ diff --git a/src/shogun/structure/DynProg.h b/src/shogun/structure/DynProg.h index cc8274f7ea4..fbf9d65588a 100644 --- a/src/shogun/structure/DynProg.h +++ b/src/shogun/structure/DynProg.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Evgeniy Andreev, Evan Shelhamer, Sergey Lisitsyn, - * Björn Esser, Saurabh Goyal + * Bjoern Esser, Saurabh Goyal */ #ifndef __CDYNPROG_H__ diff --git a/src/shogun/structure/FWSOSVM.cpp b/src/shogun/structure/FWSOSVM.cpp index 71de4dac1ab..c27906f52d0 100644 --- a/src/shogun/structure/FWSOSVM.cpp +++ b/src/shogun/structure/FWSOSVM.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sanuj Sharma, Björn Esser, Shell Hu, Viktor Gal + * Authors: Sanuj Sharma, Bjoern Esser, Shell Hu, Viktor Gal */ #include diff --git a/src/shogun/structure/FWSOSVM.h b/src/shogun/structure/FWSOSVM.h index 9100b1e7c85..c8eaaca39c7 100644 --- a/src/shogun/structure/FWSOSVM.h +++ b/src/shogun/structure/FWSOSVM.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Björn Esser, Shell Hu + * Authors: Bjoern Esser, Shell Hu */ #ifndef __FW_SOSVM_H__ diff --git a/src/shogun/structure/Factor.cpp b/src/shogun/structure/Factor.cpp index 41c68a82621..80b04fafa14 100644 --- a/src/shogun/structure/Factor.cpp +++ b/src/shogun/structure/Factor.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Shell Hu, Heiko Strathmann, Jiaolong Xu, Björn Esser, + * Authors: Shell Hu, Heiko Strathmann, Jiaolong Xu, Bjoern Esser, * Sergey Lisitsyn */ diff --git a/src/shogun/structure/Factor.h b/src/shogun/structure/Factor.h index 20a7be96d65..5532450f18a 100644 --- a/src/shogun/structure/Factor.h +++ b/src/shogun/structure/Factor.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Shell Hu, Yuyu Zhang, Fernando Iglesias, Björn Esser, + * Authors: Shell Hu, Yuyu Zhang, Fernando Iglesias, Bjoern Esser, * Sergey Lisitsyn, Jiaolong Xu */ diff --git a/src/shogun/structure/FactorGraph.cpp b/src/shogun/structure/FactorGraph.cpp index 20486be8f7a..bfc77753f03 100644 --- a/src/shogun/structure/FactorGraph.cpp +++ b/src/shogun/structure/FactorGraph.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Shell Hu, Soeren Sonnenburg, Sanuj Sharma, Fernando Iglesias, - * Björn Esser + * Bjoern Esser */ #include diff --git a/src/shogun/structure/FactorGraph.h b/src/shogun/structure/FactorGraph.h index 6a32742f670..ab618748da8 100644 --- a/src/shogun/structure/FactorGraph.h +++ b/src/shogun/structure/FactorGraph.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Shell Hu, Yuyu Zhang, Björn Esser + * Authors: Shell Hu, Yuyu Zhang, Bjoern Esser */ #ifndef __FACTORGRAPH_H__ diff --git a/src/shogun/structure/FactorGraphModel.cpp b/src/shogun/structure/FactorGraphModel.cpp index 86ca32f70ed..9a453d744ab 100644 --- a/src/shogun/structure/FactorGraphModel.cpp +++ b/src/shogun/structure/FactorGraphModel.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Shell Hu, Abinash Panda, Viktor Gal, Björn Esser, Sergey Lisitsyn, + * Authors: Shell Hu, Abinash Panda, Viktor Gal, Bjoern Esser, Sergey Lisitsyn, * Jiaolong Xu, Sanuj Sharma */ diff --git a/src/shogun/structure/FactorGraphModel.h b/src/shogun/structure/FactorGraphModel.h index 407c752314b..64fd9e2dea0 100644 --- a/src/shogun/structure/FactorGraphModel.h +++ b/src/shogun/structure/FactorGraphModel.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Shell Hu, Yuyu Zhang, Björn Esser + * Authors: Shell Hu, Yuyu Zhang, Bjoern Esser */ #ifndef __FACTOR_GRAPH_MODEL_H__ diff --git a/src/shogun/structure/FactorType.cpp b/src/shogun/structure/FactorType.cpp index 25753114adb..d3e4cc70e50 100644 --- a/src/shogun/structure/FactorType.cpp +++ b/src/shogun/structure/FactorType.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Shell Hu, Thoralf Klein, Björn Esser + * Authors: Shell Hu, Thoralf Klein, Bjoern Esser */ #include diff --git a/src/shogun/structure/FactorType.h b/src/shogun/structure/FactorType.h index c86c7c0a258..bd5c3a5eaa1 100644 --- a/src/shogun/structure/FactorType.h +++ b/src/shogun/structure/FactorType.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Shell Hu, Fernando Iglesias, Yuyu Zhang, Björn Esser + * Authors: Shell Hu, Fernando Iglesias, Yuyu Zhang, Bjoern Esser */ #ifndef __FACTOR_TYPE_H__ diff --git a/src/shogun/structure/GEMPLP.cpp b/src/shogun/structure/GEMPLP.cpp index b404542ad96..5a57bef842b 100644 --- a/src/shogun/structure/GEMPLP.cpp +++ b/src/shogun/structure/GEMPLP.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Jiaolong Xu, Sanuj Sharma, Björn Esser, Yori Zwols + * Authors: Jiaolong Xu, Sanuj Sharma, Bjoern Esser, Yori Zwols */ #include diff --git a/src/shogun/structure/GEMPLP.h b/src/shogun/structure/GEMPLP.h index 44a156030be..ffb78134a59 100644 --- a/src/shogun/structure/GEMPLP.h +++ b/src/shogun/structure/GEMPLP.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Heiko Strathmann, Jiaolong Xu, Björn Esser, Yori Zwols + * Authors: Heiko Strathmann, Jiaolong Xu, Bjoern Esser, Yori Zwols */ #ifndef __GEMPLP_H__ diff --git a/src/shogun/structure/GraphCut.cpp b/src/shogun/structure/GraphCut.cpp index 3e8e812ee16..4331796317c 100644 --- a/src/shogun/structure/GraphCut.cpp +++ b/src/shogun/structure/GraphCut.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Jiaolong Xu, Fernando Iglesias, Björn Esser + * Authors: Jiaolong Xu, Fernando Iglesias, Bjoern Esser */ #include diff --git a/src/shogun/structure/GraphCut.h b/src/shogun/structure/GraphCut.h index 25ac415bf85..32ee6a7b7f0 100644 --- a/src/shogun/structure/GraphCut.h +++ b/src/shogun/structure/GraphCut.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Jiaolong Xu, Fernando Iglesias, Björn Esser, Sergey Lisitsyn + * Authors: Jiaolong Xu, Fernando Iglesias, Bjoern Esser, Sergey Lisitsyn */ #ifndef __GRAPH_CUT_H__ diff --git a/src/shogun/structure/MAPInference.cpp b/src/shogun/structure/MAPInference.cpp index 63c407f7c3e..f9f1687ca74 100644 --- a/src/shogun/structure/MAPInference.cpp +++ b/src/shogun/structure/MAPInference.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Shell Hu, Jiaolong Xu, Björn Esser + * Authors: Shell Hu, Jiaolong Xu, Bjoern Esser */ #include diff --git a/src/shogun/structure/MAPInference.h b/src/shogun/structure/MAPInference.h index ad7e4982f26..3d2f25a5528 100644 --- a/src/shogun/structure/MAPInference.h +++ b/src/shogun/structure/MAPInference.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Shell Hu, Jiaolong Xu, Björn Esser, Yuyu Zhang + * Authors: Shell Hu, Jiaolong Xu, Bjoern Esser, Yuyu Zhang */ #ifndef __MAP_INFERENCE_H__ diff --git a/src/shogun/structure/MulticlassModel.h b/src/shogun/structure/MulticlassModel.h index 9410aac689f..b4c2802ce32 100644 --- a/src/shogun/structure/MulticlassModel.h +++ b/src/shogun/structure/MulticlassModel.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Fernando Iglesias, Shell Hu, Yuyu Zhang, Thoralf Klein, - * Sergey Lisitsyn, Björn Esser, Viktor Gal + * Sergey Lisitsyn, Bjoern Esser, Viktor Gal */ #ifndef _MULTICLASS_MODEL__H__ diff --git a/src/shogun/structure/MulticlassSOLabels.cpp b/src/shogun/structure/MulticlassSOLabels.cpp index 9c09ff2f46e..4fd03eb7c73 100644 --- a/src/shogun/structure/MulticlassSOLabels.cpp +++ b/src/shogun/structure/MulticlassSOLabels.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Thoralf Klein, Sanuj Sharma, Fernando Iglesias, Soeren Sonnenburg, - * Björn Esser + * Bjoern Esser */ #include diff --git a/src/shogun/structure/MulticlassSOLabels.h b/src/shogun/structure/MulticlassSOLabels.h index f25700992b0..a4a523d9ed1 100644 --- a/src/shogun/structure/MulticlassSOLabels.h +++ b/src/shogun/structure/MulticlassSOLabels.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Fernando Iglesias, Soeren Sonnenburg, Thoralf Klein, Yuyu Zhang, - * Björn Esser, Sergey Lisitsyn + * Bjoern Esser, Sergey Lisitsyn */ #ifndef _MULTICLASS_SO_LABELS__H__ diff --git a/src/shogun/structure/Plif.cpp b/src/shogun/structure/Plif.cpp index 1ad85d728c3..1b66b7b1332 100644 --- a/src/shogun/structure/Plif.cpp +++ b/src/shogun/structure/Plif.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Evan Shelhamer, Björn Esser, Sergey Lisitsyn + * Authors: Soeren Sonnenburg, Evan Shelhamer, Bjoern Esser, Sergey Lisitsyn */ diff --git a/src/shogun/structure/Plif.h b/src/shogun/structure/Plif.h index 524b3151516..09369626a71 100644 --- a/src/shogun/structure/Plif.h +++ b/src/shogun/structure/Plif.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Sergey Lisitsyn, Evan Shelhamer, Yuyu Zhang, - * Björn Esser + * Bjoern Esser */ #ifndef __PLIF_H__ diff --git a/src/shogun/structure/PlifArray.cpp b/src/shogun/structure/PlifArray.cpp index 0e0d02a2137..db2c7899f66 100644 --- a/src/shogun/structure/PlifArray.cpp +++ b/src/shogun/structure/PlifArray.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Evan Shelhamer, Björn Esser + * Authors: Soeren Sonnenburg, Evan Shelhamer, Bjoern Esser */ #include diff --git a/src/shogun/structure/PlifArray.h b/src/shogun/structure/PlifArray.h index 11a5ea0719e..4f6561f58d3 100644 --- a/src/shogun/structure/PlifArray.h +++ b/src/shogun/structure/PlifArray.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soeren Sonnenburg, Evan Shelhamer, Yuyu Zhang, Björn Esser + * Authors: Soeren Sonnenburg, Evan Shelhamer, Yuyu Zhang, Bjoern Esser */ #ifndef __PLIFARRAY_H__ diff --git a/src/shogun/structure/PrimalMosekSOSVM.cpp b/src/shogun/structure/PrimalMosekSOSVM.cpp index 6261d92291f..84eaeed3634 100644 --- a/src/shogun/structure/PrimalMosekSOSVM.cpp +++ b/src/shogun/structure/PrimalMosekSOSVM.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Fernando Iglesias, Shell Hu, Abinash Panda, Viktor Gal, - * Björn Esser, Sergey Lisitsyn, Soeren Sonnenburg, Sanuj Sharma + * Bjoern Esser, Sergey Lisitsyn, Soeren Sonnenburg, Sanuj Sharma */ #ifdef USE_MOSEK diff --git a/src/shogun/structure/PrimalMosekSOSVM.h b/src/shogun/structure/PrimalMosekSOSVM.h index 595047abbc2..452cf55f2c2 100644 --- a/src/shogun/structure/PrimalMosekSOSVM.h +++ b/src/shogun/structure/PrimalMosekSOSVM.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Shell Hu, Fernando Iglesias, Viktor Gal, Yuyu Zhang, - * Sergey Lisitsyn, Björn Esser + * Sergey Lisitsyn, Bjoern Esser */ #ifndef _PRIMAL_MOSEK_SOSVM__H__ diff --git a/src/shogun/structure/SOSVMHelper.cpp b/src/shogun/structure/SOSVMHelper.cpp index 2e1407454b7..824eced1ae2 100644 --- a/src/shogun/structure/SOSVMHelper.cpp +++ b/src/shogun/structure/SOSVMHelper.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Shell Hu, Björn Esser, Thoralf Klein, Viktor Gal, Jiaolong Xu, + * Authors: Shell Hu, Bjoern Esser, Thoralf Klein, Viktor Gal, Jiaolong Xu, * Sanuj Sharma */ diff --git a/src/shogun/structure/SOSVMHelper.h b/src/shogun/structure/SOSVMHelper.h index e579d787893..57a5a2be837 100644 --- a/src/shogun/structure/SOSVMHelper.h +++ b/src/shogun/structure/SOSVMHelper.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Shell Hu, Björn Esser, Yuyu Zhang + * Authors: Shell Hu, Bjoern Esser, Yuyu Zhang */ #ifndef __SOSVM_HELPER_H__ diff --git a/src/shogun/structure/SegmentLoss.h b/src/shogun/structure/SegmentLoss.h index 1923ec7b321..d5a1d1775c3 100644 --- a/src/shogun/structure/SegmentLoss.h +++ b/src/shogun/structure/SegmentLoss.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soeren Sonnenburg, Evgeniy Andreev, Evan Shelhamer, Yuyu Zhang, - * Björn Esser + * Bjoern Esser */ #ifndef __SEGMENT_LOSS__ #define __SEGMENT_LOSS__ diff --git a/src/shogun/structure/StateModel.h b/src/shogun/structure/StateModel.h index e8111bd44b8..81718aecdfe 100644 --- a/src/shogun/structure/StateModel.h +++ b/src/shogun/structure/StateModel.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Fernando Iglesias, Sergey Lisitsyn, Yuyu Zhang, Björn Esser + * Authors: Fernando Iglesias, Sergey Lisitsyn, Yuyu Zhang, Bjoern Esser */ #ifndef __STATE_MODEL_H__ diff --git a/src/shogun/structure/StochasticSOSVM.cpp b/src/shogun/structure/StochasticSOSVM.cpp index 85992587563..8c5437e552d 100644 --- a/src/shogun/structure/StochasticSOSVM.cpp +++ b/src/shogun/structure/StochasticSOSVM.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Abinash Panda, Shell Hu, Soeren Sonnenburg, Fernando Iglesias, - * Björn Esser + * Bjoern Esser */ #include diff --git a/src/shogun/structure/StochasticSOSVM.h b/src/shogun/structure/StochasticSOSVM.h index 9e3a10a23c4..4c1d1352b3e 100644 --- a/src/shogun/structure/StochasticSOSVM.h +++ b/src/shogun/structure/StochasticSOSVM.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Shell Hu, Soeren Sonnenburg, Fernando Iglesias, Yuyu Zhang, - * Björn Esser + * Bjoern Esser */ #ifndef __STOCHASTIC_SOSVM_H__ diff --git a/src/shogun/structure/StructuredModel.h b/src/shogun/structure/StructuredModel.h index eb2b5d55034..00ee55ff038 100644 --- a/src/shogun/structure/StructuredModel.h +++ b/src/shogun/structure/StructuredModel.h @@ -3,7 +3,7 @@ * * Authors: Fernando Iglesias, Abinash Panda, Sergey Lisitsyn, * Soeren Sonnenburg, Shell Hu, Thoralf Klein, Michal Uricar, - * Yuyu Zhang, Björn Esser, Viktor Gal + * Yuyu Zhang, Bjoern Esser, Viktor Gal */ #ifndef _STRUCTURED_MODEL__H__ diff --git a/src/shogun/transfer/domain_adaptation/DomainAdaptationMulticlassLibLinear.h b/src/shogun/transfer/domain_adaptation/DomainAdaptationMulticlassLibLinear.h index 0047b4b538c..2c87e823359 100644 --- a/src/shogun/transfer/domain_adaptation/DomainAdaptationMulticlassLibLinear.h +++ b/src/shogun/transfer/domain_adaptation/DomainAdaptationMulticlassLibLinear.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sergey Lisitsyn, Björn Esser + * Authors: Sergey Lisitsyn, Bjoern Esser */ #ifndef _DOMAINADAPTATIONMULTICLASSLIBLINEAR_H___ diff --git a/src/shogun/transfer/domain_adaptation/DomainAdaptationSVMLinear.cpp b/src/shogun/transfer/domain_adaptation/DomainAdaptationSVMLinear.cpp index 530b418a1b5..218adde1cf5 100644 --- a/src/shogun/transfer/domain_adaptation/DomainAdaptationSVMLinear.cpp +++ b/src/shogun/transfer/domain_adaptation/DomainAdaptationSVMLinear.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sergey Lisitsyn, Soeren Sonnenburg, Heiko Strathmann, Björn Esser + * Authors: Sergey Lisitsyn, Soeren Sonnenburg, Heiko Strathmann, Bjoern Esser */ #include diff --git a/src/shogun/transfer/multitask/LibLinearMTL.cpp b/src/shogun/transfer/multitask/LibLinearMTL.cpp index 85bb4620084..dd73817293c 100644 --- a/src/shogun/transfer/multitask/LibLinearMTL.cpp +++ b/src/shogun/transfer/multitask/LibLinearMTL.cpp @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Giovanni De Toni, Christian Widmer, Sergey Lisitsyn, - * Soeren Sonnenburg, Björn Esser + * Soeren Sonnenburg, Bjoern Esser */ #include diff --git a/src/shogun/transfer/multitask/LibLinearMTL.h b/src/shogun/transfer/multitask/LibLinearMTL.h index 1cb6e3a06ac..9cab82a87d9 100644 --- a/src/shogun/transfer/multitask/LibLinearMTL.h +++ b/src/shogun/transfer/multitask/LibLinearMTL.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Sergey Lisitsyn, Christian Widmer, Thoralf Klein, Soeren Sonnenburg, - * Björn Esser + * Bjoern Esser */ #ifndef _LIBLINEARMTL_H___ diff --git a/src/shogun/transfer/multitask/MultitaskKernelTreeNormalizer.h b/src/shogun/transfer/multitask/MultitaskKernelTreeNormalizer.h index bc7c1080dd6..9c6d7a422dd 100644 --- a/src/shogun/transfer/multitask/MultitaskKernelTreeNormalizer.h +++ b/src/shogun/transfer/multitask/MultitaskKernelTreeNormalizer.h @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Sergey Lisitsyn, Viktor Gal, Soeren Sonnenburg, Heiko Strathmann, - * Yuyu Zhang, Björn Esser, Sanuj Sharma + * Yuyu Zhang, Bjoern Esser, Sanuj Sharma */ #ifndef _MULTITASKKERNELTREENORMALIZER_H___ diff --git a/src/shogun/transfer/multitask/Task.cpp b/src/shogun/transfer/multitask/Task.cpp index d3898b73ba7..5c7c51f130d 100644 --- a/src/shogun/transfer/multitask/Task.cpp +++ b/src/shogun/transfer/multitask/Task.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sergey Lisitsyn, Soeren Sonnenburg, Björn Esser + * Authors: Sergey Lisitsyn, Soeren Sonnenburg, Bjoern Esser */ #include diff --git a/src/shogun/transfer/multitask/Task.h b/src/shogun/transfer/multitask/Task.h index 08b4b4a1a82..48cf7e21ef0 100644 --- a/src/shogun/transfer/multitask/Task.h +++ b/src/shogun/transfer/multitask/Task.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sergey Lisitsyn, Yuyu Zhang, Björn Esser + * Authors: Sergey Lisitsyn, Yuyu Zhang, Bjoern Esser */ #ifndef TASK_H_ diff --git a/src/shogun/transfer/multitask/TaskGroup.cpp b/src/shogun/transfer/multitask/TaskGroup.cpp index 7e0045ed1c5..1dd2b6d579c 100644 --- a/src/shogun/transfer/multitask/TaskGroup.cpp +++ b/src/shogun/transfer/multitask/TaskGroup.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sergey Lisitsyn, Soeren Sonnenburg, Björn Esser + * Authors: Sergey Lisitsyn, Soeren Sonnenburg, Bjoern Esser */ #include diff --git a/src/shogun/transfer/multitask/TaskGroup.h b/src/shogun/transfer/multitask/TaskGroup.h index 7948697d1e5..9491aea968e 100644 --- a/src/shogun/transfer/multitask/TaskGroup.h +++ b/src/shogun/transfer/multitask/TaskGroup.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sergey Lisitsyn, Yuyu Zhang, Björn Esser + * Authors: Sergey Lisitsyn, Yuyu Zhang, Bjoern Esser */ #ifndef TASKGROUP_H_ diff --git a/src/shogun/transfer/multitask/TaskRelation.h b/src/shogun/transfer/multitask/TaskRelation.h index 50852affec5..427005dd81d 100644 --- a/src/shogun/transfer/multitask/TaskRelation.h +++ b/src/shogun/transfer/multitask/TaskRelation.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sergey Lisitsyn, Yuyu Zhang, Björn Esser + * Authors: Sergey Lisitsyn, Yuyu Zhang, Bjoern Esser */ #ifndef TASKRELATION_H_ diff --git a/src/shogun/transfer/multitask/TaskTree.cpp b/src/shogun/transfer/multitask/TaskTree.cpp index 4466c21b276..fee622c5226 100644 --- a/src/shogun/transfer/multitask/TaskTree.cpp +++ b/src/shogun/transfer/multitask/TaskTree.cpp @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sergey Lisitsyn, Soeren Sonnenburg, Björn Esser + * Authors: Sergey Lisitsyn, Soeren Sonnenburg, Bjoern Esser */ #include diff --git a/src/shogun/transfer/multitask/TaskTree.h b/src/shogun/transfer/multitask/TaskTree.h index 24de007779d..72a9f84e47d 100644 --- a/src/shogun/transfer/multitask/TaskTree.h +++ b/src/shogun/transfer/multitask/TaskTree.h @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sergey Lisitsyn, Yuyu Zhang, Björn Esser + * Authors: Sergey Lisitsyn, Yuyu Zhang, Bjoern Esser */ #ifndef TASKTREE_H_ diff --git a/tests/unit/base/Parameter_unittest.cc b/tests/unit/base/Parameter_unittest.cc index 00dee7f280d..53cd5ec9e80 100644 --- a/tests/unit/base/Parameter_unittest.cc +++ b/tests/unit/base/Parameter_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Heiko Strathmann, Soumyajit De, Björn Esser + * Authors: Heiko Strathmann, Soumyajit De, Bjoern Esser */ #include diff --git a/tests/unit/clustering/kmeans_unittest.cc b/tests/unit/clustering/kmeans_unittest.cc index 5488fb1db9e..337ba0db200 100644 --- a/tests/unit/clustering/kmeans_unittest.cc +++ b/tests/unit/clustering/kmeans_unittest.cc @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Saurabh Mahindre, Heiko Strathmann, Viktor Gal, parijat, - * Björn Esser, Soeren Sonnenburg + * Bjoern Esser, Soeren Sonnenburg */ #include diff --git a/tests/unit/distance/EuclideanDistance_unittest.cc b/tests/unit/distance/EuclideanDistance_unittest.cc index 3e8162e88dc..367b5db1f05 100644 --- a/tests/unit/distance/EuclideanDistance_unittest.cc +++ b/tests/unit/distance/EuclideanDistance_unittest.cc @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Saurabh Mahindre, Soeren Sonnenburg, Fernando Iglesias, - * Soumyajit De, Björn Esser + * Soumyajit De, Bjoern Esser */ #include diff --git a/tests/unit/evaluation/SplittingStrategy_unittest.cc b/tests/unit/evaluation/SplittingStrategy_unittest.cc index ed1caba83bd..d85eec3ff3c 100644 --- a/tests/unit/evaluation/SplittingStrategy_unittest.cc +++ b/tests/unit/evaluation/SplittingStrategy_unittest.cc @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Saurabh Mahindre, Thoralf Klein, Sahil Chaddha, Soeren Sonnenburg, - * Björn Esser + * Bjoern Esser */ #include diff --git a/tests/unit/features/CombinedDotFeatures_unittest.cc b/tests/unit/features/CombinedDotFeatures_unittest.cc index 8b6ae4652cf..c10fc10eac3 100644 --- a/tests/unit/features/CombinedDotFeatures_unittest.cc +++ b/tests/unit/features/CombinedDotFeatures_unittest.cc @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Evangelos Anagnostopoulos, Thoralf Klein, Soeren Sonnenburg, - * Björn Esser, Viktor Gal + * Bjoern Esser, Viktor Gal */ #include diff --git a/tests/unit/features/CombinedFeatures_unittest.cc b/tests/unit/features/CombinedFeatures_unittest.cc index 0ae2fca6907..de71bffed6d 100644 --- a/tests/unit/features/CombinedFeatures_unittest.cc +++ b/tests/unit/features/CombinedFeatures_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Thoralf Klein, Heiko Strathmann, Björn Esser, + * Authors: Thoralf Klein, Heiko Strathmann, Bjoern Esser, * Evangelos Anagnostopoulos */ diff --git a/tests/unit/features/DataGenerators_unittest.cc b/tests/unit/features/DataGenerators_unittest.cc index 6ac901fc832..1e30e5ef23c 100644 --- a/tests/unit/features/DataGenerators_unittest.cc +++ b/tests/unit/features/DataGenerators_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Heiko Strathmann, Thoralf Klein, Björn Esser + * Authors: Heiko Strathmann, Thoralf Klein, Bjoern Esser */ #include diff --git a/tests/unit/features/HashedDocDotFeatures_unittest.cc b/tests/unit/features/HashedDocDotFeatures_unittest.cc index b5dd5a74e5b..928d087e50c 100644 --- a/tests/unit/features/HashedDocDotFeatures_unittest.cc +++ b/tests/unit/features/HashedDocDotFeatures_unittest.cc @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Evangelos Anagnostopoulos, Thoralf Klein, Sergey Lisitsyn, - * Björn Esser + * Bjoern Esser */ #include diff --git a/tests/unit/features/HashedSparseFeatures_unittest.cc b/tests/unit/features/HashedSparseFeatures_unittest.cc index e65f98254cc..0d29f970f85 100644 --- a/tests/unit/features/HashedSparseFeatures_unittest.cc +++ b/tests/unit/features/HashedSparseFeatures_unittest.cc @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Evangelos Anagnostopoulos, Thoralf Klein, Sergey Lisitsyn, - * Björn Esser + * Bjoern Esser */ #include diff --git a/tests/unit/features/LBPPyrDotFeatures_unittest.cc b/tests/unit/features/LBPPyrDotFeatures_unittest.cc index 169a32f3f06..3236a6218a9 100644 --- a/tests/unit/features/LBPPyrDotFeatures_unittest.cc +++ b/tests/unit/features/LBPPyrDotFeatures_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Thoralf Klein, Björn Esser, Evangelos Anagnostopoulos + * Authors: Thoralf Klein, Bjoern Esser, Evangelos Anagnostopoulos */ #include diff --git a/tests/unit/features/StreamingDenseFeatures_unittest.cc b/tests/unit/features/StreamingDenseFeatures_unittest.cc index 310b7d04ae4..f0ee394f115 100644 --- a/tests/unit/features/StreamingDenseFeatures_unittest.cc +++ b/tests/unit/features/StreamingDenseFeatures_unittest.cc @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Viktor Gal, Thoralf Klein, Giovanni De Toni, Soumyajit De, - * Björn Esser + * Bjoern Esser */ #ifndef _WIN32 diff --git a/tests/unit/features/StreamingHashedDenseFeatures_unittest.cc b/tests/unit/features/StreamingHashedDenseFeatures_unittest.cc index e5049c9f326..03ef724c62b 100644 --- a/tests/unit/features/StreamingHashedDenseFeatures_unittest.cc +++ b/tests/unit/features/StreamingHashedDenseFeatures_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Evangelos Anagnostopoulos, Thoralf Klein, Björn Esser + * Authors: Evangelos Anagnostopoulos, Thoralf Klein, Bjoern Esser */ #include diff --git a/tests/unit/features/StreamingHashedDocDotFeatures_unittest.cc b/tests/unit/features/StreamingHashedDocDotFeatures_unittest.cc index 9d61a2d2443..5c29a8e1820 100644 --- a/tests/unit/features/StreamingHashedDocDotFeatures_unittest.cc +++ b/tests/unit/features/StreamingHashedDocDotFeatures_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Evangelos Anagnostopoulos, Soeren Sonnenburg, Björn Esser + * Authors: Evangelos Anagnostopoulos, Soeren Sonnenburg, Bjoern Esser */ #include diff --git a/tests/unit/features/StreamingHashedSparseFeatures_unittest.cc b/tests/unit/features/StreamingHashedSparseFeatures_unittest.cc index 2bc3d6d356a..b46f0fa309d 100644 --- a/tests/unit/features/StreamingHashedSparseFeatures_unittest.cc +++ b/tests/unit/features/StreamingHashedSparseFeatures_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Evangelos Anagnostopoulos, Thoralf Klein, Björn Esser + * Authors: Evangelos Anagnostopoulos, Thoralf Klein, Bjoern Esser */ #include diff --git a/tests/unit/features/StreamingSparseFeatures_unittest.cc b/tests/unit/features/StreamingSparseFeatures_unittest.cc index 7443d8e0c39..51424292db9 100644 --- a/tests/unit/features/StreamingSparseFeatures_unittest.cc +++ b/tests/unit/features/StreamingSparseFeatures_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Viktor Gal, Thoralf Klein, Giovanni De Toni, Björn Esser + * Authors: Viktor Gal, Thoralf Klein, Giovanni De Toni, Bjoern Esser */ #ifndef _WIN32 diff --git a/tests/unit/integration/CV2SGFactory_unittest.cc b/tests/unit/integration/CV2SGFactory_unittest.cc index bd2db9a7d62..0075fcd8839 100644 --- a/tests/unit/integration/CV2SGFactory_unittest.cc +++ b/tests/unit/integration/CV2SGFactory_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Abhijeet Kislay, Björn Esser + * Authors: Abhijeet Kislay, Bjoern Esser */ #include #ifdef HAVE_OPENCV diff --git a/tests/unit/integration/OpenCV_unittest.cc b/tests/unit/integration/OpenCV_unittest.cc index b6904b62768..5fa6a40a8fb 100644 --- a/tests/unit/integration/OpenCV_unittest.cc +++ b/tests/unit/integration/OpenCV_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Abhijeet Kislay, Björn Esser + * Authors: Abhijeet Kislay, Bjoern Esser */ #include diff --git a/tests/unit/integration/SG2CVFactory_unittest.cc b/tests/unit/integration/SG2CVFactory_unittest.cc index 3029aa40bd2..994afdcfa64 100644 --- a/tests/unit/integration/SG2CVFactory_unittest.cc +++ b/tests/unit/integration/SG2CVFactory_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Abhijeet Kislay, Björn Esser + * Authors: Abhijeet Kislay, Bjoern Esser */ #include #ifdef HAVE_OPENCV diff --git a/tests/unit/io/LineReader_unittest.cc b/tests/unit/io/LineReader_unittest.cc index 9900fd1dc31..639f88c106f 100644 --- a/tests/unit/io/LineReader_unittest.cc +++ b/tests/unit/io/LineReader_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Evgeniy Andreev, Thoralf Klein, Björn Esser, Viktor Gal + * Authors: Evgeniy Andreev, Thoralf Klein, Bjoern Esser, Viktor Gal */ #include diff --git a/tests/unit/labels/MulticlassLabels_unittest.cc b/tests/unit/labels/MulticlassLabels_unittest.cc index 8744b51758d..a0ed79b244e 100644 --- a/tests/unit/labels/MulticlassLabels_unittest.cc +++ b/tests/unit/labels/MulticlassLabels_unittest.cc @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Heiko Strathmann, Olivier NGuyen, Sergey Lisitsyn, Viktor Gal, - * Björn Esser, Thoralf Klein + * Bjoern Esser, Thoralf Klein */ #include diff --git a/tests/unit/lib/SGSparseMatrix_unittest.cc b/tests/unit/lib/SGSparseMatrix_unittest.cc index aeddf655008..ee3962e2209 100644 --- a/tests/unit/lib/SGSparseMatrix_unittest.cc +++ b/tests/unit/lib/SGSparseMatrix_unittest.cc @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Yingrui Chang, Soumyajit De, Fernando Iglesias, Soeren Sonnenburg, - * Evgeniy Andreev, Viktor Gal, Thoralf Klein, Wuwei Lin, Björn Esser, + * Evgeniy Andreev, Viktor Gal, Thoralf Klein, Wuwei Lin, Bjoern Esser, * Pan Deng */ diff --git a/tests/unit/lib/SGSparseVector_unittest.cc b/tests/unit/lib/SGSparseVector_unittest.cc index 6215c505200..e87f01bb278 100644 --- a/tests/unit/lib/SGSparseVector_unittest.cc +++ b/tests/unit/lib/SGSparseVector_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Thoralf Klein, Heiko Strathmann, Soumyajit De, Björn Esser, + * Authors: Thoralf Klein, Heiko Strathmann, Soumyajit De, Bjoern Esser, * Viktor Gal */ diff --git a/tests/unit/machine/gp/ProbitLikelihood_unittest.cc b/tests/unit/machine/gp/ProbitLikelihood_unittest.cc index ac8b6d79bf5..290eb6c73bf 100644 --- a/tests/unit/machine/gp/ProbitLikelihood_unittest.cc +++ b/tests/unit/machine/gp/ProbitLikelihood_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Roman Votyakov, Wu Lin, Pan Deng, Björn Esser, Sanuj Sharma + * Authors: Roman Votyakov, Wu Lin, Pan Deng, Bjoern Esser, Sanuj Sharma */ #include diff --git a/tests/unit/mathematics/Complex_unittest.cc b/tests/unit/mathematics/Complex_unittest.cc index c07f4e7fbff..e0539db2636 100644 --- a/tests/unit/mathematics/Complex_unittest.cc +++ b/tests/unit/mathematics/Complex_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Viktor Gal, syashakash, Grigorii Guz, Björn Esser, + * Authors: Soumyajit De, Viktor Gal, syashakash, Grigorii Guz, Bjoern Esser, * Akash Shivram, Soeren Sonnenburg, Sergey Lisitsyn, Shubham Shukla */ #include diff --git a/tests/unit/mathematics/JacobiEllipticFunctions_unittest.cc b/tests/unit/mathematics/JacobiEllipticFunctions_unittest.cc index 131ae40d471..5c28dfa9539 100644 --- a/tests/unit/mathematics/JacobiEllipticFunctions_unittest.cc +++ b/tests/unit/mathematics/JacobiEllipticFunctions_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Viktor Gal, Heiko Strathmann, Björn Esser + * Authors: Soumyajit De, Viktor Gal, Heiko Strathmann, Bjoern Esser */ #include diff --git a/tests/unit/mathematics/Lapack_wrapper_dstemr.cc b/tests/unit/mathematics/Lapack_wrapper_dstemr.cc index 0e910d58b5c..0ec78aa944c 100644 --- a/tests/unit/mathematics/Lapack_wrapper_dstemr.cc +++ b/tests/unit/mathematics/Lapack_wrapper_dstemr.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Pan Deng, Björn Esser, Viktor Gal + * Authors: Soumyajit De, Pan Deng, Bjoern Esser, Viktor Gal */ #include diff --git a/tests/unit/mathematics/Math_unittest.cc b/tests/unit/mathematics/Math_unittest.cc index 42cd360d347..b9112e44f05 100644 --- a/tests/unit/mathematics/Math_unittest.cc +++ b/tests/unit/mathematics/Math_unittest.cc @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Sanuj Sharma, Viktor Gal, Fernando Iglesias, Heiko Strathmann, - * syashakash, Soumyajit De, Björn Esser, Soeren Sonnenburg, Wu Lin, + * syashakash, Soumyajit De, Bjoern Esser, Soeren Sonnenburg, Wu Lin, * Grigorii Guz, Albert, Akash Shivram, Thoralf Klein, Shubham Shukla */ #include diff --git a/tests/unit/mathematics/linalg/CGMShiftedFamilySolver_unittest.cc b/tests/unit/mathematics/linalg/CGMShiftedFamilySolver_unittest.cc index 83a4352e0f2..a4ae400bc23 100644 --- a/tests/unit/mathematics/linalg/CGMShiftedFamilySolver_unittest.cc +++ b/tests/unit/mathematics/linalg/CGMShiftedFamilySolver_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Pan Deng, Björn Esser, Viktor Gal + * Authors: Soumyajit De, Pan Deng, Bjoern Esser, Viktor Gal */ #include diff --git a/tests/unit/mathematics/linalg/ConjugateGradientSolver_unittest.cc b/tests/unit/mathematics/linalg/ConjugateGradientSolver_unittest.cc index 11b4199d1a6..f6eba7bd196 100644 --- a/tests/unit/mathematics/linalg/ConjugateGradientSolver_unittest.cc +++ b/tests/unit/mathematics/linalg/ConjugateGradientSolver_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Pan Deng, Soumyajit De, Björn Esser, Viktor Gal + * Authors: Pan Deng, Soumyajit De, Bjoern Esser, Viktor Gal */ #include diff --git a/tests/unit/mathematics/linalg/ConjugateOrthogonalCGSolver_unittest.cc b/tests/unit/mathematics/linalg/ConjugateOrthogonalCGSolver_unittest.cc index a508272a92a..b6bf4b2f53c 100644 --- a/tests/unit/mathematics/linalg/ConjugateOrthogonalCGSolver_unittest.cc +++ b/tests/unit/mathematics/linalg/ConjugateOrthogonalCGSolver_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Pan Deng, Björn Esser, Viktor Gal + * Authors: Soumyajit De, Pan Deng, Bjoern Esser, Viktor Gal */ #include diff --git a/tests/unit/mathematics/linalg/DenseMatrixExactLog_unittest.cc b/tests/unit/mathematics/linalg/DenseMatrixExactLog_unittest.cc index d2cecc8d062..f4fddf4431a 100644 --- a/tests/unit/mathematics/linalg/DenseMatrixExactLog_unittest.cc +++ b/tests/unit/mathematics/linalg/DenseMatrixExactLog_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Viktor Gal, Thoralf Klein, Björn Esser, + * Authors: Soumyajit De, Viktor Gal, Thoralf Klein, Bjoern Esser, * Shubham Shukla, Pan Deng */ #include diff --git a/tests/unit/mathematics/linalg/DenseMatrixOperator_unittest.cc b/tests/unit/mathematics/linalg/DenseMatrixOperator_unittest.cc index 14dcaebb07b..1148bd8e146 100644 --- a/tests/unit/mathematics/linalg/DenseMatrixOperator_unittest.cc +++ b/tests/unit/mathematics/linalg/DenseMatrixOperator_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Viktor Gal, Pan Deng, Björn Esser + * Authors: Soumyajit De, Viktor Gal, Pan Deng, Bjoern Esser */ #include diff --git a/tests/unit/mathematics/linalg/DirectEigenSolver_unittest.cc b/tests/unit/mathematics/linalg/DirectEigenSolver_unittest.cc index f6154cf0ce7..57f7526640b 100644 --- a/tests/unit/mathematics/linalg/DirectEigenSolver_unittest.cc +++ b/tests/unit/mathematics/linalg/DirectEigenSolver_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Thoralf Klein, Pan Deng, Soumyajit De, Björn Esser, Viktor Gal + * Authors: Thoralf Klein, Pan Deng, Soumyajit De, Bjoern Esser, Viktor Gal */ #include diff --git a/tests/unit/mathematics/linalg/DirectLinearSolverComplex_unittest.cc b/tests/unit/mathematics/linalg/DirectLinearSolverComplex_unittest.cc index d22de33528d..36a4e161310 100644 --- a/tests/unit/mathematics/linalg/DirectLinearSolverComplex_unittest.cc +++ b/tests/unit/mathematics/linalg/DirectLinearSolverComplex_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Sunil Mahendrakar, Pan Deng, Björn Esser, Viktor Gal + * Authors: Soumyajit De, Sunil Mahendrakar, Pan Deng, Bjoern Esser, Viktor Gal */ #include diff --git a/tests/unit/mathematics/linalg/DirectSparseLinearSolver_unittest.cc b/tests/unit/mathematics/linalg/DirectSparseLinearSolver_unittest.cc index bd09f3ecd7f..15413952125 100644 --- a/tests/unit/mathematics/linalg/DirectSparseLinearSolver_unittest.cc +++ b/tests/unit/mathematics/linalg/DirectSparseLinearSolver_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Viktor Gal, Pan Deng, Soumyajit De, Björn Esser + * Authors: Viktor Gal, Pan Deng, Soumyajit De, Bjoern Esser */ #include diff --git a/tests/unit/mathematics/linalg/LanczosEigenSolver_unittest.cc b/tests/unit/mathematics/linalg/LanczosEigenSolver_unittest.cc index aaa9c5b88c3..28ca020e158 100644 --- a/tests/unit/mathematics/linalg/LanczosEigenSolver_unittest.cc +++ b/tests/unit/mathematics/linalg/LanczosEigenSolver_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Sunil Mahendrakar, Pan Deng, Björn Esser, Viktor Gal + * Authors: Soumyajit De, Sunil Mahendrakar, Pan Deng, Bjoern Esser, Viktor Gal */ #include diff --git a/tests/unit/mathematics/linalg/LogDetEstimator_unittest.cc b/tests/unit/mathematics/linalg/LogDetEstimator_unittest.cc index 915d3c56102..8f88907b08b 100644 --- a/tests/unit/mathematics/linalg/LogDetEstimator_unittest.cc +++ b/tests/unit/mathematics/linalg/LogDetEstimator_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Sunil Mahendrakar, Soumyajit De, Heiko Strathmann, Björn Esser, + * Authors: Sunil Mahendrakar, Soumyajit De, Heiko Strathmann, Bjoern Esser, * Viktor Gal, Thoralf Klein, Shubham Shukla, Pan Deng */ #include diff --git a/tests/unit/mathematics/linalg/MatrixOperator_unittest.cc b/tests/unit/mathematics/linalg/MatrixOperator_unittest.cc index e48d2986d0c..64246896ee4 100644 --- a/tests/unit/mathematics/linalg/MatrixOperator_unittest.cc +++ b/tests/unit/mathematics/linalg/MatrixOperator_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Pan Deng, Björn Esser, Viktor Gal + * Authors: Soumyajit De, Pan Deng, Bjoern Esser, Viktor Gal */ #include diff --git a/tests/unit/mathematics/linalg/NormalSampler_unittest.cc b/tests/unit/mathematics/linalg/NormalSampler_unittest.cc index 5205319c56e..c51550437fa 100644 --- a/tests/unit/mathematics/linalg/NormalSampler_unittest.cc +++ b/tests/unit/mathematics/linalg/NormalSampler_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Heiko Strathmann, Pan Deng, Soumyajit De, Björn Esser, Viktor Gal + * Authors: Heiko Strathmann, Pan Deng, Soumyajit De, Bjoern Esser, Viktor Gal */ #include diff --git a/tests/unit/mathematics/linalg/ProbingSampler_unittest.cc b/tests/unit/mathematics/linalg/ProbingSampler_unittest.cc index c7e6fac7210..78139c07e5c 100644 --- a/tests/unit/mathematics/linalg/ProbingSampler_unittest.cc +++ b/tests/unit/mathematics/linalg/ProbingSampler_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Viktor Gal, Soumyajit De, Pan Deng, Björn Esser + * Authors: Viktor Gal, Soumyajit De, Pan Deng, Bjoern Esser */ #include #include diff --git a/tests/unit/mathematics/linalg/RationalApproximation_unittest.cc b/tests/unit/mathematics/linalg/RationalApproximation_unittest.cc index 61b8528b86d..5b8dc74fc16 100644 --- a/tests/unit/mathematics/linalg/RationalApproximation_unittest.cc +++ b/tests/unit/mathematics/linalg/RationalApproximation_unittest.cc @@ -2,7 +2,7 @@ * This software is distributed under BSD 3-clause license (see LICENSE file). * * Authors: Soumyajit De, Viktor Gal, Thoralf Klein, Heiko Strathmann, - * Björn Esser, Shubham Shukla, Pan Deng + * Bjoern Esser, Shubham Shukla, Pan Deng */ #include diff --git a/tests/unit/mathematics/linalg/SparseMatrixOperator_unittest.cc b/tests/unit/mathematics/linalg/SparseMatrixOperator_unittest.cc index 16cd6205acb..53d3f7805b8 100644 --- a/tests/unit/mathematics/linalg/SparseMatrixOperator_unittest.cc +++ b/tests/unit/mathematics/linalg/SparseMatrixOperator_unittest.cc @@ -1,7 +1,7 @@ /* * This software is distributed under BSD 3-clause license (see LICENSE file). * - * Authors: Soumyajit De, Viktor Gal, Pan Deng, Björn Esser + * Authors: Soumyajit De, Viktor Gal, Pan Deng, Bjoern Esser */ #include #include diff --git a/tests/unit/multiclass/LaRank_unittest.cc b/tests/unit/multiclass/LaRank_unittest.cc index 157ec7b2604..29517c6a7a3 100644 --- a/tests/unit/multiclass/LaRank_unittest.cc +++ b/tests/unit/multiclass/LaRank_unittest.cc @@ -1,3 +1,4 @@ +#ifdef USE_GPL_SHOGUN #include #include #include @@ -6,6 +7,7 @@ using namespace shogun; + TEST(LaRank,train) { index_t num_vec=10; @@ -83,3 +85,4 @@ TEST(LaRank,train) SG_UNREF(output_test); SG_UNREF(svm); } +#endif // USE_GPL_SHOGUN