Update jsf_data library#60
Conversation
Up to date with Nils' auvlib
1. modified the xtf_reader.c to read Hugin files (copy John's code) 2. printed the slant range as float number 3. set the input to be parsed in test_xtf as non-hard-coded
copied John's code for preprocess here 1. Added find_nadir, normalize, and regularize sss 2. Updated the README.md for preprocess
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
|
I don't know why travis is not showing, but that seems to have worked: https://travis-ci.org/github/nilsbore/auvlib/builds/669798473 |
|
The windows build failed, I'm trying to find out why |
|
I found someone says: "Adding the line ADD_COMPILE_FLAG("/D_ENABLE_EXTENDED_ALIGNED_STORAGE") to CMakeLists.txt" could fix it. |
|
Oh, that is actually for CMakeLists.txt of VS2017. |
|
But I don't see the actual error in the appveyour output, do you? I see that you added some define for aligned storage, what is it used for? |
|
On another note, I have to review #58 before I can merge this (since this is working from that branch). I don't really grasp all of John's changes yet, so that will take a bit more time. In the future, try to keep new stuff on as clean a branch as possible. |
|
The error in the appveuour output is: [00:16:42] C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\include\type_traits(1271): error C2338: You've instantiated std::aligned_storage<Len, Align> with an extended alignment (in other words, Align > alignof(max_align_t)). Before VS 2017 15.8, the member type would non-conformingly have an alignment of only alignof(max_align_t). VS 2017 15.8 was fixed to handle this correctly, but the fix inherently changes layout and breaks binary compatibility (only for uses of aligned_storage with extended alignments). Please define either (1) _ENABLE_EXTENDED_ALIGNED_STORAGE to acknowledge that you understand this message and that you actually want a type with an extended alignment, or (2) _DISABLE_EXTENDED_ALIGNED_STORAGE to silence this message and get the old non-conformant behavior. [C:\projects\auvlib\build\src\data_tools\jsf_data.vcxproj] |
Right, I forgot to remove John's changes in the this branch. But I did try to use his code to parse the xtf files, it seemed to work. |
The line I added was no good, I misunderstood how other people have fixed it. |
|
Do you know which change of yours triggered this error with the aligned storage in the first place? I don't see anything that would have changed the behavior of the appveyor build, at least from a quick glance at your code. |
I am not sure, but I would guess it is in the "match_sound_vel" when I try to assign the sound_vel to jsf_sss_ping |
|
I think it might simply be that you are trying to serialize #include <cereal/types/unordered_map.hpp>) in std_data.h. And remove the define you added.
|
I will try that. |
But before this PR, there is std::unordered_map in jsf_dvl_ping already. |
|
Hmm, ok, there might be something else going on then... |
|
Yes, the culprit seems to be something else. Let's continue tomorrow. |
okay |
…_ping.flag_ to see what happens
|
The error seems to be in jsf_data.cpp between line 86 and line 448, because there is a warning at line 86 and another warning at line 448, but an error in between. [00:07:04] jsf_data.cpp |
|
Closing in favour of #62 |
2 participants
Hi, I added a few things in the jsf_data library, the main idea is to add python interface for jsf_dvl_ping, and match the sound velocity in jsf_dvl_ping to jsf_sss_ping, so that slant range can be calculated. Also a few attributes to jsf_sss_ping are added.