Repository: incubator-systemml Updated Branches: refs/heads/master 59c1e5540 -> 9b7f8b621
[SYSTEMML-677] Fix decision tree data generator, frame meta data write Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/d7dedce2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/d7dedce2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/d7dedce2 Branch: refs/heads/master Commit: d7dedce29bcfce41fdcc58c6f0ee27b71e821abd Parents: 59c1e55 Author: Matthias Boehm <[email protected]> Authored: Mon May 9 19:43:58 2016 -0700 Committer: Matthias Boehm <[email protected]> Committed: Tue May 10 11:34:59 2016 -0700 ---------------------------------------------------------------------- scripts/datagen/genRandData4DecisionTree1.dml | 3 ++- .../apache/sysml/runtime/controlprogram/caching/FrameObject.java | 2 +- .../sysml/runtime/controlprogram/context/ExecutionContext.java | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/d7dedce2/scripts/datagen/genRandData4DecisionTree1.dml ---------------------------------------------------------------------- diff --git a/scripts/datagen/genRandData4DecisionTree1.dml b/scripts/datagen/genRandData4DecisionTree1.dml index b679783..7d1dd50 100644 --- a/scripts/datagen/genRandData4DecisionTree1.dml +++ b/scripts/datagen/genRandData4DecisionTree1.dml @@ -35,5 +35,6 @@ write (Y_bin, YFile); # generate categorical features X_cat = floor (rand (rows = num_records, cols = num_cat_features, min = 1, max = num_distinct + 0.99999999999999, sparsity = sparsity)); -write (X_cat, XCatFile, format = "csv"); +fX_cat = as.frame(X_cat); +write (fX_cat, XCatFile, format = "csv"); http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/d7dedce2/src/main/java/org/apache/sysml/runtime/controlprogram/caching/FrameObject.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/controlprogram/caching/FrameObject.java b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/FrameObject.java index 35740e9..78f58be 100644 --- a/src/main/java/org/apache/sysml/runtime/controlprogram/caching/FrameObject.java +++ b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/FrameObject.java @@ -53,7 +53,7 @@ public class FrameObject extends CacheableData<FrameBlock> * */ protected FrameObject() { - super(DataType.FRAME, ValueType.UNKNOWN); + super(DataType.FRAME, ValueType.STRING); } /** http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/d7dedce2/src/main/java/org/apache/sysml/runtime/controlprogram/context/ExecutionContext.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/controlprogram/context/ExecutionContext.java b/src/main/java/org/apache/sysml/runtime/controlprogram/context/ExecutionContext.java index f2b34c2..b31541e 100644 --- a/src/main/java/org/apache/sysml/runtime/controlprogram/context/ExecutionContext.java +++ b/src/main/java/org/apache/sysml/runtime/controlprogram/context/ExecutionContext.java @@ -338,6 +338,8 @@ public class ExecutionContext throws DMLRuntimeException { FrameObject fo = (FrameObject) getVariable(varName); + if( outputData.getNumColumns()>0 && outputData.getSchema()!=null ) + fo.setValueType(outputData.getSchema().get(0)); fo.acquireModify(outputData); fo.release();
