Fix/jniclustering2 (#90)

* Fix style
shapelets · Mar 7, 2019 · deca820 · deca820
1 parent 4beaba1
commit deca820
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/bindings/jni/include/khiva_jni/clustering.h b/bindings/jni/include/khiva_jni/clustering.h
@@ -20,13 +20,12 @@ extern "C" {
  * same) and dimension one indicates the number of time series.
  * @brief Calculates            The clusterization based on SBD.
  * @param k                     The number of means to be computed.
- * @param ref_centroids         The resulting means or centroids.
- * @param ref_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.
+ *
+ * @return An Array of arrays with the resulting centroids and labels.
  */
 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);
 
 /**
@@ -39,13 +38,10 @@ JNIEXPORT jlongArray JNICALL Java_io_shapelets_khiva_Clustering_kMeans(JNIEnv *e
  * same) and dimension one indicates the number of time series.
  * @brief Calculates            The clusterization based on SBD.
  * @param k                     The number of means to be computed.
- * @param ref_centroids         The resulting means or centroids.
- * @param ref_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.
  */
 JNIEXPORT jlongArray JNICALL Java_io_shapelets_khiva_Clustering_kShape(JNIEnv *env, jobject, jlong ref_tss, jint k,
-                                                                       jlong ref_centroids, jlong ref_labels,
                                                                        jfloat tolerance, jint maxIterations);
 
 #ifdef __cplusplus

diff --git a/bindings/jni/src/clustering.cpp b/bindings/jni/src/clustering.cpp
@@ -9,7 +9,6 @@
 #include <khiva_jni/clustering.h>
 
 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) {
     const jint l = 3;
     jlong tmp[l];
@@ -44,7 +43,6 @@ JNIEXPORT jlongArray JNICALL Java_io_shapelets_khiva_Clustering_kMeans(JNIEnv *e
 }
 
 JNIEXPORT jlongArray JNICALL Java_io_shapelets_khiva_Clustering_kShape(JNIEnv *env, jobject, jlong ref_tss, jint k,
-                                                                       jlong ref_centroids, jlong ref_labels,
                                                                        jfloat tolerance, jint maxIterations) {
     const jint l = 3;
     jlong tmp[l];