# HG changeset patch
# User Matthias Mauch <matthias.mauch@eecs.qmul.ac.uk>
# Date 1417717430 0
# Node ID b22527106f71184ee4119862f55eb1806a46c54f
# Parent  bf6b9338233d517aa6a92e5079c7f8b213949958
moved things around

diff -r bf6b9338233d -r b22527106f71 evaluation/notecsv2molina.awk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/evaluation/notecsv2molina.awk	Thu Dec 04 18:23:50 2014 +0000
@@ -0,0 +1,1 @@
+BEGIN {FS=","}; {if ($2 > 0.09) {$2=$1+$2; $3 = 69+(log($3/440)/log(2)*12); print $1,$2, $3;}}
diff -r bf6b9338233d -r b22527106f71 evaluation/notecsv2molina.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/evaluation/notecsv2molina.sh	Thu Dec 04 18:23:50 2014 +0000
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+input_csv=$1
+
+if [ $# != 2 ]; then
+  minimum_duration=0
+else
+  minimum_duration=$2
+fi
+
+awk -v md="$minimum_duration" 'BEGIN {FS=","}; {if ($2 >= md) {$2=$1+$2; $3 = 69+(log($3/440)/log(2)*12); print $1,$2,$3;}}' < $input_csv
+
diff -r bf6b9338233d -r b22527106f71 notecsv2molina.awk
--- a/notecsv2molina.awk	Thu Dec 04 16:37:58 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-BEGIN {FS=","}; {if ($2 > 0.09) {$2=$1+$2; $3 = 69+(log($3/440)/log(2)*12); print $1,$2, $3;}}
diff -r bf6b9338233d -r b22527106f71 notecsv2molina.sh
--- a/notecsv2molina.sh	Thu Dec 04 16:37:58 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-input_csv=$1
-
-if [ $# != 2 ]; then
-  minimum_duration=0
-else
-  minimum_duration=$2
-fi
-
-awk -v md="$minimum_duration" 'BEGIN {FS=","}; {if ($2 >= md) {$2=$1+$2; $3 = 69+(log($3/440)/log(2)*12); print $1,$2,$3;}}' < $input_csv
-