Added CSignal handling to MulticlassLibLinear

shogun-toolbox · Jun 18, 2012 · 4ce3514 · 4ce3514
1 parent 9a1b7ae
commit 4ce3514
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/shogun/lib/external/shogun_liblinear.cpp b/src/shogun/lib/external/shogun_liblinear.cpp
@@ -43,6 +43,7 @@
 #include <shogun/lib/external/shogun_liblinear.h>
 #include <shogun/lib/external/tron.h>
 #include <shogun/lib/Time.h>
+#include <shogun/lib/Signal.h>
 
 using namespace shogun;
 
@@ -513,7 +514,7 @@ void Solver_MCSVM_CS::solve()
 		state->inited = true;
 	}
 
-	while(iter < max_iter)
+	while(iter < max_iter && !CSignal::cancel_computations())
 	{
 		double stopping = -CMath::INFTY;
 		for(i=0;i<active_size;i++)

diff --git a/src/shogun/multiclass/MulticlassLibLinear.cpp b/src/shogun/multiclass/MulticlassLibLinear.cpp
@@ -14,6 +14,7 @@
 #include <shogun/multiclass/MulticlassOneVsRestStrategy.h>
 #include <shogun/mathematics/Math.h>
 #include <shogun/lib/v_array.h>
+#include <shogun/lib/Signal.h>
 #include <shogun/labels/MulticlassLabels.h>
 
 using namespace shogun;
@@ -121,6 +122,8 @@ bool CMulticlassLibLinear::train_machine(CFeatures* data)
 	for (int32_t i=0; i<num_vectors; i++)
 		C[i] = m_C;
 
+	CSignal::clear_cancel();
+
 	Solver_MCSVM_CS solver(&mc_problem,num_classes,C,w0.matrix,m_epsilon,
 	                       m_max_iter,m_max_train_time,m_train_state);
 	solver.solve();