Repository: mahout Updated Branches: refs/heads/master 0b564c71e -> bbf4e5a34
MAHOUT-1738: implement MatrixFlavor for H2OBlockMatrix Closes apache/mahout#140 Signed-off-by: Anand Avati <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/bbf4e5a3 Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/bbf4e5a3 Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/bbf4e5a3 Branch: refs/heads/master Commit: bbf4e5a34e9dcdd802b353b01eeabf5794aa2942 Parents: 0b564c7 Author: Anand Avati <[email protected]> Authored: Mon Jun 22 15:39:21 2015 -0700 Committer: Anand Avati <[email protected]> Committed: Mon Jun 22 19:59:32 2015 -0700 ---------------------------------------------------------------------- .../org/apache/mahout/h2obindings/H2OBlockMatrix.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/bbf4e5a3/h2o/src/main/java/org/apache/mahout/h2obindings/H2OBlockMatrix.java ---------------------------------------------------------------------- diff --git a/h2o/src/main/java/org/apache/mahout/h2obindings/H2OBlockMatrix.java b/h2o/src/main/java/org/apache/mahout/h2obindings/H2OBlockMatrix.java index a073e73..378f7b6 100644 --- a/h2o/src/main/java/org/apache/mahout/h2obindings/H2OBlockMatrix.java +++ b/h2o/src/main/java/org/apache/mahout/h2obindings/H2OBlockMatrix.java @@ -22,6 +22,7 @@ import org.apache.mahout.math.Vector; import org.apache.mahout.math.AbstractMatrix; import org.apache.mahout.math.DenseMatrix; import org.apache.mahout.math.SparseMatrix; +import org.apache.mahout.math.flavor.MatrixFlavor; import water.fvec.Chunk; @@ -119,4 +120,15 @@ public class H2OBlockMatrix extends AbstractMatrix { cow.assignColumn(col, v); return cow; } + + @Override + public MatrixFlavor getFlavor() { + if (cow != null) { + return cow.getFlavor(); + } else if (chks[0].isSparse()) { + return MatrixFlavor.SPARSELIKE; + } else { + return MatrixFlavor.DENSELIKE; + } + } }
