final stab at GPL->BSD conversion (#4253)

shogun-toolbox · Apr 14, 2018 · f6852af · f6852af
1 parent 1d34246
commit f6852af
Show file tree

Hide file tree

Showing 519 changed files with 545 additions and 3,874 deletions.
diff --git 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 <shogun/base/init.h>
 #include <shogun/features/RandomFourierDotFeatures.h>

diff --git 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 <shogun/lib/common.h>

diff --git 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
@@ -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 <shogun/base/init.h>

diff --git 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
@@ -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 <shogun/base/init.h>

diff --git 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 <shogun/lib/config.h>

diff --git 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 <shogun/base/init.h>

diff --git 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 <shogun/io/LibSVMFile.h>
 #include <shogun/lib/SGVector.h>

diff --git 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 <shogun/base/init.h>

diff --git 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
@@ -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 <shogun/kernel/GaussianKernel.h>
 #include <shogun/kernel/LinearKernel.h>

diff --git 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 <shogun/base/init.h>

diff --git 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 <shogun/lib/config.h>

diff --git 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
@@ -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 <shogun/lib/config.h>

diff --git 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
@@ -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
@@ -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 <shogun/lib/config.h>
 #ifdef USE_GPL_SHOGUN

diff --git 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 <shogun/lib/config.h>

diff --git 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 <shogun/base/init.h>

diff --git 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 <shogun/base/init.h>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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