redo HomotopyDensityDFG, creep change serialization approach#1231
Draft
redo HomotopyDensityDFG, creep change serialization approach#1231
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| @@ -0,0 +1,163 @@ | |||
|
|
|||
|
|
|||
Contributor
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #1231 +/- ##
===========================================
- Coverage 80.85% 80.69% -0.17%
===========================================
Files 49 50 +1
Lines 2648 2657 +9
===========================================
+ Hits 2141 2144 +3
- Misses 507 513 +6 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Co-authored-by: Johannes Terblanche <Affie@users.noreply.github.com>
Comment on lines
+2
to
+3
|
|
||
|
|
Contributor
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| refBandwidths(state::State) = values(state.belief.trailing_details) # FIXME, unordered will be a problem | ||
| getTopologyKind(state::State) = state.belief.topologykind | ||
|
|
||
|
|
Contributor
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
Comment on lines
+17
to
+30
| showerr = true | ||
| ret = if f === :means | ||
| getfield(obj, :principal_elements) | ||
| elseif f === :shapes | ||
| getfield(obj, :principal_details) | ||
| elseif f === :bandwidths | ||
| getfield(obj, :trailing_details) | ||
| else | ||
| showerr = false | ||
| getfield(obj, f) | ||
| end | ||
|
|
||
| showerr && @error("HomotopyDensityDFG field access with $(f) is deprecated") | ||
| return ret |
Contributor
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| showerr = true | |
| ret = if f === :means | |
| getfield(obj, :principal_elements) | |
| elseif f === :shapes | |
| getfield(obj, :principal_details) | |
| elseif f === :bandwidths | |
| getfield(obj, :trailing_details) | |
| else | |
| showerr = false | |
| getfield(obj, f) | |
| end | |
| showerr && @error("HomotopyDensityDFG field access with $(f) is deprecated") | |
| return ret | |
| showerr = true | |
| ret = if f === :means | |
| getfield(obj, :principal_elements) | |
| elseif f === :shapes | |
| getfield(obj, :principal_details) | |
| elseif f === :bandwidths | |
| getfield(obj, :trailing_details) | |
| else | |
| showerr = false | |
| getfield(obj, f) | |
| end | |
| showerr && @error("HomotopyDensityDFG field access with $(f) is deprecated") | |
| return ret |
Comment on lines
+34
to
+44
| showerr = true | ||
| ret = if f === :means | ||
| setfield!(obj, :principal_elements, val) | ||
| elseif f === :shapes | ||
| setfield!(obj, :principal_details, val) | ||
| elseif f === :bandwidths | ||
| setfield!(obj, :trailing_details, val) | ||
| else | ||
| showerr = false | ||
| setfield!(obj, f, val) | ||
| end |
Contributor
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| showerr = true | |
| ret = if f === :means | |
| setfield!(obj, :principal_elements, val) | |
| elseif f === :shapes | |
| setfield!(obj, :principal_details, val) | |
| elseif f === :bandwidths | |
| setfield!(obj, :trailing_details, val) | |
| else | |
| showerr = false | |
| setfield!(obj, f, val) | |
| end | |
| showerr = true | |
| ret = if f === :means | |
| setfield!(obj, :principal_elements, val) | |
| elseif f === :shapes | |
| setfield!(obj, :principal_details, val) | |
| elseif f === :bandwidths | |
| setfield!(obj, :trailing_details, val) | |
| else | |
| showerr = false | |
| setfield!(obj, f, val) | |
| end |
Comment on lines
+46
to
+47
| showerr && @error("HomotopyDensityDFG field access with $(f) is deprecated") | ||
| return ret |
Contributor
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| showerr && @error("HomotopyDensityDFG field access with $(f) is deprecated") | |
| return ret | |
| showerr && @error("HomotopyDensityDFG field access with $(f) is deprecated") | |
| return ret |
| end | ||
|
|
||
| @choosetype HomotopyDensityDFG resolveHomotopyDensityDFGType | ||
|
|
Contributor
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| refBandwidth(state::State) = state.belief.bandwidths[1] | ||
| refBandwidths(state::State) = state.belief.bandwidths | ||
| getTopologyKind(state::State) = state.belief.topologykind | ||
|
|
Contributor
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| ) | ||
| return dfg.solverParams | ||
| end | ||
|
|
Contributor
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| refPoints(a) != refPoints(b) && @debug("val is not equal") === nothing && return false | ||
| refBandwidths(a) != refBandwidths(b) && | ||
| TP = true | ||
| for (k,v) in refBandwidths(a) |
Contributor
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| for (k,v) in refBandwidths(a) | |
| for (k, v) in refBandwidths(a) |
Comment on lines
+163
to
165
| !TP && | ||
| @debug("bw is not equal") === nothing && | ||
| return false |
Contributor
There was a problem hiding this comment.
[JuliaFormatter] reported by reviewdog 🐶
Suggested change
| !TP && | |
| @debug("bw is not equal") === nothing && | |
| return false | |
| !TP && @debug("bw is not equal") === nothing && return false |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Alternative redo of -- creep change implementation of serialization:
At the time of writing, 1230 is good enough for AMP v0.15.0-alpha tests to pass. This redo is easiest path to make sure DFG serialization also works for new HomotopyDensityDFG (replaces StoredHomotopyBelief). Some detail on abstracts in new HomotopyRepr