summaryrefslogtreecommitdiffhomepage
path: root/ir/lpp
diff options
context:
space:
mode:
authorMatthias Braun <matze@braunis.de>2017-02-17 07:14:48 +0100
committerMatthias Braun <matze@braunis.de>2017-02-17 08:07:41 +0100
commit06cb80c5b7f318fb1fc0caef3adcf84b9802df6c (patch)
tree72c596abcda06468ebe41d0038f520e10f19acc3 /ir/lpp
parentd29ca3a0ba661b9826e126b407c1c9d6f5a81aa9 (diff)
Reorganize include directives
Diffstat (limited to 'ir/lpp')
-rw-r--r--ir/lpp/lpp.c20
-rw-r--r--ir/lpp/lpp_cplex.c9
-rw-r--r--ir/lpp/lpp_gurobi.c11
-rw-r--r--ir/lpp/lpp_solvers.c1
-rw-r--r--ir/lpp/mps.c5
-rw-r--r--ir/lpp/sp_matrix.c13
6 files changed, 27 insertions, 32 deletions
diff --git a/ir/lpp/lpp.c b/ir/lpp/lpp.c
index bdcccf1..8bf2aae 100644
--- a/ir/lpp/lpp.c
+++ b/ir/lpp/lpp.c
@@ -7,20 +7,18 @@
* @file
* @author Daniel Grund
*/
-#include <assert.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "obst.h"
-#include "hashptr.h"
#include "debug.h"
-#include "set.h"
+#include "hashptr.h"
+#include "lpp_solvers.h"
+#include "mps.h"
+#include "obst.h"
#include "panic.h"
-
+#include "set.h"
#include "sp_matrix.h"
-#include "mps.h"
-#include "lpp_solvers.h"
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#define HASH_NAME_T(n) hash_str((n)->name)
diff --git a/ir/lpp/lpp_cplex.c b/ir/lpp/lpp_cplex.c
index 2f5881e..be1ae3b 100644
--- a/ir/lpp/lpp_cplex.c
+++ b/ir/lpp/lpp_cplex.c
@@ -12,13 +12,12 @@
#ifdef WITH_CPLEX
-#include <stdio.h>
-#include <stdlib.h>
-#include <ilcplex/cplex.h>
-
#include "obst.h"
-#include "stat_timing.h"
#include "sp_matrix.h"
+#include "stat_timing.h"
+#include <ilcplex/cplex.h>
+#include <stdio.h>
+#include <stdlib.h>
static char cpx_cst_encoding[4] = "?ELG";
static char cpx_var_encoding[4] = "??CB";
diff --git a/ir/lpp/lpp_gurobi.c b/ir/lpp/lpp_gurobi.c
index 286ef4b..853575c 100644
--- a/ir/lpp/lpp_gurobi.c
+++ b/ir/lpp/lpp_gurobi.c
@@ -12,15 +12,12 @@
#ifdef WITH_GUROBI
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-
#include "obst.h"
-
-#include <gurobi_c.h>
-
#include "sp_matrix.h"
+#include <gurobi_c.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
static char gurobi_cst_encoding[4] = { 0, GRB_EQUAL, GRB_LESS_EQUAL, GRB_GREATER_EQUAL };
static char gurobi_var_encoding[4] = { 0, 0, GRB_CONTINUOUS, GRB_BINARY };
diff --git a/ir/lpp/lpp_solvers.c b/ir/lpp/lpp_solvers.c
index b624129..608965e 100644
--- a/ir/lpp/lpp_solvers.c
+++ b/ir/lpp/lpp_solvers.c
@@ -8,6 +8,7 @@
* @author Sebastian Hack
*/
#include "lpp_solvers.h"
+
#include "lpp_cplex.h"
#include "lpp_gurobi.h"
#include "util.h"
diff --git a/ir/lpp/mps.c b/ir/lpp/mps.c
index fdb6cfb..3a31862 100644
--- a/ir/lpp/mps.c
+++ b/ir/lpp/mps.c
@@ -7,10 +7,11 @@
* @file
* @author Daniel Grund
*/
-#include <stdarg.h>
-#include <assert.h>
#include "mps.h"
+
#include "panic.h"
+#include <assert.h>
+#include <stdarg.h>
/**
* These must comply to the enum cst_t in lpp.h
diff --git a/ir/lpp/sp_matrix.c b/ir/lpp/sp_matrix.c
index 6ec6376..068dc89 100644
--- a/ir/lpp/sp_matrix.c
+++ b/ir/lpp/sp_matrix.c
@@ -13,17 +13,16 @@
* Complexity is O(1) then.
* Random access or right-to-left and bottom-to-top is O(m*n).
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <math.h>
-
#include "sp_matrix.h"
-#include "util.h"
#include "bitset.h"
-#include "xmalloc.h"
#include "panic.h"
+#include "util.h"
+#include "xmalloc.h"
+#include <assert.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
typedef enum iter_direction_t {
down, right, all