Autodd pie template + overhaul of Autodd grammar (tracyhenry#132)

ricardoekm · Oct 30, 2019 · 0ce6879 · 0ce6879
1 parent 38ccb33
commit 0ce6879
Show file tree

Hide file tree

Showing 22 changed files with 1,492 additions and 953 deletions.
diff --git a/back-end/src/main/java/box/BoxandData.java b/back-end/src/main/java/box/BoxandData.java
@@ -38,7 +38,7 @@ public static ArrayList<ArrayList<HashMap<String, String>>> getDictionaryFromDat
 
                 // cluster number field for autodd layer
                 if (curLayer.getIndexerType().equals("AutoDDInMemoryIndexer")) {
-                    rowDict.put("cluster_agg", rowArray.get(numFields));
+                    rowDict.put("clusterAgg", rowArray.get(numFields));
                     numFields++;
                 }
 

diff --git a/back-end/src/main/java/index/AutoDDInMemoryIndexer.java b/back-end/src/main/java/index/AutoDDInMemoryIndexer.java
diff --git a/back-end/src/main/java/project/AutoDD.java b/back-end/src/main/java/project/AutoDD.java
@@ -11,9 +11,9 @@ public class AutoDD {
     private String query, db;
     private String xCol, yCol;
     private int bboxW, bboxH;
-    private String rendering;
-    private String renderingMode;
-    private ArrayList<String> columnNames, aggColumns, queriedColumnNames = null;
+    private String clusterMode;
+    private ArrayList<String> columnNames, queriedColumnNames = null;
+    private ArrayList<String> aggDimensionFields, aggMeasureFields;
     private int numLevels, topLevelWidth, topLevelHeight;
     private boolean overlap;
     private double zoomFactor;
@@ -44,12 +44,8 @@ public int getBboxH() {
         return bboxH;
     }
 
-    public String getRenderingMode() {
-        return renderingMode;
-    }
-
-    public String getRendering() {
-        return rendering;
+    public String getClusterMode() {
+        return clusterMode;
     }
 
     public boolean getOverlap() {
@@ -95,8 +91,12 @@ public ArrayList<String> getColumnNames() {
         return queriedColumnNames;
     }
 
-    public ArrayList<String> getAggColumns() {
-        return aggColumns;
+    public ArrayList<String> getAggDimensionFields() {
+        return aggDimensionFields;
+    }
+
+    public ArrayList<String> getAggMeasureFields() {
+        return aggMeasureFields;
     }
 
     public int getNumLevels() {
@@ -168,11 +168,9 @@ public String toString() {
                 + bboxW
                 + ", bboxH="
                 + bboxH
-                + ", rendering='"
-                + rendering
                 + '\''
-                + ", renderingMode='"
-                + renderingMode
+                + ", clusterMode='"
+                + clusterMode
                 + '\''
                 + ", columnNames="
                 + columnNames

diff --git a/back-end/src/main/java/project/Layer.java b/back-end/src/main/java/project/Layer.java
@@ -65,7 +65,7 @@ public String getColStr(String tableName) {
         String colListStr = "";
         for (String col : transform.getColumnNames())
             colListStr += (tableName.isEmpty() ? "" : tableName + ".") + col + ", ";
-        if (getIndexerType().equals("AutoDDInMemoryIndexer")) colListStr += "cluster_agg, ";
+        if (getIndexerType().equals("AutoDDInMemoryIndexer")) colListStr += "clusterAgg, ";
         colListStr += "cx, cy, minx, miny, maxx, maxy";
         return colListStr;
     }

diff --git a/compiler/examples/flare/renderers.js b/compiler/examples/flare/renderers.js
@@ -1,5 +1,5 @@
 var renderingParams = {
-    textwrap: require("../../src/template-api/Renderers").textwrap
+    textwrap: require("../../src/template-api/Utilities").textwrap
 };
 
 var flarePackRendering = function(svg, data, args) {

diff --git a/compiler/examples/nba/renderers.js b/compiler/examples/nba/renderers.js
@@ -18,7 +18,7 @@ var renderingParams = {
     teamlogoradius: 24,
     avgcharwidth: 20,
     shadowrectwidth: 5,
-    textwrap: require("../../src/template-api/Renderers").textwrap
+    textwrap: require("../../src/template-api/Utilities").textwrap
 };
 
 var teamLogoRendering = function(svg, data) {

diff --git a/compiler/examples/template-api-examples/AutoDD_circle.js b/compiler/examples/template-api-examples/AutoDD_circle.js
@@ -12,31 +12,40 @@ p.addStyles("../nba/nba.css");
 var query =
     "select game_id, year, month, day, team1.abbr as home_team, team2.abbr as away_team, home_score, away_score, team1.rank + team2.rank as agg_rank " +
     "from games, teams as team1, teams as team2 " +
-    "where games.home_team = team1.abbr and games.away_team = team2.abbr " +
-    "order by agg_rank;";
+    "where games.home_team = team1.abbr and games.away_team = team2.abbr ";
 
 var autoDD = {
     data: {
         db: "nba",
         query: query
     },
     x: {
-        col: "home_score",
-        range: [69, 149]
+        field: "home_score",
+        extent: [69, 149]
     },
     y: {
-        col: "away_score",
-        range: [69, 148]
+        field: "away_score",
+        extent: [69, 148]
     },
-    rendering: {
-        // mode: "circle",
-        mode: "circle+object",
-        axis: true,
-        obj: {
-            renderer: renderers.teamTimelineRendering,
-            bboxW: 162,
-            bboxH: 132
+    z: {
+        field: "agg_rank",
+        order: "asc"
+    },
+    marks: {
+        cluster: {
+            mode: "circle",
+            config: {
+                // circleMinSize: 30,
+                // circleMaxSize: 70
+            }
+        },
+        hover: {
+            object: renderers.teamTimelineRendering
+            // convex: true
         }
+    },
+    config: {
+        axis: true
     }
 };
 

diff --git a/compiler/examples/template-api-examples/AutoDD_contour.js b/compiler/examples/template-api-examples/AutoDD_contour.js
@@ -12,34 +12,40 @@ p.addStyles("../nba/nba.css");
 var query =
     "select game_id, year, month, day, team1.abbr as home_team, team2.abbr as away_team, home_score, away_score, team1.rank + team2.rank as agg_rank " +
     "from games, teams as team1, teams as team2 " +
-    "where games.home_team = team1.abbr and games.away_team = team2.abbr " +
-    "order by agg_rank;";
+    "where games.home_team = team1.abbr and games.away_team = team2.abbr ";
 
 var autoDD = {
     data: {
         db: "nba",
         query: query
     },
     x: {
-        col: "home_score",
-        range: [69, 149]
+        field: "home_score",
+        extent: [69, 149]
     },
     y: {
-        col: "away_score",
-        range: [69, 148]
+        field: "away_score",
+        extent: [69, 148]
     },
-    rendering: {
-        // mode: "contour",
-        mode: "contour+object",
-        axis: true,
-        // contourColorScheme: "interpolateBlues",
-        // contourOpacity: 0.5,
-        // contourBandwidth: 50,
-        obj: {
-            renderer: renderers.teamTimelineRendering,
-            bboxW: 162,
-            bboxH: 132
+    z: {
+        field: "agg_rank",
+        order: "asc"
+    },
+    marks: {
+        cluster: {
+            mode: "contour",
+            config: {
+                // contourColorScheme: "interpolateBlues",
+                // contourOpacity: 0.5,
+                // contourBandwidth: 50,
+            }
+        },
+        hover: {
+            object: renderers.teamTimelineRendering
         }
+    },
+    config: {
+        axis: true
     }
 };
 

diff --git a/compiler/examples/template-api-examples/AutoDD_glyph_radar.js b/compiler/examples/template-api-examples/AutoDD_glyph_radar.js
diff --git a/compiler/examples/template-api-examples/AutoDD_heatmap.js b/compiler/examples/template-api-examples/AutoDD_heatmap.js
@@ -12,33 +12,39 @@ p.addStyles("../nba/nba.css");
 var query =
     "select game_id, year, month, day, team1.abbr as home_team, team2.abbr as away_team, home_score, away_score, team1.rank + team2.rank as agg_rank " +
     "from games, teams as team1, teams as team2 " +
-    "where games.home_team = team1.abbr and games.away_team = team2.abbr " +
-    "order by agg_rank;";
+    "where games.home_team = team1.abbr and games.away_team = team2.abbr ";
 
 var autoDD = {
     data: {
         db: "nba",
         query: query
     },
     x: {
-        col: "home_score",
-        range: [69, 149]
+        field: "home_score",
+        extent: [69, 149]
     },
     y: {
-        col: "away_score",
-        range: [69, 148]
+        field: "away_score",
+        extent: [69, 148]
     },
-    rendering: {
-        // mode: "heatmap",
-        mode: "heatmap+object",
-        axis: true,
-        // heatmapRadius: 90,
-        // heatmapOpacity: 0.5,
-        obj: {
-            renderer: renderers.teamTimelineRendering,
-            bboxW: 162,
-            bboxH: 132
+    z: {
+        field: "agg_rank",
+        order: "asc"
+    },
+    marks: {
+        cluster: {
+            mode: "heatmap",
+            config: {
+                // heatmapRadius: 90,
+                // heatmapOpacity: 0.5,
+            }
+        },
+        hover: {
+            object: renderers.teamTimelineRendering
         }
+    },
+    config: {
+        axis: true
     }
 };
 

diff --git a/compiler/examples/template-api-examples/AutoDD_object.js b/compiler/examples/template-api-examples/AutoDD_object.js
@@ -12,31 +12,38 @@ p.addStyles("../nba/nba.css");
 var query =
     "select game_id, year, month, day, team1.abbr as home_team, team2.abbr as away_team, home_score, away_score, team1.rank + team2.rank as agg_rank " +
     "from games, teams as team1, teams as team2 " +
-    "where games.home_team = team1.abbr and games.away_team = team2.abbr " +
-    "order by agg_rank;";
+    "where games.home_team = team1.abbr and games.away_team = team2.abbr ";
 
 var autoDD = {
     data: {
         db: "nba",
         query: query
     },
     x: {
-        col: "home_score",
-        range: [69, 149]
+        field: "home_score",
+        extent: [69, 149]
     },
     y: {
-        col: "away_score",
-        range: [69, 148]
+        field: "away_score",
+        extent: [69, 148]
     },
-    rendering: {
-        // mode: "object",
-        mode: "object+clusternum",
-        axis: true,
-        obj: {
-            renderer: renderers.teamTimelineRendering,
-            bboxW: 162,
-            bboxH: 132
+    z: {
+        field: "agg_rank",
+        order: "asc"
+    },
+    marks: {
+        cluster: {
+            mode: "object",
+            object: renderers.teamTimelineRendering,
+            config: {
+                clusterCount: true,
+                bboxW: 162,
+                bboxH: 132
+            }
         }
+    },
+    config: {
+        axis: true
     }
 };