diff --git a/iPDC/inc/Kmeans2.h b/iPDC/inc/Kmeans2.h index ff856f7..8a5d908 100644 --- a/iPDC/inc/Kmeans2.h +++ b/iPDC/inc/Kmeans2.h @@ -1,3 +1,4 @@ int *getRandoms(int lower, int upper, int count); -long double distance(struct Point* A, struct Point* B); -bool Kmeans2(struct data_frame *df); \ No newline at end of file +long double distance(struct Point *A, struct Point *B); +bool Kmeans2(struct data_frame *df); +long double distance2(struct centroid *A, struct Point *B); \ No newline at end of file diff --git a/iPDC/src/Dynamic_time_warping.c b/iPDC/src/Dynamic_time_warping.c index ef4cc93..3db8a29 100644 --- a/iPDC/src/Dynamic_time_warping.c +++ b/iPDC/src/Dynamic_time_warping.c @@ -137,6 +137,7 @@ int DTWfreqDistance(struct data_frame *df) free(DTW); temp->count_track1 = 1; } + return temp->result; break; } previous = temp; @@ -154,7 +155,6 @@ int DTWfreqDistance(struct data_frame *df) previous->next = bring; return 1; } - return temp->result; } } @@ -293,6 +293,7 @@ int DTWvolDistance(struct data_frame *df) free(DTW); temp->count_track1 = 1; } + return temp->result; break; } previous = temp; @@ -310,7 +311,6 @@ int DTWvolDistance(struct data_frame *df) previous->next = bring; return 1; } - return temp->result; } }