if max_train_time == 0 - disable time limit for ocas

shogun-toolbox · Mar 9, 2012 · 0d72eb6 · 0d72eb6
1 parent c25cd07
commit 0d72eb6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/shogun/classifier/svm/SVMOcas.cpp b/src/shogun/classifier/svm/SVMOcas.cpp
@@ -330,7 +330,6 @@ void CSVMOcas::compute_W(
 
 void CSVMOcas::init()
 {
-	max_train_time=1000000;
 	use_bias=true;
 	bufsize=3000;
 	C1=1;

diff --git a/src/shogun/classifier/svm/libocas.cpp b/src/shogun/classifier/svm/libocas.cpp
@@ -898,7 +898,10 @@ ocas_return_value_T svm_ocas_solver_difC(
     if( ocas.Q_P - ocas.Q_D <= TolRel*LIBOCAS_ABS(ocas.Q_P)) ocas.exitflag = 1; 
     if( ocas.Q_P - ocas.Q_D <= TolAbs) ocas.exitflag = 2; 
     if( ocas.Q_P <= QPBound) ocas.exitflag = 3; 
-    if( ocas.ocas_time >= MaxTime) ocas.exitflag = 4; 
+	if (MaxTime>0)
+	{
+		if( ocas.ocas_time >= MaxTime) ocas.exitflag = 4; 
+	}
     if(ocas.nCutPlanes >= BufSize) ocas.exitflag = -1;
 
   } /* end of the main loop */