Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SAMOA-77: Rebuild and unification of data serialization #76

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

SAMOA-77: Rebuild and unification of data serialization #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1eb5d7c
loader refactor, loaders package creation, loader type creation, load…
Nov 30, 2017
a2e1793
space refactor
Dec 4, 2017
af493cd
refactor, clean-up
Dec 4, 2017
d5b9b06
instances refactor
Dec 4, 2017
0de64a2
interfaces clean up
Dec 4, 2017
0f5db02
loader factory implementation for avro and arff
Dec 4, 2017
80479f8
refactor, clean up
Dec 6, 2017
5d90e57
arffLoader refactor, clean up
Dec 8, 2017
3c00a52
refactor, clean up
Dec 8, 2017
70e1bfd
kafka newest version added
Dec 19, 2017
6a202d7
kafka newest version aded
Dec 19, 2017
07b2b50
kafka loader added
Dec 20, 2017
2bf1710
kafka loader test added
Dec 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@
<!-- storm 0.8.2 loads zookeeper classes with hardcoded names from 3.3 version-->
<zookeeper.storm.version>3.4.6</zookeeper.storm.version>
<avro.version>1.7.7</avro.version>
<gson.version>2.2.4</gson.version>
</properties>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions samoa-api/src/main/java/org/apache/samoa/core/SerializableInstance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
* #L%
*/

import org.apache.samoa.instances.DenseInstance;
import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.instances.DenseInstance;
import org.apache.samoa.instances.instances.Instance;

/**
* License
Expand Down
3 changes: 1 addition & 2 deletions ...pi/src/main/java/org/apache/samoa/evaluation/BasicClassificationPerformanceEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.apache.samoa.evaluation;

import java.util.Arrays;
import java.util.List;

import org.apache.samoa.instances.Attribute;
Expand All @@ -25,7 +24,7 @@
* #L%
*/

import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.instances.Instance;
import org.apache.samoa.instances.Utils;
import org.apache.samoa.moa.AbstractMOAObject;
import org.apache.samoa.moa.core.Measurement;
Expand Down
9 changes: 2 additions & 7 deletions samoa-api/src/main/java/org/apache/samoa/evaluation/BasicRegressionPerformanceEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
package org.apache.samoa.evaluation;

import java.util.List;

import org.apache.samoa.instances.Attribute;

/*
* #%L
* SAMOA
Expand All @@ -24,9 +20,8 @@
* #L%
*/

import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.Utils;
import org.apache.samoa.moa.AbstractMOAObject;
import org.apache.samoa.instances.instances.Instance;
import org.apache.samoa.moa.AbstractMOAObject;
import org.apache.samoa.moa.core.Measurement;
import org.apache.samoa.moa.core.Vote;

Expand Down
1 change: 0 additions & 1 deletion samoa-api/src/main/java/org/apache/samoa/evaluation/ClusteringEvaluationContentEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
* #L%
*/
import org.apache.samoa.core.*;
import org.apache.samoa.instances.Instance;
import org.apache.samoa.moa.cluster.Clustering;
import org.apache.samoa.moa.core.DataPoint;

Expand Down
2 changes: 1 addition & 1 deletion samoa-api/src/main/java/org/apache/samoa/evaluation/EvaluationDistributorProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import com.google.common.base.Preconditions;
import org.apache.samoa.core.ContentEvent;
import org.apache.samoa.core.Processor;
import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.instances.Instance;
import org.apache.samoa.learners.InstanceContentEvent;
import org.apache.samoa.moa.core.MiscUtils;
import org.apache.samoa.topology.Stream;
Expand Down
2 changes: 1 addition & 1 deletion ...a-api/src/main/java/org/apache/samoa/evaluation/F1ClassificationPerformanceEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/


import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.instances.Instance;
import org.apache.samoa.instances.Utils;
import org.apache.samoa.moa.AbstractMOAObject;
import org.apache.samoa.moa.core.Measurement;
Expand Down
2 changes: 1 addition & 1 deletion samoa-api/src/main/java/org/apache/samoa/evaluation/PerformanceEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* #L%
*/

import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.instances.Instance;
import org.apache.samoa.moa.MOAObject;
import org.apache.samoa.moa.core.Measurement;
import org.apache.samoa.moa.core.Vote;
Expand Down
2 changes: 1 addition & 1 deletion ...i/src/main/java/org/apache/samoa/evaluation/WindowClassificationPerformanceEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* #L%
*/

import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.instances.Instance;
import org.apache.samoa.instances.Utils;
import org.apache.samoa.moa.AbstractMOAObject;
import org.apache.samoa.moa.core.Measurement;
Expand Down
2 changes: 1 addition & 1 deletion samoa-api/src/main/java/org/apache/samoa/evaluation/measures/CMM_GTAnalysis.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import java.util.HashMap;
import java.util.Iterator;

import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.instances.Instance;
import org.apache.samoa.moa.cluster.Clustering;
import org.apache.samoa.moa.core.AutoExpandVector;
import org.apache.samoa.moa.core.DataPoint;
Expand Down
2 changes: 1 addition & 1 deletion samoa-api/src/main/java/org/apache/samoa/evaluation/measures/General.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import java.util.ArrayList;

import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.instances.Instance;
import org.apache.samoa.moa.cluster.Clustering;
import org.apache.samoa.moa.cluster.SphereCluster;
import org.apache.samoa.moa.core.DataPoint;
Expand Down
2 changes: 1 addition & 1 deletion samoa-api/src/main/java/org/apache/samoa/evaluation/measures/SSQ.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/
import java.util.ArrayList;

import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.instances.Instance;
import org.apache.samoa.moa.cluster.Clustering;
import org.apache.samoa.moa.core.DataPoint;
import org.apache.samoa.moa.evaluation.MeasureCollection;
Expand Down
4 changes: 2 additions & 2 deletions samoa-api/src/main/java/org/apache/samoa/evaluation/measures/Separation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
import java.util.ArrayList;
import java.util.List;

import org.apache.samoa.instances.DenseInstance;
import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.instances.DenseInstance;
import org.apache.samoa.instances.instances.Instance;
import org.apache.samoa.moa.cluster.Cluster;
import org.apache.samoa.moa.cluster.Clustering;
import org.apache.samoa.moa.cluster.SphereCluster;
Expand Down
2 changes: 1 addition & 1 deletion samoa-api/src/main/java/org/apache/samoa/learners/InstanceContent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import net.jcip.annotations.Immutable;

import org.apache.samoa.core.SerializableInstance;
import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.instances.Instance;

import java.io.Serializable;

Expand Down
3 changes: 1 addition & 2 deletions samoa-api/src/main/java/org/apache/samoa/learners/InstanceContentEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
*/

import org.apache.samoa.core.ContentEvent;
import org.apache.samoa.core.SerializableInstance;
import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.instances.Instance;

import net.jcip.annotations.Immutable;

Expand Down
2 changes: 1 addition & 1 deletion samoa-api/src/main/java/org/apache/samoa/learners/Learner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import java.util.Set;

import org.apache.samoa.core.Processor;
import org.apache.samoa.instances.Instances;
import org.apache.samoa.instances.instances.Instances;
import org.apache.samoa.topology.Stream;
import org.apache.samoa.topology.TopologyBuilder;

Expand Down
2 changes: 1 addition & 1 deletion samoa-api/src/main/java/org/apache/samoa/learners/ResultContentEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import org.apache.samoa.core.ContentEvent;
import org.apache.samoa.core.SerializableInstance;
import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.instances.Instance;

/**
* License
Expand Down
5 changes: 2 additions & 3 deletions samoa-api/src/main/java/org/apache/samoa/learners/classifiers/LocalLearner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@
*/

import java.io.Serializable;
import java.util.Map;

import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.Instances;
import org.apache.samoa.instances.instances.Instance;
import org.apache.samoa.instances.instances.Instances;

/**
* Learner interface for non-distributed learners.
Expand Down
2 changes: 1 addition & 1 deletion samoa-api/src/main/java/org/apache/samoa/learners/classifiers/LocalLearnerProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

import org.apache.samoa.core.ContentEvent;
import org.apache.samoa.core.Processor;
import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.instances.Instance;
import org.apache.samoa.learners.InstanceContentEvent;
import org.apache.samoa.learners.ResultContentEvent;
import org.apache.samoa.moa.classifiers.core.driftdetection.ChangeDetector;
Expand Down
4 changes: 2 additions & 2 deletions samoa-api/src/main/java/org/apache/samoa/learners/classifiers/NaiveBayes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
import java.util.HashMap;
import java.util.Map;

import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.Instances;
import org.apache.samoa.instances.instances.Instance;
import org.apache.samoa.instances.instances.Instances;
import org.apache.samoa.moa.classifiers.core.attributeclassobservers.GaussianNumericAttributeClassObserver;
import org.apache.samoa.moa.core.GaussianEstimator;
import org.slf4j.Logger;
Expand Down
6 changes: 3 additions & 3 deletions samoa-api/src/main/java/org/apache/samoa/learners/classifiers/SimpleClassifierAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
/**
* License
*/
import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.Instances;
import org.apache.samoa.instances.InstancesHeader;
import org.apache.samoa.instances.instances.Instance;
import org.apache.samoa.instances.instances.Instances;
import org.apache.samoa.instances.instances.InstancesHeader;
import org.apache.samoa.moa.classifiers.functions.MajorityClass;

import com.github.javacliparser.ClassOption;
Expand Down
3 changes: 1 addition & 2 deletions samoa-api/src/main/java/org/apache/samoa/learners/classifiers/SingleClassifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,9 @@
import java.util.Set;

import org.apache.samoa.core.Processor;
import org.apache.samoa.instances.Instances;
import org.apache.samoa.instances.instances.Instances;
import org.apache.samoa.learners.AdaptiveLearner;
import org.apache.samoa.learners.ClassificationLearner;
import org.apache.samoa.learners.Learner;
import org.apache.samoa.moa.classifiers.core.driftdetection.ChangeDetector;
import org.apache.samoa.topology.Stream;
import org.apache.samoa.topology.TopologyBuilder;
Expand Down
3 changes: 1 addition & 2 deletions samoa-api/src/main/java/org/apache/samoa/learners/classifiers/ensemble/AdaptiveBagging.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,9 @@
import java.util.Set;

import org.apache.samoa.core.Processor;
import org.apache.samoa.instances.Instances;
import org.apache.samoa.instances.instances.Instances;
import org.apache.samoa.learners.AdaptiveLearner;
import org.apache.samoa.learners.ClassificationLearner;
import org.apache.samoa.learners.Learner;
import org.apache.samoa.learners.classifiers.trees.VerticalHoeffdingTree;
import org.apache.samoa.moa.classifiers.core.driftdetection.ADWINChangeDetector;
import org.apache.samoa.moa.classifiers.core.driftdetection.ChangeDetector;
Expand Down
2 changes: 1 addition & 1 deletion samoa-api/src/main/java/org/apache/samoa/learners/classifiers/ensemble/Bagging.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import java.util.Set;

import org.apache.samoa.core.Processor;
import org.apache.samoa.instances.Instances;
import org.apache.samoa.instances.instances.Instances;
import org.apache.samoa.learners.ClassificationLearner;
import org.apache.samoa.learners.Learner;
import org.apache.samoa.learners.classifiers.trees.VerticalHoeffdingTree;
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/org/apache/samoa/learners/classifiers/ensemble/BaggingDistributorProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

import org.apache.samoa.core.ContentEvent;
import org.apache.samoa.core.Processor;
import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.instances.Instance;
import org.apache.samoa.learners.InstanceContentEvent;
import org.apache.samoa.moa.core.MiscUtils;
import org.apache.samoa.topology.Stream;
Expand Down
2 changes: 1 addition & 1 deletion samoa-api/src/main/java/org/apache/samoa/learners/classifiers/ensemble/Boosting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import java.util.Set;

import org.apache.samoa.core.Processor;
import org.apache.samoa.instances.Instances;
import org.apache.samoa.instances.instances.Instances;
import org.apache.samoa.learners.ClassificationLearner;
import org.apache.samoa.learners.Learner;
import org.apache.samoa.learners.classifiers.SingleClassifier;
Expand Down
2 changes: 1 addition & 1 deletion ...a/org/apache/samoa/learners/classifiers/ensemble/BoostingPredictionCombinerProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import java.util.Random;

import org.apache.samoa.core.ContentEvent;
import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.instances.Instance;
import org.apache.samoa.learners.InstanceContentEvent;
import org.apache.samoa.learners.ResultContentEvent;
import org.apache.samoa.moa.core.DoubleVector;
Expand Down
2 changes: 1 addition & 1 deletion samoa-api/src/main/java/org/apache/samoa/learners/classifiers/ensemble/Sharding.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import java.util.Set;

import org.apache.samoa.core.Processor;
import org.apache.samoa.instances.Instances;
import org.apache.samoa.instances.instances.Instances;
import org.apache.samoa.learners.Learner;
import org.apache.samoa.learners.classifiers.trees.VerticalHoeffdingTree;
import org.apache.samoa.topology.Stream;
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/org/apache/samoa/learners/classifiers/ensemble/ShardingDistributorProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

import org.apache.samoa.core.ContentEvent;
import org.apache.samoa.core.Processor;
import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.instances.Instance;
import org.apache.samoa.learners.InstanceContentEvent;
import org.apache.samoa.topology.Stream;

Expand Down
2 changes: 1 addition & 1 deletion samoa-api/src/main/java/org/apache/samoa/learners/classifiers/rules/AMRulesRegressor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import java.util.Set;

import org.apache.samoa.core.Processor;
import org.apache.samoa.instances.Instances;
import org.apache.samoa.instances.instances.Instances;
import org.apache.samoa.learners.RegressionLearner;
import org.apache.samoa.learners.classifiers.rules.centralized.AMRulesRegressorProcessor;
import org.apache.samoa.moa.classifiers.rules.core.attributeclassobservers.FIMTDDNumericAttributeClassLimitObserver;
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/org/apache/samoa/learners/classifiers/rules/HorizontalAMRulesRegressor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import java.util.Set;

import org.apache.samoa.core.Processor;
import org.apache.samoa.instances.Instances;
import org.apache.samoa.instances.instances.Instances;
import org.apache.samoa.learners.RegressionLearner;
import org.apache.samoa.learners.classifiers.rules.distributed.AMRDefaultRuleProcessor;
import org.apache.samoa.learners.classifiers.rules.distributed.AMRLearnerProcessor;
Expand Down
2 changes: 1 addition & 1 deletion ...i/src/main/java/org/apache/samoa/learners/classifiers/rules/VerticalAMRulesRegressor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import java.util.Set;

import org.apache.samoa.core.Processor;
import org.apache.samoa.instances.Instances;
import org.apache.samoa.instances.instances.Instances;
import org.apache.samoa.learners.RegressionLearner;
import org.apache.samoa.learners.classifiers.rules.distributed.AMRulesAggregatorProcessor;
import org.apache.samoa.learners.classifiers.rules.distributed.AMRulesStatisticsProcessor;
Expand Down
4 changes: 2 additions & 2 deletions ...va/org/apache/samoa/learners/classifiers/rules/centralized/AMRulesRegressorProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@

import org.apache.samoa.core.ContentEvent;
import org.apache.samoa.core.Processor;
import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.Instances;
import org.apache.samoa.instances.instances.Instance;
import org.apache.samoa.instances.instances.Instances;
import org.apache.samoa.learners.InstanceContentEvent;
import org.apache.samoa.learners.ResultContentEvent;
import org.apache.samoa.learners.classifiers.rules.common.ActiveRule;
Expand Down
2 changes: 1 addition & 1 deletion samoa-api/src/main/java/org/apache/samoa/learners/classifiers/rules/common/LearningRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* #L%
*/

import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.instances.Instance;
import org.apache.samoa.moa.core.DoubleVector;
import org.apache.samoa.moa.core.StringUtils;

Expand Down
2 changes: 1 addition & 1 deletion samoa-api/src/main/java/org/apache/samoa/learners/classifiers/rules/common/Perceptron.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import java.io.Serializable;

import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.instances.Instance;
import org.apache.samoa.moa.classifiers.AbstractClassifier;
import org.apache.samoa.moa.classifiers.Regressor;
import org.apache.samoa.moa.core.DoubleVector;
Expand Down
2 changes: 1 addition & 1 deletion samoa-api/src/main/java/org/apache/samoa/learners/classifiers/rules/common/Rule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import java.util.LinkedList;
import java.util.List;

import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.instances.Instance;
import org.apache.samoa.moa.AbstractMOAObject;
import org.apache.samoa.moa.classifiers.rules.core.conditionaltests.NumericAttributeBinaryRulePredicate;

Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/org/apache/samoa/learners/classifiers/rules/common/RuleActiveRegressionNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import java.util.LinkedList;
import java.util.List;

import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.instances.Instance;
import org.apache.samoa.moa.classifiers.core.AttributeSplitSuggestion;
import org.apache.samoa.moa.classifiers.core.attributeclassobservers.AttributeClassObserver;
import org.apache.samoa.moa.classifiers.core.attributeclassobservers.FIMTDDNumericAttributeClassObserver;
Expand Down
2 changes: 1 addition & 1 deletion ...in/java/org/apache/samoa/learners/classifiers/rules/common/RulePassiveRegressionNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* #L%
*/

import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.instances.Instance;
import org.apache.samoa.moa.core.DoubleVector;

/**
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/apache/samoa/learners/classifiers/rules/common/RuleRegressionNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import java.io.Serializable;

import org.apache.samoa.instances.Instance;
import org.apache.samoa.instances.instances.Instance;
import org.apache.samoa.moa.core.DoubleVector;

/**
Expand Down
Loading