Author: mkirby
Date: 2012-07-19 16:01:24 -0700 (Thu, 19 Jul 2012)
New Revision: 29931
Modified:
csplugins/trunk/soc/mkirby/CytoBridge/pom.xml
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/NetworkManager.java
Log:
RPC works, moving to JSON.
Modified: csplugins/trunk/soc/mkirby/CytoBridge/pom.xml
===================================================================
--- csplugins/trunk/soc/mkirby/CytoBridge/pom.xml 2012-07-19 23:00:04 UTC
(rev 29930)
+++ csplugins/trunk/soc/mkirby/CytoBridge/pom.xml 2012-07-19 23:01:24 UTC
(rev 29931)
@@ -100,6 +100,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.2.2</version>
+ </dependency>
+ <dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.10.0</version>
Modified:
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/NetworkManager.java
===================================================================
---
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/NetworkManager.java
2012-07-19 23:00:04 UTC (rev 29930)
+++
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/NetworkManager.java
2012-07-19 23:01:24 UTC (rev 29931)
@@ -170,7 +170,7 @@
try {
//Network Attributes
CyTable gtable =
netSyn.getNetwork().getDefaultNetworkTable();
- for (int g=0; g<gheads.size(); g++) {
+ for (int g=0; g<gheads.size()-1; g++) {
if (gtable.getColumn(gheads.get(g))==null) {
gtable.createColumn(gheads.get(g),
String.class, true, "");
}
@@ -192,12 +192,12 @@
try {
//Node attributes
CyTable ntable =
netSyn.getNetwork().getDefaultNodeTable();
- for (int n=0; n<nheads.size(); n++) {
+ for (int n=0; n<nheads.size()-1; n++) {
if (ntable.getColumn(nheads.get(n))==null) {
ntable.createColumn(nheads.get(n),
String.class, true, "");
}
- for (int i=0; i<ndata.size()/nheads.size();i++)
{
-
ntable.getRow(netSyn.getNodeMap().get(nrids.get(i)).getSUID()).set(nheads.get(n),
ndata.get(i+(n*ndata.size()/nheads.size())));
+ for (int i=0;
i<(ndata.size()-1)/(nheads.size()-1);i++) {
+
ntable.getRow(netSyn.getNodeMap().get(nrids.get(i)).getSUID()).set(nheads.get(n),
ndata.get(i+(n*(ndata.size()-1)/(nheads.size()-1))));
}
}
} catch(Exception e) {
@@ -216,12 +216,12 @@
try {
//Edge Attributes
CyTable etable =
netSyn.getNetwork().getDefaultEdgeTable();
- for (int e=0; e<eheads.size(); e++) {
+ for (int e=0; e<eheads.size()-1; e++) {
if (etable.getColumn(eheads.get(e))==null) {
etable.createColumn(eheads.get(e),
String.class, true, "");
}
- for (int i=0; i<edata.size()/eheads.size();i++)
{
-
etable.getRow(netSyn.getEdgeMap().get(erids.get(i)).getSUID()).set(eheads.get(e),
edata.get(i+(e*edata.size()/eheads.size())));
+ for (int i=0;
i<(edata.size()-1)/(eheads.size()-1);i++) {
+
etable.getRow(netSyn.getEdgeMap().get(erids.get(i)).getSUID()).set(eheads.get(e),
edata.get(i+(e*(edata.size()-1)/(eheads.size()-1))));
}
}
} catch(Exception e) {
@@ -241,8 +241,8 @@
try {
for (int e=0; e<heads.size(); e++) {
table.createColumn(heads.get(e),
String.class, true, "");
- for (int i=0;
i<data.size()/heads.size();i++) {
-
//table.getRow().set(heads.get(e), data.get(i+(e*data.size()/heads.size())));
+ for (int i=0;
i<(data.size()-1)/(heads.size()-1);i++) {
+
//table.getRow().set(heads.get(e),
data.get(i+(e*(data.size()-1)/(heads.size()-1))));
}
}
} catch(Exception e) {
--
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.
