Formatting changes

Author: ConnectedSystems

ext/MakieExt/MakieExt.jl

@@ -82,15 +82,15 @@ function Streamfall.Viz.quickplot(obs::Vector, sim::Vector, xticklabels::Vector,
         # Add small constant in case of 0-flow
         obs = copy(obs)
         sim = copy(sim)
-        obs[obs .== 0.0] .+= 1e-4
-        sim[sim .== 0.0] .+= 1e-4
+        obs[obs.==0.0] .+= 1e-4
+        sim[sim.==0.0] .+= 1e-4
     end
 
     scale = log == false ? identity : log10
 
-    f = Figure(size=(850,400))
-    flow_ax = Axis(f[1,1]; xlabel="Date", ylabel="Streamflow", yscale=scale)
-    qq_ax = Axis(f[1,2]; xlabel="Observed", ylabel="Modeled", xscale=scale, yscale=scale)
+    f = Figure(size=(850, 400))
+    flow_ax = Axis(f[1, 1]; xlabel="Date", ylabel="Streamflow", yscale=scale)
+    qq_ax = Axis(f[1, 2]; xlabel="Observed", ylabel="Modeled", xscale=scale, yscale=scale)
 
     label = "$(label) ($(metric_name): $(score))"
     lines!(flow_ax, xticklabels, obs, label="Observed")
@@ -218,7 +218,7 @@ function Streamfall.Viz.temporal_cross_section(
         ax.xticks = (1:12:length(xlabels), xlabels[1:12:end])
     end
 
-    ax.xticklabelrotation = π/4
+    ax.xticklabelrotation = π / 4
 
     # Apply log scale if specified
     if !isnothing(tmp) && (tmp in logscale)
@@ -360,7 +360,7 @@ function Streamfall.Viz.temporal_cross_section(
         ax.xticks = (1:12:length(xlabels), xlabels[1:12:end])
     end
 
-    ax.xticklabelrotation = π/4
+    ax.xticklabelrotation = π / 4
 
     # Apply log scale if specified
     if !isnothing(tmp) && (tmp in logscale)

src/plotting.jl

@@ -75,7 +75,7 @@ function quickplot(obs::Vector, sim::Vector, xticklabels::Vector, label="Modeled
         yaxis!(qqfig, :log10)
     end
 
-    combined = plot(fig, qqfig, size=(1000, 500), left_margin=10mm, bottom_margin=5mm, layout=(1,2))
+    combined = plot(fig, qqfig, size=(1000, 500), left_margin=10mm, bottom_margin=5mm, layout=(1, 2))
 
     return combined
 end
@@ -96,9 +96,9 @@ Plot residual between two sequences.
 function plot_residuals(x::Array, y::Array; xlabel="", ylabel="", title="")
     # 1:1 Plot
     fig_1to1 = scatter(x, y, legend=false,
-                       markerstrokewidth=0, markerstrokealpha=0, alpha=0.2)
+        markerstrokewidth=0, markerstrokealpha=0, alpha=0.2)
     plot!(x, y, color=:red, markersize=0.1, markerstrokewidth=0,
-    xlabel=xlabel, ylabel=ylabel, title=title)
+        xlabel=xlabel, ylabel=ylabel, title=title)
 
     return fig_1to1
 end
@@ -130,9 +130,9 @@ Filters out leap days.
 - `period::Function` : Method from `Dates` package to group (defaults to `monthday`)
 """
 function temporal_cross_section(dates, obs;
-                                title="", ylabel="ME", label=nothing,
-                                period::Function=monthday,
-                                kwargs...)  # show_extremes::Bool=false,
+    title="", ylabel="ME", label=nothing,
+    period::Function=monthday,
+    kwargs...)  # show_extremes::Bool=false,
     if isnothing(label)
         label = ylabel
     end
@@ -190,20 +190,22 @@ function temporal_cross_section(dates, obs;
 
     fig = plot(xlabels, lower_95, fillrange=upper_95, color="lightblue", alpha=0.3, label="CI₉₅ μ: $(wr95_m_ind), σ: $(wr95_sd_ind)", linealpha=0)
     plot!(fig, xlabels, lower_75, fillrange=upper_75, color="lightblue", alpha=0.5, label="CI₇₅ μ: $(wr75_m_ind), σ: $(wr75_sd_ind)", linealpha=0)
-    plot!(fig, xlabels, x_section,
-            label="Mean of $(label) μ: $(m_ind), σ: $(sd_ind)",
-            color="black",
-            xlabel=nameof(period),
-            ylabel=ylabel,
-            legend=:bottomleft,
-            legendfont=Plots.font(10),
-            fg_legend=:transparent,
-            bg_legend=:transparent,
-            left_margin=5mm,
-            bottom_margin=5mm,
-            title=title,
-            yformatter=format_func;
-            kwargs...)
+    plot!(
+        fig, xlabels, x_section,
+        label="Mean of $(label) μ: $(m_ind), σ: $(sd_ind)",
+        color="black",
+        xlabel=nameof(period),
+        ylabel=ylabel,
+        legend=:bottomleft,
+        legendfont=Plots.font(10),
+        fg_legend=:transparent,
+        bg_legend=:transparent,
+        left_margin=5mm,
+        bottom_margin=5mm,
+        title=title,
+        yformatter=format_func;
+        kwargs...
+    )
 
     # if show_extremes
     #     scatter!(fig, xlabels, min_section, label="", alpha=0.5, color="lightblue", markerstrokewidth=0; kwargs...)
@@ -346,7 +348,7 @@ function plot(node::DamNode, climate::Climate)
     levels = plot(timesteps(climate), node.level, xlabel="Date", ylabel="Dam Level", label=node.name)
     outflows = plot(timesteps(climate), node.outflow, xlabel="Date", ylabel="Discharge", label=node.name)
 
-    combined = plot(levels, outflows, size=(1000, 400), left_margin=10mm, bottom_margin=5mm, layout=(1,2))
+    combined = plot(levels, outflows, size=(1000, 400), left_margin=10mm, bottom_margin=5mm, layout=(1, 2))
 
     return combined
 end