Applied JuliaFormatter

Author: JulStraus

src/strat_scenarios/core_types.jl

@@ -53,12 +53,12 @@ mutable struct TwoLevelTree{S,T,OP<:AbstractTreeNode{S,T}} <: TimeStructure{T}
     nodes::Vector{OP}
     op_per_strat::Float64
 end
-function TwoLevelTree(parent::TreeNode; op_per_strat=1.0)
+function TwoLevelTree(parent::TreeNode; op_per_strat = 1.0)
     nodes = StratNode[]
 
     add_node!(nodes, parent, nothing, 1.0, 1, op_per_strat)
     nodes = convert(Array{typejoin(typeof.(nodes)...)}, nodes)
-    len = maximum([_strat_per(sn) for sn ∈ nodes])
+    len = maximum([_strat_per(sn) for sn in nodes])
 
     return TwoLevelTree(len, nodes[1], nodes, op_per_strat)
 end
@@ -69,13 +69,12 @@ function TwoLevelTree(
     op_per_strat::Float64 = 1.0,
 ) where {S,T,OP<:TimeStructure{T}}
     node = TreeNode(duration, ts)
-    for k ∈ reverse(branching)
+    for k in reverse(branching)
         node = TreeNode(duration, ts, k, node)
     end
     return TwoLevelTree(node; op_per_strat)
 end
 
-
 function _multiple_adj(itr::TwoLevelTree, n)
     mult =
         itr.nodes[n].duration * itr.op_per_strat / _total_duration(itr.nodes[n].operational)
@@ -241,13 +240,12 @@ Iterative addition of a `TreeNode` `node` to a `Vector{<:StratNode}` .
 # Ignored docstring, just fyi in this case
 function add_node!(
     nodes::Vector{<:StratNode},
-    node::TreeNode{S, T, OP, U},
+    node::TreeNode{S,T,OP,U},
     parent::Union{Nothing,StratNode},
     prob::Float64,
     sp::Int64,
     op_per_strat::Real,
 ) where {S,T,OP<:TimeStructure{T},U}
-
     oper = node.ts
     new_node = StratNode(
         sp,

src/utils.jl

@@ -166,7 +166,6 @@ function Base.iterate(w::ChunkDuration, state = nothing)
     return next, n[2]
 end
 
-
 function chunk_duration(_::StratTreeNodes{S,T,OP}, _) where {S,T,OP}
     return error(
         "`chunk_duration` can not be used when iterating nodes of a strategic tree structure.",

test/runtests.jl

@@ -978,18 +978,22 @@ end
 
     # Equivalent structure using `TreeNode` and the different constructors
     regtree_3 = TwoLevelTree(
-            TreeNode(5, day, [
-                TreeNode(5, day, 2,
-                    TreeNode(5, day, TreeNode(5, day))
+        TreeNode(
+            5,
+            day,
+            [
+                TreeNode(5, day, 2, TreeNode(5, day, TreeNode(5, day)))
+                TreeNode(5, day, [0.5, 0.5], TreeNode(5, day, TreeNode(5, day)))
+                TreeNode(
+                    5,
+                    day,
+                    [
+                        TreeNode(5, day, TreeNode(5, day)),
+                        TreeNode(5, day, TreeNode(5, day)),
+                    ],
                 )
-                TreeNode(5, day, [0.5, 0.5],
-                    TreeNode(5, day, TreeNode(5, day))
-                )
-                TreeNode(5, day, [
-                    TreeNode(5, day, TreeNode(5, day)),
-                    TreeNode(5, day, TreeNode(5, day)),
-                ])
-            ])
+            ],
+        ),
     )
 
     # Test that they are equivalent
@@ -1153,8 +1157,7 @@ end
 end
 
 @testitem "TwoLevelTree with RepresentativePeriods" setup = [TwoLevelTreeTest] begin
-    regtree =
-        TwoLevelTree(5, [3, 2], RepresentativePeriods(2, 1, SimpleTimes(5, 1)))
+    regtree = TwoLevelTree(5, [3, 2], RepresentativePeriods(2, 1, SimpleTimes(5, 1)))
     n_sp = 10
     n_rp = n_sp * 2
     n_op = n_rp * 5