Author: scooter
Date: 2011-10-06 09:21:20 -0700 (Thu, 06 Oct 2011)
New Revision: 27081
Modified:
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/algorithms/attributeClusterers/AbstractAttributeClusterAlgorithm.java
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/algorithms/attributeClusterers/AbstractAttributeClusterer.java
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/algorithms/attributeClusterers/kmeans/KMeansCluster.java
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/algorithms/attributeClusterers/kmedoid/KMedoidCluster.java
Log:
Fix some stupid mistakes in the silhouette refactoring
Modified:
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/algorithms/attributeClusterers/AbstractAttributeClusterAlgorithm.java
===================================================================
---
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/algorithms/attributeClusterers/AbstractAttributeClusterAlgorithm.java
2011-10-06 00:30:23 UTC (rev 27080)
+++
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/algorithms/attributeClusterers/AbstractAttributeClusterAlgorithm.java
2011-10-06 16:21:20 UTC (rev 27081)
@@ -366,7 +366,7 @@
*/
rowOrder = matrix.indexSort(clusters, clusters.length);
- System.out.println(Arrays.toString(rowOrder));
+ // System.out.println(Arrays.toString(rowOrder));
// Update the network attributes
updateAttributes(algorithm);
Modified:
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/algorithms/attributeClusterers/AbstractAttributeClusterer.java
===================================================================
---
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/algorithms/attributeClusterers/AbstractAttributeClusterer.java
2011-10-06 00:30:23 UTC (rev 27080)
+++
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/algorithms/attributeClusterers/AbstractAttributeClusterer.java
2011-10-06 16:21:20 UTC (rev 27081)
@@ -123,14 +123,14 @@
"Maximum number of clusters",
Tunable.INTEGER, new Integer(0),
(Object)new Integer(kMax), (Object)null, 0);
- if (!useSilhouette) t.setFlag(Tunable.IMMUTABLE);
+ // if (!useSilhouette) t.setFlag(Tunable.IMMUTABLE);
clusterProperties.add(t);
t = new Tunable("kNumber",
"Number of clusters (k)",
Tunable.INTEGER, new Integer(10),
(Object)new Integer(kNumber), (Object)null, 0);
- if (useSilhouette) t.setFlag(Tunable.IMMUTABLE);
+ // if (useSilhouette) t.setFlag(Tunable.IMMUTABLE);
clusterProperties.add(t);
}
@@ -168,6 +168,7 @@
}
public void tunableChanged(Tunable t) {
+ System.out.println("Tunable changed");
if (t.getName().equals("useSilhouette")) {
useSilhouette = ((Boolean) t.getValue()).booleanValue();
if (useSilhouette) {
Modified:
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/algorithms/attributeClusterers/kmeans/KMeansCluster.java
===================================================================
---
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/algorithms/attributeClusterers/kmeans/KMeansCluster.java
2011-10-06 00:30:23 UTC (rev 27080)
+++
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/algorithms/attributeClusterers/kmeans/KMeansCluster.java
2011-10-06 16:21:20 UTC (rev 27081)
@@ -214,6 +214,8 @@
algorithm.setIgnoreMissing(true);
algorithm.setSelectedOnly(selectedOnly);
algorithm.setDebug(debug);
+ algorithm.setUseSilhouette(useSilhouette);
+ algorithm.setKMax(kMax);
String resultsString = "K-Means results:";
Modified:
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/algorithms/attributeClusterers/kmedoid/KMedoidCluster.java
===================================================================
---
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/algorithms/attributeClusterers/kmedoid/KMedoidCluster.java
2011-10-06 00:30:23 UTC (rev 27080)
+++
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/algorithms/attributeClusterers/kmedoid/KMedoidCluster.java
2011-10-06 16:21:20 UTC (rev 27081)
@@ -214,6 +214,8 @@
algorithm.setIgnoreMissing(true); // KMedoid doesn't
handle missing data well
algorithm.setSelectedOnly(selectedOnly);
algorithm.setDebug(debug);
+ algorithm.setUseSilhouette(useSilhouette);
+ algorithm.setKMax(kMax);
String resultsString = "K-Medoid results:";
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
