no message

Author: felipexw

src/main/java/com/github/felipexw/classifiers/neighbors/SimpleKNNClassifier.java

@@ -52,7 +52,7 @@ protected List<LabeledInstance> getInstancesthatMaximizeAccuracy() {
                 for (List<LabeledInstance> labeled : partitionedInstances) {
                     for (LabeledInstance instance : labeled) {
                         if (i != testIndex) {
-                            Neighbor neighbor = new Neighbor(instance, -1d, featureExtractor);
+                            Neighbor neighbor = new Neighbor(instance, -1d, null);
                             List<Neighbor> neighbors = getNeighborsWithDistanceFromARootNeighboor(neighbor, k);
                             features.put(neighbor, neighbors);
                         } else
@@ -128,7 +128,7 @@ protected void setUpForTraining(List<LabeledInstance> instances) {
     protected void calculateFeatureSimilarities() {
         for (int i = 0; i < instances.size(); i++) {
             LabeledInstance instance = instances.get(i);
-            Neighbor neighbor = new Neighbor(instance, -1d, featureExtractor);
+            Neighbor neighbor = new Neighbor(instance, -1d, null);
 
             List<Neighbor> neighbors = getNeighborsWithDistanceFromARootNeighboor(neighbor, this.k);
             features.put(neighbor, neighbors);
@@ -188,19 +188,18 @@ public List<Prediction> predict(List<Instance> instances) {
     }
 
     protected List<Neighbor> getAllNeighbors(Instance labeledInstance) {
-        throw new UnsupportedOperationException("Continue the refactoring.");
-        /*
+
+
         List<Neighbor> neighborses = new ArrayList<>();
         for (short i = 0; i < instances.size(); i++) {
             LabeledInstance trainingInstance = instances.get(i);
             double distance = similarityCalculator.calculate(labeledInstance.getFeatures(), trainingInstance.getFeatures());
 
-            Neighbor neighbor = new Neighbor(trainingInstance, distance);
+            Neighbor neighbor = new Neighbor(trainingInstance, distance, featureExtractor);
             neighborses.add(neighbor);
         }
 
         return neighborses;
-        */
     }
 
     @Override

src/main/java/com/github/felipexw/core/Instance.java

@@ -5,10 +5,8 @@
 /**
  * Created by felipe.appio on 23/08/2016.
  */
-public class Instance<F> {
+public abstract class Instance<F> {
     protected  List<F> features;
 
-    public List<F> getFeatures() {
-        return features;
-    }
+    public abstract  List<F> getFeatures();
 }

src/main/java/com/github/felipexw/core/LabeledInstance.java

@@ -1,32 +1,51 @@
 package com.github.felipexw.core;
 
+import java.util.List;
 import java.util.Objects;
 
 /**
  * Created by felipe.appio on 23/08/2016.
  */
-public class LabeledInstance<L extends Label, F extends Model> extends Instance<String> {
+public class LabeledInstance<L extends Label, F extends Model> extends Instance<F> {
     protected L label;
     private int count;
 
-    public LabeledInstance(L label) {
+    public LabeledInstance(List<F> features,L label) {
         this.label = label;
+        this.features = features;
     }
 
     public L getLabel() {
         return this.label;
     }
 
-    @Override
-    public String toString() {
-        return label.toString();
-    }
-
     public void setCount(int count) {
         this.count = count;
     }
 
+    @Override
+    public List<F> getFeatures() {
+
+        return null;
+    }
+
     public int getCount() {
         return count;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        LabeledInstance<?, ?> that = (LabeledInstance<?, ?>) o;
+
+        return label.equals(that.label);
+
+    }
+
+    @Override
+    public int hashCode() {
+        return label.hashCode();
+    }
 }

src/main/java/com/github/felipexw/core/Model.java

@@ -10,14 +10,16 @@
  */
 public class Model implements FeatureVector {
 
-    private FeatureExtractor featureExtractor;
+    protected FeatureExtractor featureExtractor;
+    protected List features;
 
     public Model(FeatureExtractor featureExtractor) {
         this.featureExtractor = featureExtractor;
     }
 
     @Override
-    public List getData(List source) {
-        return  featureExtractor.extract(source);
+    public List getData() {
+        return  featureExtractor.extract(features);
     }
+
 }

src/main/java/com/github/felipexw/core/extraction/DoubleFeatureExtractor.java

@@ -1,16 +1,19 @@
 package com.github.felipexw.core.extraction;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
 /**
  * Created by felipe.appio on 31/08/2016.
  */
-public class DoubleFeatureExtractor implements FeatureExtractor<Double>{
+public class DoubleFeatureExtractor implements FeatureExtractor<Double> {
 
     @Override
     public List<Double> extract(List<Object> source) {
-        return Arrays.asList(new Double(1d), new Double(2d), new Double(3d), new Double(4d));
+        List<Double> target = new ArrayList<>();
+        source.forEach(s -> target.add(Double.parseDouble(String.valueOf(s))));
+        return target;
     }
 }

src/main/java/com/github/felipexw/core/extraction/FeatureVector.java

@@ -7,5 +7,5 @@
  */
 public interface FeatureVector<T> {
 
-    List<T> getData(List<Object> source);
+    List<T> getData();
 }