Author: mkirby
Date: 2012-06-27 10:05:08 -0700 (Wed, 27 Jun 2012)
New Revision: 29707
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/NetworkSync.java
Log:
mkirby: Added node ad edge maps.
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-06-27 16:32:05 UTC (rev 29706)
+++
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/NetworkManager.java
2012-06-27 17:05:08 UTC (rev 29707)
@@ -43,27 +43,29 @@
CyNetwork network =
currentNets.get(netName).getNetwork();
CyNode node = network.addNode();
network.getRow(node).set(CyNetwork.NAME, "55");
+ currentNets.get(netName).getNodeMap().put(55, node);
} else {
System.out.println("Creating network "+netName);
CyNetwork network = netFact.createNetwork();
network.getRow(network).set(CyNetwork.NAME,netName);
- currentNets.put(netName, new NetworkSync(network));
+ HashMap<Integer, CyNode> nodeMap = new HashMap<Integer,
CyNode>();
+ HashMap<Integer, CyEdge> edgeMap = new HashMap<Integer,
CyEdge>();
+ currentNets.put(netName, new NetworkSync(network,
nodeMap, edgeMap));
- Map<String, CyNode> nMap = new HashMap<String,
CyNode>();
-
for (Integer n : nodes) {
CyNode node = network.addNode();
network.getRow(node).set(CyNetwork.NAME, n+"");
- nMap.put(n+"", node);
+ nodeMap.put(n, node);
System.out.println("Added node "+n);
}
System.out.println("Got nodes...");
for (int e=0; e<edgeFrom.size();e++) {
- CyNode fromNode =
nMap.get(edgeFrom.get(e).intValue()+"");
- CyNode toNode =
nMap.get(edgeTo.get(e).intValue()+"");
+ CyNode fromNode =
nodeMap.get(edgeFrom.get(e).intValue());
+ CyNode toNode =
nodeMap.get(edgeTo.get(e).intValue());
CyEdge edge = network.addEdge(fromNode, toNode,
false);
network.getRow(edge).set(CyNetwork.NAME, e+"");
+ edgeMap.put(e, edge);
}
System.out.println("Got edges...");
Modified:
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/NetworkSync.java
===================================================================
---
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/NetworkSync.java
2012-06-27 16:32:05 UTC (rev 29706)
+++
csplugins/trunk/soc/mkirby/CytoBridge/src/main/java/org/cytoscape/cytobridge/NetworkSync.java
2012-06-27 17:05:08 UTC (rev 29707)
@@ -1,17 +1,41 @@
package org.cytoscape.cytobridge;
+import java.util.HashMap;
+
+import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.CyNode;
public class NetworkSync {
private CyNetwork network;
+ private HashMap<Integer, CyNode> nodeMap;
+ private HashMap<Integer, CyEdge> edgeMap;
- public NetworkSync(CyNetwork net) {
+ public NetworkSync(CyNetwork net, HashMap<Integer, CyNode> nodeMap,
HashMap<Integer, CyEdge> edgeMap) {
this.network = net;
+ this.nodeMap = nodeMap;
+ this.edgeMap = edgeMap;
}
public CyNetwork getNetwork() {
return network;
}
+ public void setEdgeMap(HashMap<Integer, CyEdge> edgeMap) {
+ this.edgeMap = edgeMap;
+ }
+
+ public HashMap<Integer, CyEdge> getEdgeMap() {
+ return edgeMap;
+ }
+
+ public void setNodeMap(HashMap<Integer, CyNode> nodeMap) {
+ this.nodeMap = nodeMap;
+ }
+
+ public HashMap<Integer, CyNode> getNodeMap() {
+ return nodeMap;
+ }
+
}
--
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.
