Pass integer barplot values as integers

Author: kojix2

shard.lock

@@ -2,5 +2,5 @@ version: 2.0
 shards:
   unicode_plot:
     git: https://github.com/crystal-data/unicode_plot.cr.git
-    version: 0.1.0+git.commit.fc5d4b3c8b452e2c4e540ecfaebd5d11217b8c21
+    version: 0.1.0+git.commit.312f8c81ee4cc829957660ee4ca721ef0907bd75
 

spec/barplot_spec.cr

@@ -0,0 +1,37 @@
+require "./spec_helper"
+
+describe "barplot value labels" do
+  it "formats all-integer bar values as integers" do
+    output = render_barplot("a\t3\nb\t7\nc\t12\n")
+
+    output.should contain(" 3 ")
+    output.should contain(" 7 ")
+    output.should contain(" 12 ")
+    output.should_not contain("3.0")
+    output.should_not contain("7.0")
+    output.should_not contain("12.0")
+  end
+
+  it "treats explicit float bar values as floats" do
+    output = render_barplot("a\t3.0\nb\t7.0\nc\t12.0\n")
+
+    output.should contain(" 3.0 ")
+    output.should contain(" 7.0 ")
+    output.should contain(" 12.0 ")
+  end
+
+  it "treats mixed integer and float bar values as floats" do
+    output = render_barplot("a\t3\nb\t3.0\nc\t12\n")
+
+    output.should contain(" 3.0 ")
+    output.should contain(" 12.0 ")
+  end
+end
+
+private def render_barplot(input : String) : String
+  data = YouPlot2::DSV.parse(input, '\t', nil, false)
+  plot = YouPlot2::Backends::UnicodePlot.barplot(data, YouPlot2::Parameters.new)
+  io = IO::Memory.new
+  ::UnicodePlot.show_plot(io, plot, use_color: false)
+  io.to_s
+end

src/youplot2/backends/unicode_plot.cr

@@ -203,26 +203,40 @@ module YouPlot2
       # -----------------------------------------------------------------------
       # String → Symbol helpers (runtime conversion via case/when)
       # -----------------------------------------------------------------------
+      private alias BarValues = Array(Float64) | Array(Int64)
+
       private def prepare_bar_data(series : Array(Array(String?)),
                                    headers : Array(String)?,
                                    fmt : String?,
-                                   params : Parameters) : {Array(String), Array(Float64)}
+                                   params : Parameters) : {Array(String), BarValues}
         validate_yx_format(fmt, "barplot")
         if series.size == 1
           params.title ||= headers[0] if headers
           labels = (1..series[0].size).map(&.to_s)
-          values = series[0].map { |v| to_f64_or_zero(v) }
+          values = parse_bar_values(series[0])
         else
           require_series_count(series, 2, "barplot")
           x_col, y_col = fmt == "yx" ? {1, 0} : {0, 1}
           params.title ||= headers[y_col] if headers
           labels = series[x_col].map { |v| v || "" }
-          values = series[y_col].map { |v| to_f64_or_zero(v) }
+          values = parse_bar_values(series[y_col])
         end
         require_values(values, "barplot")
         {labels, values}
       end
 
+      private def parse_bar_values(raw_values : Array(String?)) : BarValues
+        if raw_values.all? { |v| integer_literal?(v) }
+          raw_values.map { |v| v.to_s.to_i64 }
+        else
+          raw_values.map { |v| to_f64_or_zero(v) }
+        end
+      end
+
+      private def integer_literal?(value : String?) : Bool
+        value.to_s.strip.matches?(/\A[+-]?\d+\z/)
+      end
+
       private def line_single(data : Data, params : Parameters) : ::UnicodePlot::Plot
         headers = data.headers
         require_series(data, 1, "lineplot")
@@ -502,6 +516,10 @@ module YouPlot2
         raise DataError.new("#{label} has no data values") if values.empty?
       end
 
+      private def require_values(values : Array(Int64), label : String) : Nil
+        raise DataError.new("#{label} has no data values") if values.empty?
+      end
+
       private def require_xy_values(x : Array(Float64), y : Array(Float64), label : String) : Nil
         require_values(x, label)
         require_values(y, label)