From b20917638c28f67e297dc8558e4219a585dafdbb Mon Sep 17 00:00:00 2001
From: Tilaye Alemu <tilaye.alemu@teamaol.com>
Date: Fri, 16 Jun 2017 13:57:16 +0100
Subject: [PATCH] refactored java wrapper, no change in behavior

---
 ...owpalWabbit_learner_VWMulticlassLearner.cc |  4 ++--
 .../learner/VWMulticlassLearner.java          | 20 ++++---------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/java/src/main/c++/vowpalWabbit_learner_VWMulticlassLearner.cc b/java/src/main/c++/vowpalWabbit_learner_VWMulticlassLearner.cc
index 2f9e89b4a41..8fc910d286c 100644
--- a/java/src/main/c++/vowpalWabbit_learner_VWMulticlassLearner.cc
+++ b/java/src/main/c++/vowpalWabbit_learner_VWMulticlassLearner.cc
@@ -15,8 +15,8 @@ JNIEXPORT jint JNICALL Java_vowpalWabbit_learner_VWMulticlassLearner_predictMult
 jfloatArray multiclass_raw_predictor(example* vec, JNIEnv *env){
   size_t num_values = vec->l.cs.costs.size();
   jfloatArray j_labels = env->NewFloatArray(num_values);
-  for(int i=0;i<num_values;i++) {
-    jfloat f[] = {vec->l.cs.costs[i].partial_prediction};
+  for (int i=0 ; i<num_values; i++) {
+    jfloat f[] = { vec->l.cs.costs[i].partial_prediction };
     env->SetFloatArrayRegion(j_labels, i, 1, (float*)f);
   }
   return j_labels;
diff --git a/java/src/main/java/vowpalWabbit/learner/VWMulticlassLearner.java b/java/src/main/java/vowpalWabbit/learner/VWMulticlassLearner.java
index 364762434d8..69e4df685d1 100644
--- a/java/src/main/java/vowpalWabbit/learner/VWMulticlassLearner.java
+++ b/java/src/main/java/vowpalWabbit/learner/VWMulticlassLearner.java
@@ -17,31 +17,19 @@ final public class VWMulticlassLearner extends VWIntLearner {
     protected native float[] rawPredict(String example, boolean learn, long nativePointer);
 
     /**
-     * Runs prediction on <code>example</code> and returns the prediction output.
+     * Get raw prediction output.
      *
      * @param example a single vw example string
-     * @return A prediction
+     * @return Raw prediction
      */
     public float[] rawPredict(final String example) {
-        return rawLearnOrPredict(example, false);
-    }
-
-    /**
-     * <code>learnOrPredict</code> allows the ability to return an unboxed prediction.  This will reduce the overhead
-     * of this function call.
-     * @param example an example
-     * @param learn whether to call the learn or predict VW functions.
-     * @return an <em>UNBOXED</em> prediction.
-     */
-    private float[] rawLearnOrPredict(final String example, final boolean learn) {
         lock.lock();
         try {
             if (isOpen()) {
-                return rawPredict(example, learn, nativePointer);
+                return rawPredict(example, false, nativePointer);
             }
             throw new IllegalStateException("Already closed.");
-        }
-        finally {
+        } finally {
             lock.unlock();
         }
     }