Browse code

Commit made by the Bioconductor Git-SVN bridge. Consists of 3 commit(s).

Commit information:

Commit id: 1bbadd5e8118e5509eef035914aa8adebba604b7
Commit message:
fixed include statements in graohviz
Committed by Kasper Daniel Hansen <kasperdanielhansen at gmail.com>
Commit date: 2014-03-03T15:29:19-08:00

Commit id: 9a4b223568b7ed5c5146ccc21c48b9f1e66c41d3
Commit message:
updated NEWS
Committed by Kasper Daniel Hansen <kasperdanielhansen at gmail.com>
Commit date: 2014-03-03T15:30:41-08:00

Commit id: 3f3e2d33e7d802925296559b9a0d2e37f5a70fe9
Commit message:
Merge branch 'master' of github.com:kasperdanielhansen/Rgraphviz
Committed by Kasper Daniel Hansen <kasperdanielhansen at gmail.com>
Commit date: 2014-03-03T15:30:53-08:00

From: Bioconductor Git-SVN Bridge <bioc-sync@bioconductor.org>

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rgraphviz@86991 bc3139a8-67e5-0310-9ffc-ced21a209358

khansen authored on 03/03/2014 23:31:39
Showing62 changed files

... ...
@@ -2,7 +2,7 @@ Package: Rgraphviz
2 2
 Title: Provides plotting capabilities for R graph objects
3 3
 Description: Interfaces R with the AT and T graphviz library for
4 4
         plotting R graph objects from the graph package.
5
-Version: 2.7.0
5
+Version: 2.7.1
6 6
 Author: Jeff Gentry, Li Long, Robert Gentleman, Seth Falcon,
7 7
    Florian Hahne, Deepayan Sarkar, Kasper Daniel Hansen
8 8
 Maintainer: Kasper Daniel Hansen <khansen@jhsph.edu>
... ...
@@ -2,6 +2,13 @@
2 2
 \title{Rgraphviz News}
3 3
 \encoding{UTF-8}
4 4
 
5
+\section{Version 2.7.x}{
6
+  \itemize{
7
+    \item Fixed include statements in Graphviz code.
8
+  }
9
+}
10
+
11
+
5 12
 \section{Version 2.5.x}{
6 13
   \itemize{
7 14
     \item Expose mai argument in plot,Ragraph-method.
8 15
new file mode 100755
... ...
@@ -0,0 +1,21 @@
1
+#!/bin/bash -e
2
+
3
+## Find all #include <XX>
4
+grep -R "#include <" * > all_includes.txt
5
+
6
+## Clean, and sort the include statements, so only the header remains
7
+cut -f2 -d: all_includes.txt | sort | uniq | sed 's:.*#include <::' | sed 's:\.h>.*:.h:' | grep -v ">$" | grep -v "all_includes.txt" | sort -b > all_include_statements.txt
8
+
9
+## Find all header files
10
+find . -iname "*.h" | sed 's:.*/::' | sort | uniq | sort -b > all_header_files.txt
11
+
12
+## Find intersection between header files and #include <XX>; these needs to be fixed
13
+join all_include_statements.txt all_header_files.txt > need_fixes.txt
14
+
15
+cat need_fixes.txt | while read include
16
+do
17
+  FIXFILES=`grep -R -l "#include <$include>" * | grep -v all_include`
18
+  sed -i "_tmp" "s:#include <$include>:#include \"$include\":" $FIXFILES
19
+done
20
+
21
+    
... ...
@@ -43,3 +43,9 @@ cd graphviz-2.28.0
43 43
 patch -p1 < ../patches_2.28.0/graphviz-2.28.0-configure.patch
44 44
 autoreconf
45 45
 cd ..
46
+
47
+echo 'Fixing #include < to be #include "'
48
+cp find_includes.sh ../../src/graphviz/lib
49
+cd ../../src/graphviz/lib
50
+./find_includes.sh
51
+
... ...
@@ -23,7 +23,7 @@
23 23
 ..
24 24
 .ta 1.0i 2.0i 3.0i 4.0i 5.0i
25 25
 .Cs
26
-#include <cdt.h>
26
+#include "cdt.h"
27 27
 .Ce
28 28
 .Ss "DICTIONARY TYPES"
29 29
 .Cs
... ...
@@ -18,7 +18,7 @@ extern "C" {
18 18
 #ifndef BLOCKPATH_H
19 19
 #define BLOCKPATH_H
20 20
 
21
-#include <circular.h>
21
+#include "circular.h"
22 22
 
23 23
     extern nodelist_t *layout_block(Agraph_t * g, block_t * sn, double);
24 24
     extern int cmpNodeDegree(Dt_t *, Agnode_t **, Agnode_t **, Dtdisc_t *);
... ...
@@ -18,8 +18,8 @@ extern "C" {
18 18
 #ifndef BLOCKTREE_H
19 19
 #define BLOCKTREE_H
20 20
 
21
-#include <render.h>
22
-#include <circular.h>
21
+#include "render.h"
22
+#include "circular.h"
23 23
 
24 24
     extern block_t *createBlocktree(Agraph_t * g, circ_state * state);
25 25
     extern void freeBlocktree(block_t *);
... ...
@@ -18,8 +18,8 @@ extern "C" {
18 18
 #ifndef CIRCPOS_H
19 19
 #define CIRCPOS_H
20 20
 
21
-#include <render.h>
22
-#include <circular.h>
21
+#include "render.h"
22
+#include "circular.h"
23 23
 
24 24
     extern void circPos(Agraph_t * g, block_t * sn, circ_state *);
25 25
 
... ...
@@ -124,7 +124,7 @@ typedef struct {
124 124
 
125 125
 #define DEGREE(n) (ND_order(n))
126 126
 
127
-#include <circo.h>
127
+#include "circo.h"
128 128
 
129 129
 #ifdef __cplusplus
130 130
 extern "C" {
... ...
@@ -12,9 +12,9 @@
12 12
  *************************************************************************/
13 13
 
14 14
 
15
-#include <deglist.h>
16
-#include <circular.h>
17
-#include <blockpath.h>
15
+#include "deglist.h"
16
+#include "circular.h"
17
+#include "blockpath.h"
18 18
 #include <assert.h>
19 19
 
20 20
 typedef struct {
... ...
@@ -12,7 +12,7 @@
12 12
  *************************************************************************/
13 13
 
14 14
 
15
-#include <nodeset.h>
15
+#include "nodeset.h"
16 16
 
17 17
 
18 18
 static nsitem_t *mkItem(Dt_t * d, nsitem_t * obj, Dtdisc_t * disc)
... ...
@@ -18,7 +18,7 @@ extern "C" {
18 18
 #ifndef HTMLLEX_H
19 19
 #define HTMLLEX_H
20 20
 
21
-#include <agxbuf.h>
21
+#include "agxbuf.h"
22 22
 
23 23
     extern int initHTMLlexer(char *, agxbuf *, int);
24 24
     extern int htmllex(void);
... ...
@@ -14,8 +14,8 @@
14 14
 #ifndef _POINTSET_H
15 15
 #define _POINTSET_H 1
16 16
 
17
-#include <cdt.h>
18
-#include <geom.h>
17
+#include "cdt.h"
18
+#include "geom.h"
19 19
 
20 20
 #ifdef __cplusplus
21 21
 extern "C" {
... ...
@@ -19,7 +19,7 @@
19 19
 #include "dot.h"
20 20
 
21 21
 #ifdef ORTHO
22
-#include <ortho.h>
22
+#include "ortho.h"
23 23
 #endif
24 24
 
25 25
 #define	NSUB	9		/* number of subdivisions, re-aiming splines */
... ...
@@ -25,9 +25,9 @@
25 25
 #include <config.h>
26 26
 #endif
27 27
 
28
-#include <clusteredges.h>
29
-#include <fdp.h>
30
-#include <neatoprocs.h>
28
+#include "clusteredges.h"
29
+#include "fdp.h"
30
+#include "neatoprocs.h"
31 31
 #include "vispath.h"
32 32
 
33 33
 typedef struct {
... ...
@@ -18,8 +18,8 @@ extern "C" {
18 18
 #ifndef CLUSTEREDGES_H
19 19
 #define CLUSTEREDGES_H
20 20
 
21
-#include <render.h>
22
-#include <adjust.h>
21
+#include "render.h"
22
+#include "adjust.h"
23 23
 
24 24
     extern int compoundEdges(graph_t * g, expand_t* pm, int splines);
25 25
 
... ...
@@ -23,9 +23,9 @@
23 23
 /* use PRIVATE interface */
24 24
 #define FDP_PRIVATE 1
25 25
 
26
-#include <fdp.h>
27
-#include <comp.h>
28
-#include <pack.h>
26
+#include "fdp.h"
27
+#include "comp.h"
28
+#include "pack.h"
29 29
 #include <assert.h>
30 30
 
31 31
 #define MARK(n) (marks[ND_id(n)])
... ...
@@ -18,7 +18,7 @@ extern "C" {
18 18
 #ifndef COMP_H
19 19
 #define COMP_H
20 20
 
21
-#include <render.h>
21
+#include "render.h"
22 22
 
23 23
     extern graph_t **findCComp(graph_t *, int *, int *);
24 24
 
... ...
@@ -21,9 +21,9 @@
21 21
 
22 22
 #define FDP_PRIVATE
23 23
 
24
-#include <dbg.h>
25
-#include <neatoprocs.h>
26
-#include <fdp.h>
24
+#include "dbg.h"
25
+#include "neatoprocs.h"
26
+#include "fdp.h"
27 27
 #include <math.h>
28 28
 
29 29
 static int indent = -1;
... ...
@@ -20,9 +20,9 @@ extern "C" {
20 20
 
21 21
 #ifdef DEBUG
22 22
 
23
-#include <fdp.h>
23
+#include "fdp.h"
24 24
 #include <stdio.h>
25
-#include <graph.h>
25
+#include "graph.h"
26 26
 
27 27
     extern double Scale;
28 28
     extern void outputGraph(Agraph_t *, FILE *, int);
... ...
@@ -14,7 +14,7 @@
14 14
 #ifndef FDP_H
15 15
 #define FDP_H
16 16
 
17
-#include <render.h>
17
+#include "render.h"
18 18
 
19 19
 #ifdef FDP_PRIVATE
20 20
 
... ...
@@ -24,9 +24,9 @@
24 24
 /* uses PRIVATE interface for NOTUSED */
25 25
 #define FDP_PRIVATE 1
26 26
 
27
-#include <fdp.h>
28
-#include <grid.h>
29
-#include <macros.h>
27
+#include "fdp.h"
28
+#include "grid.h"
29
+#include "macros.h"
30 30
 
31 31
   /* structure for maintaining a free list of cells */
32 32
 typedef struct _block {
... ...
@@ -22,8 +22,8 @@ extern "C" {
22 22
 #include <config.h>
23 23
 #endif
24 24
 
25
-#include <render.h>
26
-#include <cdt.h>
25
+#include "render.h"
26
+#include "cdt.h"
27 27
 
28 28
     typedef struct _grid Grid;
29 29
 
... ...
@@ -43,9 +43,9 @@
43 43
 #include <unistd.h>
44 44
 #endif
45 45
 #include <ctype.h>
46
-#include <dbg.h>
47
-#include <grid.h>
48
-#include <neato.h>
46
+#include "dbg.h"
47
+#include "grid.h"
48
+#include "neato.h"
49 49
 
50 50
 #ifndef HAVE_SRAND48
51 51
 #define srand48 srand
... ...
@@ -27,9 +27,9 @@ Increase less between tries
27 27
 /* uses PRIVATE interface */
28 28
 #define FDP_PRIVATE 1
29 29
 
30
-#include <xlayout.h>
31
-#include <adjust.h>
32
-#include <dbg.h>
30
+#include "xlayout.h"
31
+#include "adjust.h"
32
+#include "dbg.h"
33 33
 #include <ctype.h>
34 34
 
35 35
 /* Use bbox based force function */
... ...
@@ -18,7 +18,7 @@ extern "C" {
18 18
 #ifndef XLAYOUT_H
19 19
 #define XLAYOUT_H
20 20
 
21
-#include <fdp.h>
21
+#include "fdp.h"
22 22
 
23 23
     typedef struct {
24 24
 	int numIters;
... ...
@@ -15,7 +15,7 @@
15 15
 #include <stdio.h>
16 16
 #include <stdlib.h>
17 17
 #include <string.h>
18
-#include <agxbuf.h>
18
+#include "agxbuf.h"
19 19
 
20 20
 #define N_GNEW(n,t)	 (t*)malloc((n)*sizeof(t))
21 21
 
... ...
@@ -11,7 +11,7 @@
11 11
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
12 12
  *************************************************************************/
13 13
 
14
-#include <digcola.h>
14
+#include "digcola.h"
15 15
 #ifdef DIGCOLA
16 16
 #include "kkutils.h"
17 17
 
... ...
@@ -47,7 +47,7 @@
47 47
 #include "matrix_ops.h"
48 48
 #include "kkutils.h"
49 49
 #include "conjgrad.h"
50
-#include <csolve_VPSC.h>
50
+#include "csolve_VPSC.h"
51 51
 #include "quad_prog_vpsc.h"
52 52
 #include "quad_prog_solver.h"
53 53
 #include "matrix_ops.h"
... ...
@@ -18,7 +18,7 @@ extern "C" {
18 18
 #ifndef DIGCOLA_H
19 19
 #define DIGCOLA_H
20 20
 
21
-#include <defs.h>
21
+#include "defs.h"
22 22
 #ifdef DIGCOLA
23 23
 extern void compute_y_coords(vtx_data*, int, double*, int);
24 24
 extern double compute_hierarchy(vtx_data*, int, double, double, 
... ...
@@ -35,7 +35,7 @@ extern "C" {
35 35
 		      double **(&new_coords));
36 36
 
37 37
 #else
38
-#include <defs.h>
38
+#include "defs.h"
39 39
 
40 40
     extern void embed_graph(vtx_data * graph, int n, int dim, DistType ***,
41 41
 			    int);
... ...
@@ -11,7 +11,7 @@
11 11
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
12 12
  *************************************************************************/
13 13
 
14
-#include <memory.h>
14
+#include "memory.h"
15 15
 #include <stdio.h>
16 16
 
17 17
 /* Priority queue:
... ...
@@ -46,7 +46,7 @@
46 46
  */
47 47
 
48 48
 #include <math.h>
49
-#include <neato.h>
49
+#include "neato.h"
50 50
 
51 51
 static double *scales;
52 52
 static double **lu;
... ...
@@ -23,7 +23,7 @@
23 23
 
24 24
 #include <mosek.h> /* Include the MOSEK definition file. */
25 25
 #include "types.h"
26
-#include <csolve_VPSC.h>
26
+#include "csolve_VPSC.h"
27 27
 
28 28
 typedef struct {
29 29
 	int r;
... ...
@@ -11,9 +11,9 @@
11 11
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
12 12
  *************************************************************************/
13 13
 
14
-#include <multispline.h>
15
-#include <delaunay.h>
16
-#include <neatoprocs.h>
14
+#include "multispline.h"
15
+#include "delaunay.h"
16
+#include "neatoprocs.h"
17 17
 #include <math.h>
18 18
 
19 19
 
... ...
@@ -1238,7 +1238,7 @@ static void resetGraph(tgraph * g, int ncnt, int ecnt)
1238 1238
 #define PQVTYPE float
1239 1239
 
1240 1240
 #define PQ_TYPES
1241
-#include <fPQ.h>
1241
+#include "fPQ.h"
1242 1242
 #undef PQ_TYPES
1243 1243
 
1244 1244
 typedef struct {
... ...
@@ -1251,7 +1251,7 @@ typedef struct {
1251 1251
 #define N_IDX(pq,n) ((PPQ*)pq)->idxs[n]
1252 1252
 
1253 1253
 #define PQ_CODE
1254
-#include <fPQ.h>
1254
+#include "fPQ.h"
1255 1255
 #undef PQ_CODE
1256 1256
 
1257 1257
 #define N_DAD(n) dad[n]
... ...
@@ -14,8 +14,8 @@
14 14
 #ifndef MULTISPLINE_H
15 15
 #define MULTISPLINE_H
16 16
 
17
-#include <render.h>
18
-#include <pathutil.h>
17
+#include "render.h"
18
+#include "pathutil.h"
19 19
 
20 20
 typedef struct router_s router_t;
21 21
 
... ...
@@ -26,7 +26,7 @@ extern double drand48(void);
26 26
 #endif
27 27
 
28 28
 #ifdef ORTHO
29
-#include <ortho.h>
29
+#include "ortho.h"
30 30
 #endif
31 31
 
32 32
 extern void printvis(vconfig_t * cp);
... ...
@@ -12,7 +12,7 @@
12 12
  *************************************************************************/
13 13
 
14 14
 #include <stdio.h>
15
-#include <vis.h>
15
+#include "vis.h"
16 16
 typedef Ppoint_t point;
17 17
 
18 18
 
... ...
@@ -35,7 +35,7 @@
35 35
 #include <assert.h>
36 36
 #include "matrix_ops.h"
37 37
 #include "kkutils.h"
38
-#include <csolve_VPSC.h>
38
+#include "csolve_VPSC.h"
39 39
 #include "quad_prog_vpsc.h"
40 40
 #include "quad_prog_solver.h"
41 41
 
... ...
@@ -17,8 +17,8 @@
17 17
 #include "config.h"
18 18
 #endif
19 19
 
20
-#include <fPQ.h>
21
-#include <memory.h>
20
+#include "fPQ.h"
21
+#include "memory.h"
22 22
 #include <assert.h>
23 23
 
24 24
 static snode**  pq;
... ...
@@ -13,7 +13,7 @@
13 13
 
14 14
 /* Priority Queue Code for shortest path in graph */
15 15
 
16
-#include <sgraph.h>
16
+#include "sgraph.h"
17 17
 /* typedef snode** PQ; */
18 18
 
19 19
 #define N_VAL(n) (n)->n_val
... ...
@@ -16,8 +16,8 @@
16 16
 #endif
17 17
 
18 18
 #include <stddef.h>
19
-#include <intset.h>
20
-#include <memory.h>
19
+#include "intset.h"
20
+#include "memory.h"
21 21
 
22 22
 static Void_t*
23 23
 mkIntItem(Dt_t* d,intitem* obj,Dtdisc_t* disc)
... ...
@@ -14,7 +14,7 @@
14 14
 #ifndef INTSET_H
15 15
 #define INTSET_H
16 16
 
17
-#include <cdt.h>
17
+#include "cdt.h"
18 18
 
19 19
 typedef struct {
20 20
     int       id;
... ...
@@ -19,10 +19,10 @@
19 19
 #define DEBUG
20 20
 
21 21
 #include <stddef.h>
22
-#include <maze.h>
23
-#include <partition.h>
24
-#include <memory.h>
25
-#include <arith.h>
22
+#include "maze.h"
23
+#include "partition.h"
24
+#include "memory.h"
25
+#include "arith.h"
26 26
 /* #include <values.h> */
27 27
 
28 28
 #define MARGIN 36;
... ...
@@ -14,7 +14,7 @@
14 14
 #ifndef MAZE_H
15 15
 #define MAZE_H
16 16
 
17
-#include <sgraph.h>
17
+#include "sgraph.h"
18 18
 
19 19
 enum {M_RIGHT=0, M_TOP, M_LEFT, M_BOTTOM};
20 20
 
... ...
@@ -28,7 +28,7 @@
28 28
 
29 29
 #define DEBUG
30 30
 #include <stddef.h>
31
-#include <maze.h>
31
+#include "maze.h"
32 32
 #include "fPQ.h"
33 33
 #include "memory.h"
34 34
 #include "geomprocs.h"
... ...
@@ -512,7 +512,7 @@ addNodeEdges (sgraph* sg, cell* cp, snode* np)
512 512
 
513 513
 #ifdef DEBUG
514 514
 
515
-#include <intset.h>
515
+#include "intset.h"
516 516
 static char* bendToStr (bend b)
517 517
 {
518 518
   char* s;
... ...
@@ -1362,7 +1362,7 @@ orthoEdges (Agraph_t* g, int doLbls)
1362 1362
 }
1363 1363
 
1364 1364
 #ifdef DEBUG
1365
-#include <arith.h>
1365
+#include "arith.h"
1366 1366
 /* #include <values.h> */
1367 1367
 #define TRANS 10
1368 1368
 
... ...
@@ -13,7 +13,7 @@
13 13
 
14 14
 #ifndef ORTHO_H
15 15
 #define ORTHO_H
16
-#include <render.h>
16
+#include "render.h"
17 17
 
18 18
 void orthoEdges (Agraph_t* g, int useLbls);
19 19
 #endif
... ...
@@ -15,9 +15,9 @@
15 15
 #include "config.h"
16 16
 #endif
17 17
 
18
-#include <partition.h>
19
-#include <trap.h>
20
-#include <memory.h>
18
+#include "partition.h"
19
+#include "trap.h"
20
+#include "memory.h"
21 21
 #include <math.h>
22 22
 #include <stdlib.h>
23 23
 
... ...
@@ -14,7 +14,7 @@
14 14
 #ifndef PARTITION_H
15 15
 #define PARTITION_H
16 16
 
17
-#include <maze.h>
17
+#include "maze.h"
18 18
 
19 19
 extern boxf* partition (cell*, int, int*, boxf);
20 20
 
... ...
@@ -14,7 +14,7 @@
14 14
 #ifndef RAWGRAPH_H
15 15
 #define RAWGRAPH_H
16 16
 
17
-#include <cdt.h>
17
+#include "cdt.h"
18 18
 
19 19
 typedef struct {
20 20
   int color;
... ...
@@ -21,10 +21,10 @@
21 21
 #include <stdio.h>
22 22
 #define __USE_ISOC99
23 23
 #include <math.h>
24
-#include <geom.h>
25
-#include <logic.h>
26
-#include <memory.h>
27
-#include <trap.h>
24
+#include "geom.h"
25
+#include "logic.h"
26
+#include "memory.h"
27
+#include "trap.h"
28 28
 
29 29
 #ifdef WIN32
30 30
 #define log2(x)  (log(x)/log(2))
... ...
@@ -13,8 +13,8 @@
13 13
 
14 14
 #include <stdio.h>
15 15
 #include <stdlib.h>
16
-#include <patchwork.h>
17
-#include <tree_map.h>
16
+#include "patchwork.h"
17
+#include "tree_map.h"
18 18
 #include "render.h"
19 19
 
20 20
 typedef struct treenode_t treenode_t;
... ...
@@ -14,7 +14,7 @@
14 14
 #ifndef TREE_MAP_H
15 15
 #define TREE_MAP_H
16 16
 
17
-#include <SparseMatrix.h>
17
+#include "SparseMatrix.h"
18 18
 
19 19
 typedef struct rectangle_struct {
20 20
   real x[2];/* center */
... ...
@@ -16,7 +16,7 @@ extern "C" {
16 16
 #endif
17 17
 
18 18
 
19
-#include <pathgeom.h>
19
+#include "pathgeom.h"
20 20
     void Ptriangulate(Ppoly_t * polygon,
21 21
 		      void (*fn) (void *closure, Ppoint_t tri[]),
22 22
 		      void *vc);
... ...
@@ -16,7 +16,7 @@
16 16
 #ifndef _VIS_INCLUDE
17 17
 #define _VIS_INCLUDE
18 18
 
19
-#include <pathgeom.h>
19
+#include "pathgeom.h"
20 20
 
21 21
 #ifdef __cplusplus
22 22
 extern "C" {
... ...
@@ -22,16 +22,16 @@
22 22
 #include <values.h>
23 23
 #endif
24 24
 #endif
25
-#include <sfdp.h>
26
-#include <neato.h>
27
-#include <adjust.h>
28
-#include <pack.h>
25
+#include "sfdp.h"
26
+#include "neato.h"
27
+#include "adjust.h"
28
+#include "pack.h"
29 29
 #include <assert.h>
30 30
 #include <ctype.h>
31
-#include <spring_electrical.h>
32
-#include <overlap.h>
33
-#include <uniform_stress.h>
34
-#include <stress_model.h>
31
+#include "spring_electrical.h"
32
+#include "overlap.h"
33
+#include "uniform_stress.h"
34
+#include "stress_model.h"
35 35
 
36 36
 static void sfdp_init_edge(edge_t * e)
37 37
 {
... ...
@@ -14,7 +14,7 @@
14 14
 #ifndef SFDPINTERNAL_H
15 15
 #define SFDPINTERNAL_H
16 16
 
17
-#include <sfdp.h>
17
+#include "sfdp.h"
18 18
 
19 19
 #endif
20 20
  
... ...
@@ -14,7 +14,7 @@
14 14
 #ifndef SPRING_ELECTRICAL_H
15 15
 #define SPRING_ELECTRICAL_H
16 16
 
17
-#include <SparseMatrix.h>
17
+#include "SparseMatrix.h"
18 18
 
19 19
 enum {ERROR_NOT_SQUARE_MATRIX = -100};
20 20
 
... ...
@@ -13,7 +13,7 @@
13 13
 #ifndef SPARSEMATRIX_H
14 14
 #define  SPARSEMATRIX_H
15 15
 
16
-#include <general.h>
16
+#include "general.h"
17 17
 #include <stdio.h>
18 18
 
19 19
 #define SYMMETRY_EPSILON 0.0000001
... ...
@@ -24,9 +24,9 @@
24 24
  * In particular, note that Verbose is declared but undefined.
25 25
  */
26 26
 #ifndef STANDALONE
27
-#include <logic.h>
28
-#include <arith.h>
29
-#include <memory.h>
27
+#include "logic.h"
28
+#include "arith.h"
29
+#include "memory.h"
30 30
 #endif
31 31
 
32 32
 #define real double
... ...
@@ -17,10 +17,10 @@
17 17
 
18 18
 
19 19
 #include <iostream>
20
-#include <variable.h>
21
-#include <constraint.h>
22
-#include <generate-constraints.h>
23
-#include <solve_VPSC.h>
20
+#include "variable.h"
21
+#include "constraint.h"
22
+#include "generate-constraints.h"
23
+#include "solve_VPSC.h"
24 24
 #include <cstdlib>
25 25
 #include <cassert>
26 26
 #include "csolve_VPSC.h"
... ...
@@ -11,7 +11,7 @@
11 11
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
12 12
  *************************************************************************/
13 13
 
14
-#include <xdot.h>
14
+#include "xdot.h"
15 15
 #include <stdlib.h>
16 16
 #include <string.h>
17 17
 #include <ctype.h>