-
Notifications
You must be signed in to change notification settings - Fork 2
Expand file tree
/
Copy pathDeprecated.jl
More file actions
214 lines (195 loc) · 7.99 KB
/
Deprecated.jl
File metadata and controls
214 lines (195 loc) · 7.99 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
## ================================================================================
## Deprecated in v0.27
##=================================================================================
@deprecate getNeighborhood(args...; kwargs...) listNeighborhood(args...; kwargs...)
@deprecate addBlob!(store::AbstractBlobStore, blobId::UUID, data, ::String) addBlob!(
store,
blobId,
data,
)
@deprecate addBlob!(store::AbstractBlobStore{T}, data::T, ::String) where {T} addBlob!(
store,
uuid4(),
data,
)
@deprecate updateVariable!(args...) mergeVariable!(args...)
@deprecate updateFactor!(args...) mergeFactor!(args...)
@deprecate updateBlobEntry!(args...) mergeBlobentry!(args...)
@deprecate updateGraphBlobEntry!(args...) mergeGraphBlobentry!(args...)
@deprecate updateAgentBlobEntry!(args...) mergeAgentBlobentry!(args...)
export updateVariableSolverData!
#TODO possibly completely deprecated or not exported until update verb is standardized
function updateVariableSolverData!(
dfg::AbstractDFG,
variablekey::Symbol,
vnd::VariableNodeData,
useCopy::Bool = false,
fields::Vector{Symbol} = Symbol[];
warn_if_absent::Bool = true,
)
#This is basically just setSolverData
var = getVariable(dfg, variablekey)
warn_if_absent &&
!haskey(var.solverDataDict, vnd.solveKey) &&
@warn "VariableNodeData '$(vnd.solveKey)' does not exist, adding"
# for InMemoryDFGTypes do memory copy or repointing, for cloud this would be an different kind of update.
usevnd = vnd # useCopy ? deepcopy(vnd) : vnd
# should just one, or many pointers be updated?
useExisting =
haskey(var.solverDataDict, vnd.solveKey) &&
isa(var.solverDataDict[vnd.solveKey], VariableNodeData) &&
length(fields) != 0
# @error useExisting vnd.solveKey
if useExisting
# change multiple pointers inside the VND var.solverDataDict[solvekey]
for field in fields
destField = getfield(var.solverDataDict[vnd.solveKey], field)
srcField = getfield(usevnd, field)
if isa(destField, Array) && size(destField) == size(srcField)
# use broadcast (in-place operation)
destField .= srcField
else
# change pointer of destination VND object member
setfield!(var.solverDataDict[vnd.solveKey], field, srcField)
end
end
else
# change a single pointer in var.solverDataDict
var.solverDataDict[vnd.solveKey] = usevnd
end
return var.solverDataDict[vnd.solveKey]
end
function updateVariableSolverData!(
dfg::AbstractDFG,
variablekey::Symbol,
vnd::VariableNodeData,
solveKey::Symbol,
useCopy::Bool = false,
fields::Vector{Symbol} = Symbol[];
warn_if_absent::Bool = true,
)
# TODO not very clean
if vnd.solveKey != solveKey
@warn(
"updateVariableSolverData with solveKey parameter might change in the future, see DFG #565. Future warnings are suppressed",
maxlog = 1
)
usevnd = useCopy ? deepcopy(vnd) : vnd
usevnd.solveKey = solveKey
return updateVariableSolverData!(
dfg,
variablekey,
usevnd,
useCopy,
fields;
warn_if_absent = warn_if_absent,
)
else
return updateVariableSolverData!(
dfg,
variablekey,
vnd,
useCopy,
fields;
warn_if_absent = warn_if_absent,
)
end
end
function updateVariableSolverData!(
dfg::AbstractDFG,
sourceVariable::VariableCompute,
solveKey::Symbol = :default,
useCopy::Bool = false,
fields::Vector{Symbol} = Symbol[];
warn_if_absent::Bool = true,
)
#
vnd = getSolverData(sourceVariable, solveKey)
# toshow = listSolveKeys(sourceVariable) |> collect
# @info "update DFGVar solveKey" solveKey vnd.solveKey
# @show toshow
@assert solveKey == vnd.solveKey "VariableNodeData's solveKey=:$(vnd.solveKey) does not match requested :$solveKey"
return updateVariableSolverData!(
dfg,
sourceVariable.label,
vnd,
useCopy,
fields;
warn_if_absent = warn_if_absent,
)
end
function updateVariableSolverData!(
dfg::AbstractDFG,
sourceVariables::Vector{<:VariableCompute},
solveKey::Symbol = :default,
useCopy::Bool = false,
fields::Vector{Symbol} = Symbol[];
warn_if_absent::Bool = true,
)
#I think cloud would do this in bulk for speed
for var in sourceVariables
updateVariableSolverData!(
dfg,
var.label,
getSolverData(var, solveKey),
useCopy,
fields;
warn_if_absent = warn_if_absent,
)
end
end
## ================================================================================
## Deprecated in v0.25
##=================================================================================
@deprecate getSessionBlobEntry(args...) getGraphBlobEntry(args...)
@deprecate getSessionBlobEntries(args...) getGraphBlobEntries(args...)
@deprecate addSessionBlobEntry!(args...) addGraphBlobEntry!(args...)
@deprecate addSessionBlobEntries!(args...) addGraphBlobEntries!(args...)
@deprecate updateSessionBlobEntry!(args...) updateGraphBlobEntry!(args...)
@deprecate deleteSessionBlobEntry!(args...) deleteGraphBlobEntry!(args...)
@deprecate getRobotBlobEntry(args...) getAgentBlobEntry(args...)
@deprecate getRobotBlobEntries(args...) getAgentBlobEntries(args...)
@deprecate addRobotBlobEntry!(args...) addAgentBlobEntry!(args...)
@deprecate addRobotBlobEntries!(args...) addAgentBlobEntries!(args...)
@deprecate updateRobotBlobEntry!(args...) updateAgentBlobEntry!(args...)
@deprecate deleteRobotBlobEntry!(args...) deleteAgentBlobEntry!(args...)
@deprecate getUserBlobEntry(args...) getAgentBlobEntry(args...)
@deprecate getUserBlobEntries(args...) getAgentBlobEntries(args...)
@deprecate addUserBlobEntry!(args...) addAgentBlobEntry!(args...)
@deprecate addUserBlobEntries!(args...) addAgentBlobEntries!(args...)
@deprecate updateUserBlobEntry!(args...) updateAgentBlobEntry!(args...)
@deprecate deleteUserBlobEntry!(args...) deleteAgentBlobEntry!(args...)
@deprecate listSessionBlobEntries(args...) listGraphBlobEntries(args...)
@deprecate listRobotBlobEntries(args...) listAgentBlobEntries(args...)
@deprecate listUserBlobEntries(args...) listAgentBlobEntries(args...)
@deprecate getUserData(args...) getAgentMetadata(args...)
@deprecate getRobotData(args...) getAgentMetadata(args...)
@deprecate getSessionData(args...) getGraphMetadata(args...)
@deprecate setUserData!(args...) setAgentMetadata!(args...)
@deprecate setRobotData!(args...) setAgentMetadata!(args...)
@deprecate setSessionData!(args...) setGraphMetadata!(args...)
@deprecate getUserLabel(dfg) getAgentLabel(dfg)
@deprecate getRobotLabel(dfg) getAgentLabel(dfg)
@deprecate getSessionLabel(dfg) getGraphLabel(dfg)
export DFGSummary
DFGSummary(args) = error("DFGSummary is deprecated")
@deprecate getSummary(dfg::AbstractDFG) getSummaryGraph(dfg)
@deprecate getKey(store::AbstractBlobStore) getLabel(store)
##------------------------------------------------------------------------------
## smallData
##------------------------------------------------------------------------------
@deprecate getSmallData(args...) getMetadata(args...)
@deprecate setSmallData!(args...) setMetadata!(args...)
@deprecate addSmallData!(args...) addMetadata!(args...)
@deprecate updateSmallData!(args...) updateMetadata!(args...)
@deprecate deleteSmallData!(args...) deleteMetadata!(args...)
@deprecate listSmallData(args...) listMetadata(args...)
@deprecate emptySmallData!(args...) emptyMetadata!(args...)
## ================================================================================
## Deprecated in v0.24
##=================================================================================
@deprecate getBlobEntry(var::AbstractDFGVariable, key::AbstractString) getBlobEntryFirst(
var,
Regex(key),
)
@deprecate lsfWho(dfg::AbstractDFG, type::Symbol) lsf(dfg, getfield(Main, type))