Mercurial > hg > qm-dsp
diff dsp/segmentation/cluster_melt.h @ 505:930b5b0f707d
Merge branch 'codestyle-and-tidy'
| author | Chris Cannam <cannam@all-day-breakfast.com> |
|---|---|
| date | Wed, 05 Jun 2019 12:55:15 +0100 |
| parents | 701233f8ed41 |
| children |
line wrap: on
line diff
--- a/dsp/segmentation/cluster_melt.h Thu May 30 16:18:13 2019 +0100 +++ b/dsp/segmentation/cluster_melt.h Wed Jun 05 12:55:15 2019 +0100 @@ -1,5 +1,4 @@ -#ifndef _CLUSTER_MELT_H -#define _CLUSTER_MELT_H +/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ /* * cluster_melt.h * cluster_melt @@ -15,6 +14,9 @@ * */ +#ifndef QM_DSP_CLUSTER_MELT_H +#define QM_DSP_CLUSTER_MELT_H + #include <stdlib.h> #include <math.h> @@ -22,15 +24,15 @@ extern "C" { #endif -void cluster_melt(double *h, /* normalised histograms, as a vector in row major order */ - int m, /* number of dimensions (i.e. histogram bins) */ - int n, /* number of histograms */ - double *Bsched, /* inverse temperature schedule */ - int t, /* length of schedule */ - int k, /* number of clusters */ - int l, /* neighbourhood limit (supply zero to use default value) */ - int *c /* sequence of cluster assignments */ -); +void cluster_melt(double *h, /* normalised histograms, as a vector in row major order */ + int m, /* number of dimensions (i.e. histogram bins) */ + int n, /* number of histograms */ + double *Bsched, /* inverse temperature schedule */ + int t, /* length of schedule */ + int k, /* number of clusters */ + int l, /* neighbourhood limit (supply zero to use default value) */ + int *c /* sequence of cluster assignments */ + ); #ifdef __cplusplus }