fix GPL

shogun-toolbox · Dec 8, 2020 · 0d54ccf · 0d54ccf
1 parent a1dd925
commit 0d54ccf
Show file tree

Hide file tree

Showing 31 changed files with 63 additions and 66 deletions.
diff --git a/examples/meta/src/multiclass/ecoc_discriminant_aed.sg.in b/examples/meta/src/multiclass/ecoc_discriminant_aed.sg.in
@@ -23,11 +23,11 @@ MulticlassStrategy strategy = create_multiclass_strategy("ECOCStrategy", encoder
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_discriminant_ed.sg.in b/examples/meta/src/multiclass/ecoc_discriminant_ed.sg.in
@@ -23,11 +23,11 @@ MulticlassStrategy strategy = create_multiclass_strategy("ECOCStrategy", encoder
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_discriminant_hd.sg.in b/examples/meta/src/multiclass/ecoc_discriminant_hd.sg.in
@@ -23,11 +23,11 @@ MulticlassStrategy strategy = create_multiclass_strategy("ECOCStrategy", encoder
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_discriminant_ihd.sg.in b/examples/meta/src/multiclass/ecoc_discriminant_ihd.sg.in
@@ -23,11 +23,11 @@ MulticlassStrategy strategy = create_multiclass_strategy("ECOCStrategy", encoder
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_discriminant_llb.sg.in b/examples/meta/src/multiclass/ecoc_discriminant_llb.sg.in
@@ -23,11 +23,11 @@ MulticlassStrategy strategy = create_multiclass_strategy("ECOCStrategy", encoder
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_forest_aed.sg.in b/examples/meta/src/multiclass/ecoc_forest_aed.sg.in
@@ -23,11 +23,11 @@ MulticlassStrategy strategy = create_multiclass_strategy("ECOCStrategy", encoder
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_forest_ed.sg.in b/examples/meta/src/multiclass/ecoc_forest_ed.sg.in
@@ -23,11 +23,11 @@ MulticlassStrategy strategy = create_multiclass_strategy("ECOCStrategy", encoder
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_forest_hd.sg.in b/examples/meta/src/multiclass/ecoc_forest_hd.sg.in
@@ -23,11 +23,11 @@ MulticlassStrategy strategy = create_multiclass_strategy("ECOCStrategy", encoder
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_forest_ihd.sg.in b/examples/meta/src/multiclass/ecoc_forest_ihd.sg.in
@@ -23,11 +23,11 @@ MulticlassStrategy strategy = create_multiclass_strategy("ECOCStrategy", encoder
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_forest_llb.sg.in b/examples/meta/src/multiclass/ecoc_forest_llb.sg.in
@@ -23,11 +23,11 @@ MulticlassStrategy strategy = create_multiclass_strategy("ECOCStrategy", encoder
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_ovo_aed.sg.in b/examples/meta/src/multiclass/ecoc_ovo_aed.sg.in
@@ -21,11 +21,11 @@ MulticlassStrategy strategy = create_multiclass_strategy("ECOCStrategy", encoder
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_ovo_ed.sg.in b/examples/meta/src/multiclass/ecoc_ovo_ed.sg.in
@@ -21,11 +21,11 @@ MulticlassStrategy strategy = create_multiclass_strategy("ECOCStrategy", encoder
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_ovo_hd.sg.in b/examples/meta/src/multiclass/ecoc_ovo_hd.sg.in
@@ -21,11 +21,11 @@ MulticlassStrategy strategy = create_multiclass_strategy("ECOCStrategy", encoder
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_ovo_ihd.sg.in b/examples/meta/src/multiclass/ecoc_ovo_ihd.sg.in
@@ -21,11 +21,11 @@ MulticlassStrategy strategy = create_multiclass_strategy("ECOCStrategy", encoder
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_ovo_llb.sg.in b/examples/meta/src/multiclass/ecoc_ovo_llb.sg.in
@@ -21,11 +21,11 @@ MulticlassStrategy strategy = create_multiclass_strategy("ECOCStrategy", encoder
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_ovr_aed.sg.in b/examples/meta/src/multiclass/ecoc_ovr_aed.sg.in
@@ -21,11 +21,11 @@ MulticlassStrategy strategy = create_multiclass_strategy("ECOCStrategy", encoder
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_ovr_ed.sg.in b/examples/meta/src/multiclass/ecoc_ovr_ed.sg.in
@@ -21,11 +21,11 @@ MulticlassStrategy strategy = create_multiclass_strategy("ECOCStrategy", encoder
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_ovr_hd.sg.in b/examples/meta/src/multiclass/ecoc_ovr_hd.sg.in
@@ -21,11 +21,11 @@ MulticlassStrategy strategy = create_multiclass_strategy("ECOCStrategy", encoder
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_ovr_ihd.sg.in b/examples/meta/src/multiclass/ecoc_ovr_ihd.sg.in
@@ -21,11 +21,11 @@ MulticlassStrategy strategy = create_multiclass_strategy("ECOCStrategy", encoder
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_ovr_llb.sg.in b/examples/meta/src/multiclass/ecoc_ovr_llb.sg.in
@@ -21,11 +21,11 @@ MulticlassStrategy strategy = create_multiclass_strategy("ECOCStrategy", encoder
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier = create_machine("LinearMulticlassMachine", multiclass_strategy=strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_random_dense_aed.sg.in b/examples/meta/src/multiclass/ecoc_random_dense_aed.sg.in
@@ -22,11 +22,11 @@ MulticlassStrategy rnd_dense_strategy=create_multiclass_strategy("ECOCStrategy",
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier=create_machine("LinearMulticlassMachine", multiclass_strategy=rnd_dense_strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier=create_machine("LinearMulticlassMachine", multiclass_strategy=rnd_dense_strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_random_dense_ed.sg.in b/examples/meta/src/multiclass/ecoc_random_dense_ed.sg.in
@@ -22,11 +22,11 @@ MulticlassStrategy rnd_dense_strategy=create_multiclass_strategy("ECOCStrategy",
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier=create_machine("LinearMulticlassMachine", multiclass_strategy=rnd_dense_strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier=create_machine("LinearMulticlassMachine", multiclass_strategy=rnd_dense_strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_random_dense_ihd.sg.in b/examples/meta/src/multiclass/ecoc_random_dense_ihd.sg.in
@@ -22,11 +22,11 @@ MulticlassStrategy rnd_dense_strategy=create_multiclass_strategy("ECOCStrategy",
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier=create_machine("LinearMulticlassMachine", multiclass_strategy=rnd_dense_strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier=create_machine("LinearMulticlassMachine", multiclass_strategy=rnd_dense_strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_random_dense_llb.sg.in b/examples/meta/src/multiclass/ecoc_random_dense_llb.sg.in
@@ -22,11 +22,11 @@ MulticlassStrategy rnd_dense_strategy=create_multiclass_strategy("ECOCStrategy",
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier=create_machine("LinearMulticlassMachine", multiclass_strategy=rnd_dense_strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier=create_machine("LinearMulticlassMachine", multiclass_strategy=rnd_dense_strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_random_sparse_aed.sg.in b/examples/meta/src/multiclass/ecoc_random_sparse_aed.sg.in
@@ -22,11 +22,11 @@ MulticlassStrategy rnd_dense_strategy=create_multiclass_strategy("ECOCStrategy",
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier=create_machine("LinearMulticlassMachine", multiclass_strategy=rnd_dense_strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier=create_machine("LinearMulticlassMachine", multiclass_strategy=rnd_dense_strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_random_sparse_ed.sg.in b/examples/meta/src/multiclass/ecoc_random_sparse_ed.sg.in
@@ -22,11 +22,11 @@ MulticlassStrategy rnd_dense_strategy=create_multiclass_strategy("ECOCStrategy",
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier=create_machine("LinearMulticlassMachine", multiclass_strategy=rnd_dense_strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier=create_machine("LinearMulticlassMachine", multiclass_strategy=rnd_dense_strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_random_sparse_hd.sg.in b/examples/meta/src/multiclass/ecoc_random_sparse_hd.sg.in
@@ -22,11 +22,11 @@ MulticlassStrategy rnd_dense_strategy=create_multiclass_strategy("ECOCStrategy",
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier=create_machine("LinearMulticlassMachine", multiclass_strategy=rnd_dense_strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier=create_machine("LinearMulticlassMachine", multiclass_strategy=rnd_dense_strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]
 

diff --git a/examples/meta/src/multiclass/ecoc_random_sparse_ihd.sg.in b/examples/meta/src/multiclass/ecoc_random_sparse_ihd.sg.in
@@ -22,11 +22,11 @@ MulticlassStrategy rnd_dense_strategy=create_multiclass_strategy("ECOCStrategy",
 #![choose_strategy]
 
 #![create_instance]
-Machine mc_classifier=create_machine("LinearMulticlassMachine", multiclass_strategy=rnd_dense_strategy, machine=classifier, labels=labels_train)
+Machine mc_classifier=create_machine("LinearMulticlassMachine", multiclass_strategy=rnd_dense_strategy, machine=classifier)
 #![create_instance]
 
 #![train_and_apply]
-mc_classifier.train(features_train)
+mc_classifier.train(features_train, labels_train)
 Labels labels_predict = mc_classifier.apply(features_test)
 #![train_and_apply]