projects
/
epclust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FIX: C code (double, float, ...) + wrapper (read/write data, get medoids)
[epclust.git]
/
code
/
stage1
/
src
/
Algorithm
/
get_dissimilarities.c
diff --git
a/code/stage1/src/Algorithm/get_dissimilarities.c
b/code/stage1/src/Algorithm/get_dissimilarities.c
index
083cce6
..
5dc8ea2
100644
(file)
--- a/
code/stage1/src/Algorithm/get_dissimilarities.c
+++ b/
code/stage1/src/Algorithm/get_dissimilarities.c
@@
-3,9
+3,9
@@
#include <math.h>
// compute L^p dissimilarities for a nxm matrix
#include <math.h>
// compute L^p dissimilarities for a nxm matrix
-
Real* get_dissimilarities_intra(Real
* samples, uint32_t nbSamples, uint32_t nbValues, uint32_t p)
+
float* get_dissimilarities_intra(float
* samples, uint32_t nbSamples, uint32_t nbValues, uint32_t p)
{
{
-
Real* dissimilarities = (Real*) malloc(nbSamples*nbSamples*sizeof(Real
));
+
float* dissimilarities = (float*) malloc(nbSamples*nbSamples*sizeof(float
));
for (uint32_t i=0; i<nbSamples; i++)
{
dissimilarities[i*nbSamples+i] = 0.0;
for (uint32_t i=0; i<nbSamples; i++)
{
dissimilarities[i*nbSamples+i] = 0.0;
@@
-26,10
+26,10
@@
Real* get_dissimilarities_intra(Real* samples, uint32_t nbSamples, uint32_t nbVa
}
// compute L^p dissimilarities between rows of 2 matrices
}
// compute L^p dissimilarities between rows of 2 matrices
-
Real* get_dissimilarities_inter(Real* mat1, uint32_t n1, Real
* mat2, uint32_t n2,
+
float* get_dissimilarities_inter(float* mat1, uint32_t n1, float
* mat2, uint32_t n2,
uint32_t nbValues, uint32_t p)
{
uint32_t nbValues, uint32_t p)
{
-
Real* dissimilarities = (Real*) malloc(n1*n2*sizeof(Real
));
+
float* dissimilarities = (float*) malloc(n1*n2*sizeof(float
));
for (uint32_t i=0; i<n1; i++)
{
for (uint32_t j=0; j<n2; j++)
for (uint32_t i=0; i<n1; i++)
{
for (uint32_t j=0; j<n2; j++)