diff --git a/samples/liblinear/wscript b/samples/liblinear/wscript index 19af4df..3da89c5 100644 --- a/samples/liblinear/wscript +++ b/samples/liblinear/wscript @@ -10,7 +10,7 @@ def build(bld): pass # for enabling waf-clean @maflib.plot.plot_by -def plot(figure, data): +def plot(figure, data, parameter): """Plot figure for LIBLINEAR experiment.""" LIBLINEAR_METHODS = { @@ -45,17 +45,10 @@ def experiment(exp): # Download and decompress 20 newsgroup dataset from LIBSVM webiste. website = 'http://www.csie.ntu.edu.tw/~cjlin/libsvmtools/datasets/multiclass/' - exp(target='news20.scale.bz2', - rule='wget %s/news20.scale.bz2 -O ${TGT}' % website) - exp(source='news20.scale.bz2', - target='news20.scale', - rule='bunzip2 ${SRC} --keep') - - exp(target='news20.t.scale.bz2', - rule='wget %s/news20.t.scale.bz2 -O ${TGT}' % website) - exp(source='news20.t.scale.bz2', - target='news20.t.scale', - rule='bunzip2 ${SRC} --keep') + exp(target='news20.scale', + rule=maflib.rules.download(website+'/news20.scale.bz2', 'bz2')) + exp(target='news20.t.scale', + rule=maflib.rules.download(website+'/news20.t.scale.bz2', 'bz2')) # Train with various parameters. exp(source='news20.scale',