Repository: systemml Updated Branches: refs/heads/master eca9dbbb8 -> ed6b74bfe
[MINOR] Remove EncoderRecode fields and TfUtils.TXMETHOD_MVRCD Remove _mvrcdList and _fullrcdList fields and related code from EncoderRecode. Remove TfUtils.TXMETHOD_MVRCD since it was only referenced from the removed code. Closes #576. Project: http://git-wip-us.apache.org/repos/asf/systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/ed6b74bf Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/ed6b74bf Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/ed6b74bf Branch: refs/heads/master Commit: ed6b74bfe6e357399532084877066ebf65db0691 Parents: eca9dbb Author: Deron Eriksson <[email protected]> Authored: Sat Jul 15 03:26:12 2017 -0700 Committer: Deron Eriksson <[email protected]> Committed: Sat Jul 15 03:26:12 2017 -0700 ---------------------------------------------------------------------- .../apache/sysml/runtime/transform/TfUtils.java | 1 - .../runtime/transform/encode/EncoderRecode.java | 24 +------------------- 2 files changed, 1 insertion(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/systemml/blob/ed6b74bf/src/main/java/org/apache/sysml/runtime/transform/TfUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/transform/TfUtils.java b/src/main/java/org/apache/sysml/runtime/transform/TfUtils.java index 7743b61..fc95168 100644 --- a/src/main/java/org/apache/sysml/runtime/transform/TfUtils.java +++ b/src/main/java/org/apache/sysml/runtime/transform/TfUtils.java @@ -54,7 +54,6 @@ public class TfUtils implements Serializable public static final String TXMETHOD_DUMMYCODE = "dummycode"; public static final String TXMETHOD_SCALE = "scale"; public static final String TXMETHOD_OMIT = "omit"; - public static final String TXMETHOD_MVRCD = "mvrcd"; //transform meta data constants (frame-based transform) public static final String TXMTD_MVPREFIX = "#Meta"+Lop.DATATYPE_PREFIX+"MV"; http://git-wip-us.apache.org/repos/asf/systemml/blob/ed6b74bf/src/main/java/org/apache/sysml/runtime/transform/encode/EncoderRecode.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/transform/encode/EncoderRecode.java b/src/main/java/org/apache/sysml/runtime/transform/encode/EncoderRecode.java index dc75a74..855d565 100644 --- a/src/main/java/org/apache/sysml/runtime/transform/encode/EncoderRecode.java +++ b/src/main/java/org/apache/sysml/runtime/transform/encode/EncoderRecode.java @@ -37,9 +37,6 @@ public class EncoderRecode extends Encoder { private static final long serialVersionUID = 8213163881283341874L; - private int[] _mvrcdList = null; - private int[] _fullrcdList = null; - //recode maps and custom map for partial recode maps private HashMap<Integer, HashMap<String, Long>> _rcdMaps = new HashMap<Integer, HashMap<String, Long>>(); private HashMap<Integer, HashMap<String,String>> _finalMaps = null; @@ -49,28 +46,9 @@ public class EncoderRecode extends Encoder throws JSONException { super(null, clen); - int rcdCount = 0; if( parsedSpec.containsKey(TfUtils.TXMETHOD_RECODE) ) { - int[] collist = TfMetaUtils.parseJsonIDList(parsedSpec, colnames, TfUtils.TXMETHOD_RECODE); - rcdCount = initColList(collist); - } - - if ( parsedSpec.containsKey(TfUtils.TXMETHOD_MVRCD)) { - _mvrcdList = TfMetaUtils.parseJsonIDList(parsedSpec, colnames, TfUtils.TXMETHOD_MVRCD); - rcdCount += _mvrcdList.length; - } - - if ( rcdCount > 0 ) { - _fullrcdList = new int[rcdCount]; - int idx = -1; - if(_colList != null) - for(int i=0; i < _colList.length; i++) - _fullrcdList[++idx] = _colList[i]; - - if(_mvrcdList != null) - for(int i=0; i < _mvrcdList.length; i++) - _fullrcdList[++idx] = _mvrcdList[i]; + _colList = TfMetaUtils.parseJsonIDList(parsedSpec, colnames, TfUtils.TXMETHOD_RECODE); } }
