[mlpack-svn] r15808 - mlpack/conf/jenkins-conf/benchmark/methods/weka
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Wed Sep 18 08:54:29 EDT 2013
Author: marcus
Date: Wed Sep 18 08:54:28 2013
New Revision: 15808
Log:
Fix unorderable type error.
Modified:
mlpack/conf/jenkins-conf/benchmark/methods/weka/allknn.py
mlpack/conf/jenkins-conf/benchmark/methods/weka/kmeans.py
mlpack/conf/jenkins-conf/benchmark/methods/weka/linear_regression.py
mlpack/conf/jenkins-conf/benchmark/methods/weka/nbc.py
mlpack/conf/jenkins-conf/benchmark/methods/weka/pca.py
Modified: mlpack/conf/jenkins-conf/benchmark/methods/weka/allknn.py
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/methods/weka/allknn.py (original)
+++ mlpack/conf/jenkins-conf/benchmark/methods/weka/allknn.py Wed Sep 18 08:54:28 2013
@@ -79,7 +79,10 @@
# Return the elapsed time.
timer = self.parseTimer(s)
- if not timer or timer < 0:
+ if not timer:
+ Log.Fatal("Can't parse the timer")
+ return -1
+ elif isinstance(timer, int):
Log.Fatal("Can't parse the timer")
return -1
else:
Modified: mlpack/conf/jenkins-conf/benchmark/methods/weka/kmeans.py
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/methods/weka/kmeans.py (original)
+++ mlpack/conf/jenkins-conf/benchmark/methods/weka/kmeans.py Wed Sep 18 08:54:28 2013
@@ -72,7 +72,10 @@
# Return the elapsed time.
timer = self.parseTimer(s)
- if not timer or timer < 0:
+ if not timer:
+ Log.Fatal("Can't parse the timer")
+ return -1
+ elif isinstance(timer, int):
Log.Fatal("Can't parse the timer")
return -1
else:
Modified: mlpack/conf/jenkins-conf/benchmark/methods/weka/linear_regression.py
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/methods/weka/linear_regression.py (original)
+++ mlpack/conf/jenkins-conf/benchmark/methods/weka/linear_regression.py Wed Sep 18 08:54:28 2013
@@ -79,7 +79,10 @@
# Return the elapsed time.
timer = self.parseTimer(s)
- if not timer or timer < 0:
+ if not timer:
+ Log.Fatal("Can't parse the timer")
+ return -1
+ elif isinstance(timer, int):
Log.Fatal("Can't parse the timer")
return -1
else:
Modified: mlpack/conf/jenkins-conf/benchmark/methods/weka/nbc.py
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/methods/weka/nbc.py (original)
+++ mlpack/conf/jenkins-conf/benchmark/methods/weka/nbc.py Wed Sep 18 08:54:28 2013
@@ -76,7 +76,10 @@
# Return the elapsed time.
timer = self.parseTimer(s)
- if not timer or timer < 0:
+ if not timer:
+ Log.Fatal("Can't parse the timer")
+ return -1
+ elif isinstance(timer, int):
Log.Fatal("Can't parse the timer")
return -1
else:
Modified: mlpack/conf/jenkins-conf/benchmark/methods/weka/pca.py
==============================================================================
--- mlpack/conf/jenkins-conf/benchmark/methods/weka/pca.py (original)
+++ mlpack/conf/jenkins-conf/benchmark/methods/weka/pca.py Wed Sep 18 08:54:28 2013
@@ -72,7 +72,10 @@
# Return the elapsed time.
timer = self.parseTimer(s)
- if not timer or timer < 0:
+ if not timer:
+ Log.Fatal("Can't parse the timer")
+ return -1
+ elif isinstance(timer, int):
Log.Fatal("Can't parse the timer")
return -1
else:
More information about the mlpack-svn
mailing list