Skip to content

fix: johnsop-test.cpp was not testing anything #556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Becheler wants to merge 1 commit into
base: develop
Choose a base branch
from
+29 −42
Open

fix: johnsop-test.cpp was not testing anything #556

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
71 changes: 29 additions & 42 deletions test/johnson-test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,39 @@
//=======================================================================
// Copyright 2002 Indiana University.
// Authors: Andrew Lumsdaine, Lie-Quan Lee, Jeremy G. Siek
// Copyright (c) 2026 Arnaud Becheler
//
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
//=======================================================================

/* Expected Output
0 1 2 3 4 5 6 7 8 9
0 0 99 111 123 103 107 125 105 111 123
1 99 0 12 24 4 8 26 6 12 24
2 111 12 0 12 16 20 24 18 24 26
3 123 24 12 0 28 30 12 30 26 14
4 103 4 16 28 0 4 22 2 8 20
5 107 8 20 30 4 0 18 6 4 16
6 125 26 24 12 22 18 0 24 14 2
7 105 6 18 30 2 6 24 0 10 22
8 111 12 24 26 8 4 14 10 0 12
9 123 24 26 14 20 16 2 22 12 0
*/

#include <boost/config.hpp>
#include <fstream>
#include <iostream>
#include <vector>
#include <iomanip>
#include <boost/property_map/property_map.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <boost/graph/graphviz.hpp>
#include <boost/graph/johnson_all_pairs_shortest.hpp>
#include <boost/core/lightweight_test.hpp>

int main()
{
using namespace boost;
typedef adjacency_list< vecS, vecS, undirectedS, no_property,
property< edge_weight_t, int, property< edge_weight2_t, int > > >
Graph;
const int V = 10;
typedef std::pair< int, int > Edge;
Edge edge_array[] = { Edge(0, 1), Edge(1, 2), Edge(2, 3), Edge(1, 4),
Edge(2, 5), Edge(3, 6), Edge(4, 5), Edge(5, 6), Edge(4, 7), Edge(5, 8),
Edge(6, 9), Edge(7, 8), Edge(8, 9) };
using Graph = adjacency_list< vecS, vecS, undirectedS, no_property,
property< edge_weight_t, int, property< edge_weight2_t, int > > >;
constexpr int V = 10;
using Edge = std::pair< int, int >;
constexpr Edge edge_array[] = { Edge(0, 1), Edge(1, 2), Edge(2, 3),
Edge(1, 4), Edge(2, 5), Edge(3, 6), Edge(4, 5), Edge(5, 6), Edge(4, 7),
Edge(5, 8), Edge(6, 9), Edge(7, 8), Edge(8, 9) };

const std::size_t E = sizeof(edge_array) / sizeof(Edge);
constexpr std::size_t E = sizeof(edge_array) / sizeof(Edge);

Graph g(edge_array, edge_array + E, V);

property_map< Graph, edge_weight_t >::type w = get(edge_weight, g);
int weights[] = { 99, 12, 12, 4, 99, 12, 4, 99, 2, 4, 2, 99, 12 };
int* wp = weights;
constexpr int weights[] = { 99, 12, 12, 4, 99, 12, 4, 99, 2, 4, 2, 99, 12 };
const int* wp = weights;

graph_traits< Graph >::edge_iterator e, e_end;
for (boost::tie(e, e_end) = edges(g); e != e_end; ++e)
Expand All @@ -59,19 +43,22 @@ int main()
int D[V][V];
johnson_all_pairs_shortest_paths(g, D, distance_map(&d[0]));

std::cout << std::setw(5) << " ";
for (int k = 0; k < 10; ++k)
std::cout << std::setw(5) << k;
std::cout << std::endl;
for (int i = 0; i < 10; ++i)
{
std::cout << std::setw(5) << i;
for (int j = 0; j < 10; ++j)
{
std::cout << std::setw(5) << D[i][j];
}
std::cout << std::endl;
}
constexpr int expected[V][V] = {
{ 0, 99, 111, 123, 103, 107, 125, 105, 111, 123 },
{ 99, 0, 12, 24, 4, 8, 26, 6, 12, 24 },
{ 111, 12, 0, 12, 16, 20, 24, 18, 24, 26 },
{ 123, 24, 12, 0, 28, 30, 12, 30, 26, 14 },
{ 103, 4, 16, 28, 0, 4, 22, 2, 8, 20 },
{ 107, 8, 20, 30, 4, 0, 18, 6, 4, 16 },
{ 125, 26, 24, 12, 22, 18, 0, 24, 14, 2 },
{ 105, 6, 18, 30, 2, 6, 24, 0, 10, 22 },
{ 111, 12, 24, 26, 8, 4, 14, 10, 0, 12 },
{ 123, 24, 26, 14, 20, 16, 2, 22, 12, 0 },
};

for (int i = 0; i < V; ++i)
for (int j = 0; j < V; ++j)
BOOST_TEST_EQ(D[i][j], expected[i][j]);

return 0;
return boost::report_errors();
}
Loading