projects
/
sort-networks.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/sn_comparator.h: Add Doxygen documentation.
[sort-networks.git]
/
src
/
sn_comparator.c
diff --git
a/src/sn_comparator.c
b/src/sn_comparator.c
index
052731c
..
18361e4
100644
(file)
--- a/
src/sn_comparator.c
+++ b/
src/sn_comparator.c
@@
-1,6
+1,6
@@
/**
/**
- *
collectd
- src/sn_comparator.c
- * Copyright (C) 2008 Florian octo Forster
+ *
libsortnetwork
- src/sn_comparator.c
+ * Copyright (C) 2008
-2010
Florian octo Forster
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@
-16,7
+16,7
@@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* Authors:
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* Authors:
- * Florian octo Forster <
octo at verplant.org
>
+ * Florian octo Forster <
ff at octo.it
>
**/
#ifndef _ISOC99_SOURCE
**/
#ifndef _ISOC99_SOURCE
@@
-61,6
+61,12
@@
void sn_comparator_invert (sn_comparator_t *c)
c->max = max;
} /* void sn_comparator_invert */
c->max = max;
} /* void sn_comparator_invert */
+void sn_comparator_shift (sn_comparator_t *c, int sw, int inputs_num)
+{
+ c->min = (c->min + sw) % inputs_num;
+ c->max = (c->max + sw) % inputs_num;
+} /* void sn_comparator_shift */
+
void sn_comparator_swap (sn_comparator_t *c, int con0, int con1)
{
if (c->min == con0)
void sn_comparator_swap (sn_comparator_t *c, int con0, int con1)
{
if (c->min == con0)
@@
-82,11
+88,9
@@
void sn_comparator_swap (sn_comparator_t *c, int con0, int con1)
}
} /* void sn_comparator_swap */
}
} /* void sn_comparator_swap */
-int sn_comparator_compare (const void *v0, const void *v1)
+int sn_comparator_compare (const sn_comparator_t *c0,
+ const sn_comparator_t *c1)
{
{
- sn_comparator_t *c0 = (sn_comparator_t *) v0;
- sn_comparator_t *c1 = (sn_comparator_t *) v1;
-
if (SN_COMP_LEFT (c0) < SN_COMP_LEFT (c1))
return (-1);
else if (SN_COMP_LEFT (c0) > SN_COMP_LEFT (c1))
if (SN_COMP_LEFT (c0) < SN_COMP_LEFT (c1))
return (-1);
else if (SN_COMP_LEFT (c0) > SN_COMP_LEFT (c1))