You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by mb...@apache.org on 2018/02/26 07:35:12 UTC
[2/3] systemml git commit: [MINOR] Refactoring matrix block slice and
append operations
http://git-wip-us.apache.org/repos/asf/systemml/blob/d16cc7cf/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameIndexingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameIndexingTest.java b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameIndexingTest.java
index 858c9d6..0f1ce12 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameIndexingTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/frame/FrameIndexingTest.java
@@ -103,10 +103,10 @@ public class FrameIndexingTest extends AutomatedTestBase
{
//matrix indexing
MatrixBlock mbA = DataConverter.convertToMatrixBlock(A);
- mbC = mbA.sliceOperations(rl, ru, cl, cu, new MatrixBlock());
+ mbC = mbA.slice(rl, ru, cl, cu, new MatrixBlock());
//frame indexing
- frame3 = frame1.sliceOperations(rl, ru, cl, cu, new FrameBlock());
+ frame3 = frame1.slice(rl, ru, cl, cu, new FrameBlock());
}
else if( itype == IXType.LIX )
{
http://git-wip-us.apache.org/repos/asf/systemml/blob/d16cc7cf/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorFrameConversionTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorFrameConversionTest.java b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorFrameConversionTest.java
index 29bc8a3..3a6865a 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorFrameConversionTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorFrameConversionTest.java
@@ -310,7 +310,7 @@ public class DataFrameVectorFrameConversionTest extends AutomatedTestBase
}
else {
double[] tmp = DataConverter.convertToDoubleVector(
- mb.sliceOperations(i, i, j, j+colsVector-1, new MatrixBlock()), false);
+ mb.slice(i, i, j, j+colsVector-1, new MatrixBlock()), false);
row[j2+off] = new DenseVector(tmp);
j += colsVector-1;
}
http://git-wip-us.apache.org/repos/asf/systemml/blob/d16cc7cf/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorScriptTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorScriptTest.java b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorScriptTest.java
index c17e0e2..d6f0d9d 100644
--- a/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorScriptTest.java
+++ b/src/test/java/org/apache/sysml/test/integration/functions/mlcontext/DataFrameVectorScriptTest.java
@@ -299,7 +299,7 @@ public class DataFrameVectorScriptTest extends MLContextTestBase
}
else {
double[] tmp = DataConverter.convertToDoubleVector(
- mb.sliceOperations(i, i, j, j+colsVector-1, new MatrixBlock()), false);
+ mb.slice(i, i, j, j+colsVector-1, new MatrixBlock()), false);
row[j2+off] = new DenseVector(tmp);
j += colsVector-1;
}