remove the need for lib/sparse to be in the include path

Related to #1785.

diff --git a/lib/mingle/edge_bundling.h b/lib/mingle/edge_bundling.h
index 7d6018d91465e40fc4f35e302d1b42abdac89090..0efafb36f1623a9e63c886c9bec7108b56c1df21 100644 (file)
--- a/lib/mingle/edge_bundling.h
+++ b/lib/mingle/edge_bundling.h
@@ -10,7 +10,7 @@
 #ifndef EDGE_BUNDLING_H
 #define EDGE_BUNDLING_H
 
-#include <SparseMatrix.h>
+#include <sparse/SparseMatrix.h>
 
 struct pedge_struct {
   real wgt; /* weight, telling how many original edges this edge represent. If this edge consists of multiple sections of different weights then this is a lower bound. This only applied for agglomerative bundling */

diff --git a/lib/neatogen/adjust.h b/lib/neatogen/adjust.h
index 603d9cfb876f41c89158e8c7c51fd261001246ee..0b41da8717fed129edddda98e00e35686f3814d0 100644 (file)
--- a/lib/neatogen/adjust.h
+++ b/lib/neatogen/adjust.h
@@ -21,7 +21,7 @@ extern "C" {
 #endif
 
 #include "geom.h"
-#include "SparseMatrix.h"
+#include <sparse/SparseMatrix.h>
 
 #define DFLT_MARGIN     4   /* 4 points */
 

diff --git a/lib/patchwork/tree_map.h b/lib/patchwork/tree_map.h
index 12bc9041671e8fd03c681c7020dfbadfca55d8a6..9e13107795e76f5e58f80298c069b9d4f91a3954 100644 (file)
--- a/lib/patchwork/tree_map.h
+++ b/lib/patchwork/tree_map.h
@@ -14,7 +14,7 @@
 #ifndef TREE_MAP_H
 #define TREE_MAP_H
 
-#include <SparseMatrix.h>
+#include <sparse/SparseMatrix.h>
 
 typedef struct rectangle_struct {
   real x[2];/* center */

diff --git a/lib/sfdpgen/Multilevel.h b/lib/sfdpgen/Multilevel.h
index 1f981dce3dd0fc9bf051438f61334f9940a9eceb..205b5ebf95d3a8c5de3bfe5129365c15f072bfdb 100644 (file)
--- a/lib/sfdpgen/Multilevel.h
+++ b/lib/sfdpgen/Multilevel.h
@@ -14,7 +14,7 @@
 #ifndef MULTILEVEL_H
 #define MULTILEVEL_H
 
-#include "SparseMatrix.h"
+#include <sparse/SparseMatrix.h>
 
 typedef struct Multilevel_struct *Multilevel;
 

diff --git a/lib/sfdpgen/PriorityQueue.h b/lib/sfdpgen/PriorityQueue.h
index 4481e82e3d16904cfb3fdf60c27fcefe7b5050f1..c43734021ee5ee063e19a96c23783225294b698d 100644 (file)
--- a/lib/sfdpgen/PriorityQueue.h
+++ b/lib/sfdpgen/PriorityQueue.h
@@ -1,6 +1,6 @@
 #ifndef PRIORITY_QUEUE_H
 #define PRIORITY_QUEUE_H
-#include "LinkedList.h"
+#include <sparse/LinkedList.h>
 struct PriorityQueue_struct {
   /* a simple priority queue structure: entries are all integers, gains are all integers in [0, gainmax], total n elements */
   int count;/* how many entries are in?*/

diff --git a/lib/sfdpgen/sparse_solve.h b/lib/sfdpgen/sparse_solve.h
index 53617fb7e42524088c258ab65a5ee83af0dedb6a..845941b5d4ab441d5d3249a485485b63553488c6 100644 (file)
--- a/lib/sfdpgen/sparse_solve.h
+++ b/lib/sfdpgen/sparse_solve.h
@@ -15,7 +15,7 @@
 #ifndef SPARSE_SOLVER_H
 #define SPARSE_SOLVER_H
 
-#include "SparseMatrix.h"
+#include <sparse/SparseMatrix.h>
 
 enum {SOLVE_METHOD_CG, SOLVE_METHOD_JACOBI};
 

diff --git a/lib/sfdpgen/spring_electrical.h b/lib/sfdpgen/spring_electrical.h
index 4297890258826b0fee8e12c56917112545572fa1..ff1bebabb9de919369f30560c2bc5a7ddb704867 100644 (file)
--- a/lib/sfdpgen/spring_electrical.h
+++ b/lib/sfdpgen/spring_electrical.h
@@ -14,7 +14,7 @@
 #ifndef SPRING_ELECTRICAL_H
 #define SPRING_ELECTRICAL_H
 
-#include <SparseMatrix.h>
+#include <sparse/SparseMatrix.h>
 
 enum {ERROR_NOT_SQUARE_MATRIX = -100};
 

diff --git a/lib/sparse/BinaryHeap.h b/lib/sparse/BinaryHeap.h
index 946442511fdea28d23daf50f53a881868f69539f..d74ece8aaed51f0f7bea6e65db98fc05b7ff743c 100644 (file)
--- a/lib/sparse/BinaryHeap.h
+++ b/lib/sparse/BinaryHeap.h
@@ -14,8 +14,8 @@
 #ifndef BinaryHeap_H
 #define  BinaryHeap_H
 
-#include "general.h"
-#include "IntStack.h"
+#include <sparse/general.h>
+#include <sparse/IntStack.h>
 
 /* binary heap code. 
    Caution: items inserted should be kept untouched, e.g., the value of the item should be kepted unchanged while the heap is still in use! 

diff --git a/lib/sparse/DotIO.h b/lib/sparse/DotIO.h
index f5fc1fe3348b97f9f3bb8e825a0f365e52d2710e..07f8ee01a8f98605cb1102382c61671fd13ce915 100644 (file)
--- a/lib/sparse/DotIO.h
+++ b/lib/sparse/DotIO.h
@@ -15,7 +15,7 @@
 #define DOTIO_H
 
 #include <cgraph.h>
-#include "SparseMatrix.h"
+#include <sparse/SparseMatrix.h>
 
 enum {COLOR_SCHEME_NONE, COLOR_SCHEME_PASTEL = 1, COLOR_SCHEME_BLUE_YELLOW, COLOR_SCHEME_WHITE_RED, COLOR_SCHEME_GREY_RED, COLOR_SCHEME_PRIMARY, COLOR_SCHEME_SEQUENTIAL_SINGLEHUE_RED, COLOR_SCHEME_ADAM, COLOR_SCHEME_ADAM_BLEND, COLOR_SCHEME_SEQUENTIAL_SINGLEHUE_RED_LIGHTER, COLOR_SCHEME_GREY};
 extern void initDotIO (Agraph_t *g);

diff --git a/lib/sparse/QuadTree.h b/lib/sparse/QuadTree.h
index d0b51f43ed4b9fa90f2d89026611d8dd120380a0..846cdf89e9cceed36e5bdc186415aee8529e6f2f 100644 (file)
--- a/lib/sparse/QuadTree.h
+++ b/lib/sparse/QuadTree.h
@@ -14,7 +14,7 @@
 #ifndef QUAD_TREE_H
 #define QUAD_TREE_H
 
-#include "LinkedList.h"
+#include <sparse/LinkedList.h>
 #include <stdio.h>
 
 typedef struct QuadTree_struct *QuadTree;

diff --git a/lib/sparse/SparseMatrix.h b/lib/sparse/SparseMatrix.h
index 0a6dacb44985b3caacb06fec3b84b764de3fc404..25171219a02f713c602440d54fd7602b7b8e4c52 100644 (file)
--- a/lib/sparse/SparseMatrix.h
+++ b/lib/sparse/SparseMatrix.h
@@ -13,7 +13,7 @@
 #ifndef SPARSEMATRIX_H
 #define  SPARSEMATRIX_H
 
-#include <general.h>
+#include <sparse/general.h>
 #include <stdio.h>
 
 #define SYMMETRY_EPSILON 0.0000001