SAMOA-58: changes @gdfm requested
Project: http://git-wip-us.apache.org/repos/asf/incubator-samoa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-samoa/commit/a3423402 Tree: http://git-wip-us.apache.org/repos/asf/incubator-samoa/tree/a3423402 Diff: http://git-wip-us.apache.org/repos/asf/incubator-samoa/diff/a3423402 Branch: refs/heads/master Commit: a34234026571ab3710e08cbcdf2f6260c8f2b7ca Parents: a1e0376 Author: edi_bice <[email protected]> Authored: Mon Mar 14 14:01:59 2016 -0400 Committer: Gianmarco De Francisci Morales <[email protected]> Committed: Tue Apr 19 11:33:42 2016 +0300 ---------------------------------------------------------------------- pom.xml | 4 ++-- .../src/main/java/org/apache/samoa/moa/core/Measurement.java | 6 +++--- .../src/main/java/org/apache/samoa/streams/FileStream.java | 7 +++++-- 3 files changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/a3423402/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e02a1d6..191499f 100644 --- a/pom.xml +++ b/pom.xml @@ -158,8 +158,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.5</version> <configuration> - <source>1.8</source> - <target>1.8</target> + <source>1.7</source> + <target>1.7</target> </configuration> </plugin> <plugin> http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/a3423402/samoa-api/src/main/java/org/apache/samoa/moa/core/Measurement.java ---------------------------------------------------------------------- diff --git a/samoa-api/src/main/java/org/apache/samoa/moa/core/Measurement.java b/samoa-api/src/main/java/org/apache/samoa/moa/core/Measurement.java index 8a3d598..cfda55f 100644 --- a/samoa-api/src/main/java/org/apache/samoa/moa/core/Measurement.java +++ b/samoa-api/src/main/java/org/apache/samoa/moa/core/Measurement.java @@ -40,12 +40,12 @@ public class Measurement extends AbstractMOAObject { protected int fractionDigits; public Measurement(String name, double value) { - this.name = name; - this.value = value; + this(name, value, 3); } public Measurement(String name, double value, int fractionDigits) { - this(name, value); + this.name = name; + this.value = value; this.fractionDigits = fractionDigits; } http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/a3423402/samoa-api/src/main/java/org/apache/samoa/streams/FileStream.java ---------------------------------------------------------------------- diff --git a/samoa-api/src/main/java/org/apache/samoa/streams/FileStream.java b/samoa-api/src/main/java/org/apache/samoa/streams/FileStream.java index e9595b1..05dcb1a 100644 --- a/samoa-api/src/main/java/org/apache/samoa/streams/FileStream.java +++ b/samoa-api/src/main/java/org/apache/samoa/streams/FileStream.java @@ -20,7 +20,10 @@ package org.apache.samoa.streams; * #L% */ -import com.github.javacliparser.*; +import com.github.javacliparser.ClassOption; +import com.github.javacliparser.FloatOption; +import com.github.javacliparser.IntOption; +import com.github.javacliparser.ListOption; import org.apache.samoa.instances.Instances; import org.apache.samoa.instances.InstancesHeader; import org.apache.samoa.moa.core.InstanceExample; @@ -107,7 +110,7 @@ public abstract class FileStream extends AbstractOptionHandler implements Instan if (classWeights != null && classWeights.length > 0) { int i = (int) prevInstance.instance.classValue(); double w = 1.0; - if (i>=0 && i<classWeights.length) + if (i >= 0 && i < classWeights.length) w = classWeights[i].getValue(); prevInstance.setWeight(w); }
