Generated figures for the first batch of results

Author: dx-tang

forms/executor/dbexecutor/dbexecutor.py

@@ -95,6 +95,8 @@ def execute_formula_plan(self, formula_plan: PlanNode) -> pd.DataFrame:
                 end_time = time.time()
                 translation_time += end_time - start_time
 
+                print(sql_composable.as_string(self.exec_context.conn))
+
                 start_time = end_time
                 if scheduler.has_next_subtree():
                     sql_str = sql_composable.as_string(self.exec_context.conn)

systests/ICRISAT_test.sh

@@ -9,5 +9,5 @@ if [ "$#" -ne 1 ]; then
 fi
 
 
-$TEST_HOME/run.sh ICRISAT ICRISAT.csv ICRISAT_formula.csv obvdate $1
-# $TEST_HOME/run.sh ICRISAT ICRISAT.csv test_formula.csv obvdate $1
+# $TEST_HOME/run.sh ICRISAT ICRISAT.csv ICRISAT_formula.csv obvdate $1
+$TEST_HOME/run.sh ICRISAT ICRISAT.csv test_formula.csv obvdate $1

systests/formulas/test_formula.csv

@@ -1,10 +1,2 @@
-=SUM(C1:D2, E1:F3)
-=SUM(C1:D2, $E$1:F1)
-=AVERAGE(C1:D2, $E$1:F1)
-=MAX(C1:D2, $E$1:F1)
-=C1+D2-E3
-=SUM(C1:D2)+E1
-=SUMIF(C1:D2, ">15") + E1
-=IF(E1>F1, SUM(C1:D2), AVERAGE(E1:F2))
-=IF(E1>F1, SUM(C1:D2), LOOKUP(F1, E$1:E$14853, D$1:D$14853, 0))
-=IF(F1> 5, C1, IF(F1 < 5, D1, E1))
+=LOOKUP(F1, E$1:E$14853, D$1:D$14853, 0)
+=LOOKUP(F1, E$1:E$14853, D$1:D$14853, 1)