Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion include/xtensor/io/xio.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "../core/xexpression.hpp"
#include "../core/xmath.hpp"
#include "../views/xstrided_view.hpp"
#include "xtl/xmasked_value_meta.hpp"

namespace xt
{
Expand Down Expand Up @@ -646,7 +647,14 @@ namespace xt
void update(const_reference val)
{
std::stringstream buf;
buf << val;
if constexpr (xtl::is_xmasked_value<value_type>::value)
{
buf << +val;
}
else
{
buf << val;
}
std::string s = buf.str();
if (int(s.size()) > m_width)
{
Expand Down
17 changes: 17 additions & 0 deletions test/test_xmasked_view.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
* The full license is in the file LICENSE, distributed with this software. *
****************************************************************************/

#include <sstream>

#include "xtensor/io/xio.hpp"
#include "xtensor/optional/xoptional_assembly.hpp"
#include "xtensor/views/xmasked_view.hpp"
Expand Down Expand Up @@ -210,6 +212,21 @@ namespace xt
EXPECT_EQ(data, expected2);
}

TEST(xmasked_view, non_optional_data_stream)
{
const xarray<double> data = {{1., 5., 3.}, {4., 5., 6.}};
const xarray<bool> mask = {{true, false, false}, {false, true, false}};

const auto masked_data = masked_view(data, mask);

std::stringstream out;
out << masked_data;

const std::string expected = "{{ 1, masked, masked},\n"
" {masked, 5, masked}}";
EXPECT_EQ(out.str(), expected);
}

TEST(xmasked_view, assign)
{
xarray<double> data = {{1., -2., 3.}, {4., 5., -6.}, {7., 8., -9.}};
Expand Down
Loading