restructure

tests/funcs.a

@@ -9,23 +9,13 @@ FUNCTION sd ( x) {
 sqrt ( covariance (x , x) )
 }
 
-AGGREGATION FUNCTION covariances(x, y, w){
-    static xmeans := 0, ymeans := 0, cnt := 0; 
-    if (cnt < w) { xmeans += x; }
-    else {       
-        xmeans += (x - x.vec[cnt - w]) / w;
-        ymeans += (y - y.vec[cnt - w]) / w;   
-    }
-    avg (( x.vec(x.len-w, x.len) - xmean ) * (y.vec(y.len - w, y.len) - ymean ))
-}
-
 FUNCTION pairCorr (x , y ) {
 covariance (x , y ) / ( sd (x) * sd (y ))
 }
 
 CREATE TABLE test1(a INT, b INT, c INT, d INT)
 
-LOAD DATA INFILE "test.csv"
+LOAD DATA INFILE "data/test.csv"
 INTO TABLE test1
 FIELDS TERMINATED BY ","
 

tests/joins.a

@@ -20,13 +20,13 @@ covariance (x , y ) / ( sd (x) * sd (y ))
 
 CREATE TABLE tt(a INT, b INT, c INT, d INT)
 
-LOAD DATA INFILE "test.csv"
+LOAD DATA INFILE "data/test.csv"
 INTO TABLE tt
 FIELDS TERMINATED BY ","
 
 CREATE TABLE sale(Mont INT, sales INT)
 
-LOAD DATA INFILE "moving_avg.csv"
+LOAD DATA INFILE "data/moving_avg.csv"
 INTO TABLE sale
 FIELDS TERMINATED BY ","
 

tests/moving_avg.a

@@ -1,6 +1,6 @@
 CREATE TABLE sale(Mont INT, sales INT)
 
-LOAD DATA INFILE "moving_avg.csv"
+LOAD DATA INFILE "data/moving_avg.csv"
 INTO TABLE sale
 FIELDS TERMINATED BY ","
 

tests/q1.sql

@@ -1,6 +1,6 @@
 CREATE TABLE testq1(a INT, b INT, c INT, d INT)
 
-LOAD DATA INFILE "test.csv"
+LOAD DATA INFILE "data/test.csv"
 INTO TABLE testq1
 FIELDS TERMINATED BY ","
 

tests/strings.a

@@ -1,6 +1,6 @@
 CREATE TABLE types_test(names varchar(10), val real, id int)
 
-LOAD DATA INFILE "datatypes.csv"
+LOAD DATA INFILE "data/datatypes.csv"
 INTO TABLE types_test
 FIELDS TERMINATED BY ","
 

tests/udf3.a

@@ -31,7 +31,7 @@ AGGREGATION FUNCTION covariances2(x, y, w){
 
 CREATE TABLE test(a INT, b INT, c INT, d INT)
 
-LOAD DATA INFILE "test2.csv"
+LOAD DATA INFILE "data/test2.csv"
 INTO TABLE test
 FIELDS TERMINATED BY ","