Skip to content

refactor PIC #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 30, 2015
Merged

refactor PIC #44

merged 1 commit into from
Jan 30, 2015

Conversation

mengxr
Copy link

@mengxr mengxr commented Jan 30, 2015

@fjiang6 @javadba I made some API refactoring and the following changes:

  1. normalize A to W (expect users input symmetric similarities)
  2. initialization (generate v0 remotely)
  3. k-means (do not collect v)

Debug code was removed. Unit tests were added for normalize and powerIter. We can move the original unit test to examples in a later PR.

@javadba
Copy link

javadba commented Jan 30, 2015

Thanks Xiangrui. I am looking into how to automatically merge this into our
branch.

2015-01-30 6:50 GMT-08:00 Xiangrui Meng notifications@github.com:

@fjiang6 https://github.com/fjiang6 @javadba
https://github.com/javadba I made some API refactoring and the
following changes:

  1. normalize A to W (expect users input symmetric similarities)
  2. initialization (generate v0 remotely)
  3. k-means (do not collect v)

Debug code was removed. Unit tests were added for normalize and powerIter.

We can move the original unit test to examples in a later PR.

You can view, comment on, or merge this pull request online at:

#44
Commit Summary

  • refactor PIC

File Changes

Patch Links:


Reply to this email directly or view it on GitHub
#44.

@javadba
Copy link

javadba commented Jan 30, 2015

I am so far unable to determine how to do a merge. The github docs talk about a "merge" button: but no such button appears for me. I am looking into how to do this on command line.

sboeschhuawei added a commit that referenced this pull request Jan 30, 2015
@sboeschhuawei sboeschhuawei merged commit f292f31 into Huawei-Spark:PIC Jan 30, 2015
sboeschhuawei added a commit that referenced this pull request Feb 1, 2015
…ussian Similarity Function

Add single pseudo-eigenvector PIC
Including documentations and updated pom.xml with the following codes:
mllib/src/main/scala/org/apache/spark/mllib/clustering/PIClustering.scala
mllib/src/test/scala/org/apache/spark/mllib/clustering/PIClusteringSuite.scala

Author: sboeschhuawei <stephen.boesch@huawei.com>
Author: Fan Jiang <fanjiang.sc@huawei.com>
Author: Jiang Fan <fjiang6@gmail.com>
Author: Stephen Boesch <stephen.boesch@huawei.com>
Author: Xiangrui Meng <meng@databricks.com>

Closes apache#4254 from fjiang6/PIC and squashes the following commits:

4550850 [sboeschhuawei] Removed pic test data
f292f31 [Stephen Boesch] Merge pull request #44 from mengxr/SPARK-4259
4b78aaf [Xiangrui Meng] refactor PIC
24fbf52 [sboeschhuawei] Updated API to be similar to KMeans plus other changes requested by Xiangrui on the PR
c12dfc8 [sboeschhuawei] Removed examples files and added pic_data.txt. Revamped testcases yet to come
92d4752 [sboeschhuawei] Move the Guassian/ Affinity matrix calcs out of PIC. Presently in the test suite
7ebd149 [sboeschhuawei] Incorporate Xiangrui's first set of PR comments except restructure PIC.run to take Graph but do not remove Gaussian
121e4d5 [sboeschhuawei] Remove unused testing data files
1c3a62e [sboeschhuawei] removed matplot.py and reordered all private methods to bottom of PIC
218a49d [sboeschhuawei] Applied Xiangrui's comments - especially removing RDD/PICLinalg classes and making noncritical methods private
43ab10b [sboeschhuawei] Change last two println's to log4j logger
88aacc8 [sboeschhuawei] Add assert to testcase on cluster sizes
24f438e [sboeschhuawei] fixed incorrect markdown in clustering doc
060e6bf [sboeschhuawei] Added link to PIC doc from the main clustering md doc
be659e3 [sboeschhuawei] Added mllib specific log4j
90e7fa4 [sboeschhuawei] Converted from custom Linalg routines to Breeze: added JavaDoc comments; added Markdown documentation
bea48ea [sboeschhuawei] Converted custom Linear Algebra datatypes/routines to use Breeze.
b29c0db [Fan Jiang] Update PIClustering.scala
ace9749 [Fan Jiang] Update PIClustering.scala
a112f38 [sboeschhuawei] Added graphx main and test jars as dependencies to mllib/pom.xml
f656c34 [sboeschhuawei] Added iris dataset
b7dbcbe [sboeschhuawei] Added axes and combined into single plot for matplotlib
a2b1e57 [sboeschhuawei] Revert inadvertent update to KMeans
9294263 [sboeschhuawei] Added visualization/plotting of input/output data
e5df2b8 [sboeschhuawei] First end to end working PIC
0700335 [sboeschhuawei] First end to end working version: but has bad performance issue
32a90dc [sboeschhuawei] Update circles test data values
0ef163f [sboeschhuawei] Added ConcentricCircles data generation and KMeans clustering
3fd5bc8 [sboeschhuawei] PIClustering is running in new branch (up to the pseudo-eigenvector convergence step)
d5aae20 [Jiang Fan] Adding Power Iteration Clustering and Suite test
a3c5fbe [Jiang Fan] Adding Power Iteration Clustering
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants