You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by nt...@apache.org on 2017/11/23 14:25:56 UTC
[2/3] ignite git commit: IGNITE-6949: Cleanup OLS code. This closes
#3063.
http://git-wip-us.apache.org/repos/asf/ignite/blob/34955be3/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/storage/vector/SparseDistributedVectorStorage.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/storage/vector/SparseDistributedVectorStorage.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/storage/vector/SparseDistributedVectorStorage.java
index 8f79413..af1c2cd 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/storage/vector/SparseDistributedVectorStorage.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/storage/vector/SparseDistributedVectorStorage.java
@@ -17,29 +17,25 @@
package org.apache.ignite.ml.math.impls.storage.vector;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.Ignition;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.internal.util.typedef.internal.A;
-import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.ml.math.StorageConstants;
import org.apache.ignite.ml.math.VectorStorage;
import org.apache.ignite.ml.math.distributed.CacheUtils;
import org.apache.ignite.ml.math.distributed.DistributedStorage;
import org.apache.ignite.ml.math.distributed.keys.RowColMatrixKey;
import org.apache.ignite.ml.math.distributed.keys.impl.SparseMatrixKey;
-import org.apache.ignite.ml.math.functions.IgniteDoubleFunction;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
/**
* {@link VectorStorage} implementation for {@link /*SparseDistributedVector}.
@@ -47,10 +43,13 @@ import java.util.stream.IntStream;
public class SparseDistributedVectorStorage extends CacheUtils implements VectorStorage, StorageConstants, DistributedStorage<RowColMatrixKey> {
/** Cache name used for all instances of {@link SparseDistributedVectorStorage}. */
private static final String CACHE_NAME = "ML_SPARSE_VECTORS_CONTAINER";
+
/** Amount of elements in the vector. */
private int size;
+
/** Random or sequential access mode. */
private int acsMode;
+
/** Matrix uuid. */
private UUID uuid;
@@ -65,7 +64,7 @@ public class SparseDistributedVectorStorage extends CacheUtils implements Vector
}
/**
- * @param size Amount of elements in the vector.
+ * @param size Amount of elements in the vector.
* @param acsMode Random or sequential access mode.
*/
public SparseDistributedVectorStorage(int size, int acsMode) {
@@ -137,7 +136,8 @@ public class SparseDistributedVectorStorage extends CacheUtils implements Vector
return ignite().compute(getClusterGroupForGivenKey(CACHE_NAME, getCacheKey(i))).call(() -> {
IgniteCache<RowColMatrixKey, Double> cache = Ignition.localIgnite().getOrCreateCache(CACHE_NAME);
Double res = cache.get(getCacheKey(i));
- if (res == null) return 0.0;
+ if (res == null)
+ return 0.0;
return res;
});
}
@@ -163,13 +163,11 @@ public class SparseDistributedVectorStorage extends CacheUtils implements Vector
});
}
-
/** {@inheritDoc} */
@Override public int size() {
return size;
}
-
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
out.writeInt(size);
@@ -182,7 +180,7 @@ public class SparseDistributedVectorStorage extends CacheUtils implements Vector
@Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
size = in.readInt();
acsMode = in.readInt();
- uuid = (UUID) in.readObject();
+ uuid = (UUID)in.readObject();
cache = ignite().getOrCreateCache(in.readUTF());
}
@@ -217,37 +215,11 @@ public class SparseDistributedVectorStorage extends CacheUtils implements Vector
cache.clearAll(keyset);
}
- /** {@inheritDoc} */
- @Override public int hashCode() {
- int res = 1;
-
- res = res * 37 + size;
- res = res * 37 + acsMode;
- res = res * 37 + uuid.hashCode();
- res = res * 37 + cache.hashCode();
-
- return res;
- }
-
- /** {@inheritDoc} */
- @Override public boolean equals(Object obj) {
- if (this == obj)
- return true;
-
- if (obj == null || getClass() != obj.getClass())
- return false;
-
- SparseDistributedVectorStorage that = (SparseDistributedVectorStorage) obj;
-
- return size == that.size && acsMode == that.acsMode
- && uuid.equals(that.uuid) && (cache != null ? cache.equals(that.cache) : that.cache == null);
- }
-
/**
- * Builds cache key for vector element
+ * Builds cache key for vector element.
*
- * @param idx Index
- * @return RowColMatrixKey
+ * @param idx Index.
+ * @return RowColMatrixKey.
*/
public RowColMatrixKey getCacheKey(int idx) {
return new SparseMatrixKey(idx, uuid, null);
@@ -270,11 +242,39 @@ public class SparseDistributedVectorStorage extends CacheUtils implements Vector
return uuid;
}
- @Override
- public double[] data() {
- double[] result = new double[this.size];
- for (int i = 0; i < this.size; i++) result[i] = this.get(i);
- return result;
+ /** {@inheritDoc} */
+ @Override public double[] data() {
+ double[] res = new double[this.size];
+
+ for (int i = 0; i < this.size; i++)
+ res[i] = this.get(i);
+
+ return res;
}
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ int res = 1;
+
+ res = res * 37 + size;
+ res = res * 37 + acsMode;
+ res = res * 37 + uuid.hashCode();
+ res = res * 37 + cache.hashCode();
+
+ return res;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+
+ if (obj == null || getClass() != obj.getClass())
+ return false;
+
+ SparseDistributedVectorStorage that = (SparseDistributedVectorStorage)obj;
+
+ return size == that.size && acsMode == that.acsMode
+ && uuid.equals(that.uuid) && (cache != null ? cache.equals(that.cache) : that.cache == null);
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/34955be3/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/storage/vector/SparseLocalOnHeapVectorStorage.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/storage/vector/SparseLocalOnHeapVectorStorage.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/storage/vector/SparseLocalOnHeapVectorStorage.java
index 272f08d..4e07a92 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/storage/vector/SparseLocalOnHeapVectorStorage.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/storage/vector/SparseLocalOnHeapVectorStorage.java
@@ -161,7 +161,7 @@ public class SparseLocalOnHeapVectorStorage implements VectorStorage, StorageCon
@Override public double[] data() {
double[] data = new double[size];
- sto.forEach((idx, val) -> data[idx]=val);
+ sto.forEach((idx, val) -> data[idx] = val);
return data;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/34955be3/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/vector/MapWrapperVector.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/vector/MapWrapperVector.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/vector/MapWrapperVector.java
index 58309f6..d79f98b 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/vector/MapWrapperVector.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/vector/MapWrapperVector.java
@@ -20,7 +20,6 @@ package org.apache.ignite.ml.math.impls.vector;
import java.util.Map;
import org.apache.ignite.ml.math.Matrix;
import org.apache.ignite.ml.math.Vector;
-import org.apache.ignite.ml.math.VectorStorage;
import org.apache.ignite.ml.math.impls.storage.matrix.MapWrapperStorage;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/34955be3/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/vector/SparseBlockDistributedVector.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/vector/SparseBlockDistributedVector.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/vector/SparseBlockDistributedVector.java
index e460f9f..535d51a 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/vector/SparseBlockDistributedVector.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/vector/SparseBlockDistributedVector.java
@@ -17,18 +17,14 @@
package org.apache.ignite.ml.math.impls.vector;
-import org.apache.ignite.lang.IgniteUuid;
+import java.util.UUID;
import org.apache.ignite.ml.math.Matrix;
import org.apache.ignite.ml.math.StorageConstants;
import org.apache.ignite.ml.math.Vector;
import org.apache.ignite.ml.math.distributed.CacheUtils;
import org.apache.ignite.ml.math.functions.IgniteDoubleFunction;
import org.apache.ignite.ml.math.impls.matrix.SparseBlockDistributedMatrix;
-import org.apache.ignite.ml.math.impls.storage.matrix.BlockMatrixStorage;
import org.apache.ignite.ml.math.impls.storage.matrix.BlockVectorStorage;
-import org.apache.ignite.ml.math.impls.storage.vector.SparseDistributedVectorStorage;
-
-import java.util.UUID;
/**
* Sparse distributed vector implementation based on data grid.
@@ -58,7 +54,6 @@ public class SparseBlockDistributedVector extends AbstractVector implements Stor
setStorage(new BlockVectorStorage(size));
}
-
/**
* @param data Data to fill storage
*/
@@ -66,14 +61,14 @@ public class SparseBlockDistributedVector extends AbstractVector implements Stor
setStorage(new BlockVectorStorage(data.length));
for (int i = 0; i < data.length; i++) {
double val = data[i];
- if (val != 0.0) storage().set(i, val);
+ if (val != 0.0)
+ storage().set(i, val);
}
}
-
/** */
public BlockVectorStorage storage() {
- return (BlockVectorStorage) getStorage();
+ return (BlockVectorStorage)getStorage();
}
/**
@@ -85,10 +80,12 @@ public class SparseBlockDistributedVector extends AbstractVector implements Stor
return mapOverValues(v -> v / d);
}
+ /** {@inheritDoc} */
@Override public Vector like(int size) {
return new SparseBlockDistributedVector(size);
}
+ /** {@inheritDoc} */
@Override public Matrix likeMatrix(int rows, int cols) {
return new SparseBlockDistributedMatrix(rows, cols);
}
@@ -111,7 +108,6 @@ public class SparseBlockDistributedVector extends AbstractVector implements Stor
return mapOverValues(v -> v * x);
}
-
/** {@inheritDoc} */
@Override public Vector assign(double val) {
return mapOverValues(v -> val);
@@ -134,6 +130,6 @@ public class SparseBlockDistributedVector extends AbstractVector implements Stor
/** */
public UUID getUUID() {
- return ((BlockVectorStorage) getStorage()).getUUID();
+ return ((BlockVectorStorage)getStorage()).getUUID();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/34955be3/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/vector/SparseDistributedVector.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/vector/SparseDistributedVector.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/vector/SparseDistributedVector.java
index b773bfa..3e7f8a1 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/vector/SparseDistributedVector.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/vector/SparseDistributedVector.java
@@ -17,28 +17,15 @@
package org.apache.ignite.ml.math.impls.vector;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.Ignition;
-import org.apache.ignite.cache.affinity.Affinity;
-import org.apache.ignite.cluster.ClusterNode;
-import org.apache.ignite.lang.IgniteUuid;
+import java.util.UUID;
import org.apache.ignite.ml.math.Matrix;
import org.apache.ignite.ml.math.StorageConstants;
import org.apache.ignite.ml.math.Vector;
import org.apache.ignite.ml.math.distributed.CacheUtils;
-import org.apache.ignite.ml.math.distributed.keys.RowColMatrixKey;
-import org.apache.ignite.ml.math.exceptions.CardinalityException;
-import org.apache.ignite.ml.math.exceptions.UnsupportedOperationException;
import org.apache.ignite.ml.math.functions.IgniteDoubleFunction;
-import org.apache.ignite.ml.math.impls.matrix.*;
-import org.apache.ignite.ml.math.impls.storage.matrix.SparseDistributedMatrixStorage;
+import org.apache.ignite.ml.math.impls.matrix.SparseDistributedMatrix;
import org.apache.ignite.ml.math.impls.storage.vector.SparseDistributedVectorStorage;
-import java.util.Collection;
-import java.util.Map;
-import java.util.UUID;
-
/**
* Sparse distributed vector implementation based on data grid.
* <p>
@@ -59,7 +46,7 @@ public class SparseDistributedVector extends AbstractVector implements StorageCo
}
/**
- * @param size Vector size.
+ * @param size Vector size.
* @param acsMode Vector elements access mode..
*/
public SparseDistributedVector(int size, int acsMode) {
@@ -67,29 +54,33 @@ public class SparseDistributedVector extends AbstractVector implements StorageCo
assert size > 0;
assertAccessMode(acsMode);
-
setStorage(new SparseDistributedVectorStorage(size, acsMode));
}
+ /**
+ * @param size Size.
+ */
public SparseDistributedVector(int size) {
this(size, StorageConstants.RANDOM_ACCESS_MODE);
}
/**
- * @param data
+ * @param data Data.
*/
public SparseDistributedVector(double[] data) {
setStorage(new SparseDistributedVectorStorage(data.length, StorageConstants.RANDOM_ACCESS_MODE));
+
for (int i = 0; i < data.length; i++) {
- double value = data[i];
- if (value != 0.0) storage().set(i, value);
+ double val = data[i];
+
+ if (val != 0.0)
+ storage().set(i, val);
}
}
-
/** */
public SparseDistributedVectorStorage storage() {
- return (SparseDistributedVectorStorage) getStorage();
+ return (SparseDistributedVectorStorage)getStorage();
}
/**
@@ -101,13 +92,13 @@ public class SparseDistributedVector extends AbstractVector implements StorageCo
return mapOverValues(v -> v / d);
}
- @Override
- public Vector like(int size) {
+ /** {@inheritDoc} */
+ @Override public Vector like(int size) {
return new SparseDistributedVector(size, storage().accessMode());
}
- @Override
- public Matrix likeMatrix(int rows, int cols) {
+ /** {@inheritDoc} */
+ @Override public Matrix likeMatrix(int rows, int cols) {
return new SparseDistributedMatrix(rows, cols);
}
@@ -129,7 +120,6 @@ public class SparseDistributedVector extends AbstractVector implements StorageCo
return mapOverValues(v -> v * x);
}
-
/** {@inheritDoc} */
@Override public Vector assign(double val) {
return mapOverValues(v -> val);
@@ -152,6 +142,6 @@ public class SparseDistributedVector extends AbstractVector implements StorageCo
/** */
public UUID getUUID() {
- return ((SparseDistributedVectorStorage) getStorage()).getUUID();
+ return ((SparseDistributedVectorStorage)getStorage()).getUUID();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/34955be3/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/vector/VectorBlockEntry.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/vector/VectorBlockEntry.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/vector/VectorBlockEntry.java
index ad795c4..999e412 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/vector/VectorBlockEntry.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/impls/vector/VectorBlockEntry.java
@@ -17,10 +17,8 @@
package org.apache.ignite.ml.math.impls.vector;
-
import org.apache.ignite.ml.math.Vector;
-
/**
* Block for {@link SparseBlockDistributedVector}.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/34955be3/modules/ml/src/main/java/org/apache/ignite/ml/math/util/MatrixUtil.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/math/util/MatrixUtil.java b/modules/ml/src/main/java/org/apache/ignite/ml/math/util/MatrixUtil.java
index 0ab568c..9b670e5 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/math/util/MatrixUtil.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/math/util/MatrixUtil.java
@@ -187,7 +187,7 @@ public class MatrixUtil {
for (int i = 0; i < rowsCnt; i++)
for (int j = 0; j < colsCnt; j++)
- res[i][j] = fArr[!isRowMode? i * colsCnt + j : j * rowsCnt + i];
+ res[i][j] = fArr[!isRowMode ? i * colsCnt + j : j * rowsCnt + i];
return res;
}
@@ -206,7 +206,7 @@ public class MatrixUtil {
for (int i = 0; i < rowsCnt; i++)
for (int j = 0; j < colsCnt; j++)
- mtx.setX(i, j, fArr[!isRowMode? i * colsCnt + j : j * rowsCnt + i]);
+ mtx.setX(i, j, fArr[!isRowMode ? i * colsCnt + j : j * rowsCnt + i]);
}
/** */
@@ -227,7 +227,7 @@ public class MatrixUtil {
for (int i = 0; i < iLim; i++)
for (int j = 0; j < jLim; j++)
- res[isRowMode? j * iLim + i : i * jLim + j] = arr[i][j];
+ res[isRowMode ? j * iLim + i : i * jLim + j] = arr[i][j];
return res;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/34955be3/modules/ml/src/main/java/org/apache/ignite/ml/trees/trainers/columnbased/caches/ProjectionsCache.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/trees/trainers/columnbased/caches/ProjectionsCache.java b/modules/ml/src/main/java/org/apache/ignite/ml/trees/trainers/columnbased/caches/ProjectionsCache.java
index 29cf6b4..080cb66 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/trees/trainers/columnbased/caches/ProjectionsCache.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/trees/trainers/columnbased/caches/ProjectionsCache.java
@@ -234,7 +234,8 @@ public class ProjectionsCache {
}
/**
- * Returns projections of regions on given feature filtered by maximal depth in the form of (region index -> region projection).
+ * Returns projections of regions on given feature filtered by maximal depth in the form of (region index -> region
+ * projection).
*
* @param featureIdx Feature index.
* @param maxDepth Maximal depth of the tree.
@@ -243,7 +244,8 @@ public class ProjectionsCache {
* @param affinity Affinity function.
* @param trainingUUID UUID of training.
* @param ignite Ignite instance.
- * @return Projections of regions on given feature filtered by maximal depth in the form of (region index -> region projection).
+ * @return Projections of regions on given feature filtered by maximal depth in the form of (region index -> region
+ * projection).
*/
public static Map<Integer, RegionProjection> projectionsOfFeature(int featureIdx, int maxDepth, int regsCnt,
int blockSize, IgniteFunction<Integer, Object> affinity, UUID trainingUUID, Ignite ignite) {
@@ -281,4 +283,4 @@ public class ProjectionsCache {
getOrCreate(ignite).removeAll(toRmv);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/34955be3/modules/ml/src/main/java/org/apache/ignite/ml/util/MnistUtils.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/util/MnistUtils.java b/modules/ml/src/main/java/org/apache/ignite/ml/util/MnistUtils.java
index 03e3198..d69781e 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/util/MnistUtils.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/util/MnistUtils.java
@@ -32,15 +32,18 @@ import org.apache.ignite.ml.math.impls.vector.DenseLocalOnHeapVector;
*/
public class MnistUtils {
/**
- * Read random {@code count} samples from MNIST dataset from two files (images and labels) into a stream of labeled vectors.
+ * Read random {@code count} samples from MNIST dataset from two files (images and labels) into a stream of labeled
+ * vectors.
+ *
* @param imagesPath Path to the file with images.
* @param labelsPath Path to the file with labels.
* @param rnd Random numbers generatror.
- * @param count Count of samples to read.
+ * @param cnt Count of samples to read.
* @return Stream of MNIST samples.
* @throws IOException
*/
- public static Stream<DenseLocalOnHeapVector> mnist(String imagesPath, String labelsPath, Random rnd, int count) throws IOException {
+ public static Stream<DenseLocalOnHeapVector> mnist(String imagesPath, String labelsPath, Random rnd, int cnt)
+ throws IOException {
FileInputStream isImages = new FileInputStream(imagesPath);
FileInputStream isLabels = new FileInputStream(labelsPath);
@@ -74,22 +77,24 @@ public class MnistUtils {
isImages.close();
isLabels.close();
- return lst.subList(0, count).stream().map(DenseLocalOnHeapVector::new);
+ return lst.subList(0, cnt).stream().map(DenseLocalOnHeapVector::new);
}
/**
* Convert random {@code count} samples from MNIST dataset from two files (images and labels) into libsvm format.
+ *
* @param imagesPath Path to the file with images.
* @param labelsPath Path to the file with labels.
* @param outPath Path to output path.
* @param rnd Random numbers generator.
- * @param count Count of samples to read.
+ * @param cnt Count of samples to read.
* @throws IOException
*/
- public static void asLIBSVM(String imagesPath, String labelsPath, String outPath, Random rnd, int count) throws IOException {
+ public static void asLIBSVM(String imagesPath, String labelsPath, String outPath, Random rnd, int cnt)
+ throws IOException {
try (FileWriter fos = new FileWriter(outPath)) {
- mnist(imagesPath, labelsPath, rnd, count).forEach(vec -> {
+ mnist(imagesPath, labelsPath, rnd, cnt).forEach(vec -> {
try {
fos.write((int)vec.get(vec.size() - 1) + " ");
@@ -112,6 +117,7 @@ public class MnistUtils {
/**
* Utility method for reading 4 bytes from input stream.
+ *
* @param is Input stream.
* @throws IOException
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/34955be3/modules/ml/src/main/java/org/apache/ignite/ml/util/Utils.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/util/Utils.java b/modules/ml/src/main/java/org/apache/ignite/ml/util/Utils.java
index b7669be..bb779e3 100644
--- a/modules/ml/src/main/java/org/apache/ignite/ml/util/Utils.java
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/util/Utils.java
@@ -29,25 +29,30 @@ import java.io.ObjectOutputStream;
public class Utils {
/**
* Perform deep copy of an object.
+ *
* @param orig Original object.
* @param <T> Class of original object;
* @return Deep copy of original object.
*/
public static <T> T copy(T orig) {
Object obj = null;
+
try {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream(baos);
+
out.writeObject(orig);
out.flush();
out.close();
- ObjectInputStream in = new ObjectInputStream(
- new ByteArrayInputStream(baos.toByteArray()));
+
+ ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray()));
+
obj = in.readObject();
}
catch (IOException | ClassNotFoundException e) {
e.printStackTrace();
}
+
return (T)obj;
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/34955be3/modules/ml/src/test/java/org/apache/ignite/ml/LocalModelsTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/LocalModelsTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/LocalModelsTest.java
index 8b12501..acc5649 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/LocalModelsTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/LocalModelsTest.java
@@ -48,7 +48,7 @@ public class LocalModelsTest {
*
*/
@Test
- public void importExportKMeansModelTest(){
+ public void importExportKMeansModelTest() {
Path mdlPath = Paths.get(mdlFilePath);
KMeansModel mdl = getClusterModel();
@@ -67,7 +67,7 @@ public class LocalModelsTest {
/**
*
*/
- private KMeansModel getClusterModel(){
+ private KMeansModel getClusterModel() {
KMeansLocalClusterer clusterer = new KMeansLocalClusterer(new EuclideanDistance(), 1, 1L);
double[] v1 = new double[] {1959, 325100};
http://git-wip-us.apache.org/repos/asf/ignite/blob/34955be3/modules/ml/src/test/java/org/apache/ignite/ml/clustering/KMeansDistributedClustererTestMultiNode.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/clustering/KMeansDistributedClustererTestMultiNode.java b/modules/ml/src/test/java/org/apache/ignite/ml/clustering/KMeansDistributedClustererTestMultiNode.java
index 06066c2..2722d74 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/clustering/KMeansDistributedClustererTestMultiNode.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/clustering/KMeansDistributedClustererTestMultiNode.java
@@ -18,10 +18,7 @@
package org.apache.ignite.ml.clustering;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
-import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -30,20 +27,14 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import org.apache.ignite.Ignite;
import org.apache.ignite.internal.util.IgniteUtils;
-import org.apache.ignite.ml.math.DistanceMeasure;
import org.apache.ignite.ml.math.EuclideanDistance;
import org.apache.ignite.ml.math.StorageConstants;
import org.apache.ignite.ml.math.Vector;
-import org.apache.ignite.ml.math.VectorUtils;
-import org.apache.ignite.ml.math.functions.Functions;
import org.apache.ignite.ml.math.impls.matrix.SparseDistributedMatrix;
import org.apache.ignite.ml.math.impls.vector.DenseLocalOnHeapVector;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import org.junit.Assert;
import org.junit.Test;
-import static org.apache.ignite.ml.clustering.KMeansUtil.checkIsInEpsilonNeighbourhood;
-
/**
* This test is made to make sure that K-Means distributed clustering does not crush on distributed environment.
* In {@link KMeansDistributedClustererTestMultiNode} we check logic of clustering (checks for clusters structures).
@@ -120,7 +111,7 @@ public class KMeansDistributedClustererTestMultiNode extends GridCommonAbstractT
centers.put(6000, new DenseLocalOnHeapVector(new double[] {squareSideLen, squareSideLen}));
SparseDistributedMatrix points = new SparseDistributedMatrix(ptsCnt, 2, StorageConstants.ROW_STORAGE_MODE,
- StorageConstants.RANDOM_ACCESS_MODE);
+ StorageConstants.RANDOM_ACCESS_MODE);
List<Integer> permutation = IntStream.range(0, ptsCnt).boxed().collect(Collectors.toList());
Collections.shuffle(permutation, rnd);
@@ -143,4 +134,4 @@ public class KMeansDistributedClustererTestMultiNode extends GridCommonAbstractT
clusterer.cluster(points, 4);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/34955be3/modules/ml/src/test/java/org/apache/ignite/ml/math/BlasTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/BlasTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/BlasTest.java
index ad83e9f..5f1c772 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/BlasTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/BlasTest.java
@@ -99,7 +99,8 @@ public class BlasTest {
DenseLocalOnHeapVector u = new DenseLocalOnHeapVector(new double[] {3.0, 13.0, 20.0, 0.0});
// m is alpha * v * v^t
- DenseLocalOnHeapMatrix m = (DenseLocalOnHeapMatrix)new DenseLocalOnHeapMatrix(new double[][] {{1.0, 0.0},
+ DenseLocalOnHeapMatrix m = (DenseLocalOnHeapMatrix)new DenseLocalOnHeapMatrix(new double[][] {
+ {1.0, 0.0},
{2.0, 4.0}}, StorageConstants.COLUMN_STORAGE_MODE).times(alpha);
DenseLocalOnHeapMatrix a = new DenseLocalOnHeapMatrix(new double[][] {{3.0, 0.0}, {13.0, 20.0}},
StorageConstants.COLUMN_STORAGE_MODE);
@@ -121,7 +122,8 @@ public class BlasTest {
DenseLocalOnHeapMatrix a = new DenseLocalOnHeapMatrix(new double[][] {{3.0, 0.0}, {13.0, 20.0}},
StorageConstants.COLUMN_STORAGE_MODE);
- DenseLocalOnHeapMatrix exp = (DenseLocalOnHeapMatrix)new DenseLocalOnHeapMatrix(new double[][] {{1.0, 0.0},
+ DenseLocalOnHeapMatrix exp = (DenseLocalOnHeapMatrix)new DenseLocalOnHeapMatrix(new double[][] {
+ {1.0, 0.0},
{2.0, 4.0}}, StorageConstants.COLUMN_STORAGE_MODE).times(alpha).plus(a);
//m := alpha * v * v.t + A
@@ -141,7 +143,8 @@ public class BlasTest {
DenseLocalOnHeapVector u = new DenseLocalOnHeapVector(new double[] {3.0, 13.0, 20.0, 0.0});
// m is alpha * v * v^t
- DenseLocalOnHeapMatrix m = (DenseLocalOnHeapMatrix)new DenseLocalOnHeapMatrix(new double[][] {{1.0, 0.0},
+ DenseLocalOnHeapMatrix m = (DenseLocalOnHeapMatrix)new DenseLocalOnHeapMatrix(new double[][] {
+ {1.0, 0.0},
{0.0, 0.0}}, StorageConstants.COLUMN_STORAGE_MODE).times(alpha);
DenseLocalOnHeapMatrix a = new DenseLocalOnHeapMatrix(new double[][] {{3.0, 0.0}, {13.0, 20.0}},
StorageConstants.COLUMN_STORAGE_MODE);
@@ -343,4 +346,4 @@ public class BlasTest {
return new DenseLocalOnHeapMatrix(d, rows, acsMode);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/34955be3/modules/ml/src/test/java/org/apache/ignite/ml/math/MathImplDistributedTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/MathImplDistributedTestSuite.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/MathImplDistributedTestSuite.java
index 784a455..2968924 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/MathImplDistributedTestSuite.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/MathImplDistributedTestSuite.java
@@ -33,14 +33,14 @@ import org.junit.runners.Suite;
*/
@RunWith(Suite.class)
@Suite.SuiteClasses({
- CacheVectorTest.class,
- CacheMatrixTest.class,
- SparseDistributedMatrixStorageTest.class,
- SparseDistributedMatrixTest.class,
- SparseDistributedBlockMatrixTest.class,
- SparseDistributedVectorStorageTest.class,
- SparseDistributedVectorTest.class,
- SparseBlockDistributedVectorTest.class
+ CacheVectorTest.class,
+ CacheMatrixTest.class,
+ SparseDistributedMatrixStorageTest.class,
+ SparseDistributedMatrixTest.class,
+ SparseDistributedBlockMatrixTest.class,
+ SparseDistributedVectorStorageTest.class,
+ SparseDistributedVectorTest.class,
+ SparseBlockDistributedVectorTest.class
})
public class MathImplDistributedTestSuite {
// No-op.
http://git-wip-us.apache.org/repos/asf/ignite/blob/34955be3/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/matrix/MatrixImplementationsTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/matrix/MatrixImplementationsTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/matrix/MatrixImplementationsTest.java
index 8270da1..dc8ff12 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/matrix/MatrixImplementationsTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/matrix/MatrixImplementationsTest.java
@@ -928,9 +928,9 @@ public class MatrixImplementationsTest extends ExternalizeTest<Matrix> {
/** */
@Test
- public void testGetRowCol(){
- consumeSampleMatrix((m,desc)-> {
- if (! (m instanceof RandomMatrix))
+ public void testGetRowCol() {
+ consumeSampleMatrix((m, desc) -> {
+ if (!(m instanceof RandomMatrix))
for (int i = 0; i < m.rowSize(); i++)
for (int j = 0; j < m.columnSize(); j++)
m.setX(i, j, i + j);
http://git-wip-us.apache.org/repos/asf/ignite/blob/34955be3/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/matrix/SparseDistributedBlockMatrixTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/matrix/SparseDistributedBlockMatrixTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/matrix/SparseDistributedBlockMatrixTest.java
index b4f5c2d..20dda2a 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/matrix/SparseDistributedBlockMatrixTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/matrix/SparseDistributedBlockMatrixTest.java
@@ -17,6 +17,13 @@
package org.apache.ignite.ml.math.impls.matrix;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Collection;
+import java.util.Set;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.internal.util.IgniteUtils;
@@ -30,10 +37,6 @@ import org.apache.ignite.ml.math.impls.vector.SparseBlockDistributedVector;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.testframework.junits.common.GridCommonTest;
-import java.io.*;
-import java.util.Collection;
-import java.util.Set;
-
import static org.apache.ignite.ml.math.impls.MathTestConstants.UNEXPECTED_VAL;
/**
@@ -43,14 +46,19 @@ import static org.apache.ignite.ml.math.impls.MathTestConstants.UNEXPECTED_VAL;
public class SparseDistributedBlockMatrixTest extends GridCommonAbstractTest {
/** Number of nodes in grid */
private static final int NODE_COUNT = 3;
+
/** Precision. */
private static final double PRECISION = 0.0;
+
/** Grid instance. */
private Ignite ignite;
+
/** Matrix rows */
private final int rows = MathTestConstants.STORAGE_SIZE;
+
/** Matrix cols */
private final int cols = MathTestConstants.STORAGE_SIZE;
+
/** Matrix for tests */
private SparseBlockDistributedMatrix cacheMatrix;
@@ -100,7 +108,7 @@ public class SparseDistributedBlockMatrixTest extends GridCommonAbstractTest {
double v = Math.random();
cacheMatrix.set(i, j, v);
- assertEquals("Unexpected value for matrix element["+ i +" " + j + "]", v, cacheMatrix.get(i, j), PRECISION);
+ assertEquals("Unexpected value for matrix element[" + i + " " + j + "]", v, cacheMatrix.get(i, j), PRECISION);
}
}
}
@@ -204,24 +212,23 @@ public class SparseDistributedBlockMatrixTest extends GridCommonAbstractTest {
cacheMatrix = new SparseBlockDistributedMatrix(rows, cols);
- cacheMatrix.set(rows-1, cols -1, 1);
-
+ cacheMatrix.set(rows - 1, cols - 1, 1);
- Matrix newMatrix = cacheMatrix.copy();
+ Matrix newMatrix = cacheMatrix.copy();
assert newMatrix.columnSize() == cols;
assert newMatrix.rowSize() == rows;
- assert newMatrix.get(rows-1,cols-1) == 1;
+ assert newMatrix.get(rows - 1, cols - 1) == 1;
}
/** Test cache behaviour for matrix with different blocks */
- public void testCacheBehaviour(){
+ public void testCacheBehaviour() {
IgniteUtils.setCurrentIgniteName(ignite.configuration().getIgniteInstanceName());
cacheBehaviorLogic(rows);
}
/** Test cache behaviour for matrix with homogeneous blocks */
- public void testCacheBehaviourWithHomogeneousBlocks(){
+ public void testCacheBehaviourWithHomogeneousBlocks() {
IgniteUtils.setCurrentIgniteName(ignite.configuration().getIgniteInstanceName());
int size = MatrixBlockEntry.MAX_BLOCK_SIZE * 3;
cacheBehaviorLogic(size);
@@ -281,16 +288,14 @@ public class SparseDistributedBlockMatrixTest extends GridCommonAbstractTest {
/**
* Simple test for two square matrices.
*/
- public void testSquareMatrixTimes(){
- int size = rows;
-
- squareMatrixTimesLogic(size);
+ public void testSquareMatrixTimes() {
+ squareMatrixTimesLogic(rows);
}
/**
* Simple test for two square matrices with size which is proportional to MAX_BLOCK_SIZE constant
*/
- public void testSquareMatrixTimesWithHomogeneousBlocks(){
+ public void testSquareMatrixTimesWithHomogeneousBlocks() {
int size = MatrixBlockEntry.MAX_BLOCK_SIZE * 3;
squareMatrixTimesLogic(size);
@@ -310,18 +315,18 @@ public class SparseDistributedBlockMatrixTest extends GridCommonAbstractTest {
Matrix res = cacheMatrix1.times(cacheMatrix2);
- for(int i = 0; i < size; i++)
- for(int j = 0; j < size; j++)
+ for (int i = 0; i < size; i++)
+ for (int j = 0; j < size; j++)
if (i == j)
- assertEquals(UNEXPECTED_VAL + " for "+ i +":"+ j, i * i, res.get(i, j), PRECISION);
+ assertEquals(UNEXPECTED_VAL + " for " + i + ":" + j, i * i, res.get(i, j), PRECISION);
else
- assertEquals(UNEXPECTED_VAL + " for "+ i +":"+ j, 0, res.get(i, j), PRECISION);
+ assertEquals(UNEXPECTED_VAL + " for " + i + ":" + j, 0, res.get(i, j), PRECISION);
}
/**
*
*/
- public void testNonSquareMatrixTimes(){
+ public void testNonSquareMatrixTimes() {
IgniteUtils.setCurrentIgniteName(ignite.configuration().getIgniteInstanceName());
int size = MatrixBlockEntry.MAX_BLOCK_SIZE + 1;
@@ -337,18 +342,18 @@ public class SparseDistributedBlockMatrixTest extends GridCommonAbstractTest {
Matrix res = cacheMatrix1.times(cacheMatrix2);
- for(int i = 0; i < size; i++)
- for(int j = 0; j < size; j++)
+ for (int i = 0; i < size; i++)
+ for (int j = 0; j < size; j++)
if (i == j)
- assertEquals(UNEXPECTED_VAL + " for "+ i +":"+ j, i * i, res.get(i, j), PRECISION);
+ assertEquals(UNEXPECTED_VAL + " for " + i + ":" + j, i * i, res.get(i, j), PRECISION);
else
- assertEquals(UNEXPECTED_VAL + " for "+ i +":"+ j, 0, res.get(i, j), PRECISION);
+ assertEquals(UNEXPECTED_VAL + " for " + i + ":" + j, 0, res.get(i, j), PRECISION);
}
/**
*
*/
- public void testNonSquareMatrixTimes2(){
+ public void testNonSquareMatrixTimes2() {
IgniteUtils.setCurrentIgniteName(ignite.configuration().getIgniteInstanceName());
int size = MatrixBlockEntry.MAX_BLOCK_SIZE + 1;
@@ -364,34 +369,28 @@ public class SparseDistributedBlockMatrixTest extends GridCommonAbstractTest {
Matrix res = cacheMatrix1.times(cacheMatrix2);
- for(int i = 0; i < size; i++)
- for(int j = 0; j < size; j++)
+ for (int i = 0; i < size; i++)
+ for (int j = 0; j < size; j++)
if (i == j)
- assertEquals(UNEXPECTED_VAL + " for "+ i +":"+ j, i * i, res.get(i, j), PRECISION);
+ assertEquals(UNEXPECTED_VAL + " for " + i + ":" + j, i * i, res.get(i, j), PRECISION);
else
- assertEquals(UNEXPECTED_VAL + " for "+ i +":"+ j, 0, res.get(i, j), PRECISION);
+ assertEquals(UNEXPECTED_VAL + " for " + i + ":" + j, 0, res.get(i, j), PRECISION);
}
- public void testMatrixVectorTimes(){
+ /** */
+ public void testMatrixVectorTimes() {
IgniteUtils.setCurrentIgniteName(ignite.configuration().getIgniteInstanceName());
SparseBlockDistributedMatrix a = new SparseBlockDistributedMatrix(new double[][] {{2.0, 4.0, 0.0}, {-2.0, 1.0, 3.0}, {-1.0, 0.0, 1.0}});
SparseBlockDistributedVector b = new SparseBlockDistributedVector(new double[] {1.0, 2.0, -1.0});
- SparseBlockDistributedVector result = new SparseBlockDistributedVector(new double[] {10, -3.0, -2.0});
-
-
- Vector calculatedResult = a.times(b);
-
- for(int i = 0; i < calculatedResult.size(); i++)
- assertEquals(UNEXPECTED_VAL + " for "+ i, result.get(i), calculatedResult.get(i), PRECISION);
+ SparseBlockDistributedVector res = new SparseBlockDistributedVector(new double[] {10, -3.0, -2.0});
+ Vector calculatedRes = a.times(b);
+ for (int i = 0; i < calculatedRes.size(); i++)
+ assertEquals(UNEXPECTED_VAL + " for " + i, res.get(i), calculatedRes.get(i), PRECISION);
}
-
-
-
-
/** */
private void initMtx(Matrix m) {
for (int i = 0; i < m.rowSize(); i++)
@@ -400,7 +399,7 @@ public class SparseDistributedBlockMatrixTest extends GridCommonAbstractTest {
}
/** Build key set for SparseBlockDistributedMatrix. */
- private Set<MatrixBlockKey> buildKeySet(SparseBlockDistributedMatrix m){
+ private Set<MatrixBlockKey> buildKeySet(SparseBlockDistributedMatrix m) {
BlockMatrixStorage storage = (BlockMatrixStorage)m.getStorage();
http://git-wip-us.apache.org/repos/asf/ignite/blob/34955be3/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/matrix/SparseDistributedMatrixTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/matrix/SparseDistributedMatrixTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/matrix/SparseDistributedMatrixTest.java
index a9343f4..65f3453 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/matrix/SparseDistributedMatrixTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/matrix/SparseDistributedMatrixTest.java
@@ -33,10 +33,8 @@ import org.apache.ignite.ml.math.StorageConstants;
import org.apache.ignite.ml.math.Vector;
import org.apache.ignite.ml.math.distributed.DistributedStorage;
import org.apache.ignite.ml.math.distributed.keys.RowColMatrixKey;
-import org.apache.ignite.ml.math.exceptions.UnsupportedOperationException;
import org.apache.ignite.ml.math.impls.MathTestConstants;
import org.apache.ignite.ml.math.impls.storage.matrix.SparseDistributedMatrixStorage;
-import org.apache.ignite.ml.math.impls.vector.SparseBlockDistributedVector;
import org.apache.ignite.ml.math.impls.vector.SparseDistributedVector;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.testframework.junits.common.GridCommonTest;
@@ -50,16 +48,22 @@ import static org.apache.ignite.ml.math.impls.MathTestConstants.UNEXPECTED_VAL;
public class SparseDistributedMatrixTest extends GridCommonAbstractTest {
/** Number of nodes in grid */
private static final int NODE_COUNT = 3;
+
/** Precision. */
private static final double PRECISION = 0.0;
+
/** */
private static final int MATRIX_SIZE = 10;
+
/** Grid instance. */
private Ignite ignite;
+
/** Matrix rows */
private final int rows = MathTestConstants.STORAGE_SIZE;
+
/** Matrix cols */
private final int cols = MathTestConstants.STORAGE_SIZE;
+
/** Matrix for tests */
private SparseDistributedMatrix cacheMatrix;
@@ -217,11 +221,9 @@ public class SparseDistributedMatrixTest extends GridCommonAbstractTest {
Matrix copiedMtx = cacheMatrix.copy();
- for (int i = 0; i < cacheMatrix.rowSize(); i++) {
- for (int j = 0; j < cacheMatrix.columnSize(); j++) {
- assert copiedMtx.get(i,j) == cacheMatrix.get(i,j);
- }
- }
+ for (int i = 0; i < cacheMatrix.rowSize(); i++)
+ for (int j = 0; j < cacheMatrix.columnSize(); j++)
+ assert copiedMtx.get(i, j) == cacheMatrix.get(i, j);
}
/** */
@@ -282,7 +284,7 @@ public class SparseDistributedMatrixTest extends GridCommonAbstractTest {
}
/** */
- public void testMatrixTimes(){
+ public void testMatrixTimes() {
IgniteUtils.setCurrentIgniteName(ignite.configuration().getIgniteInstanceName());
int size = MATRIX_SIZE;
@@ -297,8 +299,8 @@ public class SparseDistributedMatrixTest extends GridCommonAbstractTest {
Matrix res = cacheMatrix1.times(cacheMatrix2);
- for(int i = 0; i < size; i++)
- for(int j = 0; j < size; j++)
+ for (int i = 0; i < size; i++)
+ for (int j = 0; j < size; j++)
if (i == j)
assertEquals(UNEXPECTED_VAL, i * i, res.get(i, j), PRECISION);
else
http://git-wip-us.apache.org/repos/asf/ignite/blob/34955be3/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/storage/vector/SparseDistributedVectorStorageTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/storage/vector/SparseDistributedVectorStorageTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/storage/vector/SparseDistributedVectorStorageTest.java
index 9b6aa32..f433725 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/storage/vector/SparseDistributedVectorStorageTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/storage/vector/SparseDistributedVectorStorageTest.java
@@ -21,7 +21,6 @@ import org.apache.ignite.Ignite;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.ml.math.StorageConstants;
import org.apache.ignite.ml.math.impls.MathTestConstants;
-import org.apache.ignite.ml.math.impls.storage.matrix.SparseDistributedMatrixStorage;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.testframework.junits.common.GridCommonTest;
@@ -32,10 +31,13 @@ import org.apache.ignite.testframework.junits.common.GridCommonTest;
public class SparseDistributedVectorStorageTest extends GridCommonAbstractTest {
/** Number of nodes in grid */
private static final int NODE_COUNT = 3;
+
/** Cache name. */
private static final String CACHE_NAME = "test-cache";
+
/** */
private static final String UNEXPECTED_ATTRIBUTE_VALUE = "Unexpected attribute value.";
+
/** Grid instance. */
private Ignite ignite;
@@ -91,11 +93,11 @@ public class SparseDistributedVectorStorageTest extends GridCommonAbstractTest {
SparseDistributedVectorStorage storage = new SparseDistributedVectorStorage(size, StorageConstants.RANDOM_ACCESS_MODE);
for (int i = 0; i < size; i++) {
- double v = Math.random();
- storage.set(i, v);
+ double v = Math.random();
+ storage.set(i, v);
- assert Double.compare(v, storage.get(i)) == 0;
- assert Double.compare(v, storage.get(i)) == 0;
+ assert Double.compare(v, storage.get(i)) == 0;
+ assert Double.compare(v, storage.get(i)) == 0;
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/34955be3/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/vector/SparseBlockDistributedVectorTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/vector/SparseBlockDistributedVectorTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/vector/SparseBlockDistributedVectorTest.java
index 4ac2845..6b2590c 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/vector/SparseBlockDistributedVectorTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/vector/SparseBlockDistributedVectorTest.java
@@ -17,6 +17,11 @@
package org.apache.ignite.ml.math.impls.vector;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import org.apache.ignite.Ignite;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.ml.math.Vector;
@@ -24,8 +29,6 @@ import org.apache.ignite.ml.math.impls.MathTestConstants;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.testframework.junits.common.GridCommonTest;
-import java.io.*;
-
import static org.apache.ignite.ml.math.impls.MathTestConstants.UNEXPECTED_VAL;
/**
@@ -35,12 +38,16 @@ import static org.apache.ignite.ml.math.impls.MathTestConstants.UNEXPECTED_VAL;
public class SparseBlockDistributedVectorTest extends GridCommonAbstractTest {
/** Number of nodes in grid */
private static final int NODE_COUNT = 3;
+
/** Precision. */
private static final double PRECISION = 0.0;
+
/** Grid instance. */
private Ignite ignite;
+
/** Vector size */
private final int size = MathTestConstants.STORAGE_SIZE;
+
/** Vector for tests */
private SparseBlockDistributedVector sparseBlockDistributedVector;
@@ -86,9 +93,9 @@ public class SparseBlockDistributedVectorTest extends GridCommonAbstractTest {
sparseBlockDistributedVector = new SparseBlockDistributedVector(size);
for (int i = 0; i < size; i++) {
- double v = Math.random();
- sparseBlockDistributedVector.set(i, v);
- assertEquals("Unexpected value for vector element[" + i + "]", v, sparseBlockDistributedVector.get(i), PRECISION);
+ double v = Math.random();
+ sparseBlockDistributedVector.set(i, v);
+ assertEquals("Unexpected value for vector element[" + i + "]", v, sparseBlockDistributedVector.get(i), PRECISION);
}
}
@@ -123,22 +130,21 @@ public class SparseBlockDistributedVectorTest extends GridCommonAbstractTest {
sparseBlockDistributedVector.assign(2.0);
for (int i = 0; i < sparseBlockDistributedVector.size(); i++)
- assertEquals(UNEXPECTED_VAL, 2.0, sparseBlockDistributedVector.get(i), PRECISION);
+ assertEquals(UNEXPECTED_VAL, 2.0, sparseBlockDistributedVector.get(i), PRECISION);
sparseBlockDistributedVector.plus(3.0);
for (int i = 0; i < sparseBlockDistributedVector.size(); i++)
- assertEquals(UNEXPECTED_VAL, 5.0, sparseBlockDistributedVector.get(i), PRECISION);
+ assertEquals(UNEXPECTED_VAL, 5.0, sparseBlockDistributedVector.get(i), PRECISION);
sparseBlockDistributedVector.times(2.0);
for (int i = 0; i < sparseBlockDistributedVector.size(); i++)
- assertEquals(UNEXPECTED_VAL, 10.0, sparseBlockDistributedVector.get(i), PRECISION);
+ assertEquals(UNEXPECTED_VAL, 10.0, sparseBlockDistributedVector.get(i), PRECISION);
sparseBlockDistributedVector.divide(10.0);
for (int i = 0; i < sparseBlockDistributedVector.size(); i++)
- assertEquals(UNEXPECTED_VAL, 1.0, sparseBlockDistributedVector.get(i), PRECISION);
+ assertEquals(UNEXPECTED_VAL, 1.0, sparseBlockDistributedVector.get(i), PRECISION);
}
-
/** */
public void testMap() {
IgniteUtils.setCurrentIgniteName(ignite.configuration().getIgniteInstanceName());
@@ -148,7 +154,7 @@ public class SparseBlockDistributedVectorTest extends GridCommonAbstractTest {
sparseBlockDistributedVector.map(i -> 100.0);
for (int i = 0; i < sparseBlockDistributedVector.size(); i++)
- assertEquals(UNEXPECTED_VAL, 100.0, sparseBlockDistributedVector.get(i), PRECISION);
+ assertEquals(UNEXPECTED_VAL, 100.0, sparseBlockDistributedVector.get(i), PRECISION);
}
/** */
@@ -172,10 +178,9 @@ public class SparseBlockDistributedVectorTest extends GridCommonAbstractTest {
assertNotNull(sparseBlockDistributedVector.like(1));
}
-
/** */
private void initVector(Vector v) {
for (int i = 0; i < v.size(); i++)
- v.set(i, 1.0);
+ v.set(i, 1.0);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/34955be3/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/vector/SparseDistributedVectorTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/vector/SparseDistributedVectorTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/vector/SparseDistributedVectorTest.java
index 416e254..b5c348f 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/vector/SparseDistributedVectorTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/math/impls/vector/SparseDistributedVectorTest.java
@@ -17,22 +17,18 @@
package org.apache.ignite.ml.math.impls.vector;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import org.apache.ignite.Ignite;
-
import org.apache.ignite.internal.util.IgniteUtils;
-
import org.apache.ignite.ml.math.StorageConstants;
import org.apache.ignite.ml.math.Vector;
-
-import org.apache.ignite.ml.math.exceptions.UnsupportedOperationException;
import org.apache.ignite.ml.math.impls.MathTestConstants;
-
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.testframework.junits.common.GridCommonTest;
-import org.junit.Ignore;
-
-import java.io.*;
-
import static org.apache.ignite.ml.math.impls.MathTestConstants.UNEXPECTED_VAL;
@@ -43,12 +39,16 @@ import static org.apache.ignite.ml.math.impls.MathTestConstants.UNEXPECTED_VAL;
public class SparseDistributedVectorTest extends GridCommonAbstractTest {
/** Number of nodes in grid */
private static final int NODE_COUNT = 3;
+
/** Precision. */
private static final double PRECISION = 0.0;
+
/** Grid instance. */
private Ignite ignite;
+
/** Vector size */
private final int size = MathTestConstants.STORAGE_SIZE;
+
/** Vector for tests */
private SparseDistributedVector sparseDistributedVector;
@@ -94,9 +94,9 @@ public class SparseDistributedVectorTest extends GridCommonAbstractTest {
sparseDistributedVector = new SparseDistributedVector(size, StorageConstants.RANDOM_ACCESS_MODE);
for (int i = 0; i < size; i++) {
- double v = Math.random();
- sparseDistributedVector.set(i, v);
- assertEquals("Unexpected value for vector element[" + i + "]", v, sparseDistributedVector.get(i), PRECISION);
+ double v = Math.random();
+ sparseDistributedVector.set(i, v);
+ assertEquals("Unexpected value for vector element[" + i + "]", v, sparseDistributedVector.get(i), PRECISION);
}
}
@@ -131,24 +131,23 @@ public class SparseDistributedVectorTest extends GridCommonAbstractTest {
sparseDistributedVector.assign(2.0);
for (int i = 0; i < sparseDistributedVector.size(); i++)
- assertEquals(UNEXPECTED_VAL, 2.0, sparseDistributedVector.get(i), PRECISION);
+ assertEquals(UNEXPECTED_VAL, 2.0, sparseDistributedVector.get(i), PRECISION);
sparseDistributedVector.plus(3.0);
for (int i = 0; i < sparseDistributedVector.size(); i++)
- assertEquals(UNEXPECTED_VAL, 5.0, sparseDistributedVector.get(i), PRECISION);
+ assertEquals(UNEXPECTED_VAL, 5.0, sparseDistributedVector.get(i), PRECISION);
sparseDistributedVector.times(2.0);
for (int i = 0; i < sparseDistributedVector.size(); i++)
- assertEquals(UNEXPECTED_VAL, 10.0, sparseDistributedVector.get(i), PRECISION);
+ assertEquals(UNEXPECTED_VAL, 10.0, sparseDistributedVector.get(i), PRECISION);
sparseDistributedVector.divide(10.0);
for (int i = 0; i < sparseDistributedVector.size(); i++)
- assertEquals(UNEXPECTED_VAL, 1.0, sparseDistributedVector.get(i), PRECISION);
+ assertEquals(UNEXPECTED_VAL, 1.0, sparseDistributedVector.get(i), PRECISION);
- // assertEquals(UNEXPECTED_VAL, sparseDistributedVector.rowSize() * sparseDistributedVector.columnSize(), sparseDistributedVector.sum(), PRECISION);
+ // assertEquals(UNEXPECTED_VAL, sparseDistributedVector.rowSize() * sparseDistributedVector.columnSize(), sparseDistributedVector.sum(), PRECISION);
}
-
/** */
public void testMap() {
IgniteUtils.setCurrentIgniteName(ignite.configuration().getIgniteInstanceName());
@@ -158,7 +157,7 @@ public class SparseDistributedVectorTest extends GridCommonAbstractTest {
sparseDistributedVector.map(i -> 100.0);
for (int i = 0; i < sparseDistributedVector.size(); i++)
- assertEquals(UNEXPECTED_VAL, 100.0, sparseDistributedVector.get(i), PRECISION);
+ assertEquals(UNEXPECTED_VAL, 100.0, sparseDistributedVector.get(i), PRECISION);
}
/** */
@@ -167,13 +166,14 @@ public class SparseDistributedVectorTest extends GridCommonAbstractTest {
sparseDistributedVector = new SparseDistributedVector(size, StorageConstants.RANDOM_ACCESS_MODE);
- Vector copy = sparseDistributedVector.copy();
- assertNotNull(copy);
+ Vector cp = sparseDistributedVector.copy();
+
+ assertNotNull(cp);
+
for (int i = 0; i < size; i++)
- assertEquals(UNEXPECTED_VAL, copy.get(i), sparseDistributedVector.get(i), PRECISION);
+ assertEquals(UNEXPECTED_VAL, cp.get(i), sparseDistributedVector.get(i), PRECISION);
}
-
/** */
public void testLike() {
IgniteUtils.setCurrentIgniteName(ignite.configuration().getIgniteInstanceName());
@@ -183,10 +183,9 @@ public class SparseDistributedVectorTest extends GridCommonAbstractTest {
assertNotNull(sparseDistributedVector.like(1));
}
-
/** */
private void initVector(Vector v) {
for (int i = 0; i < v.size(); i++)
- v.set(i, 1.0);
+ v.set(i, 1.0);
}
}