From 55838f225cce9da33e7d5e79000508876ba9cd9d Mon Sep 17 00:00:00 2001 From: Gregor Majcen Date: Thu, 3 Jan 2013 19:15:53 +0100 Subject: [PATCH 1/4] added maven --- pom.xml | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ run.sh | 11 +++++++++ 2 files changed, 80 insertions(+) create mode 100644 pom.xml create mode 100755 run.sh diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..0d45f0b --- /dev/null +++ b/pom.xml @@ -0,0 +1,69 @@ + + 4.0.0 + + storm.dra + distributedRedditAnalyser + 0.0.1-SNAPSHOT + jar + + Distributed Reddit Analyser + https://github.com/majcn/DistributedRedditAnalyser + + + UTF-8 + + + + clojars.org + http://clojars.org/repo + + + + + + storm + storm + 0.9.0-wip7 + provided + + + nz.ac.waikato.cms.weka + weka-dev + 3.7.7 + + + nz.ac.waikato.cms.moa + moa + 2012.08 + + + + src/distributedRedditAnalyser + + + maven-assembly-plugin + + + jar-with-dependencies + + + + + + + + + + make-assembly + package + + single + + + + + + + + diff --git a/run.sh b/run.sh new file mode 100755 index 0000000..f56053e --- /dev/null +++ b/run.sh @@ -0,0 +1,11 @@ +if [ -d "RELEASE" ]; then + mv "RELEASE" "RELEASE("$(date +%F-%T)")" +fi +mkdir RELEASE + +rm -rf target +nohup mvn package > RELEASE/maven.log 2>&1 +cp target/*-jar-with-dependencies.jar RELEASE/uberjar.jar +rm -rf target + +echo "storm<0.9.0-wip7> jar RELEASE/uberjar.jar " From 8789dba0446e4f0adfb1c02ca2eb683e3f366b38 Mon Sep 17 00:00:00 2001 From: Gregor Majcen Date: Tue, 15 Jan 2013 16:57:35 +0100 Subject: [PATCH 2/4] changed to stable storm and autodownload it if needed --- pom.xml | 2 +- run.sh | 29 +++++++++++++++++++++++------ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 0d45f0b..3eec8b5 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ storm storm - 0.9.0-wip7 + 0.8.1 provided diff --git a/run.sh b/run.sh index f56053e..8cf1567 100755 --- a/run.sh +++ b/run.sh @@ -1,11 +1,28 @@ -if [ -d "RELEASE" ]; then - mv "RELEASE" "RELEASE("$(date +%F-%T)")" +if [ ! -d "storm-0.8.1" ]; then + echo "Downloading storm" + curl https://dl.dropbox.com/u/133901206/storm-0.8.1.zip > /tmp/storm.zip + echo "Download done" + if zipinfo /tmp/storm.zip > /dev/null; then + echo "Unziping storm" + unzip /tmp/storm.zip > /dev/null + echo "Unzip done" + rm /tmp/storm.zip + else + rm /tmp/storm.zip + exit + fi fi -mkdir RELEASE + +if [ -d "results" ]; then + mv "results" "results("$(date +%F-%T)")" +fi +mkdir results rm -rf target -nohup mvn package > RELEASE/maven.log 2>&1 -cp target/*-jar-with-dependencies.jar RELEASE/uberjar.jar +echo "Compiling" +nohup mvn package > results/maven.log 2>&1 +cp target/*-jar-with-dependencies.jar results/uberjar.jar rm -rf target +echo "Compiled. Trying to run" -echo "storm<0.9.0-wip7> jar RELEASE/uberjar.jar " +storm-0.8.1/bin/storm jar results/uberjar.jar distributedRedditAnalyser.Main $@ From c73036bdd8caac82f875603e528a41bf2d0e8241 Mon Sep 17 00:00:00 2001 From: Gregor Majcen Date: Tue, 15 Jan 2013 21:18:33 +0100 Subject: [PATCH 3/4] added gnuplot graph --- graf.gnu | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 graf.gnu diff --git a/graf.gnu b/graf.gnu new file mode 100644 index 0000000..31c655b --- /dev/null +++ b/graf.gnu @@ -0,0 +1,17 @@ +set datafile separator "," +set terminal png size 800,600 +set output 'plot.png' + +set multiplot + +unset key + +plot 'naiveBayes.csv' u 1:2 w l lw 3, \ + 'naiveBayesMultinominal.csv' u 1:2 w l lw 3, \ + 'perceptron.csv'u 1:2 w l lw 3 + +set key; unset tics; unset border; unset xlabel; unset ylabel + +plot [][0:1] 2 title 'NAIVE BAYES' lw 3, \ + 2 title 'NAIVE BAYES MULTINOMINAL' lw 3, \ + 2 title 'PERCEPTRON' lw 3 From 8f21d97f02698fb41e7514d4caf04c7a30f1aad2 Mon Sep 17 00:00:00 2001 From: Gregor Majcen Date: Tue, 22 Jan 2013 11:42:14 +0100 Subject: [PATCH 4/4] add graph with output .eps --- grafEps.gnu | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 grafEps.gnu diff --git a/grafEps.gnu b/grafEps.gnu new file mode 100644 index 0000000..091e28e --- /dev/null +++ b/grafEps.gnu @@ -0,0 +1,17 @@ +set datafile separator "," +set terminal postscript enhanced eps solid colour "Helvetica" 22 +set output 'plot.eps' + +set multiplot + +unset key + +plot 'naiveBayes.csv' u 1:2 w l lw 3, \ + 'naiveBayesMultinominal.csv' u 1:2 w l lw 3, \ + 'perceptron.csv'u 1:2 w l lw 3 + +set key; unset tics; unset border; unset xlabel; unset ylabel + +plot [][0:1] 2 title 'NAIVE BAYES' lw 3, \ + 2 title 'NAIVE BAYES MULTINOMINAL' lw 3, \ + 2 title 'PERCEPTRON' lw 3