Skip to content

Commit

Permalink
update to print topological order
Browse files Browse the repository at this point in the history
need to do bfs to achieve what eamonn would like to have
  • Loading branch information
drseb committed Dec 12, 2017
1 parent 7c4f32c commit fc55605
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions src/de/phenomics/Obo2Xls.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.stream.Collectors;

import org.apache.commons.cli.CommandLine;
Expand Down Expand Up @@ -130,14 +131,21 @@ private static void createXlsFromObo(Ontology ontology, Term selectedRootTerm, S

rowIndex = createHeaderRow(createHelper, style, rowIndex, sheet0, headersTermAdd);

ArrayList<Term> termsToReport = new ArrayList<>();
ArrayList<Term> termsInTopologicalOrder = ontology.getTermsInTopologicalOrder();
HashSet<Term> termsToReport = new HashSet<>();
if (selectedRootTerm != null) {
termsToReport.addAll(ontologySlim.getDescendants(selectedRootTerm));
} else {
termsToReport.addAll(ontology.getAllTerms());
}

for (Term term : termsToReport) {
for (Term term : termsInTopologicalOrder) {

if (term.isObsolete())
continue;

if (!termsToReport.contains(term))
continue;

Row row = sheet0.createRow((short) rowIndex++);

Expand Down

0 comments on commit fc55605

Please sign in to comment.