completed
This commit is contained in:
parent
6014b7be48
commit
9dad2b4885
|
@ -1,3 +1,4 @@
|
||||||
int *getRandoms(int lower, int upper, int count);
|
int *getRandoms(int lower, int upper, int count);
|
||||||
long double distance(struct Point* A, struct Point* B);
|
long double distance(struct Point *A, struct Point *B);
|
||||||
bool Kmeans2(struct data_frame *df);
|
bool Kmeans2(struct data_frame *df);
|
||||||
|
long double distance2(struct centroid *A, struct Point *B);
|
|
@ -137,6 +137,7 @@ int DTWfreqDistance(struct data_frame *df)
|
||||||
free(DTW);
|
free(DTW);
|
||||||
temp->count_track1 = 1;
|
temp->count_track1 = 1;
|
||||||
}
|
}
|
||||||
|
return temp->result;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
previous = temp;
|
previous = temp;
|
||||||
|
@ -154,7 +155,6 @@ int DTWfreqDistance(struct data_frame *df)
|
||||||
previous->next = bring;
|
previous->next = bring;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
return temp->result;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -293,6 +293,7 @@ int DTWvolDistance(struct data_frame *df)
|
||||||
free(DTW);
|
free(DTW);
|
||||||
temp->count_track1 = 1;
|
temp->count_track1 = 1;
|
||||||
}
|
}
|
||||||
|
return temp->result;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
previous = temp;
|
previous = temp;
|
||||||
|
@ -310,7 +311,6 @@ int DTWvolDistance(struct data_frame *df)
|
||||||
previous->next = bring;
|
previous->next = bring;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
return temp->result;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue