unit test

Author: Mohammed Sadique

lib/matplotex.ex

@@ -213,9 +213,7 @@ defmodule Matplotex do
     bar(pos, values, width, [])
   end
 
-  def bar(pos, values, width, opts) do
-    BarChart.create(%Figure{axes: %BarChart{}}, {pos, values, width}, opts)
-  end
+
 
   @doc """
   Adds an additional dataset to a bar plot in the given `%Figure{}`.
@@ -251,12 +249,19 @@ defmodule Matplotex do
   |> M.bar(0, values2, width, label: "Dataset2", color: "#D3D3D3")
   |> M.bar(width, values2, width, label: "Dataset3", color: "green")
   """
+
+  def bar(%Figure{} = figure, values, width, opts), do: bar(figure, width, values, width, opts)
+
+  def bar(pos, values, width, opts) do
+    BarChart.create(%Figure{axes: %BarChart{}}, {pos, values, width}, opts)
+  end
   def bar(%Figure{} = figure, pos, values, width, opts) do
     figure
     |> show_legend()
     |> BarChart.create({pos, values, width}, opts)
   end
 
+
   @doc """
   Creates a scatter plot based on the given `x` and `y` values, with optional customization provided via `opts`.
 
@@ -751,7 +756,9 @@ defmodule Matplotex do
   def show_legend(figure) do
     Figure.show_legend(figure)
   end
-
+  def hide_legend(figure) do
+    Figure.hide_legend(figure)
+  end
   def set_options(figure, opts) do
     PlotOptions.set_options_in_figure(figure, opts)
   end

lib/matplotex/figure.ex

@@ -62,6 +62,8 @@ defmodule Matplotex.Figure do
 
   def show_legend(%__MODULE__{axes: %module{} = axes} = figure),
     do: %{figure | axes: module.show_legend(axes)}
+  def hide_legend(%__MODULE__{axes: %module{} = axes} = figure),
+    do: %{figure | axes: module.hide_legend(axes)}
 
   def set_figure_size(%__MODULE__{margin: margin, axes: axes} = figure, {fwidth, fheight} = fsize) do
     frame_size = {fwidth - fwidth * 2 * margin, fheight - fheight * 2 * margin}

lib/matplotex/figure/areal.ex

@@ -170,11 +170,11 @@ defmodule Matplotex.Figure.Areal do
         end
       end
       # For stacked bar chart the flattening supposed to be the sumation of yaxis data
-      def flatten_for_data(datasets,_data, nil), do: flatten_for_data(datasets)
-      def flatten_for_data(_datasets,%{x: x, y: y} = _data, bottom) do
-      y =   bottom
-        |> Tuple.to_list()
-        |> Kernel.++(y)
+      def flatten_for_data(datasets, nil), do: flatten_for_data(datasets)
+      def flatten_for_data([%{x: x, y: y}| _datasets], bottom) do
+
+      y= bottom
+        |> Kernel.++([y])
         |> Nx.tensor(names: [:x, :y])
         |> Nx.sum(axes: [:x])
         |> Nx.to_list()
@@ -215,6 +215,9 @@ defmodule Matplotex.Figure.Areal do
       def show_legend(%__MODULE__{} = axes) do
         %__MODULE__{axes | show_legend: true}
       end
+      def hide_legend(%__MODULE__{} = axes) do
+        %__MODULE__{axes | show_legend: false}
+      end
 
       def set_frame_size(%__MODULE__{} = axes, frame_size) do
         %__MODULE__{axes | size: frame_size}

lib/matplotex/figure/areal/bar_chart.ex

@@ -38,7 +38,7 @@ defmodule Matplotex.Figure.Areal.BarChart do
     dataset = Dataset.cast(%Dataset{x: x, y: values, pos: pos, width: width}, opts)
     datasets = data ++ [dataset]
      bottom = Keyword.get(opts, :bottom)
-    xydata = flatten_for_data(datasets,data, bottom)
+    xydata = datasets|>Enum.reverse()|> flatten_for_data(bottom)
 
     %Figure{
       figure
@@ -57,7 +57,6 @@ defmodule Matplotex.Figure.Areal.BarChart do
            axes:
              %{
                dataset: datasets,
-               data: {_x, y},
                limit: %{x: xlim, y: ylim},
                type: "stacked",
                region_content: %Region{
@@ -70,14 +69,12 @@ defmodule Matplotex.Figure.Areal.BarChart do
              } = axes,
            rc_params: %RcParams{
              x_padding: x_padding,
-             white_space: white_space,
-             concurrency: concurrency
+             white_space: white_space
            }
          } = figure
        ) do
         x_padding_value = width_region_content * x_padding + white_space
         shrinked_width_region_content = width_region_content - x_padding_value * 2
-
         bar_elements =
           datasets
           |> Enum.map(fn dataset ->
@@ -89,7 +86,7 @@ defmodule Matplotex.Figure.Areal.BarChart do
               height_region_content,
               {x_region_content + x_padding_value, y_region_content}
             )
-            |> capture(-y_region_content, concurrency)
+            |> capture_stacked(-y_region_content)
           end)
           |> List.flatten()
 
@@ -164,7 +161,6 @@ defmodule Matplotex.Figure.Areal.BarChart do
     step = (max - min) / (side * 2)
     {min..max |> Enum.into([], fn d -> d * round_to_best(step) end), lim}
   end
-
   def capture(%Dataset{transformed: transformed} = dataset, bly, concurrency) do
     if concurrency do
       process_concurrently(transformed, concurrency, [[], dataset, bly])
@@ -173,6 +169,37 @@ defmodule Matplotex.Figure.Areal.BarChart do
     end
   end
 
+  def capture([{{x, y}, bottom} | to_capture], captured, %Dataset{
+    color: color,
+    width: width,
+    pos: pos_factor,
+    edge_color: edge_color,
+    alpha: alpha,
+    line_width: line_width
+  } =  dataset) do
+    capture(
+      to_capture,
+      captured ++
+        [
+          %Rect{
+            type: "figure.bar",
+            x: bar_position(x, pos_factor),
+            y: y,
+            width: width,
+            height: bottom - y,
+            color: color,
+            stroke: edge_color || color,
+            fill_opacity: alpha,
+            stroke_opacity: alpha,
+            stroke_width: line_width
+          }
+        ],
+      dataset
+    )
+  end
+  def capture([], captured, _dataset), do: captured
+
+
   def capture(
         [{x, y} | to_capture],
         captured,
@@ -209,40 +236,23 @@ defmodule Matplotex.Figure.Areal.BarChart do
   end
 
   def capture([], captured, _dataset, _bly), do: captured
-  defp capture_stacked([{x, y} | to_capture], captured,  %Dataset{
-    color: color,
-    width: width,
-    pos: pos_factor,
-    edge_color: edge_color,
-    alpha: alpha,
-    line_width: line_width
-  } = dataset, bly) do
-    {y, bottom_y} = if is_list(y) do
-      {Enum.sum(y), y|>tl()|>Enum.sum()}
-    else
-      {y, bly}
-    end
+  defp capture_stacked(%Dataset{transformed: transformed}=dataset, bly) do
+    capture_stacked(transformed, [],dataset, bly)
+  end
+  defp capture_stacked(to_capture, captured, dataset, bly) do
+    to_capture
+    |>Enum.map(fn point ->
+      calculate_point(point, bly)
+    end)
+    |>capture(captured, dataset)
+  end
 
+  defp calculate_point({x, y}, _bly) when is_list(y) do
+    {{x, Enum.sum(y)}, y|>tl()|>Enum.sum()}
+  end
 
-    capture_stacked(
-      to_capture,
-      captured ++
-        [
-          %Rect{
-            type: "figure.bar",
-            x: bar_position(x, pos_factor),
-            y: y,
-            width: width,
-            height: bottom_y - y,
-            color: color,
-            stroke: edge_color || color,
-            fill_opacity: alpha,
-            stroke_opacity: alpha,
-            stroke_width: line_width
-          }
-        ],
-      dataset, bly
-    )
+  defp calculate_point({x, y}, bly) do
+    {{x, y}, bly}
   end
   defp hypox(y) do
     nof_x = length(y)
@@ -260,7 +270,7 @@ defmodule Matplotex.Figure.Areal.BarChart do
     end)
   end
 
-  defp do_transform_with_bottom(%Dataset{x: x, y: y, bottom: bottom} = dataset, xlim, ylim, width, height, transition) do
+  defp do_transform_with_bottom(%Dataset{x: x, y: y, bottom: bottom} = dataset, xlim, ylim, width, height, transition) when is_list(bottom) do
     y = [y | bottom]|> Nx.tensor() |> Nx.transpose()|> Nx.to_list()
 
     transformed =
@@ -273,6 +283,10 @@ defmodule Matplotex.Figure.Areal.BarChart do
     %Dataset{dataset | transformed: transformed}
   end
 
+  defp do_transform_with_bottom(dataset, xlim, ylim, width, height, transition) do
+    do_transform(dataset, xlim, ylim, width, height, transition)
+  end
+
   defp transform_with_bottom(x, y, xlim, ylim, width, height, transition) when is_list(y) do
    transformed = Enum.map(y, fn y_with_bottom ->
      transformation(x, y_with_bottom, xlim, ylim, width, height, transition)

test/matplotex/figure/areal/bar_chart_test.exs

@@ -15,8 +15,22 @@ defmodule Matplotex.Figure.Areal.BarChartTest do
       assert %Figure{axes: %{element: elements}} =
                BarChart.materialized_by_region(figure) |> BarChart.materialize()
 
-      assert assert Enum.filter(elements, fn x -> x.type == "figure.bar" end) |> length() ==
+       assert Enum.filter(elements, fn x -> x.type == "figure.bar" end) |> length() ==
                       length(y)
     end
+
+    test "bottom variable in opts makes stacked bar chart and it will stack the bars" do
+      values1 = [2,4,3,2]
+      values2 = [1,2,1,4]
+      values3 = [3,1,2,1]
+      width = 0.3
+      bar = Matplotex.bar(values1, width)|> Matplotex.bar(values2, width, bottom: [values1])
+      |> Matplotex.bar(values3, width, bottom: [values2, values1])
+      expected_elements_count = values1  ++ values2 ++ values3 |> length()
+      assert %Figure{axes: %{element: elements}} = Figure.materialize(bar)
+
+      assert Enum.filter(elements, fn x -> x.type == "figure.bar" end) |> length() ==
+        expected_elements_count
+    end
   end
 end