Merge "Fix compiler warnings in ml/bordeaux/learning/"android-n-preview-2android-n-preview-1

4 files changed, 27 insertions, 25 deletions

diff --git a/bordeaux/learning/multiclass_pa/jni/jni_multiclass_pa.cpp b/bordeaux/learning/multiclass_pa/jni/jni_multiclass_pa.cpp
index 65575de6d..3825586ed 100644
--- a/bordeaux/learning/multiclass_pa/jni/jni_multiclass_pa.cpp
+++ b/bordeaux/learning/multiclass_pa/jni/jni_multiclass_pa.cpp
@@ -33,8 +33,8 @@ void CreateIndexValuePairs(const int* indices, const float* values,
   }
 }
 
-jlong Java_android_bordeaux_learning_MulticlassPA_initNativeClassifier(JNIEnv* env,
-                                                       jobject thiz,
+jlong Java_android_bordeaux_learning_MulticlassPA_initNativeClassifier(JNIEnv* /* env */,
+                                                       jobject /* thiz */,
                                                        jint num_classes,
                                                        jint num_dims,
                                                        jfloat aggressiveness) {
@@ -45,8 +45,8 @@ jlong Java_android_bordeaux_learning_MulticlassPA_initNativeClassifier(JNIEnv* e
 }
 
 
-jboolean Java_android_bordeaux_learning_MulticlassPA_deleteNativeClassifier(JNIEnv* env,
-                                                             jobject thiz,
+jboolean Java_android_bordeaux_learning_MulticlassPA_deleteNativeClassifier(JNIEnv* /* env */,
+                                                             jobject /* thiz */,
                                                              jlong paPtr) {
   MulticlassPA* classifier = (MulticlassPA*) paPtr;
   delete classifier;
@@ -54,7 +54,7 @@ jboolean Java_android_bordeaux_learning_MulticlassPA_deleteNativeClassifier(JNIE
 }
 
 jboolean Java_android_bordeaux_learning_MulticlassPA_nativeSparseTrainOneExample(JNIEnv* env,
-                                                                  jobject thiz,
+                                                                  jobject /* thiz */,
                                                                   jintArray index_array,
                                                                   jfloatArray value_array,
                                                                   jint target,
@@ -87,7 +87,7 @@ jboolean Java_android_bordeaux_learning_MulticlassPA_nativeSparseTrainOneExample
 
 
 jint Java_android_bordeaux_learning_MulticlassPA_nativeSparseGetClass(JNIEnv* env,
-                                                       jobject thiz,
+                                                       jobject /* thiz */,
                                                        jintArray index_array,
                                                        jfloatArray value_array,
                                                        jlong paPtr) {
diff --git a/bordeaux/learning/multiclass_pa/jni/jni_multiclass_pa.h b/bordeaux/learning/multiclass_pa/jni/jni_multiclass_pa.h
index 81fca8a9e..dd0f43d5c 100644
--- a/bordeaux/learning/multiclass_pa/jni/jni_multiclass_pa.h
+++ b/bordeaux/learning/multiclass_pa/jni/jni_multiclass_pa.h
@@ -15,7 +15,7 @@
  */
 
 #ifndef LEARNINGFW_JNI_MULTICLASS_PA_H
-#define LEAENINGFW_JNI_MULTICLASS_PA_H
+#define LEARNINGFW_JNI_MULTICLASS_PA_H
 
 #include <jni.h>
 
@@ -56,4 +56,4 @@ Java_android_bordeaux_learning_MulticlassPA_nativeSparseGetClass(JNIEnv* env,
 }
 #endif
 
-#endif /* ANDROID_LERNINGFW_JNI_MULTICLASS_PA_H */
+#endif /* ANDROID_LEARNINGFW_JNI_MULTICLASS_PA_H */
diff --git a/bordeaux/learning/stochastic_linear_ranker/jni/jni_stochastic_linear_ranker.cpp b/bordeaux/learning/stochastic_linear_ranker/jni/jni_stochastic_linear_ranker.cpp
index f54b33e36..fd45edaa1 100644
--- a/bordeaux/learning/stochastic_linear_ranker/jni/jni_stochastic_linear_ranker.cpp
+++ b/bordeaux/learning/stochastic_linear_ranker/jni/jni_stochastic_linear_ranker.cpp
@@ -49,7 +49,7 @@ void ConvertParameter2Object(JNIEnv* env, jobjectArray *keys, jobjectArray *valu
 }
 
 void DecomposeSparseWeightVector(JNIEnv* env, jobjectArray *keys, jfloatArray *values,
-    const int length, SparseWeightVector<string> *sample) {
+    SparseWeightVector<string> *sample) {
 
   SparseWeightVector<string>::Wmap w_ = sample->GetMap();
   int i=0;
@@ -68,7 +68,7 @@ void DecomposeSparseWeightVector(JNIEnv* env, jobjectArray *keys, jfloatArray *v
 
 jboolean Java_android_bordeaux_learning_StochasticLinearRanker_nativeSetWeightClassifier(
     JNIEnv* env,
-    jobject thiz,
+    jobject /* thiz */,
     jobjectArray key_array_model,
     jfloatArray value_array_model,
     jfloat normalizer_model,
@@ -94,7 +94,7 @@ jboolean Java_android_bordeaux_learning_StochasticLinearRanker_nativeSetWeightCl
 
 jboolean Java_android_bordeaux_learning_StochasticLinearRanker_nativeSetParameterClassifier(
     JNIEnv* env,
-    jobject thiz,
+    jobject /* thiz */,
     jstring key,
     jstring value,
     jlong paPtr) {
@@ -227,8 +227,8 @@ jboolean Java_android_bordeaux_learning_StochasticLinearRanker_nativeSetParamete
 }
 
 jint Java_android_bordeaux_learning_StochasticLinearRanker_nativeGetLengthClassifier(
-  JNIEnv* env,
-  jobject thiz,
+  JNIEnv* /* env */,
+  jobject /* thiz */,
   jlong paPtr) {
 
   StochasticLinearRanker<string>* classifier = (StochasticLinearRanker<string>*) paPtr;
@@ -248,7 +248,7 @@ std::string ConvertFloat2String(float v){
 
 void Java_android_bordeaux_learning_StochasticLinearRanker_nativeGetParameterClassifier(
     JNIEnv* env,
-    jobject thiz,
+    jobject /* thiz */,
     jobjectArray key_array_param,
     jobjectArray value_array_param,
     jlong paPtr){
@@ -367,7 +367,7 @@ void Java_android_bordeaux_learning_StochasticLinearRanker_nativeGetParameterCla
 
 void Java_android_bordeaux_learning_StochasticLinearRanker_nativeGetWeightClassifier(
   JNIEnv* env,
-  jobject thiz,
+  jobject /* thiz */,
   jobjectArray key_array_model,
   jfloatArray value_array_model,
   jfloat normalizer,
@@ -380,18 +380,20 @@ void Java_android_bordeaux_learning_StochasticLinearRanker_nativeGetWeightClassi
   int array_len = w_map.size();
 
   normalizer = M_weights.GetNormalizer();
-  DecomposeSparseWeightVector(env, &key_array_model, &value_array_model, array_len, &M_weights);
+  DecomposeSparseWeightVector(env, &key_array_model, &value_array_model, &M_weights);
 }
 
-jlong Java_android_bordeaux_learning_StochasticLinearRanker_initNativeClassifier(JNIEnv* env,
-                             jobject thiz) {
+jlong Java_android_bordeaux_learning_StochasticLinearRanker_initNativeClassifier(
+  JNIEnv* /* env */,
+  jobject /* thiz */) {
   StochasticLinearRanker<string>* classifier = new StochasticLinearRanker<string>();
   return ((jlong) classifier);
 }
 
-jboolean Java_android_bordeaux_learning_StochasticLinearRanker_deleteNativeClassifier(JNIEnv* env,
-                               jobject thiz,
-                               jlong paPtr) {
+jboolean Java_android_bordeaux_learning_StochasticLinearRanker_deleteNativeClassifier(
+  JNIEnv* /* env */,
+  jobject /* thiz */,
+  jlong paPtr) {
   StochasticLinearRanker<string>* classifier = (StochasticLinearRanker<string>*) paPtr;
   delete classifier;
   return JNI_TRUE;
@@ -399,7 +401,7 @@ jboolean Java_android_bordeaux_learning_StochasticLinearRanker_deleteNativeClass
 
 jboolean Java_android_bordeaux_learning_StochasticLinearRanker_nativeUpdateClassifier(
   JNIEnv* env,
-  jobject thiz,
+  jobject /* thiz */,
   jobjectArray key_array_positive,
   jfloatArray value_array_positive,
   jobjectArray key_array_negative,
@@ -438,7 +440,7 @@ jboolean Java_android_bordeaux_learning_StochasticLinearRanker_nativeUpdateClass
 
 jfloat Java_android_bordeaux_learning_StochasticLinearRanker_nativeScoreSample(
   JNIEnv* env,
-  jobject thiz,
+  jobject /* thiz */,
   jobjectArray key_array,
   jfloatArray value_array,
   jlong paPtr) {
diff --git a/bordeaux/learning/stochastic_linear_ranker/jni/jni_stochastic_linear_ranker.h b/bordeaux/learning/stochastic_linear_ranker/jni/jni_stochastic_linear_ranker.h
index 09a7047bc..fd187b009 100644
--- a/bordeaux/learning/stochastic_linear_ranker/jni/jni_stochastic_linear_ranker.h
+++ b/bordeaux/learning/stochastic_linear_ranker/jni/jni_stochastic_linear_ranker.h
@@ -15,7 +15,7 @@
  */
 
 #ifndef LEARNING_JNI_STOCHASTIC_LINEAR_RANKER_H
-#define LEAENING_JNI_STOCHASTIC_LINEAR_RANKER_H
+#define LEARNING_JNI_STOCHASTIC_LINEAR_RANKER_H
 
 #include <jni.h>
 
@@ -179,4 +179,4 @@ Java_android_bordeaux_learning_StochasticLinearRanker_nativeSetParameterClassifi
 }
 #endif
 
-#endif /* ANDROID_LERNING_JNI_STOCHASTIC_LINEAR_RANKER_H */
+#endif /* ANDROID_LEARNING_JNI_STOCHASTIC_LINEAR_RANKER_H */