Skip to content

Commit c59a9c5

Browse files
author
Jack Dunham
committed
Rename laststep -> islaststep in fitting with Julia conventions.
1 parent 4ce453e commit c59a9c5

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/solvers/adapters.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ struct NoComputeStep{S<:AbstractNetworkIterator} <: AbstractNetworkIterator
99
parent::S
1010
end
1111

12-
laststep(adapter::NoComputeStep) = laststep(adapter.parent)
12+
islaststep(adapter::NoComputeStep) = islaststep(adapter.parent)
1313
state(adapter::NoComputeStep) = state(adapter.parent)
1414
increment!(adapter::NoComputeStep) = increment!(adapter.parent)
1515
compute!(adapter::NoComputeStep) = adapter
@@ -30,13 +30,13 @@ end
3030
eachregion(iter::SweepIterator) = EachRegion(iter)
3131

3232
# Essential definitions
33-
function laststep(adapter::EachRegion)
33+
function islaststep(adapter::EachRegion)
3434
region_iter = region_iterator(adapter.parent)
35-
return laststep(adapter.parent) && laststep(region_iter)
35+
return islaststep(adapter.parent) && islaststep(region_iter)
3636
end
3737
function increment!(adapter::EachRegion)
3838
region_iter = region_iterator(adapter.parent)
39-
laststep(region_iter) ? increment!(adapter.parent) : increment!(region_iter)
39+
islaststep(region_iter) ? increment!(adapter.parent) : increment!(region_iter)
4040
return adapter
4141
end
4242
function compute!(adapter::EachRegion)

src/solvers/iterators.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ this call is implict. Termination of the iterator is controlled by the function
99
abstract type AbstractNetworkIterator end
1010

1111
# We use greater than or equals here as we increment the state at the start of the iteration
12-
laststep(iterator::AbstractNetworkIterator) = state(iterator) >= length(iterator)
12+
islaststep(iterator::AbstractNetworkIterator) = state(iterator) >= length(iterator)
1313

1414
function Base.iterate(iterator::AbstractNetworkIterator, init=true)
15-
laststep(iterator) && return nothing
15+
islaststep(iterator) && return nothing
1616
# We seperate increment! from step! and demand that any AbstractNetworkIterator *must*
1717
# define a method for increment! This way we avoid cases where one may wish to nest
1818
# calls to different step! methods accidentaly incrementing multiple times.
@@ -83,7 +83,7 @@ function prev_region(region_iter::RegionIterator)
8383
end
8484

8585
function next_region(region_iter::RegionIterator)
86-
laststep(region_iter) && return nothing
86+
islaststep(region_iter) && return nothing
8787
next, _ = region_iter.region_plan[region_iter.which_region + 1]
8888
return next
8989
end
@@ -122,7 +122,7 @@ mutable struct SweepIterator{Problem,Iter} <: AbstractNetworkIterator
122122
end
123123
end
124124

125-
laststep(sweep_iter::SweepIterator) = isnothing(peek(sweep_iter.sweep_kwargs))
125+
islaststep(sweep_iter::SweepIterator) = isnothing(peek(sweep_iter.sweep_kwargs))
126126

127127
region_iterator(sweep_iter::SweepIterator) = sweep_iter.region_iter
128128
problem(sweep_iter::SweepIterator) = problem(region_iterator(sweep_iter))

0 commit comments

Comments
 (0)