Refactoring.

Author: felipexw

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

@@ -2,7 +2,7 @@
 
 import com.github.felipexw.classifiers.Classifier;
 import com.github.felipexw.core.CrossValidation;
-import com.github.felipexw.metrics.SimilarityCalculator;
+import com.github.felipexw.evaluations.metrics.SimilarityCalculator;
 import com.github.felipexw.core.LabeledInstance;
 import com.github.felipexw.core.Prediction;
 

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

@@ -1,7 +1,7 @@
 package com.github.felipexw.classifiers.neighbors;
 
 import com.github.felipexw.evaluations.EvaluatorMetric;
-import com.github.felipexw.metrics.SimilarityCalculator;
+import com.github.felipexw.evaluations.metrics.SimilarityCalculator;
 import com.github.felipexw.core.Instance;
 import com.github.felipexw.core.LabeledInstance;
 import com.github.felipexw.core.Prediction;
@@ -14,7 +14,7 @@
 /**
  * Created by felipe.appio on 23/08/2016.
  */
-public class SimpleKNNClassifier extends KNNClassifier  {
+public class SimpleKNNClassifier extends KNNClassifier {
 
 
  public SimpleKNNClassifier(SimilarityCalculator similarityCalculator) {
@@ -40,12 +40,12 @@ public void train(List<LabeledInstance> instances, int k) {
  }
 
  protected List<LabeledInstance> getInstancesthatMaximizeAccuracy() {
- List<List<LabeledInstance>> partitionedInstances = Lists.partition(instances, instances.size()/k);
+ List<List<LabeledInstance>> partitionedInstances = Lists.partition(instances, instances.size() / k);
  int testIndex = 0;
 
  double[] accuraciesAndInstanceTestIndex = new double[k];
 
- do{
+ do {
  features = new HashMap<>();
  List<Instance> testIntances = new ArrayList<>();
 
@@ -56,10 +56,8 @@ protected List<LabeledInstance> getInstancesthatMaximizeAccuracy() {
  Neighbor neighbor = new Neighbor(instance, -1d);
  List<Neighbor> neighbors = getNeighborsWithDistanceFromARootNeighboor(neighbor, k);
  features.put(neighbor, neighbors);
- }
- else{
+ } else
  testIntances.add(instance);
- }
  }
  }
  }
@@ -71,7 +69,7 @@ protected List<LabeledInstance> getInstancesthatMaximizeAccuracy() {
  accuraciesAndInstanceTestIndex[testIndex] = accuracy;
 
  testIndex++;
- }while(testIndex < accuraciesAndInstanceTestIndex.length-1);
+ } while (testIndex < accuraciesAndInstanceTestIndex.length - 1);
 
  testIndex = getTestIndexWithGreaterAccuracy(accuraciesAndInstanceTestIndex);
  return getTrainingLabeledInstances(partitionedInstances, testIndex);
@@ -140,21 +138,22 @@ protected void calculateFeatureSimilarities() {
 
  protected List<Neighbor> getNeighborsWithDistanceFromARootNeighboor(Neighbor neighbor, int threshold) {
  throw new UnsupportedOperationException("Continue the implementation");
- /*
+
  List<Neighbor> neighbors = new ArrayList<>();
  LabeledInstance instance = neighbor.getInstance();
 
  for (int j = -1; j < instances.size() - 1; j++) {
  LabeledInstance neighborInstance = instances.get(j + 1);
- double similarity = similarityCalculator.calculate(instance.getFeatures(), neighborInstance.getFeatures());
+// double similarity = similarityCalculator.calculate(instance.getFeatures(), neighborInstance.getFeatures());
+ double similarity = 0d;
  Neighbor neighborRoot = new Neighbor(neighborInstance, similarity);
  neighbors.add(neighborRoot);
  if (neighbors.size() == threshold)
  return neighbors;
  }
 
  return neighbors;
- */
+
  }
 
  public List<Neighbor> similarNeighbors(LabeledInstance trainingInstance, int k) {
@@ -183,7 +182,7 @@ public List<Prediction> predict(List<Instance> instances) {
  throw new IllegalArgumentException("instanances can't be empty or null");
 
  List<Prediction> predictionList = new ArrayList<>();
- for(Instance instance: instances)
+ for (Instance instance : instances)
  predictionList.add(predict(instance));
 
  return predictionList;

src/main/java/com/github/felipexw/clusters/KMeansClusterer.java

@@ -1,6 +1,6 @@
 package com.github.felipexw.clusters;
 
-import com.github.felipexw.metrics.SimilarityCalculator;
+import com.github.felipexw.evaluations.metrics.SimilarityCalculator;
 import com.github.felipexw.core.Instance;
 
 import java.util.List;

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

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

src/main/java/com/github/felipexw/evaluations/metrics/ChebyshevSimilarityCalculator.java

@@ -1,4 +1,4 @@
-package com.github.felipexw.metrics;
+package com.github.felipexw.evaluations.metrics;
 
 /**
  * Created by felipe.appio on 30/08/2016.

src/main/java/com/github/felipexw/evaluations/metrics/CosineSimilarityCalculator.java

@@ -1,4 +1,4 @@
-package com.github.felipexw.metrics;
+package com.github.felipexw.evaluations.metrics;
 
 /**
  * Created by felipe.appio on 25/08/2016.