Skip to content

Move graphflood/define_types.h into topotoolbox.h #231

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

Merged
wkearn merged 1 commit into from
Jul 15, 2026
Merged

Move graphflood/define_types.h into topotoolbox.h #231

Show file tree
Hide file tree
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
5 changes: 0 additions & 5 deletions include/graphflood/define_types.h
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion include/topotoolbox.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2022,7 +2022,9 @@ TOPOTOOLBOX_API void propagatevaluesupstream_i64(int64_t *data,
Graphflood
*/

#include "graphflood/define_types.h"
#define GF_UINT size_t
#define GF_INT ptrdiff_t
#define GF_FLOAT double

/**
@brief Computes a single flow graph:
Expand Down
1 change: 0 additions & 1 deletion src/graphflood/gf_flowacc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ This file contains routine to accumulate flow downstream, a way or another
#include <stdint.h>

#include "gf_utils.h"
#include "graphflood/define_types.h"
#include "topotoolbox.h"

/*
Expand Down
3 changes: 1 addition & 2 deletions src/graphflood/gf_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
#include <stdio.h>
#include <stdlib.h>

#include "graphflood/define_types.h"
// #include "topotoolbox.h"
#include "topotoolbox.h"

/*
Offset helpers:
Expand Down
1 change: 0 additions & 1 deletion src/graphflood/graphflood.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include <stdio.h>

#include "gf_utils.h"
#include "graphflood/define_types.h"
#include "pq_maxheap.h"
#include "topotoolbox.h"

Expand Down
2 changes: 1 addition & 1 deletion src/graphflood/pq_maxheap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <stdlib.h>
#include <string.h>

#include "graphflood/define_types.h"
#include "topotoolbox.h"

// Define the element structure in the max-heap priority queue
typedef struct {
Expand Down
2 changes: 1 addition & 1 deletion src/graphflood/pq_priority_flood.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <stdlib.h>
#include <string.h>

#include "graphflood/define_types.h"
#include "topotoolbox.h"

// Define the element structure in the priority queue
typedef struct {
Expand Down
1 change: 0 additions & 1 deletion src/graphflood/priority_flood_standalone.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ A Single flow graph is a data structure describing a Directed Acyclic Graph
#include <stdio.h>

#include "gf_utils.h"
#include "graphflood/define_types.h"
#include "pq_priority_flood.h"
#include "queue_pit.h"
#include "topotoolbox.h"
Expand Down
2 changes: 1 addition & 1 deletion src/graphflood/queue_pit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ B.G.
#include <stdint.h>
#include <stdlib.h>

#include "graphflood/define_types.h"
#include "topotoolbox.h"

// Define the queue structure
typedef struct {
Expand Down
1 change: 0 additions & 1 deletion src/graphflood/sfgraph.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ A Single flow graph is a data structure describing a Directed Acyclic Graph
#include <stdio.h>

#include "gf_utils.h"
#include "graphflood/define_types.h"
#include "pq_priority_flood.h"
#include "queue_pit.h"
#include "topotoolbox.h"
Expand Down
Loading