Skip to content
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

Jump to bottom

fix for Issue1895 contracted_rt #1982

Merged
merged 2 commits into from
Jul 14, 2021
Merged

fix for Issue1895 contracted_rt #1982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfb9061
[c_types] fixing contracted_rt.h
nishkakotian Jul 14, 2021
7ae03e5
[C/C++] adjustments because of change on contracted_rt.h
nishkakotian Jul 14, 2021
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
4 changes: 2 additions & 2 deletions include/c_types/contracted_rt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
/**************************************************************************
* return type for contraction
* ***********************************************************************/
typedef struct {
struct contracted_rt {
int64_t id;
char* type;
int64_t source;
int64_t target;
double cost;
int64_t *contracted_vertices;
int contracted_vertices_size;
} contracted_rt;
};

#endif // INCLUDE_C_TYPES_CONTRACTED_RT_H_
2 changes: 1 addition & 1 deletion include/drivers/contraction/contractGraph_driver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# include <stddef.h>
#endif

#include "c_types/contracted_rt.h"
typedef struct contracted_rt contracted_rt;
#include "c_types/pgr_edge_t.h"

#ifdef __cplusplus
Expand Down
1 change: 1 addition & 0 deletions src/contraction/contractGraph_driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include "contraction/ch_graphs.hpp"
#include "contraction/pgr_contract.hpp"

#include "c_types/contracted_rt.h"
#include "cpp_common/identifiers.hpp"
#include "cpp_common/pgr_alloc.hpp"

Expand Down