Skip to content

Commit a9f6bb9

Browse files
maarztStefan Hahmann
authored andcommitted
Rename LineageTreeUtils to GraphUtils
1 parent 0db93f8 commit a9f6bb9

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

src/main/java/org/mastodon/mamut/tomancak/lineage_registration/LineageTreeUtils.java renamed to src/main/java/org/mastodon/mamut/tomancak/lineage_registration/GraphUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.mastodon.graph.Vertex;
99
import org.mastodon.spatial.HasTimepoint;
1010

11-
public class LineageTreeUtils
11+
public class GraphUtils
1212
{
1313
/**
1414
* @return the set of root nodes of the given graph.

src/main/java/org/mastodon/mamut/tomancak/trackmatching/BranchGraphUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public static < V extends Vertex< E >, E extends Edge< V > > boolean doesBranchD
137137
}
138138

139139
/**
140-
* Returns the first vertex of the specified branch with {@code vertex.getTimepoint() > timepoint.}
140+
* Returns the first vertex of the specified branch with {@code vertex.getTimepoint() >= timepoint.}
141141
*
142142
* @param branchStart The first vertex of the branch.
143143
* @param timepoint The time point.

src/main/java/org/mastodon/mamut/tomancak/trackmatching/RootsPairing.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import org.mastodon.collection.ref.RefRefHashMap;
4242
import org.mastodon.mamut.model.ModelGraph;
4343
import org.mastodon.mamut.model.Spot;
44+
import org.mastodon.mamut.tomancak.lineage_registration.GraphUtils;
4445

4546
/**
4647
* Pair the root spots in two ModelGraphs based on their label.
@@ -72,7 +73,7 @@ static RefRefMap< Spot, Spot > pairDividingRoots( ModelGraph graphA, int timepoi
7273

7374
private static RefSet< Spot > getRoots( ModelGraph graph, int timepoint )
7475
{
75-
return getBranchStarts( filterDividingSpots( LineageTreeUtils.getRoots( graph, timepoint ) ) );
76+
return getBranchStarts( filterDividingSpots( GraphUtils.getRoots( graph, timepoint ) ) );
7677
}
7778

7879
private static RefRefMap< Spot, Spot > pairSpotsBasedOnLabel( RefSet< Spot > spotsA, RefSet< Spot > spotsB )
@@ -99,6 +100,10 @@ private static RefSet< Spot > filterDividingSpots( RefSet< Spot > spots )
99100
}
100101
}
101102

103+
/**
104+
* Returns the set that contains the first vertices of all branches, that
105+
* contain a vertex in the given set ({@code spots}).
106+
*/
102107
private static RefSet< Spot > getBranchStarts( RefSet< Spot > spots )
103108
{
104109
Spot ref = spots.createRef();

0 commit comments

Comments
 (0)