Author: kozo
Date: 2009-08-10 08:54:32 -0700 (Mon, 10 Aug 2009)
New Revision: 17757
Modified:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/MultiLayerNetworkBuilderImpl.java
Log:
removed test comment lines and added sysout lines for layer attribute test of
biological data
(refs ticket:13)
(refs ticket:19)
Modified:
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/MultiLayerNetworkBuilderImpl.java
===================================================================
---
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/MultiLayerNetworkBuilderImpl.java
2009-08-10 15:47:22 UTC (rev 17756)
+++
csplugins/trunk/soc/kozo/layer-plugin/layer-builder-plugin/src/main/java/org/cytoscape/layer/internal/MultiLayerNetworkBuilderImpl.java
2009-08-10 15:54:32 UTC (rev 17757)
@@ -61,49 +61,27 @@
CyNetwork connector=connectors.get(i);
CyNetwork bottomLayer = layers.get(i+1);
-// System.out.println("-----");
-// System.out.println("topLayerIndex, bottomLayerIndex");
-// System.out.println(i);
-// System.out.println(i+1);
-// System.out.println("-----");
-
connect(topLayer, connector, bottomLayer, nodeMap,
edgeMap, i, i+1);
}
-// for (CyNetwork topLayer : layers) {
-// topLayerIndex = topLayerIndex + 1;
-// for (CyNetwork bottomLayer : layers) {
-// bottomLayerIndex = bottomLayerIndex + 1;
-// for (CyNetwork connector : connectors) {
-// if (topLayerIndex != bottomLayerIndex){
-// System.out.println("-----");
-//
System.out.println("topLayerIndex, bottomLayerIndex");
-//
System.out.println(topLayerIndex);
-//
System.out.println(bottomLayerIndex);
-// System.out.println("-----");
-//
-// connect(topLayer, bottomLayer,
connector, nodeMap, edgeMap, topLayerIndex, bottomLayerIndex);
-// }
-// }
-// }
-// }
-
nodeMap.clear();
nodeMap = null;
manager.addNetwork(layeredNetwork);
+
+ System.out.println("layer index attribute test start!!");
-// for (CyNode cyNode : layeredNetwork.getNodeList()){
-//
-// System.out.println("NODE_NAME");
-// System.out.println(cyNode.attrs().get(NODE_TITLE,
String.class));
-// System.out.println("NODE_LAYER_INDEX");
-// System.out.println(cyNode.attrs().get(LAYER_INDEX,
String.class));
-//
-// }
+ for (CyNode cyNode : layeredNetwork.getNodeList()){
+
+ System.out.println("NODE_NAME");
+ System.out.println(cyNode.attrs().get(NODE_TITLE,
String.class));
+ System.out.println("NODE_LAYER_INDEX");
+ System.out.println(cyNode.attrs().get(LAYER_INDEX,
String.class));
-// System.out.println("OK!");
+ }
+
+ System.out.println("OK!");
return layeredNetwork;
}
@@ -124,14 +102,8 @@
CyNode newNode = layeredNetwork.addNode();
newNode.attrs().set(NODE_TITLE, nodeName);
-// System.out.println("NODE_TITLE");
-//
System.out.println(newNode.attrs().get(NODE_TITLE, String.class));
-
newNode.attrs().set(LAYER_INDEX,
Integer.toString(topLayerIndex));
-// System.out.println("node top layer index");
-//
System.out.println(newNode.attrs().get(LAYER_INDEX, String.class));
-
nodeMap.put(nodeName, newNode);
}
}
@@ -157,22 +129,13 @@
for (CyNode cyNode : bottomLayer.getNodeList()) {
String nodeName = cyNode.attrs().get(NODE_TITLE,
String.class);
- System.out.println("3rd phase bottom layer node name");
- System.out.println(nodeName);
if (nodeMap.containsKey(nodeName) == false) {
CyNode newNode = layeredNetwork.addNode();
newNode.attrs().set(NODE_TITLE, nodeName);
-// System.out.println("NODE_TITLE");
-// System.out.println("bottom layer node name
check");
-//
System.out.println(newNode.attrs().get(NODE_TITLE, String.class));
-
newNode.attrs().set(LAYER_INDEX,
Integer.toString(bottomLayerIndex));
-// System.out.println("node bottom layer index");
-//
System.out.println(newNode.attrs().get(LAYER_INDEX, String.class));
-
nodeMap.put(nodeName, newNode);
}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
