Merge 86eaac2 into 4de06dc

lux-org · Mar 13, 2021 · c6a00e0 · c6a00e0
2 parents 4de06dc + 86eaac2
commit c6a00e0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/lux/vislib/altair/Histogram.py b/lux/vislib/altair/Histogram.py
@@ -88,7 +88,8 @@ def initialize_chart(self):
                     y=alt.Y(
                         str(msr_attr.attribute),
                         title=axis_title,
-                        bin=alt.Bin(binned=True, step=markbar),
+                        bin=alt.Bin(binned=True, step=step),
+                        type=msr_attr.data_type,
                         axis=alt.Axis(title=axis_title),
                     ),
                     y2=end_attr_abv,
@@ -99,20 +100,21 @@ def initialize_chart(self):
         #####################################
 
         self.code += "import altair as alt\n"
-        # self.code += f"visData = pd.DataFrame({str(self.data.to_dict(orient='records'))})\n"
         self.code += f"visData = pd.DataFrame({str(self.data.to_dict())})\n"
         if measure.channel == "x":
             self.code += f"""
-		chart = alt.Chart(visData).mark_bar(size={markbar}).encode(
-		    alt.X('{msr_attr.attribute}', title='{axis_title}',bin=alt.Bin(binned=True), type='{msr_attr.data_type}', axis=alt.Axis(labelOverlap=True, title='{axis_title}'), scale=alt.Scale(domain=({x_min}, {x_max}))),
-		    alt.Y("Number of Records", type="quantitative")
+		chart = alt.Chart(visData).mark_bar().encode(
+		    x=alt.X('{msr_attr.attribute}', title='{axis_title}',bin=alt.Bin(binned=True, step={step}), type='{msr_attr.data_type}', axis=alt.Axis(labelOverlap=True, title='{axis_title}'), scale=alt.Scale(domain=({x_min}, {x_max}))),
+            x2='{end_attr_abv}',
+		    y=alt.Y("Number of Records", type="quantitative")
 		)
 		"""
         elif measure.channel == "y":
             self.code += f"""
-		chart = alt.Chart(visData).mark_bar(size={markbar}).encode(
-		    alt.Y('{msr_attr.attribute}', title='{axis_title}',bin=alt.Bin(binned=True), type='{msr_attr.data_type}', axis=alt.Axis(labelOverlap=True, title='{axis_title}'), scale=alt.Scale(domain=({x_min}, {x_max}))),
-		    alt.X("Number of Records", type="quantitative")
+		chart = alt.Chart(visData).mark_bar().encode(
+		    y=alt.Y('{msr_attr.attribute}', title='{axis_title}', bin=alt.Bin(binned=True, step={step}), type='{msr_attr.data_type}', axis=alt.Axis(labelOverlap=True, title='{axis_title}')),
+            y2='{end_attr_abv}',
+		    x=alt.X("Number of Records", type="quantitative")
 		)
 		"""
         return chart

diff --git a/tests/test_vis.py b/tests/test_vis.py
@@ -17,7 +17,6 @@
 import pandas as pd
 from lux.vis.VisList import VisList
 from lux.vis.Vis import Vis
-from lux.vislib.altair.Histogram import compute_bin_width
 
 
 def test_vis(global_var):
@@ -341,11 +340,9 @@ def test_histogram_chart(global_var):
     lux.config.plotting_backend = "vegalite"
     vis = Vis(["Displacement"], df)
     vis_code = vis.to_Altair()
-    expected_bin_size = compute_bin_width(vis.data["Displacement"])
     assert "alt.Chart(visData).mark_bar" in vis_code
-    assert str(expected_bin_size) in vis_code
     assert (
-        "alt.X('Displacement', title='Displacement (binned)',bin=alt.Bin(binned=True), type='quantitative', axis=alt.Axis(labelOverlap=True, title='Displacement (binned)'), scale=alt.Scale(domain=(68.0, 455.0)))"
+        "alt.X('Displacement', title='Displacement (binned)',bin=alt.Bin(binned=True, step=38.7), type='quantitative', axis=alt.Axis(labelOverlap=True, title='Displacement (binned)'), scale=alt.Scale(domain=(68.0, 455.0)))"
         in vis_code
     )
     assert 'alt.Y("Number of Records", type="quantitative")' in vis_code