diff --git a/include/graphflood/define_types.h b/include/graphflood/define_types.h deleted file mode 100644 index 601cc5a8..00000000 --- a/include/graphflood/define_types.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#define GF_UINT size_t -#define GF_INT ptrdiff_t -#define GF_FLOAT double diff --git a/include/topotoolbox.h b/include/topotoolbox.h index 03f99ca3..d4bac6ee 100644 --- a/include/topotoolbox.h +++ b/include/topotoolbox.h @@ -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: diff --git a/src/graphflood/gf_flowacc.c b/src/graphflood/gf_flowacc.c index 6952081a..f1633fdc 100644 --- a/src/graphflood/gf_flowacc.c +++ b/src/graphflood/gf_flowacc.c @@ -10,7 +10,6 @@ This file contains routine to accumulate flow downstream, a way or another #include #include "gf_utils.h" -#include "graphflood/define_types.h" #include "topotoolbox.h" /* diff --git a/src/graphflood/gf_utils.h b/src/graphflood/gf_utils.h index 3cdfc39d..938af26c 100644 --- a/src/graphflood/gf_utils.h +++ b/src/graphflood/gf_utils.h @@ -8,8 +8,7 @@ #include #include -#include "graphflood/define_types.h" -// #include "topotoolbox.h" +#include "topotoolbox.h" /* Offset helpers: diff --git a/src/graphflood/graphflood.c b/src/graphflood/graphflood.c index 0a0898b2..6b2c3914 100644 --- a/src/graphflood/graphflood.c +++ b/src/graphflood/graphflood.c @@ -6,7 +6,6 @@ #include #include "gf_utils.h" -#include "graphflood/define_types.h" #include "pq_maxheap.h" #include "topotoolbox.h" diff --git a/src/graphflood/pq_maxheap.h b/src/graphflood/pq_maxheap.h index a168e8f6..0acfccf5 100644 --- a/src/graphflood/pq_maxheap.h +++ b/src/graphflood/pq_maxheap.h @@ -5,7 +5,7 @@ #include #include -#include "graphflood/define_types.h" +#include "topotoolbox.h" // Define the element structure in the max-heap priority queue typedef struct { diff --git a/src/graphflood/pq_priority_flood.h b/src/graphflood/pq_priority_flood.h index b5c45aeb..9cc710d2 100644 --- a/src/graphflood/pq_priority_flood.h +++ b/src/graphflood/pq_priority_flood.h @@ -5,7 +5,7 @@ #include #include -#include "graphflood/define_types.h" +#include "topotoolbox.h" // Define the element structure in the priority queue typedef struct { diff --git a/src/graphflood/priority_flood_standalone.c b/src/graphflood/priority_flood_standalone.c index 4560ac28..21ea735a 100644 --- a/src/graphflood/priority_flood_standalone.c +++ b/src/graphflood/priority_flood_standalone.c @@ -14,7 +14,6 @@ A Single flow graph is a data structure describing a Directed Acyclic Graph #include #include "gf_utils.h" -#include "graphflood/define_types.h" #include "pq_priority_flood.h" #include "queue_pit.h" #include "topotoolbox.h" diff --git a/src/graphflood/queue_pit.h b/src/graphflood/queue_pit.h index 420adfb1..b1584b40 100644 --- a/src/graphflood/queue_pit.h +++ b/src/graphflood/queue_pit.h @@ -13,7 +13,7 @@ B.G. #include #include -#include "graphflood/define_types.h" +#include "topotoolbox.h" // Define the queue structure typedef struct { diff --git a/src/graphflood/sfgraph.c b/src/graphflood/sfgraph.c index e84becc7..c4dfb2db 100644 --- a/src/graphflood/sfgraph.c +++ b/src/graphflood/sfgraph.c @@ -14,7 +14,6 @@ A Single flow graph is a data structure describing a Directed Acyclic Graph #include #include "gf_utils.h" -#include "graphflood/define_types.h" #include "pq_priority_flood.h" #include "queue_pit.h" #include "topotoolbox.h"