Skip to content
This repository was archived by the owner on Sep 4, 2024. It is now read-only.

fixing coverage #51

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ env:
before_script:
- julia -e 'using Pkg;
Pkg.add(PackageSpec(name="MbedTLS", version="0.6.6"));
Pkg.pin(PackageSpec(name="MbedTLS", version="0.6.6"));'
Pkg.pin(PackageSpec(name="MbedTLS", version="0.6.6"));
Pkg.update();'

script:
- if [ $JULIA_COVERAGE_VERSION == $TRAVIS_JULIA_VERSION ]; then export PUSH_COVERAGE=true; else export PUSH_COVERAGE=false; fi
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
* ![enhancement](https://img.shields.io/badge/PD-enhancement-%23a2eeef.svg) [fixing node docs](https://github.com/JuliaEnergy/PowerDynBase.jl/pull/46)
* ![miscellaneous](https://img.shields.io/badge/PD-miscellaneous-lightgrey.svg) [add Sabine Auer to AUTHORS](https://github.com/JuliaEnergy/PowerDynBase.jl/pull/45)
* ![bugfix](https://img.shields.io/badge/PD-bugfix-%23d73a4a.svg) [temporarily pin MbedTLS version to 0.6.6 to fix travis ci issue](https://github.com/JuliaEnergy/PowerDynBase.jl/pull/49)
* ![bugfix](https://img.shields.io/badge/PD-bugfix-%23d73a4a.svg) [adding a package update before the tests in travis to ensure the latest packges are used](https://github.com/JuliaEnergy/PowerDynBase.jl/pull/50)
3 changes: 2 additions & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ SymPy = ">=0.8"
Crayons = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f"
SymPy = "24249f21-da20-56a4-8eb1-6a02cf4ae2e6"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Suppressor = "fd094767-a336-5f1f-9728-57cf17d0bbfb"

[targets]
test = ["Test", "SymPy", "Crayons"]
test = ["Test", "SymPy", "Crayons", "Suppressor"]
3 changes: 0 additions & 3 deletions src/DEVariables.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
import Base: length, view, @__doc__
using MacroTools

issymbol(::Symbol) = true
issymbol(::Any) = false

"""
abstract type AbstractDEVariable end

Expand Down
3 changes: 0 additions & 3 deletions src/NetwirkRHSs.jl
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# (C) 2018 Potsdam Institute for Climate Impact Research, authors and contributors (see AUTHORS file)
# Licensed under GNU GPL v3 (see LICENSE file)

"Get the total number of internal variables for an array of node dynamics."
total_nint(nodes::AbstractVector{<:AbstractNodeDynamics}) = sum(nint, nodes)

"""
Get the total number of dynamic variables for an array of node dynamics.

Expand Down
7 changes: 0 additions & 7 deletions src/NodeDynamicsBase.jl
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,6 @@ function (dyn::OrdinaryNodeDynamics)(n, u::ODEVariable, i,
nothing
end

"Identify each subtype of [`AbstractNodeDynamics`](@ref) with its corresponding subtype of [`AbstractDEVariable`](@ref)"
getDEVariableType(::Type{Val{OrdinaryNodeDynamics}}) = ODEVariable

"Get number of internal arguments of the node."
nint(dyn::OrdinaryNodeDynamics) = dyn.n_int

Expand Down Expand Up @@ -129,8 +126,6 @@ OrdinaryNodeDynamicsWithMass(;rhs::Function, n_int, m_u, m_int, parameters) = Or
m_u, m_int)
(dyn::OrdinaryNodeDynamicsWithMass)(args...;kwargs...) = dyn.ode_dynamics(args...;kwargs...)

getDEVariableType(::Type{Val{OrdinaryNodeDynamicsWithMass}}) = ODEVariable

nint(dyn::OrdinaryNodeDynamicsWithMass) = nint(dyn.ode_dynamics)

OrdinaryNodeDynamics(n::OrdinaryNodeDynamicsWithMass) = n.ode_dynamics
Expand Down Expand Up @@ -177,8 +172,6 @@ function (dyn::AlgebraicNodeDynamics)(i, u::DAEVariable, i_c,
nothing
end

getDEVariableType(::Type{Val{AlgebraicNodeDynamics}}) = DAEVariable

nint(dyn::AlgebraicNodeDynamics) = dyn.n_int

parametersof(n::AlgebraicNodeDynamics) = n.parameters
Expand Down
6 changes: 6 additions & 0 deletions test/dynamicnodemacro.jl
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,9 @@ full_macro_return_test = quote
$(symbolsof_fct_test)
end |> rlr |> rsb
@test full_macro_return == full_macro_return_test

struct UnknownDynamicsWithMass{N <: AbstractNodeParameters} <: PowerDynBase.AbstractNodeDynamics{N} end
@test_throws PowerDynBase.NodeDynamicsError PowerDynBase.cndfunction_builder!(Val{UnknownDynamicsWithMass})
@test_throws PowerDynBase.NodeDynamicsError PowerDynBase.generate_symbolsof_fct(Val{UnknownDynamicsWithMass}, nothing, nothing)

@test_nowarn @suppress showdefinition(SwingEq)
2 changes: 1 addition & 1 deletion test/outputanderrors.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ include("testing_base.jl")
using Crayons

struct DummyNodeDynamics{N <: PowerDynBase.AbstractNodeParameters} <: PowerDynBase.AbstractNodeDynamics{N} end
let
@suppress_out let
println(Crayon(foreground = :light_gray), "OUTPUT TESTS:")
@test_nowarn println(PQAlgebraic)
@test_nowarn println(SwingEq)
Expand Down
2 changes: 1 addition & 1 deletion test/testing_base.jl
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ begin
using Test
using Random
random_seed = 1234
@show random_seed
Random.seed!(random_seed)
using LinearAlgebra
using Suppressor
end

begin
Expand Down