Commit 9e8ed5ff authored by Thomas Huetter's avatar Thomas Huetter

fixed OR function in plot_experiments_n.py

parent a4b2903d
......@@ -6,19 +6,19 @@
"legend": "lower right",
"grid": "on",
"dataset_name": "Sentiment",
"markers": ["s", "*", "o", "^", "p", "d", "8"],
"markersize": [20, 15, 15, 15, 15, 15, 15],
"markers": [ "*", "s","o", "^", "p", "d", "8", "X"],
"markersize": [20, 15, 15, 15, 15, 15, 15, 15],
"markerfacecolor": "none",
"colors": ["green", "red", "blue", "cyan", "magenta", "orange", "greenyellow"],
"colors": ["green", "red", "blue", "cyan", "magenta", "orange", "greenyellow", "indigo"],
"tables": [
{
"table_name": "t_join",
"attributes": [
{
"attr_name": "avg(verification_candidates - upperbound_pruned)"
"attr_name": "avg(join_result_size)"
}
],
"name": "$\\mathtt{TJoin}$",
"name": "$\\mathtt{Result}$",
"constraints": {
"verification_algorithm": ["Touzet"],
"upperbound": ["greedy"]
......@@ -88,6 +88,32 @@
"verification_algorithm": ["APTED"],
"reference_set_size": [32]
}
},
{
"table_name": "guha_rsc_join",
"attributes": [
{
"attr_name": "avg(l_t_candidates - u_t_result_pairs)"
}
],
"name": "$\\mathtt{Guha RSC\\ K=64}$",
"constraints": {
"verification_algorithm": ["APTED"],
"reference_set_size": [64]
}
},
{
"table_name": "guha_rsc_join",
"attributes": [
{
"attr_name": "avg(l_t_candidates - u_t_result_pairs)"
}
],
"name": "$\\mathtt{Guha RSC\\ K=128}$",
"constraints": {
"verification_algorithm": ["APTED"],
"reference_set_size": [128]
}
}
],
"constraints": {
......
......@@ -6,19 +6,19 @@
"legend": "lower right",
"grid": "on",
"dataset_name": "Sentiment",
"markers": ["s", "*", "o", "^", "p", "d", "8"],
"markersize": [20, 15, 15, 15, 15, 15, 15],
"markers": [ "*", "s","o", "^", "p", "d", "8", "X"],
"markersize": [20, 15, 15, 15, 15, 15, 15, 15],
"markerfacecolor": "none",
"colors": ["green", "red", "blue", "cyan", "magenta", "orange", "greenyellow"],
"colors": ["green", "red", "blue", "cyan", "magenta", "orange", "greenyellow", "indigo"],
"tables": [
{
"table_name": "t_join",
"attributes": [
{
"attr_name": "avg(verification_candidates - upperbound_pruned)"
"attr_name": "avg(join_result_size)"
}
],
"name": "$\\mathtt{TJoin}$",
"name": "$\\mathtt{Result}$",
"constraints": {
"verification_algorithm": ["Touzet"],
"upperbound": ["greedy"]
......@@ -88,6 +88,32 @@
"verification_algorithm": ["APTED"],
"reference_set_size": [32]
}
},
{
"table_name": "guha_rsc_join",
"attributes": [
{
"attr_name": "avg(l_t_candidates - u_t_result_pairs)"
}
],
"name": "$\\mathtt{Guha RSC\\ K=64}$",
"constraints": {
"verification_algorithm": ["APTED"],
"reference_set_size": [64]
}
},
{
"table_name": "guha_rsc_join",
"attributes": [
{
"attr_name": "avg(l_t_candidates - u_t_result_pairs)"
}
],
"name": "$\\mathtt{Guha RSC\\ K=128}$",
"constraints": {
"verification_algorithm": ["APTED"],
"reference_set_size": [128]
}
}
],
"constraints": {
......
......@@ -103,10 +103,12 @@ for table in data['tables']:
if 'constraints' in data:
where_args = ' WHERE '
for (key,val) in data['constraints'].items():
where_args += '('
for or_val in val:
where_args += "{!s}={!r}".format(key,or_val)
where_args += ' OR '
where_args = where_args[:-3] # remove last OR
where_args += ')'
where_args += ' AND '
where_args = where_args[:-4] # remove last AND
if 'constraints' in table:
......@@ -115,10 +117,12 @@ for table in data['tables']:
else:
where_args += ' AND '
for (key,val) in table['constraints'].items():
where_args += '('
for or_val in val:
where_args += "{!s}={!r}".format(key,or_val)
where_args += ' OR '
where_args = where_args[:-3] # remove last OR
where_args += ')'
where_args += ' AND '
where_args = where_args[:-4] # remove last AND
if 'db_column' in data['x_axis']:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment