Author: mes
Date: 2011-03-09 12:53:15 -0800 (Wed, 09 Mar 2011)
New Revision: 24349
Modified:
csplugins/trunk/ucsd/mes/VennDiagram/build.xml
csplugins/trunk/ucsd/mes/VennDiagram/resources/plugin.props
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/VennAnalytic.java
Log:
updated with bug fixes and reference to the paper.
Modified: csplugins/trunk/ucsd/mes/VennDiagram/build.xml
===================================================================
--- csplugins/trunk/ucsd/mes/VennDiagram/build.xml 2011-03-09 19:07:41 UTC
(rev 24348)
+++ csplugins/trunk/ucsd/mes/VennDiagram/build.xml 2011-03-09 20:53:15 UTC
(rev 24349)
@@ -7,7 +7,7 @@
<target name="init">
<tstamp/>
<property name="name" value="VennDiagram"/>
- <property name="version" value="1.02"/>
+ <property name="version" value="1.03"/>
<echo message="Building ${name} version ${version} ..."/>
Modified: csplugins/trunk/ucsd/mes/VennDiagram/resources/plugin.props
===================================================================
--- csplugins/trunk/ucsd/mes/VennDiagram/resources/plugin.props 2011-03-09
19:07:41 UTC (rev 24348)
+++ csplugins/trunk/ucsd/mes/VennDiagram/resources/plugin.props 2011-03-09
20:53:15 UTC (rev 24349)
@@ -8,7 +8,7 @@
# Description used to give users information about the plugin such as what it
does.
# Html tags are encouraged for formatting purposes.
-pluginDescription=This plugin generates a Venn/Euler Diagram of shared nodes
for a selection of networks.
+pluginDescription=This plugin generates a Venn/Euler diagram of shared nodes
for a selection of networks. The diagram generation algorithm is described in
<a href=http://www.computer.org/portal/web/csdl/doi/10.1109/TVCG.2011.56>Exact
and Approximate Area-proportional Circular Venn and Euler Diagrams</a> by
Leland Wilkinson.
# Plugin version number, this must be two numbers separated by a decimlal.
Ex. 0.2, 14.03
pluginVersion=@version@
Modified:
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/VennAnalytic.java
===================================================================
---
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/VennAnalytic.java
2011-03-09 19:07:41 UTC (rev 24348)
+++
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/VennAnalytic.java
2011-03-09 20:53:15 UTC (rev 24349)
@@ -251,6 +251,7 @@
}
private void calculateAreas() {
+ polyAreas = new double[nPolygons];
totalCount = 0;
int size = 200;
byte[][][] bis = new byte[nCircles][size][size];
@@ -532,8 +533,8 @@
continue;
int ko = k + offset;
double resid = polyAreas[i] - polyHats[i];
- double dx = resid * stepsize * (centers[jo][0] -
centers[ko][0]);
- double dy = resid * stepsize * (centers[jo][1] -
centers[ko][1]);
+ double dx = 0.5 * resid * stepsize * (centers[jo][0] -
centers[ko][0]);
+ double dy = 0.5 * resid * stepsize * (centers[jo][1] -
centers[ko][1]);
gradients[jo][0] += dx;
gradients[jo][1] += dy;
gradients[ko][0] -= dx;
--
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.
