Skip to content

Only jsf parts of #60#62

Open
nilsbore wants to merge 3 commits intomasterfrom
only_jsf
Open

Only jsf parts of #60#62
nilsbore wants to merge 3 commits intomasterfrom
only_jsf

Conversation

@nilsbore
Copy link
Owner

Cherry-picking the parts out of #60 that are relevant for parsing jsf. The xtf parts that John have done will need a separate PR to figure out what is causing the windows build failure.

1. Added sample_interval for jsf_sss_ping
2. Added python interface for jsf_dvl_ping
1. Added altitude, validity flag, sample interval for jsf_sss_ping
2. Added function match_sound_vel to match sound velocity from jsf_dvl_ping to jsf_sss_ping and calculate the max slant range
@nilsbore nilsbore changed the title Only jsf parts of https://github.com/nilsbore/auvlib/pull/60 Only jsf parts of #60 Aug 10, 2020
@nilsbore nilsbore mentioned this pull request Aug 10, 2020
@nilsbore
Copy link
Owner Author

@xyp8023 So these are only the jsf parts but it's still failing on windows for some reason. I've rebuilt the current master on CI and it's still building so it's not a problem with CI having been updated.


jsf_sss_ping::PingsT match_sound_vel(jsf_sss_ping::PingsT& sss_pings, jsf_dvl_ping::PingsT& dvl_pings)
{
std::stable_sort(dvl_pings.begin(), dvl_pings.end(), [](const jsf_dvl_ping& dvl_ping1, const jsf_dvl_ping& dvl_ping2) {
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, so my suspicion are actually these two stable_sort invocations. There seems to be some template instantiation problem here that causes a static_assert.

@nilsbore
Copy link
Owner Author

Suspicion confirmed: #63 builds.

@xyp8023
Copy link
Contributor

xyp8023 commented Aug 26, 2020

Maybe we can do something like this?:

if (MSVC AND ${MSVC_VERSION} GREATER_EQUAL 1915)
target_compile_definitions( ${target_name} PRIVATE _ENABLE_EXTENDED_ALIGNED_STORAGE )
endif()

@nilsbore
Copy link
Owner Author

If that fixes the problem, that would be a good way to do it. Please open another PR with that change to see if it builds. Make sure to base it on the only_jsf branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants