From 0b9aeaa9167b8f21c4b16044eb38364bb0f62563 Mon Sep 17 00:00:00 2001 From: Giovanni De Toni Date: Thu, 15 Jun 2017 18:37:36 +0200 Subject: [PATCH] [PrematureStopping] Style fixes. --- src/shogun/classifier/svm/LibLinear.cpp | 2 +- src/shogun/classifier/svm/MPDSVM.cpp | 1 - src/shogun/classifier/svm/NewtonSVM.cpp | 2 +- src/shogun/classifier/svm/OnlineSVMSGD.cpp | 2 - src/shogun/classifier/svm/SGDQN.cpp | 1 - src/shogun/classifier/svm/SVMLight.cpp | 2 +- src/shogun/classifier/svm/SVMSGD.cpp | 1 - src/shogun/classifier/vw/VowpalWabbit.cpp | 1 - src/shogun/features/DotFeatures.cpp | 4 -- .../hashed/HashedWDFeaturesTransposed.cpp | 4 -- .../WeightedDegreePositionStringKernel.cpp | 3 +- .../string/WeightedDegreeStringKernel.cpp | 4 +- src/shogun/lib/Signal.cpp | 51 +++++++++---------- src/shogun/lib/Signal.h | 4 +- src/shogun/machine/KernelMachine.cpp | 4 -- src/shogun/multiclass/KNN.cpp | 3 -- src/shogun/multiclass/LaRank.cpp | 2 - src/shogun/multiclass/MulticlassLibLinear.cpp | 2 - src/shogun/optimization/liblinear/tron.cpp | 1 - .../regression/svr/LibLinearRegression.cpp | 1 - .../transfer/multitask/LibLinearMTL.cpp | 2 +- tests/unit/lib/Signal_unittest.cc | 23 ++++----- 22 files changed, 43 insertions(+), 77 deletions(-) diff --git a/src/shogun/classifier/svm/LibLinear.cpp b/src/shogun/classifier/svm/LibLinear.cpp index 4f5a3ff75e6..5b45e77c99c 100644 --- a/src/shogun/classifier/svm/LibLinear.cpp +++ b/src/shogun/classifier/svm/LibLinear.cpp @@ -78,7 +78,7 @@ CLibLinear::~CLibLinear() bool CLibLinear::train_machine(CFeatures* data) { - + ASSERT(m_labels) ASSERT(m_labels->get_label_type() == LT_BINARY) diff --git a/src/shogun/classifier/svm/MPDSVM.cpp b/src/shogun/classifier/svm/MPDSVM.cpp index 51ac838d901..c0de8ac0cb8 100644 --- a/src/shogun/classifier/svm/MPDSVM.cpp +++ b/src/shogun/classifier/svm/MPDSVM.cpp @@ -79,7 +79,6 @@ bool CMPDSVM::train_machine(CFeatures* data) bool primalcool; bool dualcool; - //if (nustop) //etas[1] = 1; diff --git a/src/shogun/classifier/svm/NewtonSVM.cpp b/src/shogun/classifier/svm/NewtonSVM.cpp index 651c3113a62..bca0f115512 100644 --- a/src/shogun/classifier/svm/NewtonSVM.cpp +++ b/src/shogun/classifier/svm/NewtonSVM.cpp @@ -51,7 +51,7 @@ CNewtonSVM::~CNewtonSVM() bool CNewtonSVM::train_machine(CFeatures* data) { - + ASSERT(m_labels) ASSERT(m_labels->get_label_type() == LT_BINARY) diff --git a/src/shogun/classifier/svm/OnlineSVMSGD.cpp b/src/shogun/classifier/svm/OnlineSVMSGD.cpp index 9e83b3645ff..cdd03b32b7d 100644 --- a/src/shogun/classifier/svm/OnlineSVMSGD.cpp +++ b/src/shogun/classifier/svm/OnlineSVMSGD.cpp @@ -100,8 +100,6 @@ bool COnlineSVMSGD::train(CFeatures* data) if (features->is_seekable()) features->reset_stream(); - - ELossType loss_type = loss->get_loss_type(); bool is_log_loss = false; if ((loss_type == L_LOGLOSS) || (loss_type == L_LOGLOSSMARGIN)) diff --git a/src/shogun/classifier/svm/SGDQN.cpp b/src/shogun/classifier/svm/SGDQN.cpp index bdc856243f9..5d5caa509de 100644 --- a/src/shogun/classifier/svm/SGDQN.cpp +++ b/src/shogun/classifier/svm/SGDQN.cpp @@ -137,7 +137,6 @@ bool CSGDQN::train(CFeatures* data) calibrate(); SG_INFO("Training on %d vectors\n", num_vec) - ELossType loss_type = loss->get_loss_type(); bool is_log_loss = false; diff --git a/src/shogun/classifier/svm/SVMLight.cpp b/src/shogun/classifier/svm/SVMLight.cpp index 93a1cb36cb5..8d2aaac795c 100644 --- a/src/shogun/classifier/svm/SVMLight.cpp +++ b/src/shogun/classifier/svm/SVMLight.cpp @@ -646,7 +646,7 @@ int32_t CSVMLight::optimize_to_convergence(int32_t* docs, int32_t* label, int32_ #ifdef CYGWIN for (;((iteration<100 || (!mkl_converged && callback) ) || (retrain && (!terminate))); iteration++){ #else - + for (;((!CSignal::cancel_computations()) && ((iteration<3 || (!mkl_converged && callback) ) || (retrain && (!terminate)))); iteration++){ #endif diff --git a/src/shogun/classifier/svm/SVMSGD.cpp b/src/shogun/classifier/svm/SVMSGD.cpp index 39130d210a1..3da25d946a5 100644 --- a/src/shogun/classifier/svm/SVMSGD.cpp +++ b/src/shogun/classifier/svm/SVMSGD.cpp @@ -109,7 +109,6 @@ bool CSVMSGD::train_machine(CFeatures* data) calibrate(); SG_INFO("Training on %d vectors\n", num_vec) - ELossType loss_type = loss->get_loss_type(); bool is_log_loss = false; diff --git a/src/shogun/classifier/vw/VowpalWabbit.cpp b/src/shogun/classifier/vw/VowpalWabbit.cpp index 2c32ac8ad2c..176fe0b5c34 100644 --- a/src/shogun/classifier/vw/VowpalWabbit.cpp +++ b/src/shogun/classifier/vw/VowpalWabbit.cpp @@ -163,7 +163,6 @@ bool CVowpalWabbit::train_machine(CFeatures* feat) "loss", "last", "counter", "weight", "label", "predict", "features"); } - features->start_parser(); while (!(CSignal::cancel_computations()) && (env->passes_complete < env->num_passes)) { diff --git a/src/shogun/features/DotFeatures.cpp b/src/shogun/features/DotFeatures.cpp index 4485fbe6b21..2ae277cb6c5 100644 --- a/src/shogun/features/DotFeatures.cpp +++ b/src/shogun/features/DotFeatures.cpp @@ -63,8 +63,6 @@ void CDotFeatures::dense_dot_range(float64_t* output, int32_t start, int32_t sto int32_t num_vectors=stop-start; ASSERT(num_vectors>0) - - int32_t num_threads; int32_t step; auto pb = progress(range(num_vectors), *this->io); @@ -114,8 +112,6 @@ void CDotFeatures::dense_dot_range_subset(int32_t* sub_index, int32_t num, float ASSERT(sub_index) ASSERT(output) - - auto pb = progress(range(num), *this->io); int32_t num_threads; int32_t step; diff --git a/src/shogun/features/hashed/HashedWDFeaturesTransposed.cpp b/src/shogun/features/hashed/HashedWDFeaturesTransposed.cpp index bb5c8628435..dfb9a0ae7a0 100644 --- a/src/shogun/features/hashed/HashedWDFeaturesTransposed.cpp +++ b/src/shogun/features/hashed/HashedWDFeaturesTransposed.cpp @@ -222,8 +222,6 @@ void CHashedWDFeaturesTransposed::dense_dot_range(float64_t* output, int32_t sta #endif ASSERT(num_threads>0) - - if (dim != w_dim) SG_ERROR("Dimensions don't match, vec_len=%d, w_dim=%d\n", dim, w_dim) @@ -315,8 +313,6 @@ void CHashedWDFeaturesTransposed::dense_dot_range_subset(int32_t* sub_index, int #endif ASSERT(num_threads>0) - - if (dim != w_dim) SG_ERROR("Dimensions don't match, vec_len=%d, w_dim=%d\n", dim, w_dim) diff --git a/src/shogun/kernel/string/WeightedDegreePositionStringKernel.cpp b/src/shogun/kernel/string/WeightedDegreePositionStringKernel.cpp index 4096b769cfd..713606b21d2 100644 --- a/src/shogun/kernel/string/WeightedDegreePositionStringKernel.cpp +++ b/src/shogun/kernel/string/WeightedDegreePositionStringKernel.cpp @@ -1252,7 +1252,7 @@ void CWeightedDegreePositionStringKernel::compute_batch( if (num_threads < 2) { - + auto pb = progress(range(num_feat), *this->io); for (int32_t j=0; jio); for (int32_t j=0; j -#include -#include -#include #include #include +#include +#include +#include using namespace shogun; using namespace rxcpp; @@ -24,17 +24,15 @@ using namespace rxcpp; int CSignal::signals[NUMTRAPPEDSIGS]={SIGINT, SIGURG}; struct sigaction CSignal::oldsigaction[NUMTRAPPEDSIGS]; -rxcpp::connectable_observable CSignal::m_sigint_observable = rxcpp::observable<>::create( - [](rxcpp::subscriber s){ - s.on_completed(); - } -).publish(); +rxcpp::connectable_observable CSignal::m_sigint_observable = + rxcpp::observable<>::create([](rxcpp::subscriber s) { + s.on_completed(); + }).publish(); -rxcpp::connectable_observable CSignal::m_sigurg_observable = rxcpp::observable<>::create( - [](rxcpp::subscriber s){ - s.on_next(1); - } -).publish(); +rxcpp::connectable_observable CSignal::m_sigurg_observable = + rxcpp::observable<>::create([](rxcpp::subscriber s) { + s.on_next(1); + }).publish(); CSignal::CSignal() : CSGObject() @@ -43,8 +41,7 @@ CSignal::CSignal() m_active = true; } -CSignal::CSignal(bool active) -: CSGObject() +CSignal::CSignal(bool active) : CSGObject() { // Set if the signal handler is active or not m_active = active; @@ -68,22 +65,22 @@ void CSignal::handler(int signal) { if (signal == SIGINT) { - //SG_SPRINT("\nImmediately return to prompt / Prematurely finish computations / Do nothing (I/P/D)? ") - //char answer=fgetc(stdin); + // SG_SPRINT("\nImmediately return to prompt / Prematurely finish + // computations / Do nothing (I/P/D)? ") + // char answer=fgetc(stdin); /*switch (answer){ - case 'I': - m_sigint_observable.connect(); - break; - case 'P': - m_sigurg_observable.connect(); - break; - default: - SG_SPRINT("Continuing...\n") - break; + case 'I': + m_sigint_observable.connect(); + break; + case 'P': + m_sigurg_observable.connect(); + break; + default: + SG_SPRINT("Continuing...\n") + break; }*/ SG_SPRINT("Killing the application...\n"); m_sigint_observable.connect(); - } else if (signal == SIGURG) m_sigurg_observable.connect(); diff --git a/src/shogun/lib/Signal.h b/src/shogun/lib/Signal.h index 162f96a4d4a..4b8aa46bcc9 100644 --- a/src/shogun/lib/Signal.h +++ b/src/shogun/lib/Signal.h @@ -11,8 +11,8 @@ #ifndef __SIGNAL__H_ #define __SIGNAL__H_ -#include #include +#include #if defined(__MINGW64__) || defined(_MSC_VER) typedef unsigned long sigset_t; @@ -74,7 +74,6 @@ namespace shogun class CSignal : public CSGObject { public: - CSignal(); CSignal(bool active); virtual ~CSignal(); @@ -110,7 +109,6 @@ class CSignal : public CSGObject virtual const char* get_name() const { return "Signal"; } private: - /** signals; handling external lib */ static int signals[NUMTRAPPEDSIGS]; diff --git a/src/shogun/machine/KernelMachine.cpp b/src/shogun/machine/KernelMachine.cpp index b12a7bfcabb..c6288c32ee0 100644 --- a/src/shogun/machine/KernelMachine.cpp +++ b/src/shogun/machine/KernelMachine.cpp @@ -298,8 +298,6 @@ SGVector CKernelMachine::apply_get_outputs(CFeatures* data) { SG_DEBUG("computing output on %d test examples\n", num_vectors) - - if (io->get_show_progress()) io->enable_progress(); else @@ -495,8 +493,6 @@ SGVector CKernelMachine::apply_locked_get_output( int32_t num_inds=indices.vlen; SGVector output(num_inds); - - if (io->get_show_progress()) io->enable_progress(); else diff --git a/src/shogun/multiclass/KNN.cpp b/src/shogun/multiclass/KNN.cpp index 15a51eaea68..c181f7e9624 100644 --- a/src/shogun/multiclass/KNN.cpp +++ b/src/shogun/multiclass/KNN.cpp @@ -181,7 +181,6 @@ CMulticlassLabels* CKNN::apply_multiclass(CFeatures* data) SGVector train_lab(m_k); SG_INFO("%d test examples\n", num_lab) - //histogram of classes and returned output SGVector classes(m_num_classes); @@ -207,7 +206,6 @@ CMulticlassLabels* CKNN::classify_NN() SGVector distances(m_train_labels.vlen); SG_INFO("%d test examples\n", num_lab) - distance->precompute_lhs(); @@ -262,7 +260,6 @@ SGMatrix CKNN::classify_for_multiple_k() SGVector classes(m_num_classes); SG_INFO("%d test examples\n", num_lab) - init_solver(m_knn_solver); diff --git a/src/shogun/multiclass/LaRank.cpp b/src/shogun/multiclass/LaRank.cpp index dbafc9207ef..f1d21c186e4 100644 --- a/src/shogun/multiclass/LaRank.cpp +++ b/src/shogun/multiclass/LaRank.cpp @@ -619,8 +619,6 @@ bool CLaRank::train_machine(CFeatures* data) 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()) diff --git a/src/shogun/multiclass/MulticlassLibLinear.cpp b/src/shogun/multiclass/MulticlassLibLinear.cpp index 72df37460f3..b25bcc66a77 100644 --- a/src/shogun/multiclass/MulticlassLibLinear.cpp +++ b/src/shogun/multiclass/MulticlassLibLinear.cpp @@ -121,8 +121,6 @@ bool CMulticlassLibLinear::train_machine(CFeatures* data) for (int32_t i=0; i -#include #include +#include #include using namespace shogun; using namespace rxcpp; - -TEST(Signal, SIGINT_test) { +TEST(Signal, SIGINT_test) +{ CSignal tmp; - int on_next_v=0; - int on_complete_v=0; + int on_next_v = 0; + int on_complete_v = 0; auto sub = rxcpp::make_subscriber( - [&on_next_v](int v) {on_next_v=1;}, [&]() {on_complete_v=1;} - ); + [&on_next_v](int v) { on_next_v = 1; }, [&]() { on_complete_v = 1; }); tmp.get_SIGINT_observable().subscribe(sub); @@ -25,14 +24,14 @@ TEST(Signal, SIGINT_test) { EXPECT_TRUE(on_complete_v == 1); } -TEST(Signal, SIGURG_test) { +TEST(Signal, SIGURG_test) +{ CSignal tmp; - int on_next_v=0; - int on_complete_v=0; + int on_next_v = 0; + int on_complete_v = 0; auto sub = rxcpp::make_subscriber( - [&](int v) {on_next_v++;}, [&]() {on_complete_v++;} - ); + [&](int v) { on_next_v++; }, [&]() { on_complete_v++; }); tmp.get_SIGURG_observable().subscribe(sub);