Skip to content

Commit 2555f88

Browse files
committed
save multihypo,
fixes #345
1 parent 0fda37d commit 2555f88

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/entities/DFGFactor.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ mutable struct GenericFunctionNodeData{T, S}
2727
edgeIDs::Array{Int,1}
2828
frommodule::S #Union{Symbol, AbstractString}
2929
fnc::T
30-
multihypo::String # likely to moved when GenericWrapParam is refactored
30+
multihypo::Array{Float64} # likely to moved when GenericWrapParam is refactored
3131
certainhypo::Vector{Int}
3232
solveInProgress::Int
3333
GenericFunctionNodeData{T, S}() where {T, S} = new{T,S}()
34-
GenericFunctionNodeData{T, S}(x1, x2, x3, x4, x5::S, x6::T, x7::String="", x8::Vector{Int}=Int[], x9::Int=0) where {T, S} = new{T,S}(x1, x2, x3, x4, x5, x6, x7, x8, x9)
35-
GenericFunctionNodeData(x1, x2, x3, x4, x5::S, x6::T, x7::String="", x8::Vector{Int}=Int[], x9::Int=0) where {T, S} = new{T,S}(x1, x2, x3, x4, x5, x6, x7, x8, x9)
34+
GenericFunctionNodeData{T, S}(x1, x2, x3, x4, x5::S, x6::T, multihypo::Vector{<:Real}=Float64[], x8::Vector{Int}=Int[], x9::Int=0) where {T, S} = new{T,S}(x1, x2, x3, x4, x5, x6, multihypo, x8, x9)
35+
GenericFunctionNodeData(x1, x2, x3, x4, x5::S, x6::T, multihypo::Vector{<:Real}=Float64[], x8::Vector{Int}=Int[], x9::Int=0) where {T, S} = new{T,S}(x1, x2, x3, x4, x5, x6, multihypo, x8, x9)
3636
# GenericFunctionNodeData(x1, x2, x3, x4, x5::S, x6::T, x7::String) where {T, S} = new{T,S}(x1, x2, x3, x4, x5, x6, x7)
3737
end
3838

@@ -43,9 +43,9 @@ end
4343

4444
# Simply for convenience - don't export, TODO Its used in IIF so maybe it should be exported
4545
const PackedFunctionNodeData{T} = GenericFunctionNodeData{T, <: AbstractString}
46-
PackedFunctionNodeData(x1, x2, x3, x4, x5::S, x6::T, x7::String="", x8::Vector{Int}=Int[], x9::Int=0) where {T <: PackedInferenceType, S <: AbstractString} = GenericFunctionNodeData(x1, x2, x3, x4, x5, x6, x7, x8, x9)
46+
PackedFunctionNodeData(x1, x2, x3, x4, x5::S, x6::T, multihypo::Vector{Float64}=[], x8::Vector{Int}=Int[], x9::Int=0) where {T <: PackedInferenceType, S <: AbstractString} = GenericFunctionNodeData(x1, x2, x3, x4, x5, x6, multihypo, x8, x9)
4747
const FunctionNodeData{T} = GenericFunctionNodeData{T, Symbol}
48-
FunctionNodeData(x1, x2, x3, x4, x5::Symbol, x6::T, x7::String="", x8::Vector{Int}=Int[], x9::Int=0) where {T <: Union{FunctorInferenceType, ConvolutionObject}}= GenericFunctionNodeData{T, Symbol}(x1, x2, x3, x4, x5, x6, x7, x8, x9)
48+
FunctionNodeData(x1, x2, x3, x4, x5::Symbol, x6::T, multihypo::Vector{Float64}=[], x8::Vector{Int}=Int[], x9::Int=0) where {T <: Union{FunctorInferenceType, ConvolutionObject}}= GenericFunctionNodeData{T, Symbol}(x1, x2, x3, x4, x5, x6, multihypo, x8, x9)
4949

5050
##==============================================================================
5151
## Factors

0 commit comments

Comments
 (0)