Repository: systemml Updated Branches: refs/heads/master 205c37fd4 -> 847e5bcab
[HOTFIX] Fix invalid assignments in ID3 to new builtin constants Project: http://git-wip-us.apache.org/repos/asf/systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/847e5bca Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/847e5bca Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/847e5bca Branch: refs/heads/master Commit: 847e5bcab97ed195fcbb33a7974564add4fdfdbd Parents: 205c37f Author: Matthias Boehm <[email protected]> Authored: Mon Apr 2 15:28:31 2018 -0700 Committer: Matthias Boehm <[email protected]> Committed: Mon Apr 2 15:28:31 2018 -0700 ---------------------------------------------------------------------- src/test/scripts/applications/id3/id3.R | 6 +++--- src/test/scripts/applications/id3/id3.dml | 6 +++--- src/test/scripts/applications/id3/id3.pydml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/systemml/blob/847e5bca/src/test/scripts/applications/id3/id3.R ---------------------------------------------------------------------- diff --git a/src/test/scripts/applications/id3/id3.R b/src/test/scripts/applications/id3/id3.R index b838607..1880da2 100644 --- a/src/test/scripts/applications/id3/id3.R +++ b/src/test/scripts/applications/id3/id3.R @@ -87,9 +87,9 @@ id3_learn = function(X, y, X_subset, attributes, minsplit) hist_labels1 = as.matrix(hist_labels1_helper[,2]) num_samples1 = sum(Tj) zero_entries_in_hist = (hist_labels1 == 0) - pi = hist_labels1/num_samples1 - log_term = zero_entries_in_hist*1 + (1-zero_entries_in_hist)*pi - entropy_vector = -pi*log(log_term) + piv = hist_labels1/num_samples1 + log_term = zero_entries_in_hist*1 + (1-zero_entries_in_hist)*piv + entropy_vector = -piv*log(log_term) entropy = sum(entropy_vector) hxt_vector[j,1] = sum(Tj)/sum(X_subset)*entropy http://git-wip-us.apache.org/repos/asf/systemml/blob/847e5bca/src/test/scripts/applications/id3/id3.dml ---------------------------------------------------------------------- diff --git a/src/test/scripts/applications/id3/id3.dml b/src/test/scripts/applications/id3/id3.dml index 66a39f2..e300169 100644 --- a/src/test/scripts/applications/id3/id3.dml +++ b/src/test/scripts/applications/id3/id3.dml @@ -150,9 +150,9 @@ id3_learn = function(Matrix[Double] X, Matrix[Double] y, Matrix[Double] X_subset hist_labels1 = aggregate(target=Tj, groups=y, fn="sum") num_samples1 = sum(Tj) zero_entries_in_hist = (hist_labels1 == 0) - pi = hist_labels1/num_samples1 - log_term = zero_entries_in_hist*1 + (1-zero_entries_in_hist)*pi - entropy_vector = -pi*log(log_term) + piv = hist_labels1/num_samples1 + log_term = zero_entries_in_hist*1 + (1-zero_entries_in_hist)*piv + entropy_vector = -piv*log(log_term) entropy = sum(entropy_vector) hxt_vector[j,1] = sum(Tj)/sum(X_subset)*entropy http://git-wip-us.apache.org/repos/asf/systemml/blob/847e5bca/src/test/scripts/applications/id3/id3.pydml ---------------------------------------------------------------------- diff --git a/src/test/scripts/applications/id3/id3.pydml b/src/test/scripts/applications/id3/id3.pydml index 9bfc70a..f8c6555 100644 --- a/src/test/scripts/applications/id3/id3.pydml +++ b/src/test/scripts/applications/id3/id3.pydml @@ -150,9 +150,9 @@ def id3_learn(X:matrix[float], y:matrix[float], X_subset:matrix[float], attribut hist_labels1 = aggregate(target=Tj, groups=y, fn="sum") num_samples1 = sum(Tj) zero_entries_in_hist = (hist_labels1 == 0) - pi = hist_labels1/num_samples1 - log_term = zero_entries_in_hist*1 + (1-zero_entries_in_hist)*pi - entropy_vector = -pi*log(log_term) + piv = hist_labels1/num_samples1 + log_term = zero_entries_in_hist*1 + (1-zero_entries_in_hist)*piv + entropy_vector = -piv*log(log_term) entropy = sum(entropy_vector) hxt_vector[j-1,0] = sum(Tj)/sum(X_subset)*entropy
