You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemds.apache.org by ss...@apache.org on 2021/09/09 14:50:47 UTC
[systemds] branch master updated: [MINOR] Bug fixes for commit
88f1063
This is an automated email from the ASF dual-hosted git repository.
ssiddiqi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/systemds.git
The following commit(s) were added to refs/heads/master by this push:
new e6d9510 [MINOR] Bug fixes for commit 88f1063
e6d9510 is described below
commit e6d951080f109958ea865a4e1fc229e61735e9cf
Author: Shafaq Siddiqi <sh...@tugraz.at>
AuthorDate: Thu Sep 9 16:50:27 2021 +0200
[MINOR] Bug fixes for commit 88f1063
---
scripts/pipelines/properties/testPrimitives.csv | 5 +++--
.../sysds/test/functions/pipelines/BuiltinTopkLogicalTest.java | 4 ++--
.../functions/pipelines/intermediates/classification/bestAcc.csv | 6 +++---
.../functions/pipelines/intermediates/classification/dirtyScore.csv | 2 +-
.../functions/pipelines/intermediates/classification/evalHp.csv | 2 +-
.../scripts/functions/pipelines/intermediates/classification/hp.csv | 6 +++---
.../scripts/functions/pipelines/intermediates/classification/lp.csv | 2 +-
.../functions/pipelines/intermediates/classification/pip.csv | 6 +++---
8 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/scripts/pipelines/properties/testPrimitives.csv b/scripts/pipelines/properties/testPrimitives.csv
index 3ce4b97..afa1986 100644
--- a/scripts/pipelines/properties/testPrimitives.csv
+++ b/scripts/pipelines/properties/testPrimitives.csv
@@ -1,3 +1,4 @@
ED,MVI,OTLR,EC,SCALE,CI,DUMMY,DIM
-outlierBySd,imputeByMean,winsorize,imputeByMean,scale,SMOTE,dummycoding,m_pca
-outlierByIQR,imputeByMedian,outlierBySd,imputeByMedian,,wtomeklink,,ppca
+,imputeByMean,winsorize,imputeByMean,scale,abstain,dummycoding,m_pca
+outlierBySd,imputeByMedian,outlierBySd,imputeByMedian,,wtomeklink,,ppca
+outlierByIQR,forward_fill,outlierByIQR,fillDefault,,SMOTE,,
diff --git a/src/test/java/org/apache/sysds/test/functions/pipelines/BuiltinTopkLogicalTest.java b/src/test/java/org/apache/sysds/test/functions/pipelines/BuiltinTopkLogicalTest.java
index 812870a..35d9843 100644
--- a/src/test/java/org/apache/sysds/test/functions/pipelines/BuiltinTopkLogicalTest.java
+++ b/src/test/java/org/apache/sysds/test/functions/pipelines/BuiltinTopkLogicalTest.java
@@ -49,12 +49,12 @@ public class BuiltinTopkLogicalTest extends AutomatedTestBase {
@Test
public void testLogical1() {
- runTestLogical(10, 5, 2, Types.ExecMode.SINGLE_NODE);
+ runTestLogical(10, 3, 2, Types.ExecMode.SINGLE_NODE);
}
@Test
public void testLogical2() {
- runTestLogical(2, 3, 2,
+ runTestLogical(2, 2, 2,
Types.ExecMode.SINGLE_NODE);
}
diff --git a/src/test/scripts/functions/pipelines/intermediates/classification/bestAcc.csv b/src/test/scripts/functions/pipelines/intermediates/classification/bestAcc.csv
index 9bde89f..646eef1 100644
--- a/src/test/scripts/functions/pipelines/intermediates/classification/bestAcc.csv
+++ b/src/test/scripts/functions/pipelines/intermediates/classification/bestAcc.csv
@@ -1,3 +1,3 @@
-85.58558558558559
-84.68468468468468
-82.88288288288288
+94.5945945945946
+94.5945945945946
+94.5945945945946
diff --git a/src/test/scripts/functions/pipelines/intermediates/classification/dirtyScore.csv b/src/test/scripts/functions/pipelines/intermediates/classification/dirtyScore.csv
index 6339ce1..69535a4 100644
--- a/src/test/scripts/functions/pipelines/intermediates/classification/dirtyScore.csv
+++ b/src/test/scripts/functions/pipelines/intermediates/classification/dirtyScore.csv
@@ -1 +1 @@
-67.56756756756756
\ No newline at end of file
+90.09009009009009
\ No newline at end of file
diff --git a/src/test/scripts/functions/pipelines/intermediates/classification/evalHp.csv b/src/test/scripts/functions/pipelines/intermediates/classification/evalHp.csv
index 9b09301..faeeae7 100644
--- a/src/test/scripts/functions/pipelines/intermediates/classification/evalHp.csv
+++ b/src/test/scripts/functions/pipelines/intermediates/classification/evalHp.csv
@@ -1 +1 @@
-2.0,0.001,1.0E-5,1000.0
+2.0,0.001,1.0,1000.0
diff --git a/src/test/scripts/functions/pipelines/intermediates/classification/hp.csv b/src/test/scripts/functions/pipelines/intermediates/classification/hp.csv
index 61e02de..3d5c3ff 100644
--- a/src/test/scripts/functions/pipelines/intermediates/classification/hp.csv
+++ b/src/test/scripts/functions/pipelines/intermediates/classification/hp.csv
@@ -1,3 +1,3 @@
-36.0,3.0,3.0,2.0,1.0,0,0,0,1.0,0,0,0,0,0,1.0,0,0,0,2.0,0,0,0,0,0,0,1.0,0,2.0,0,0,0,0,1.0,0,0,0,2.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-36.0,3.0,2.0,2.0,1.0,0,0,0,1.0,0,0,0,0,0,1.0,0,0,0,2.0,0,0,0,0,0,0,1.0,0,2.0,0,0,0,0,1.0,0,0,0,2.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-36.0,3.0,3.0,1.0,1.0,0,0,0,1.0,0,0,0,0,0,1.0,0,0,0,2.0,0,0,0,0,0,0,1.0,0,2.0,0,0,0,0,1.0,0,0,0,2.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+40.0,2.0,0.01816863223655686,0.9565161479438591,0,0,0,1.0,0,0,0,0,1.0,0,0,0,2.0,0,0,0,1.0,0,0,0,2.0,1.0,0.6515164788504212,0,0,0,1.0,1.0,2.0,0,0,0,1.0,0,0,0,2.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+40.0,2.0,0.03510876761722913,0.9673791862807241,0,0,0,1.0,0,0,0,0,1.0,0,0,0,2.0,0,0,0,1.0,0,0,0,2.0,1.0,0.6149768032146687,0,0,0,1.0,1.0,2.0,0,0,0,1.0,0,0,0,2.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+40.0,2.0,0.014861839294898092,0.9595626659056867,0,0,0,1.0,0,0,0,0,1.0,0,0,0,2.0,0,0,0,1.0,0,0,0,2.0,1.0,0.6274449265973082,0,0,0,1.0,1.0,2.0,0,0,0,1.0,0,0,0,2.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/src/test/scripts/functions/pipelines/intermediates/classification/lp.csv b/src/test/scripts/functions/pipelines/intermediates/classification/lp.csv
index 0ba2cb8..52b30dc 100644
--- a/src/test/scripts/functions/pipelines/intermediates/classification/lp.csv
+++ b/src/test/scripts/functions/pipelines/intermediates/classification/lp.csv
@@ -1 +1 @@
-ED,MVI,CI,DUMMY
+OTLR,EC,EC,CI,DUMMY
diff --git a/src/test/scripts/functions/pipelines/intermediates/classification/pip.csv b/src/test/scripts/functions/pipelines/intermediates/classification/pip.csv
index a70985d..2feb234 100644
--- a/src/test/scripts/functions/pipelines/intermediates/classification/pip.csv
+++ b/src/test/scripts/functions/pipelines/intermediates/classification/pip.csv
@@ -1,3 +1,3 @@
-outlierBySd,imputeByMedian,wtomeklink,dummycoding
-outlierBySd,imputeByMedian,wtomeklink,dummycoding
-outlierBySd,imputeByMedian,wtomeklink,dummycoding
+winsorize,imputeByMean,imputeByMedian,abstain,dummycoding
+winsorize,imputeByMean,imputeByMedian,abstain,dummycoding
+winsorize,imputeByMean,imputeByMedian,abstain,dummycoding