Author: scooter
Date: 2010-02-13 13:11:46 -0800 (Sat, 13 Feb 2010)
New Revision: 19334
Modified:
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/algorithms/hierarchical/EisenCluster.java
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/algorithms/hierarchical/Matrix.java
Log:
Fix problem with symmetrical matrices and "ignore missing data"
Modified:
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/algorithms/hierarchical/EisenCluster.java
===================================================================
---
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/algorithms/hierarchical/EisenCluster.java
2010-02-13 00:49:52 UTC (rev 19333)
+++
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/algorithms/hierarchical/EisenCluster.java
2010-02-13 21:11:46 UTC (rev 19334)
@@ -114,6 +114,7 @@
columnList.add(columnArray[col]);
}
}
+ // System.out.println("Order: "+orderList);
if (matrix.isTransposed()) {
// We did an Array cluster -- output the calculated
array order
Modified:
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/algorithms/hierarchical/Matrix.java
===================================================================
---
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/algorithms/hierarchical/Matrix.java
2010-02-13 00:49:52 UTC (rev 19333)
+++
csplugins/trunk/ucsf/scooter/clusterMaker/src/clusterMaker/algorithms/hierarchical/Matrix.java
2010-02-13 21:11:46 UTC (rev 19334)
@@ -433,6 +433,13 @@
if ((!ignoreMissing || found) && (!selectedOnly ||
hasSelectedEdge))
index++;
}
+
+ // At this point, if we're ignoring missing values, we only
have part of the matrix
+ // in use. Update nRows and nColumns to reflect the new size.
+ if (ignoreMissing) {
+ this.nRows = index;
+ this.nColumns = index;
+ }
}
private void buildGeneArrayMatrix(CyNetwork network, String[]
weightAttributes,
--
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.
