feat: Implement stacked histogram for step type and update examples

Author: KarthikRIyer

Package.swift

@@ -130,6 +130,18 @@ let package = Package(
             name: "HistogramExample",
             dependencies: ["AGGRenderer", "SVGRenderer", "SwiftPlot"],
             path: "examples/Histogram"),
+  .target(
+            name: "HistogramStepExample",
+            dependencies: ["AGGRenderer", "SVGRenderer", "SwiftPlot"],
+            path: "examples/HistogramStep"),
+  .target(
+            name: "HistogramStackedExample",
+            dependencies: ["AGGRenderer", "SVGRenderer", "SwiftPlot"],
+            path: "examples/HistogramStacked"),
+  .target(
+            name: "HistogramStackedStepExample",
+            dependencies: ["AGGRenderer", "SVGRenderer", "SwiftPlot"],
+            path: "examples/HistogramStackedStep"),
         //.testTarget(
         //  name: "swiftplotTests",
         //  dependencies: ["swiftplot"]),

examples/Histogram/main.swift

@@ -19,21 +19,13 @@ for _ in 1...numberOfSamples {
     x.append(z1*deviation + mean)
 }
 
-for _ in 1...numberOfSamples {
-    let x1 = Float.random(in: 0.0...1.0)
-    let x2 = Float.random(in: 0.0...1.0)
-    let z1 = sqrt(-2 * log(x1))*cos(2*Float.pi*x2)
-    y.append(z1*deviation + 150)
-}
-
 var agg_renderer = AGGRenderer()
 var svg_renderer = SVGRenderer()
 
 var histogram: Histogram = Histogram(isNormalized: false)
-histogram.addSeries(data: x, bins: 50, label: "Plot 1", color: .blue, histogramType: .step)
-histogram.addStackSeries(data: y, label: "Plot 2", color: .orange)
+histogram.addSeries(data: x, bins: 50, label: "Plot 1", color: .blue)
 histogram.plotTitle = PlotTitle("HISTOGRAM")
-histogram.plotLabel = PlotLabel(xLabel: "X-AXIS", yLabel: "Y-AXIS")
+histogram.plotLabel = PlotLabel(xLabel: "X", yLabel: "Frequency")
 
 histogram.drawGraphAndOutput(fileName: filePath+"agg/"+fileName, renderer: agg_renderer)
 histogram.drawGraphAndOutput(fileName: filePath+"svg/"+fileName, renderer: svg_renderer)

examples/HistogramStacked/main.swift

@@ -0,0 +1,40 @@
+import SwiftPlot
+import AGGRenderer
+import SVGRenderer
+import Foundation
+
+var filePath = "examples/Reference/"
+let fileName = "_22_histogram_stacked"
+
+var x = [Float]()
+var y = [Float]()
+var mean1: Float = 100
+var mean2: Float = 150
+var deviation: Float = 15
+let numberOfSamples = 10000
+
+for _ in 1...numberOfSamples {
+    let x1 = Float.random(in: 0.0...1.0)
+    let x2 = Float.random(in: 0.0...1.0)
+    let z1 = sqrt(-2 * log(x1))*cos(2*Float.pi*x2)
+    x.append(z1*deviation + mean1)
+}
+
+for _ in 1...numberOfSamples {
+    let x1 = Float.random(in: 0.0...1.0)
+    let x2 = Float.random(in: 0.0...1.0)
+    let z1 = sqrt(-2 * log(x1))*cos(2*Float.pi*x2)
+    y.append(z1*deviation + mean2)
+}
+
+var agg_renderer = AGGRenderer()
+var svg_renderer = SVGRenderer()
+
+var histogram: Histogram = Histogram(isNormalized: false)
+histogram.addSeries(data: x, bins: 50, label: "Plot 1", color: .blue)
+histogram.addStackSeries(data: y, label: "Plot 2", color: .orange)
+histogram.plotTitle = PlotTitle("HISTOGRAM STACKED")
+histogram.plotLabel = PlotLabel(xLabel: "X", yLabel: "Frequency")
+
+histogram.drawGraphAndOutput(fileName: filePath+"agg/"+fileName, renderer: agg_renderer)
+histogram.drawGraphAndOutput(fileName: filePath+"svg/"+fileName, renderer: svg_renderer)

examples/HistogramStackedStep/main.swift

@@ -0,0 +1,40 @@
+import SwiftPlot
+import AGGRenderer
+import SVGRenderer
+import Foundation
+
+var filePath = "examples/Reference/"
+let fileName = "_23_histogram_stacked_step"
+
+var x = [Float]()
+var y = [Float]()
+var mean1: Float = 100
+var mean2: Float = 150
+var deviation: Float = 15
+let numberOfSamples = 10000
+
+for _ in 1...numberOfSamples {
+    let x1 = Float.random(in: 0.0...1.0)
+    let x2 = Float.random(in: 0.0...1.0)
+    let z1 = sqrt(-2 * log(x1))*cos(2*Float.pi*x2)
+    x.append(z1*deviation + mean1)
+}
+
+for _ in 1...numberOfSamples {
+    let x1 = Float.random(in: 0.0...1.0)
+    let x2 = Float.random(in: 0.0...1.0)
+    let z1 = sqrt(-2 * log(x1))*cos(2*Float.pi*x2)
+    y.append(z1*deviation + mean2)
+}
+
+var agg_renderer = AGGRenderer()
+var svg_renderer = SVGRenderer()
+
+var histogram: Histogram = Histogram(isNormalized: false)
+histogram.addSeries(data: x, bins: 50, label: "Plot 1", color: .blue, histogramType: .step)
+histogram.addStackSeries(data: y, label: "Plot 2", color: .orange)
+histogram.plotTitle = PlotTitle("HISTOGRAM STACKED STEP")
+histogram.plotLabel = PlotLabel(xLabel: "X", yLabel: "Frequency")
+
+histogram.drawGraphAndOutput(fileName: filePath+"agg/"+fileName, renderer: agg_renderer)
+histogram.drawGraphAndOutput(fileName: filePath+"svg/"+fileName, renderer: svg_renderer)

examples/HistogramStep/main.swift

@@ -0,0 +1,31 @@
+import SwiftPlot
+import AGGRenderer
+import SVGRenderer
+import Foundation
+
+var filePath = "examples/Reference/"
+let fileName = "_21_histogram_step"
+
+var x = [Float]()
+var y = [Float]()
+var mean: Float = 100
+var deviation: Float = 15
+let numberOfSamples = 10000
+
+for _ in 1...numberOfSamples {
+    let x1 = Float.random(in: 0.0...1.0)
+    let x2 = Float.random(in: 0.0...1.0)
+    let z1 = sqrt(-2 * log(x1))*cos(2*Float.pi*x2)
+    x.append(z1*deviation + mean)
+}
+
+var agg_renderer = AGGRenderer()
+var svg_renderer = SVGRenderer()
+
+var histogram: Histogram = Histogram(isNormalized: false)
+histogram.addSeries(data: x, bins: 50, label: "Plot 1", color: .blue, histogramType: .step)
+histogram.plotTitle = PlotTitle("HISTOGRAM STEP")
+histogram.plotLabel = PlotLabel(xLabel: "X", yLabel: "Frequency")
+
+histogram.drawGraphAndOutput(fileName: filePath+"agg/"+fileName, renderer: agg_renderer)
+histogram.drawGraphAndOutput(fileName: filePath+"svg/"+fileName, renderer: svg_renderer)