You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ap...@apache.org on 2016/05/18 17:52:37 UTC
mahout git commit: MAHOUT-1859: temporariliy disable msurf and mgrid
for 0.12.1 release. closes apache/mahout#234
Repository: mahout
Updated Branches:
refs/heads/master 79a70dff9 -> 855471423
MAHOUT-1859: temporariliy disable msurf and mgrid for 0.12.1 release. closes apache/mahout#234
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/85547142
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/85547142
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/85547142
Branch: refs/heads/master
Commit: 8554714235ace8f44c6ac81f6edfe1343bacee4c
Parents: 79a70df
Author: Andrew Palumbo <ap...@apache.org>
Authored: Wed May 18 13:52:09 2016 -0400
Committer: Andrew Palumbo <ap...@apache.org>
Committed: Wed May 18 13:52:09 2016 -0400
----------------------------------------------------------------------
examples/bin/spark-shell-plot.mscala | 8 ++++----
.../scala/org/apache/mahout/visualization/MGrid.scala | 1 +
.../scala/org/apache/mahout/visualization/MSurf.scala | 3 +++
.../scala/org/apache/mahout/visualization/package.scala | 12 ++++++++----
4 files changed, 16 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/85547142/examples/bin/spark-shell-plot.mscala
----------------------------------------------------------------------
diff --git a/examples/bin/spark-shell-plot.mscala b/examples/bin/spark-shell-plot.mscala
index 8711596..e7d79db 100644
--- a/examples/bin/spark-shell-plot.mscala
+++ b/examples/bin/spark-shell-plot.mscala
@@ -55,8 +55,8 @@ val drmGauss = drmRand3d.mapBlock() {case (keys, block) =>
mplot3d(drmGauss, samplePercent = 50)
// 3d Surface needs to be ordered. --not working correctly as is
-//import org.apache.mahout.visualization.MSurf
-msurf(drmGauss, samplePercent = 10)
+//import org.apache.mahout.visualization.MSurf`
+// msurf(drmGauss, samplePercent = 10)
// 3d "Matlab peaks"
import org.apache.mahout.visualization._
@@ -81,7 +81,7 @@ mplot3d(drmPeaks, samplePercent = 10)
// 3d Surface needs to be ordered. --not working correctly as is
import org.apache.mahout.visualization._
-msurf(drmPeaks, samplePercent = 10)
+// msurf(drmPeaks, samplePercent = 10)
@@ -104,7 +104,7 @@ val drmGauss = drmRand3d.mapBlock() {case (keys, block) =>
keys -> blockB
}
-mgrid(drmGauss, samplePercent = 10)
+// mgrid(drmGauss, samplePercent = 10)
// 2 and 3d histograms of gaussian data
http://git-wip-us.apache.org/repos/asf/mahout/blob/85547142/math-scala/src/main/scala/org/apache/mahout/visualization/MGrid.scala
----------------------------------------------------------------------
diff --git a/math-scala/src/main/scala/org/apache/mahout/visualization/MGrid.scala b/math-scala/src/main/scala/org/apache/mahout/visualization/MGrid.scala
index 4b452e0..afd7384 100644
--- a/math-scala/src/main/scala/org/apache/mahout/visualization/MGrid.scala
+++ b/math-scala/src/main/scala/org/apache/mahout/visualization/MGrid.scala
@@ -33,6 +33,7 @@ import smile.plot._
* @tparam K
*/
class MGrid[K](drmXYZ: DrmLike[K], samplePercent: Double = 1, setVisible: Boolean = true) extends MahoutPlot{
+ throw new NotImplementedError("This Class is not yet fully implemented.")
val drmSize = drmXYZ.checkpoint().numRows()
val sampleDec: Double = samplePercent / 100.toDouble
http://git-wip-us.apache.org/repos/asf/mahout/blob/85547142/math-scala/src/main/scala/org/apache/mahout/visualization/MSurf.scala
----------------------------------------------------------------------
diff --git a/math-scala/src/main/scala/org/apache/mahout/visualization/MSurf.scala b/math-scala/src/main/scala/org/apache/mahout/visualization/MSurf.scala
index c7593ec..397cb7c 100644
--- a/math-scala/src/main/scala/org/apache/mahout/visualization/MSurf.scala
+++ b/math-scala/src/main/scala/org/apache/mahout/visualization/MSurf.scala
@@ -35,6 +35,9 @@ import smile.plot._
* @tparam K
*/
class MSurf[K](drmXYZ: DrmLike[K], samplePercent: Double = 1, setVisible: Boolean = true) extends MahoutPlot {
+ throw new NotImplementedError("This Class is not yet fully implemented.")
+
+
val drmSize = drmXYZ.checkpoint().numRows()
val sampleDec: Double = samplePercent / 100.toDouble
http://git-wip-us.apache.org/repos/asf/mahout/blob/85547142/math-scala/src/main/scala/org/apache/mahout/visualization/package.scala
----------------------------------------------------------------------
diff --git a/math-scala/src/main/scala/org/apache/mahout/visualization/package.scala b/math-scala/src/main/scala/org/apache/mahout/visualization/package.scala
index fcbadea..0c798b7 100644
--- a/math-scala/src/main/scala/org/apache/mahout/visualization/package.scala
+++ b/math-scala/src/main/scala/org/apache/mahout/visualization/package.scala
@@ -51,6 +51,7 @@ package object visualization {
}
/**
+ * Not enabled in Mahout 0.12.1 Will be finished in Mahout 0.13.0
* Syntatic sugar for MSurf class
* @param drmXYZ
* @param samplePercent
@@ -58,8 +59,9 @@ package object visualization {
* @tparam K
* @return
*/
- def msurf[K](drmXYZ: DrmLike[K], samplePercent: Double = 1, setVisible: Boolean = true): MahoutPlot =
- new MSurf[K](drmXYZ: DrmLike[K], samplePercent, setVisible)
+ // Disable for Mahout 0.12.1 finish in Mahout 0.13.0
+ // def msurf[K](drmXYZ: DrmLike[K], samplePercent: Double = 1, setVisible: Boolean = true): MahoutPlot =
+ // new MSurf[K](drmXYZ: DrmLike[K], samplePercent, setVisible)
/**
* Syntatic sugar for MPlot2d class
@@ -84,6 +86,7 @@ package object visualization {
new MPlot3d[K](drmXYZ: DrmLike[K], samplePercent, setVisible)
/**
+ * Not enabled in Mahout 0.12.1 Will be finished in Mahout 0.13.0
* Syntatic sugar for MGrid class
* @param drmXYZ
* @param samplePercent
@@ -91,8 +94,9 @@ package object visualization {
* @tparam K
* @return
*/
- def mgrid[K](drmXYZ: DrmLike[K], samplePercent: Double = 1, setVisible: Boolean = true): MahoutPlot =
- new MGrid[K](drmXYZ: DrmLike[K], samplePercent, setVisible)
+ // Disable for Mahout 0.12.1 finish in Mahout 0.13.0
+ // def mgrid[K](drmXYZ: DrmLike[K], samplePercent: Double = 1, setVisible: Boolean = true): MahoutPlot =
+ // new MGrid[K](drmXYZ: DrmLike[K], samplePercent, setVisible)
/**
*