Skip to content

Commit 6dd81e2

Browse files
committed
fix test with span
1 parent 39fd88f commit 6dd81e2

File tree

1 file changed

+22
-34
lines changed

1 file changed

+22
-34
lines changed

ponio/test/expressions.hxx

Lines changed: 22 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -336,12 +336,10 @@ TEST_CASE( "expressions::vector::expr3.1" )
336336

337337
TEST_CASE( "expressions::span::expr1.0" )
338338
{
339-
static constexpr std::size_t N = 5;
340-
using container_t = std::span<double>;
339+
using container_t = std::span<double>;
341340

342-
double raw_a[]{ 0., 1., 2., 3., 4. };
343-
double raw_b[]{ 9., 8., 7., 6., 5. };
344-
container_t a( raw_a, N ), b( raw_b, N );
341+
std::vector<double> raw_a{ 0., 1., 2., 3., 4. }, raw_b{ 9., 8., 7., 6., 5. };
342+
container_t a( raw_a.data(), raw_a.size() ), b( raw_b.data(), raw_b.size() );
345343
double result = 81;
346344

347345
auto va = ponio::expression::make_state( a );
@@ -364,12 +362,10 @@ TEST_CASE( "expressions::span::expr1.0" )
364362

365363
TEST_CASE( "expressions::span::expr1.1" )
366364
{
367-
static constexpr std::size_t N = 5;
368-
using container_t = std::span<double>;
365+
using container_t = std::span<double>;
369366

370-
double raw_a[]{ 0., 1., 2., 3., 4. };
371-
double raw_b[]{ 9., 8., 7., 6., 5. };
372-
container_t a( raw_a, N ), b( raw_b, N );
367+
std::vector<double> raw_a{ 0., 1., 2., 3., 4. }, raw_b{ 9., 8., 7., 6., 5. };
368+
container_t a( raw_a.data(), raw_a.size() ), b( raw_b.data(), raw_b.size() );
373369
double result = 81;
374370

375371
auto va = ponio::expression::make_state( a );
@@ -392,13 +388,11 @@ TEST_CASE( "expressions::span::expr1.1" )
392388

393389
TEST_CASE( "expressions::span::expr2.0" )
394390
{
395-
static constexpr std::size_t N = 5;
396-
using container_t = std::span<double>;
391+
using container_t = std::span<double>;
397392

398-
double raw_a[]{ 0., 1., 2., 3., 4. };
399-
double raw_b[]{ 9., 8., 7., 6., 5. };
400-
container_t a( raw_a, N ), b( raw_b, N );
401-
constexpr double result[]{ 81, 49, 25, 9, 1 };
393+
std::vector<double> raw_a{ 0., 1., 2., 3., 4. }, raw_b{ 9., 8., 7., 6., 5. };
394+
container_t a( raw_a.data(), raw_a.size() ), b( raw_b.data(), raw_b.size() );
395+
std::vector<double> result{ 81, 49, 25, 9, 1 };
402396

403397
auto va = ponio::expression::make_state( a );
404398
auto vb = ponio::expression::make_state( b );
@@ -420,13 +414,11 @@ TEST_CASE( "expressions::span::expr2.0" )
420414

421415
TEST_CASE( "expressions::span::expr2.1" )
422416
{
423-
static constexpr std::size_t N = 5;
424-
using container_t = std::span<double>;
417+
using container_t = std::span<double>;
425418

426-
double raw_a[]{ 0., 1., 2., 3., 4. };
427-
double raw_b[]{ 9., 8., 7., 6., 5. };
428-
container_t a( raw_a, N ), b( raw_b, N );
429-
constexpr double result[]{ 81, 49, 25, 9, 1 };
419+
std::vector<double> raw_a{ 0., 1., 2., 3., 4. }, raw_b{ 9., 8., 7., 6., 5. };
420+
container_t a( raw_a.data(), raw_a.size() ), b( raw_b.data(), raw_b.size() );
421+
std::vector<double> result{ 81, 49, 25, 9, 1 };
430422

431423
auto va = ponio::expression::make_state( a );
432424
auto vb = ponio::expression::make_state( b );
@@ -448,13 +440,11 @@ TEST_CASE( "expressions::span::expr2.1" )
448440

449441
TEST_CASE( "expressions::span::expr3.0" )
450442
{
451-
static constexpr std::size_t N = 5;
452-
using container_t = std::span<double>;
443+
using container_t = std::span<double>;
453444

454-
double raw_a[]{ 0., 1., 2., 3., 4. };
455-
double raw_b[]{ 9., 8., 7., 6., 5. };
456-
container_t a( raw_a, N ), b( raw_b, N );
457-
constexpr double result[]{ -81, -63, -45, -27, -9 };
445+
std::vector<double> raw_a{ 0., 1., 2., 3., 4. }, raw_b{ 9., 8., 7., 6., 5. };
446+
container_t a( raw_a.data(), raw_a.size() ), b( raw_b.data(), raw_b.size() );
447+
std::vector<double> result{ -81, -63, -45, -27, -9 };
458448

459449
auto va = ponio::expression::make_state( a );
460450
auto vb = ponio::expression::make_state( b );
@@ -475,13 +465,11 @@ TEST_CASE( "expressions::span::expr3.0" )
475465

476466
TEST_CASE( "expressions::span::expr3.1" )
477467
{
478-
static constexpr std::size_t N = 5;
479-
using container_t = std::span<double>;
468+
using container_t = std::span<double>;
480469

481-
double raw_a[]{ 0., 1., 2., 3., 4. };
482-
double raw_b[]{ 9., 8., 7., 6., 5. };
483-
container_t a( raw_a, N ), b( raw_b, N );
484-
constexpr double result[]{ -81, -63, -45, -27, -9 };
470+
std::vector<double> raw_a{ 0., 1., 2., 3., 4. }, raw_b{ 9., 8., 7., 6., 5. };
471+
container_t a( raw_a.data(), raw_a.size() ), b( raw_b.data(), raw_b.size() );
472+
std::vector<double> result{ -81, -63, -45, -27, -9 };
485473

486474
auto va = ponio::expression::make_state( a );
487475
auto vb = ponio::expression::make_state( b );

0 commit comments

Comments
 (0)