Author: pwang
Date: 2011-11-08 16:02:50 -0800 (Tue, 08 Nov 2011)
New Revision: 27434
Modified:
csplugins/trunk/ucsd/pwang/jActiveModules-impl/src/main/java/csplugins/jActiveModules/ActivePathsFinder.java
Log:
Clean up
Modified:
csplugins/trunk/ucsd/pwang/jActiveModules-impl/src/main/java/csplugins/jActiveModules/ActivePathsFinder.java
===================================================================
---
csplugins/trunk/ucsd/pwang/jActiveModules-impl/src/main/java/csplugins/jActiveModules/ActivePathsFinder.java
2011-11-08 22:05:23 UTC (rev 27433)
+++
csplugins/trunk/ucsd/pwang/jActiveModules-impl/src/main/java/csplugins/jActiveModules/ActivePathsFinder.java
2011-11-09 00:02:50 UTC (rev 27434)
@@ -79,6 +79,7 @@
private Component[] activePaths = null;
Vector<Component> activePathsVect;
+ TaskMonitor taskMonitor = null;
/**
* This is the only constructor for ActivePathsFinder. In order to find
the
@@ -239,7 +240,7 @@
}
public void run(TaskMonitor taskMonitor) {
-
+ this.taskMonitor = taskMonitor;
activePaths = findActivePaths();
for (int i=0; i< activePaths.length; i++){
@@ -293,13 +294,9 @@
// progress.close();
// } // end of if ()
+
+ thread.run(this.taskMonitor);
- //this.insertTasksAfterCurrentTask(thread);
-
- ActivePathsTaskFactory factory = new
ActivePathsTaskFactory(thread);
-
ServicesUtil.synchronousTaskManagerServiceRef.execute(factory);
-
-
logger.info("Finished simulated annealing run");
if (apfParams.getToQuench()) {
logger.info("Starting quenching run");
@@ -315,11 +312,12 @@
// logger.error("Failed to rejoin
Quenching Search Thread",e);
// return new Component[0];
// }
- //this.insertTasksAfterCurrentTask(thread_2);
- ActivePathsTaskFactory factory2 = new
ActivePathsTaskFactory(thread_2);
-
ServicesUtil.synchronousTaskManagerServiceRef.execute(factory2);
+// ActivePathsTaskFactory factory2 = new
ActivePathsTaskFactory(thread_2);
+//
ServicesUtil.synchronousTaskManagerServiceRef.execute(factory2);
+ thread_2.run(this.taskMonitor);
+
logger.info("Quenching run finished");
}
@@ -327,23 +325,12 @@
// restoreNodes();
}
+
Collections.sort(comps);
comps = filterResults(comps);
-// for (int i=0; i< comps.size(); i++){
-// Component comp = (Component)comps.get(i);
-// System.out.println("comp.getScore()="+ comp.getScore());
-// String[] names =comp.getNodeNames();
-//
-// for(int j=0; j<names.length; j++){
-// System.out.print(names[j] + " ");
-// }
-// System.out.print( "\n");
-// }
-
-
/*
* Finalize the display information
*/
@@ -424,12 +411,8 @@
// }
-
int number_threads = apfParams.getMaxThreads();
- System.out.println("runGreedySearch(): seedList.size()= "+
seedList.size());
- System.out.println("runGreedySearch(): number_threads = "+
number_threads);
-
// Vector threadVector = new Vector();
for (int i = 0; i < number_threads; i++) {
GreedySearchThread gst = new
GreedySearchThread(cyNetwork,
@@ -455,10 +438,6 @@
// if (progressMonitor != null) {
// progressMonitor.close();
// }
-//
-
-// System.out.println("runGreedySearch():
node2BestComponent.size()= "+ node2BestComponent.size());
-// System.out.println("runGreedySearch(): nodes.length= = "+
nodes.length+ "\n");
-
+//
}
}
--
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.
