Conversation
added 9 commits
February 6, 2019 14:29
Codecov Report
@@ Coverage Diff @@
## master #80 +/- ##
==========================================
+ Coverage 98.61% 98.68% +0.07%
==========================================
Files 13 13
Lines 1511 1603 +92
==========================================
+ Hits 1490 1582 +92
Misses 21 21
Continue to review full report at Codecov.
|
otorreno
reviewed
Feb 15, 2019
| * @param maxIterations The maximum number of iterations allowed. | ||
| */ | ||
| KHIVAAPI void kMeans(khiva_array *tss, int *k, khiva_array *centroids, khiva_array *labels, float *tolerance, | ||
| int *maxIterations); |
Contributor
There was a problem hiding this comment.
use snake case in this var name
otorreno
reviewed
Feb 15, 2019
| * @param centroids The resulting means or centroids. | ||
| * @param labels The resulting labels of each time series which is the closest centroid. | ||
| * @param tolerance The error tolerance to stop the computation of the centroids. | ||
| * @param maxIterations The maximum number of iterations allowed. |
Contributor
There was a problem hiding this comment.
don't forget to change it here too
otorreno
reviewed
Feb 15, 2019
| * @param centroids The resulting means or centroids. | ||
| * @param labels The resulting labels of each time series which is the closest centroid. | ||
| * @param tolerance The error tolerance to stop the computation of the centroids. | ||
| * @param maxIterations The maximum number of iterations allowed. |
otorreno
reviewed
Feb 15, 2019
| * @param maxIterations The maximum number of iterations allowed. | ||
| */ | ||
| KHIVAAPI void kShape(khiva_array *tss, int *k, khiva_array *centroids, khiva_array *labels, float *tolerance, | ||
| int *maxIterations); |
otorreno
reviewed
Feb 15, 2019
| #include <khiva_c/clustering.h> | ||
|
|
||
| void kMeans(khiva_array *tss, int *k, khiva_array *centroids, khiva_array *labels, float *tolerance, | ||
| int *maxIterations) { |
otorreno
reviewed
Feb 15, 2019
| } | ||
|
|
||
| void kShape(khiva_array *tss, int *k, khiva_array *centroids, khiva_array *labels, float *tolerance, | ||
| int *maxIterations) { |
otorreno
reviewed
Feb 15, 2019
| */ | ||
| JNIEXPORT jlongArray JNICALL Java_io_shapelets_khiva_Clustering_kMeans(JNIEnv *env, jobject, jlong ref_tss, jint k, | ||
| jlong ref_centroids, jlong ref_labels, | ||
| jfloat tolerance, jint maxIterations); |
Contributor
There was a problem hiding this comment.
here it is ok, don't change it
otorreno
reviewed
Feb 15, 2019
| // Extract first EigenVector | ||
| af::array first = af::lookup(evectors, indMaxEigenValue, 1); | ||
|
|
||
| // TODO: Check this normalization is necessary. |
otorreno
reviewed
Feb 15, 2019
| float error = std::numeric_limits<float>::max(); | ||
| int iter = 0; | ||
|
|
||
| // Stop Criteria: Stop updating after convergence is reached. |
Contributor
There was a problem hiding this comment.
... or the max number of iterations is reached.
otorreno
reviewed
Feb 15, 2019
|
|
||
| unsigned int idxh[5] = {0, 1, 2, 0, 1}; | ||
|
|
||
| float expected_c[35] = {-0.5234, 0.1560, -0.3627, -1.2764, -0.7781, 0.9135, 1.8711, |
Contributor
There was a problem hiding this comment.
use CamelCase in this file. Applies to other variables as well
otorreno
suggested changes
Feb 15, 2019
Contributor
otorreno
left a comment
otorreno
left a comment
There was a problem hiding this comment.
Take a look at the comments and merge eigenValues and eigenVectors functions
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Make sure you have checked all steps below.
Description
Tests
Benchmarks
Commits
License
Documentation