Commit 303262db authored by John Ellson's avatar John Ellson

lots of spelling fixes - detected by codespell

parent 665b93e5
......@@ -231,7 +231,7 @@ lib/color_lib
*.VC.opendb
*.vcxproj.user
# Do not ignore Windows MSI setup.exe untill a new MSI can be generated.
# Do not ignore Windows MSI setup.exe until a new MSI can be generated.
!windows/graphviz-msi/setup/Release/setup.exe
# Don't ignore contents of windows/include
......
......@@ -628,7 +628,7 @@ July 3, 2003
- "--with-wish=xxx" now works (bug #270)
- remove generated file: ast_common.h from source distributions
- make GIF support configurable
- added .cvsignore thoughout source tree to reduce CVS noise
- added .cvsignore throughout source tree to reduce CVS noise
- FAQ updates
- documentation updates for gpr
- improve portability of dotneato-config, but requires libtool now
......@@ -664,7 +664,7 @@ July 3, 2003
- doted demo
- use tcl's file requestor instead of homebrew
- add zooming controlled by mousewheel
- support additonal export formats
- support additional export formats
January 31, 2003
- declare this version 1.9
......@@ -1130,7 +1130,7 @@ April 14, 2000: Add Tcldgl and dge demo <ellson@graphviz.org>
April 14, 2000: Add dynagraph libraries <north@research.att.com>
April 14, 2000: Flatten directory hierachy of sources <ellson@graphviz.org>
April 14, 2000: Flatten directory hierarchy of sources <ellson@graphviz.org>
April 14, 2000: Fix X11 library detection for lefty:
src/configure.in, src/lefty/Makefile.in
......
......@@ -281,7 +281,7 @@ TYPEDEF_HIDES_STRUCT = NO
# causing a significant performance penality.
# If the system has enough physical memory increasing the cache will improve the
# performance by keeping more symbols in memory. Note that the value works on
# a logarithmic scale so increasing the size by one will rougly double the
# a logarithmic scale so increasing the size by one will roughly double the
# memory usage. The cache size is given by this formula:
# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
# corresponding to a cache size of 2^16 = 65536 symbols
......
......@@ -68,5 +68,12 @@ deb: dist
pkg: dist
tar xzf graphviz-@VERSION@.tar.gz && make -C graphviz-@VERSION@/macosx/build && mv graphviz-@VERSION@/macosx/build/graphviz-*.pkg .
# codespell is a python script:
# https://github.com/lucasdemarchi/codespell
# install on Fedora26 with:
# pip install codespell
.PHONY: spellcheck
spellcheck:
codespell -d -q 3 --skip="*.po,*.ts"
DISTCLEANFILES = config.cache builddate.h FEATURE/* graphviz-@VERSION@*
......@@ -117,9 +117,9 @@ and to force a particular variant, use, for example: ``dot \-Tpng:gd''
.P
Traditionally, Graphviz supports the following:
.br
\fB\-Tdot\fP (Dot format containing layout infomation),
\fB\-Tdot\fP (Dot format containing layout information),
.br
\fB\-Txdot\fP (Dot format containing complete layout infomation),
\fB\-Txdot\fP (Dot format containing complete layout information),
.br
\fB\-Tps\fP (PostScript),
.br
......
......@@ -198,7 +198,7 @@ static char* usestr =
/* e.g.,
1 [cluster=10, clustercolor="#ff0000"]
2 [cluster=10]
(and no ther nodes are in cluster10)
(and no other nodes are in cluster10)
then since we can only use 1 color for the cluster 10, both 1 and 2 will be colored based on the color of node 2. However if you have
......
......@@ -1713,7 +1713,7 @@ static void get_polygons(int exclude_random, int n, int nrandom, int dim, Sparse
}
ncomps = i + 1;
if (Verbose) fprintf(stderr,"ncomps = %d\n",ncomps);
} else {/* alwasy exclud bounding box */
} else {/* always exclude bounding box */
for (i = ncomps - 1; i >= 0; i--) {
if (groups[comps[comps_ptr[i]]] != GRP_BBOX) break;
}
......@@ -2276,7 +2276,7 @@ int make_map_from_rectangle_groups(int exclude_random, int include_OK_points,
/* add artificial points in an anti-clockwise fashion */
if (K > 0){
delta[0] = .5*avgsize[0]/K; delta[1] = .5*avgsize[1]/K;/* small pertubation to make boundary between labels looks more fractal */
delta[0] = .5*avgsize[0]/K; delta[1] = .5*avgsize[1]/K;/* small perturbation to make boundary between labels looks more fractal */
} else {
delta[0] = delta[1] = 0.;
}
......
......@@ -84,7 +84,7 @@ void power_method(void (*matvec)(void *, int, int, real*, real **, int, int*),
v[k][i] = u[i];
}
/*
fprintf(stderr,"inital vec=");
fprintf(stderr,"initial vec=");
for (i = 0; i < n; i++) fprintf(stderr,"%f,",u[i]);fprintf(stderr,"\n");
*/
iter = 0;
......@@ -102,7 +102,7 @@ void power_method(void (*matvec)(void *, int, int, real*, real **, int, int*),
assert(!flag);
/*
fprintf(stderr,"normalized aginst prev vec=");
fprintf(stderr,"normalized against prev vec=");
for (i = 0; i < n; i++) fprintf(stderr,"%f,",u[i]);fprintf(stderr,"\n");
*/
......
......@@ -22,7 +22,7 @@ Enhancements to the dotty interface:
- Added save prompt for current graph on 'load graph' menu selection
- Rudimentary "hyperlink" - click on node and select "load subgraph"
from the menu to load and display ./{nodename}.gv graph. Can
navigate back to immediate parent thru menu selection.
navigate back to immediate parent through menu selection.
'+' also goes to parent, '-' to subgraph of a node. Was not able to
store parent information in graph spec file, so a graph has to be
loaded as a subgraph to another graph before the "parent" feature will
......
......@@ -772,7 +772,7 @@ neato -Gmaxiter=500
<P>
Note that, if you have a large graph, the generation of edges as splines
is a cubic algorithm, so you would do well to avoid using <tt>splines=true</tt>.
(This commment applies to circo, fdp and twopi as well.)
(This comment applies to circo, fdp and twopi as well.)
<P>
<A name=Q33 HREF=#Q33>
<B>Q33</A>. Edge label placement in neato is bad.</b>
......@@ -828,7 +828,7 @@ proportional to the number of previously declared attributes. Thus,
the running time for the above would be <I>cN</I> O(<I>M</I>)
for some constant <I>c</I>. If there is any concern about this, the
graph should specify the attributes first before declaring nodes or
edges. In practice, this problem is neglible.
edges. In practice, this problem is negligible.
<P>
<A name=Q34a>
<B>Q. Twopi runs forever on a certain example.</B>
......@@ -915,7 +915,7 @@ WebDot Error:
Response Code = 403
</pre>
This usually means that webdot ran succesfully, but was not able
This usually means that webdot ran successfully, but was not able
to fetch the remote graph from the URL you gave as an argument.
The reason is probably that your server is behind a firewall that
blocks the webdot server, so it cannot get the graph file.
......
......@@ -281,7 +281,7 @@ loaded but the plugins themselves are not loaded unless a plugin
is demanded from that library.
</para>
<para>
<command>dot -c</command> must be run, with enough priviledges to write
<command>dot -c</command> must be run, with enough privileges to write
<filename>/usr/lib/graphviz/config</filename>, whenever the set of plugins is changed.
For rpm systems
<command>dot -c</command>
......
......@@ -49,7 +49,7 @@
@article {gknv:methods,
author="Emden R. Gansner and Eleftherios Koutsofios and Stephen C. North and Kiem-Phong Vo",
title="{A Technique for Drawing Directed Graphs}",
journal="IEEE Trans. Sofware Eng.",
journal="IEEE Trans. Software Eng.",
month=may,
year=1993,
volume=19,
......
......@@ -137,7 +137,7 @@ From: http://www.fontconfig.org/fontconfig-user.html
Monospace:matrix=1 .1 0 The users preferred monospace font
with artificial obliquing
Graphviz currently has a seperate attribute for specififying fontsize.
Graphviz currently has a separate attribute for specififying fontsize.
[ FIXME
We should allow the fontconfig style specification. "Times-20" does
......@@ -288,7 +288,7 @@ Pango/cairo depends on fontconfig, so to disable fontconfig you also have
to disable pango/cairo. The easiest way to do this temporarily is to
edit /usr/lib/graphviz/config and remove the entire "libpango" block.
[Note that any changes to this file will be lost the next time graphviz
is updated, or "dot -c" is run with installer priviledges.]
is updated, or "dot -c" is run with installer privileges.]
With pango disabled, graphviz will use gd which, even if it was built with
fontconfig support, will still allow fontnames to be given as filenames.
......
......@@ -991,7 +991,7 @@ of the layout programs.
<DT><A NAME=d:id HREF=#a:id><STRONG>id</STRONG></A>
<DD> Allows the graph author to provide an id for graph objects which is to be included in the output.
Normal "&#92;N", "&#92;E", "&#92;G" substitutions are applied.
If provided, it is the responsiblity of the provider to keep
If provided, it is the responsibility of the provider to keep
its values sufficiently unique for its intended downstream use.
Note, in particular, that "&#92;E" does not provide a unique id for multi-edges.
If no id attribute is provided, then a unique internal id is used. However,
......@@ -2148,7 +2148,7 @@ enclosed in the parentheses, <TT>(...)+</TT> indicates 1 or more, and
These are the basic set of backward-compatible arrow shapes. In addition,
there is a grammar of <A HREF=arrows.html>arrow shapes</A>
which can be used to describe a collection of 2,313,441 arrow combinations of the
39 varations of the primitive set of 10 arrows. The basic arrows shown
39 variations of the primitive set of 10 arrows. The basic arrows shown
above contain all of the primitive shapes
(<TT>box</TT>, <TT>crow</TT>, <TT>circle</TT>, <TT>diamond</TT>,
<TT>dot</TT>, <TT>inv</TT>, <TT>none</tt>,
......@@ -2171,7 +2171,7 @@ enclosed in the parentheses, <TT>(...)+</TT> indicates 1 or more, and
<TR><TD>string<TD><A HREF=colors.html>color name</A></TR></TABLE>
The specification for the RGB and RGBA formats are the format strings used by
<TT>sscanf</TT> to scan the color value. Thus, these values have the form
"#RGB" or "#RGBA", where R, G, B, and A each consist of 2 hexidecimal
"#RGB" or "#RGBA", where R, G, B, and A each consist of 2 hexadecimal
digits, and can be separated by whitespace. HSV colors have the form of 3
numbers between 0 and 1, separated by whitespace or commas.
<P>
......
......@@ -467,7 +467,7 @@ Synonym for <A HREF=#d:URL>URL</A>.
:id:GCNE:escString:""; map,ps,svg
Allows the graph author to provide an id for graph objects which is to be included in the output.
Normal "&#92;N", "&#92;E", "&#92;G" substitutions are applied.
If provided, it is the responsiblity of the provider to keep
If provided, it is the responsibility of the provider to keep
its values sufficiently unique for its intended downstream use.
Note, in particular, that "&#92;E" does not provide a unique id for multi-edges.
If no id attribute is provided, then a unique internal id is used. However,
......
......@@ -40,7 +40,7 @@
These are the basic set of backward-compatible arrow shapes. In addition,
there is a grammar of <A HREF=arrows.html>arrow shapes</A>
which can be used to describe a collection of 2,313,441 arrow combinations of the
39 varations of the primitive set of 10 arrows. The basic arrows shown
39 variations of the primitive set of 10 arrows. The basic arrows shown
above contain all of the primitive shapes
(<TT>box</TT>, <TT>crow</TT>, <TT>circle</TT>, <TT>diamond</TT>,
<TT>dot</TT>, <TT>inv</TT>, <TT>none</tt>,
......@@ -61,7 +61,7 @@ Colors can be specified using one of four formats.
<TR><TD>string<TD><A HREF=colors.html>color name</A></TR></TABLE>
The specification for the RGB and RGBA formats are the format strings used by
<TT>sscanf</TT> to scan the color value. Thus, these values have the form
"#RGB" or "#RGBA", where R, G, B, and A each consist of 2 hexidecimal
"#RGB" or "#RGBA", where R, G, B, and A each consist of 2 hexadecimal
digits, and can be separated by whitespace. HSV colors have the form of 3
numbers between 0 and 1, separated by whitespace or commas.
<P>
......
......@@ -663,7 +663,7 @@ writes out the graph {\it table}. If {\it flag} is set to {\tt 1} {\LEFTY}
will attach extra attributes to edges to help identify them when this graph
is read back in. This is used when {\LEFTY} communicates with {\DOT}. {\tt
parsegraphlabel} takes a {\DOT}-style record label and the corresponding string
of coordinates for the record fields and returns a hierachical table. Each
of coordinates for the record fields and returns a hierarchical table. Each
entry in this table contains either the text and coordinates of a field, or a
sub-table of fields.
......@@ -709,7 +709,7 @@ from the global namespace. {\tt tablesize} returns the number of entries in a
table. {\tt strlen} returns the number of characters in {\it string}. {\tt
split} splits {\it string} in words and returns a table (indexed from 0 and
up), where each entry is a word. {\it delimiter} is a one character string that
is used to break {\it string} into words. Each occurance of {\it delimiter}
is used to break {\it string} into words. Each occurrence of {\it delimiter}
separates two words. The only exception is when {\it delimiter} is the space
character; all leading and trailing spaces are ignored and multiple spaces are
treated as a single space. {\tt concat} concatenates all its arguments into one
......
......@@ -146,7 +146,7 @@ causes \gvpr\ to mark all blue nodes as selected.
Though \gvpr\ is primarily designed for working with graphs, it incorporates the C language
expression model, and provides many general-purpose C-like functions such as {\tt printf} and file I/O,
string manipulation functions, and associative arrays. A more complete discussion of the use of
\gvpr\ is outside of the scope of this document. The reader is refered to the \gvpr\ man page for
\gvpr\ is outside of the scope of this document. The reader is referred to the \gvpr\ man page for
further information.
\subsection{Topological Fisheye Views}
......
......@@ -128,7 +128,7 @@ for the name. */
};
struct Agdesc_s { /* graph descriptor */
unsigned directed:1; /* if edges are assymetric */
unsigned directed:1; /* if edges are assymmetric */
unsigned strict:1; /* if and self, multi-edges forbidden */
unsigned flatlock:1; /* if sets are flattened into lists */
unsigned maingraph:1; /* if this is the top level graph */
......
......@@ -266,7 +266,7 @@ static Agsym_t *setattr(Agraph_t * g, int kind, char *name, char *value)
dd = agdatadict(g, TRUE); /* force initialization of string attributes */
ldict = agdictof(g, kind);
lsym = aglocaldictsym(ldict, name);
if (lsym) { /* update old local definiton */
if (lsym) { /* update old local definition */
agstrfree(g, lsym->defval);
lsym->defval = agstrdup(g, value);
rv = lsym;
......
......@@ -12,7 +12,7 @@
*************************************************************************/
/* geometric functions (e.g. on points and boxes) with application to, but
* no specific dependance on graphs */
* no specific dependence on graphs */
#ifndef GV_ARITH_H
#define GV_ARITH_H
......
......@@ -1697,7 +1697,7 @@ static void setup_page(GVJ_t * job, graph_t * g)
}
/* CAUTION - job->translation was difficult to get right. */
/* Test with and without assymetric margins, e.g: -Gmargin="1,0" */
/* Test with and without assymmetric margins, e.g: -Gmargin="1,0" */
if (job->rotation) {
job->translation.y = - job->clip.UR.y - job->canvasBox.LL.y / job->zoom;
if ((job->flags & GVRENDER_Y_GOES_DOWN) || (Y_invert))
......@@ -3722,7 +3722,7 @@ void emit_clusters(GVJ_t * job, Agraph_t * g, int flags)
pencolor = color;
if (((color = agget(sg, "fillcolor")) != 0) && color[0])
fillcolor = color;
/* bgcolor is supported for backward compatability
/* bgcolor is supported for backward compatibility
if fill is set, fillcolor trumps bgcolor, so
don't bother checking.
if gradient is set fillcolor trumps bgcolor
......
......@@ -12,7 +12,7 @@
*************************************************************************/
/* geometric functions (e.g. on points and boxes) with application to, but
* no specific dependance on graphs */
* no specific dependence on graphs */
#include "config.h"
......
......@@ -12,7 +12,7 @@
*************************************************************************/
/* geometric types and macros (e.g. points and boxes) with application to, but
* no specific dependance on graphs */
* no specific dependence on graphs */
#ifndef GV_GEOM_H
#define GV_GEOM_H
......
......@@ -12,7 +12,7 @@
*************************************************************************/
/* geometric functions (e.g. on points and boxes) with application to, but
* no specific dependance on graphs */
* no specific dependence on graphs */
#ifndef GV_GEOMPROCS_H
#define GV_GEOMPROCS_H
......
......@@ -81,7 +81,7 @@
% allwidths i j aix get 0.0 gt
% { allstrwidths i j aix get FontSize div } % scale it
% { 1.0} ifelse
% we now use the value for all characters, expecially ' ', because
% we now use the value for all characters, especially ' ', because
% when stringwidth is applied to a string, these are the values
% used. Setting the width of ' ' to 1 doesn't work.
allstrwidths i j aix get FontSize div % scale it
......
......@@ -810,7 +810,7 @@ int clearHTMLlexer()
#ifdef HAVE_EXPAT
/* eatComment:
* Given first character after open comment, eat characters
* upto comment close, returning pointer to closing > if it exists,
* up to comment close, returning pointer to closing > if it exists,
* or null character otherwise.
* We rely on HTML strings having matched nested <>.
*/
......
......@@ -1322,7 +1322,7 @@ static int processTbl(graph_t * g, htmltbl_t * tbl, htmlenv_t * env)
}
/* Split size x over n pieces with spacing s.
* We substract s*(n-1) from x, divide by n and
* We subtract s*(n-1) from x, divide by n and
* take the ceiling.
*/
#define SPLIT(x,n,s) (((x) - ((s)-1)*((n)-1)) / (n))
......
......@@ -428,7 +428,7 @@ int dotneato_args_initialize(GVC_t * gvc, int argc, char **argv)
if (!v) {
// assert(v); /* "dot" should always be available as an output format */
fprintf(stderr,
"Unable to find even the default \"-Tdot\" renderer. Has the config\nfile been generated by running \"dot -c\" with installer's priviledges?\n");
"Unable to find even the default \"-Tdot\" renderer. Has the config\nfile been generated by running \"dot -c\" with installer's privileges?\n");
return(2);
}
}
......
......@@ -349,7 +349,7 @@ char *findFillDflt(node_t * n, char *dflt)
color = late_nnstring(n, N_fillcolor, "");
if (!color[0]) {
/* for backward compatibilty, default fill is same as pen */
/* for backward compatibility, default fill is same as pen */
color = late_nnstring(n, N_color, "");
if (!color[0]) {
color = dflt;
......
......@@ -1037,7 +1037,7 @@ static void break_cycles(graph_t * g)
}
/* setMinMax:
* This will only be called with the root graph or a cluster
* which are guarenteed to contain nodes. Thus, leader will be
* which are guaranteed to contain nodes. Thus, leader will be
* set.
*/
static void setMinMax (graph_t* g, int doRoot)
......
......@@ -40,7 +40,7 @@ static void radix (short bitsOffset, ulong N, rec *source, rec *dest)
for (i = 256; i > 0; --i, ++cp)
*cp = 0;
/* count occurences of every byte value */
/* count occurrences of every byte value */
sp = source;
for (i = N; i > 0; --i, ++sp) {
cp = count + ByteOf (sp->key);
......
......@@ -22,7 +22,7 @@ static void radix (short byteOffset, ulong N, ulong *source, ulong *dest)
for (i = 256; i > 0; --i, ++cp)
*cp = 0;
// count occurences of every byte value
// count occurrences of every byte value
bp = ((uchar *) source) + byteOffset;
for (i = N; i > 0; --i, bp += 4) {
cp = count + *bp;
......
......@@ -32,7 +32,7 @@ static void radix (short byteOffset, ulong N, rec *source, rec *dest)
for (i = 256; i > 0; --i, ++cp)
*cp = 0;
// count occurences of every byte value
// count occurrences of every byte value
bp = ((uchar *) source) + byteOffset;
for (i = N; i > 0; --i, bp += sizeof(rec)) {
cp = count + *bp;
......
......@@ -114,7 +114,7 @@ void furtherest_point(int k, int dim, real *wgt, real *pts, real *center, real w
fprintf(stderr,"}, width = %f, dist = %f\n", qt->width, qt->total_weight);
}
distance = qt->total_weight;/* total_weight is used to store the distance from teh center to the group */
distance = qt->total_weight;/* total_weight is used to store the distance from the center to the group */
if (distance + wmax*sqrt(((real) dim))*qt->width < *dist_max) continue;/* this could happen if this candidate was entered into the list earlier than a better one later in the list */
qt->qts = MALLOC(sizeof(QuadTree)*(1<<dim));
for (ii = 0; ii < 1<<dim; ii++) {
......
......@@ -383,7 +383,7 @@ extern "C" {
glCompButton **buttons;
glCompLabel **labels;
int groupCount; /*group id counter */
int active; //0 dont draw, 1 draw
int active; //0 don't draw, 1 draw
int enabled; //0 disabled 1 enabled(allow mouse interaction)
GLfloat clickedX, clickedY;
......
......@@ -233,7 +233,7 @@ int myaglex(void)
* In particular, the buffer will contain a '\n' as the last non-null char.
* Ignore lines beginning with '#'; update cpp line number if applicable.
* Fold long lines, i.e., ignore escaped newlines.
* Assume the AG.fgets function reads upto newline or buffer length
* Assume the AG.fgets function reads up to newline or buffer length
* like fgets.
* Need to be careful that AG.fgets might not return full physical line
* because buffer is too small to hold it.
......
......@@ -248,7 +248,7 @@ extern "C" {
int url_map_n; /* number of points for url map if GVRENDER_DOES_MAPS */
pointf *url_map_p;
/* additonal mapped regions for edges */
/* additional mapped regions for edges */
int url_bsplinemap_poly_n; /* number of polygons in url bspline map
if GVRENDER_DOES_MAPS && GVRENDER_DOES_MAP_BSPLINES */
int *url_bsplinemap_n; /* array of url_bsplinemap_poly_n ints
......
......@@ -120,7 +120,7 @@ static void gv_edge_state(GVJ_t *job, edge_t *e)
nlist = &(job->selected_obj_type_name);
/* only tail, head, and key are strictly identifying properties,
* but we commonly alse use edge kind (e.g. "->") and tailport,headport
* but we commonly also use edge kind (e.g. "->") and tailport,headport
* in edge names */
j = 0;
gv_argvlist_set_item(nlist, j++, s_edge);
......
......@@ -311,7 +311,7 @@ gvplugin_available_t *gvplugin_load(GVC_t * gvc, api_t api, const char *str)
}
}
/* one last check for successfull load */
/* one last check for successful load */
if (rv && rv->typeptr == NULL)
rv = NULL;
......
......@@ -37,7 +37,7 @@ extern "C" {
has an id that is different from the "ps" type
in the same package */
const char *type; /* a string name, such as "png" or "ps" that
distinguishes different types withing the same
distinguishes different types within the same
(renderer in this case) */
int quality; /* an arbitrary integer used for ordering plugins of
the same type from different packages */
......
......@@ -112,7 +112,7 @@ Rect_t NodeCover(Node_t * n)
}
/* Pick a branch. Pick the one that will need the smallest increase
** in area to accomodate the new rectangle. This will result in the
** in area to accommodate the new rectangle. This will result in the
** least total area for the covering rectangles in the current node.
** In case of a tie, pick the one which was smaller before, to get
** the best resolution when searching.
......
......@@ -157,19 +157,19 @@ static real edge_compatibility_full(pedge e1, pedge e2){
len2 = MAX(dist(dim, u2, v2), SMALL);
len = 0.5*(len1+len2);
/* angle compatability */
/* angle compatibility */
ca = 0;
for (i = 0; i < dim; i++)
ca += (v1[i]-u1[i])*(v2[i]-u2[i]);
ca = ABS(ca/(len1*len2));
assert(ca > -0.001);
/* scale compatability */
/* scale compatibility */
//cs = 2/(len1/len2+len2/len1);
cs = 2/(MAX(len1,len2)/len + len/MIN(len1, len2));
assert(cs > -0.001 && cs < 1.001);
/* position compatability */
/* position compatibility */
cp = 0;
for (i = 0; i < dim; i++) {
tmp = .5*(v1[i]+u1[i])-.5*(v2[i]+u2[i]);
......@@ -179,7 +179,7 @@ static real edge_compatibility_full(pedge e1, pedge e2){
cp = len/(len + cp);
assert(cp > -0.001 && cp < 1.001);
/* visibility compatability */
/* visibility compatibility */
//dist1 = MAX(0.1, dist1/(len1+len2+dist1));
dist1 = cp*ca*cs;
......@@ -251,7 +251,7 @@ void pedge_export_gv(FILE *fp, int ne, pedge *edges){
}
/* figure out max number of bundled origional edges in a pedge */
/* figure out max number of bundled original edges in a pedge */
for (i = 0; i < ne; i++){
edge = edges[i];
if (edge->wgts){
......@@ -707,7 +707,7 @@ static pedge* modularity_ink_bundling(int dim, int ne, SparseMatrix B, pedge* ed
}
static SparseMatrix check_compatibility(SparseMatrix A, int ne, pedge *edges, int compatibility_method, real tol){
/* go through the links and make sure edges are compatable */
/* go through the links and make sure edges are compatible */
SparseMatrix B, C;
int *ia, *ja, i, j, jj;
real start;
......@@ -789,7 +789,7 @@ pedge* edge_bundling(SparseMatrix A0, int dim, real *x, int maxit_outer, real K,
if (Verbose) start = clock();
if (method == METHOD_INK){
/* go through the links and make sure edges are compatable */
/* go through the links and make sure edges are compatible */
B = check_compatibility(A, ne, edges, compatibility_method, tol);
edges = modularity_ink_bundling(dim, ne, B, edges, angle_param, angle);
......@@ -805,7 +805,7 @@ pedge* edge_bundling(SparseMatrix A0, int dim, real *x, int maxit_outer, real K,
#endif
} else if (method == METHOD_FD){/* FD method */
/* go through the links and make sure edges are compatable */
/* go through the links and make sure edges are compatible */
B = check_compatibility(A, ne, edges, compatibility_method, tol);
......
......@@ -517,8 +517,7 @@ static void newPos(void)
/* cleanup:
* Cleanup voronoi memory.
* Note that PQcleanup and ELcleanup rely on the number
* of sites, so should at least be reset everytime we use
* vAdjust.
* of sites, so should at least be reset every time we use vAdjust.
* This could be optimized, over multiple components or
* even multiple graphs, but probably not worth it.
*/
......
......@@ -225,7 +225,7 @@ find_closest_pairs(double *place, int n, int num_pairs,
inv_ordering[ordering[i]] = i;
}
/* Intialize heap with all consecutive pairs */
/* Initialize heap with all consecutive pairs */
initHeap(&heap, place, ordering, n);
/* store the leftmost and rightmost neighbors of each node that were entered into heap */
......
......@@ -57,7 +57,7 @@ compute_hierarchy(vtx_data * graph, int n, double abs_tol,
int use_given_levels = FALSE;
int *ordering;
int *levels;
double tol; /* node 'i' precedes 'j' in hierachy iff y[i]-y[j]>tol */
double tol; /* node 'i' precedes 'j' in hierarchy iff y[i]-y[j]>tol */
double hierarchy_span;
int num_levels;
......
......@@ -613,7 +613,7 @@ get_triangles (double *x, int n, int* tris)
return mid.trianglelist;
}
// maybe it should be replaced by RNG - relative neigborhood graph, or by GG - gabriel graph
// maybe it should be replaced by RNG - relative neighborhood graph, or by GG - gabriel graph
int*
delaunay_tri (double *x, double *y, int n, int* nedges)
{
......
......@@ -995,7 +995,7 @@ void neato_translate(Agraph_t * g)
/* _neato_set_aspect;
* Assume all bounding boxes are correct.
* Return false if no transform is performed. This includes
* the possiblity that a translation was done.
* the possibility that a translation was done.
*/
static boolean _neato_set_aspect(graph_t * g)
{
......
......@@ -467,7 +467,7 @@ static int inPoly(Point vertex[], int n, Point q)
/* crosses ray if strictly positive intersection. */
if (x > 0) {
if ((tp3[i].y == 0) || (tp3[i1].y == 0)) {
crossings += .5; /* goes thru vertex */
crossings += .5; /* goes through vertex */
} else {
crossings += 1.0;
}
......
......@@ -47,7 +47,7 @@ typedef struct CMajEnvVPSC {
int m; /* total number of constraints for next iteration */
int gm; /* number of global constraints */
Constraint **cs;
/* global constraints are persistant throughout optimisation process */
/* global constraints are persistent throughout optimisation process */
Constraint **gcs;
VPSC *vpsc;
float *fArray1; /* utility arrays - reusable memory */
......
......@@ -379,7 +379,7 @@ static int sparse_stress_subspace_majorization_kD(vtx_data * graph, /* Input gra
for (i = 0; i < num_centers; i++)
Dij[i] = storage + i * n;
/* select 'num_centers' pivots that are uniformaly spreaded over the graph */
/* select 'num_centers' pivots that are uniformaly spread over the graph */
/* the first pivots is selected randomly */
node = rand() % n;
......@@ -555,7 +555,7 @@ static int sparse_stress_subspace_majorization_kD(vtx_data * graph, /* Input gra
/*************************************************
** initialize direction vectors **
** to get an intial layout **
** to get an initial layout **
*************************************************/
/* the layout is subspace*directions */
......
......@@ -27,7 +27,7 @@ typedef struct {
vertex* vertices;
} rawgraph;
extern rawgraph* make_graph(int n); /* makes a graph wih n vertices, 0 edges */
extern rawgraph* make_graph(int n); /* makes a graph with n vertices, 0 edges */
extern void free_graph(rawgraph*);
/* inserts edge FROM v1 to v2 */
extern void insert_edge(rawgraph*, int v1, int v2);
......
......@@ -704,7 +704,7 @@ add_segment (int segnum, segment_t* seg, trap_t* tr, qnode_t* qs)
{
if ((tr[tr[t].d0].u0 > 0) && (tr[tr[t].d0].u1 > 0))
{
if (tr[tr[t].d0].u0 == t) /* passes thru LHS */
if (tr[tr[t].d0].u0 == t) /* passes through LHS */
{
tr[tr[t].d0].usave = tr[tr[t].d0].u1;
tr[tr[t].d0].uside = S_LEFT;
......@@ -814,7 +814,7 @@ add_segment (int segnum, segment_t* seg, trap_t* tr, qnode_t* qs)
{
if ((tr[tr[t].d1].u0 > 0) && (tr[tr[t].d1].u1 > 0))
{
if (tr[tr[t].d1].u0 == t) /* passes thru LHS */
if (tr[tr[t].d1].u0 == t) /* passes through LHS */
{
tr[tr[t].d1].usave = tr[tr[t].d1].u1;
tr[tr[t].d1].uside = S_LEFT;
......
......@@ -2,7 +2,7 @@
/* vim:set shiftwidth=4 ts=8: */
/**********************************************************
* See the LICENSE file for copyright infomation. *
* See the LICENSE file for copyright information. *
**********************************************************/
#include "config.h"
......@@ -44,7 +44,7 @@ void Assert(int assertion, char* error) {
/**/
/* INPUTS: size is the size to malloc */