Skip to content
Snippets Groups Projects
Commit 518c5732 authored by Peter Wagenhuber's avatar Peter Wagenhuber
Browse files

just tests

parent c02b71c4
No related branches found
No related tags found
No related merge requests found
...@@ -181,6 +181,7 @@ public class Nloc { ...@@ -181,6 +181,7 @@ public class Nloc {
// "end" to "start" // "end" to "start"
for (int i = bifurcationList.size() - 1; i >= 0; --i) { for (int i = bifurcationList.size() - 1; i >= 0; --i) {
Channel currentBifurcation = bifurcationList.get(i); Channel currentBifurcation = bifurcationList.get(i);
System.out.println("At Bifurcation: " + currentBifurcation.getName());
List<List<SequenceTuple>> tmpSeqs = new ArrayList<List<SequenceTuple>>(); List<List<SequenceTuple>> tmpSeqs = new ArrayList<List<SequenceTuple>>();
for (List<SequenceTuple> stl: sequences) { for (List<SequenceTuple> stl: sequences) {
tmpSeqs.addAll( tmpSeqs.addAll(
......
...@@ -39,7 +39,7 @@ public class TestNloc { ...@@ -39,7 +39,7 @@ public class TestNloc {
//} //}
List<List<Channel>> allPaths = nl.getAllPaths(); List<List<Channel>> allPaths = nl.getAllPaths();
allPaths.remove(4); List<Channel> critPath = allPaths.get(4);
//try { //try {
// String[] mtv = {"f2", "m3", "h0", "m5"}; // String[] mtv = {"f2", "m3", "h0", "m5"};
...@@ -54,19 +54,26 @@ public class TestNloc { ...@@ -54,19 +54,26 @@ public class TestNloc {
//} //}
//printPaths(allPaths); //printPaths(allPaths);
int count = 0; //int count = 0;
for (List<Channel> path: allPaths) { //for (List<Channel> path: allPaths) {
String[] modulesToVisit = extractModuleStringArrayFromPath(path); String[] modulesToVisit = extractModuleStringArrayFromPath(critPath);
System.out.println("Modules to visit: "); System.out.println("Modules to visit: ");
for (String str: modulesToVisit) { for (String str: modulesToVisit) {
System.out.print(str + " " ); System.out.print(str + " " );
} }
System.out.println("Pathnum: " + count++); try {
Pump p = nl.getShortestSequence(modulesToVisit); List<List<SequenceTuple>> seTupList = nl.getPossibleSequences(modulesToVisit);
printPumpcontents(p); printSequences(seTupList);
} } catch (Exception e) {
System.out.println(e.getMessage());
}
//System.out.println("Pathnum: " + count++);
//Pump p = nl.getShortestSequence(modulesToVisit);
//printPumpcontents(p);
//}
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment