Misnomer.

PhillHenry · Apr 9, 2016 · 50b806f · 50b806f
1 parent b5761c5
commit 50b806f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/src/main/java/uk/co/odinconsultants/bitset/AtomicBitSet.java b/src/main/java/uk/co/odinconsultants/bitset/AtomicBitSet.java
@@ -43,6 +43,10 @@ public boolean set(long n) {
         }
     }
 
+    public boolean apply(long n) {
+        return set(n);
+    }
+
     public boolean get(long n) {
         int bit = 1 << n;
         int idx = (int) (n >>> 5);

diff --git a/src/main/scala/uk/co/odinconsultants/graph/search/BFS.scala b/src/main/scala/uk/co/odinconsultants/graph/search/BFS.scala
@@ -17,22 +17,22 @@ object BFS {
 
   def search(g: Graph, start: VertexId, alreadySeen: AtomicBitSet): Unit = {
     @tailrec
-    def bfs(toExpore: Seq[VertexId]): Unit = {
-      if (toExpore.nonEmpty) {
-        val next = toExpore.head
-        if (alreadySeen.set(next.toLong)) {
-          bfs(toExpore.tail ++ g.neighboursOf(next))
+    def bfs(toExplore: Seq[VertexId]): Unit = {
+      if (toExplore.nonEmpty) {
+        val next = toExplore.head
+        if (alreadySeen(next.toLong)) {
+          bfs(toExplore.tail ++ g.neighboursOf(next))
         } else {
-          bfs(toExpore.tail)
+          bfs(toExplore.tail)
         }
       }
     }
-    if (alreadySeen.set(start)) {
+    if (alreadySeen(start)) {
       bfs(g.neighboursOf(start))
     }
   }
 
-  def parallelTopologicalSort(g: Graph, start: VertexId)(implicit xc: ExecutionContext): Seq[VertexId] = {
+  def parallelPath(g: Graph, start: VertexId)(implicit xc: ExecutionContext): Seq[VertexId] = {
 
     val alreadySeen = new AtomicBitSet(g.numberOfVertices.toInt)
 
@@ -59,7 +59,7 @@ object BFS {
     bfs(g.neighboursOf(start), Seq(start))
   }
 
-  def topologicalSort(g: Graph, start: VertexId): Seq[VertexId] = {
+  def path(g: Graph, start: VertexId): Seq[VertexId] = {
 
     val alreadySeen = new AtomicBitSet(g.numberOfVertices.toInt)
 

diff --git a/src/test/java/uk/co/odinconsultants/graph/search/BFSPerformanceMain.java b/src/test/java/uk/co/odinconsultants/graph/search/BFSPerformanceMain.java
@@ -24,13 +24,13 @@ public class BFSPerformanceMain {
     @Benchmark
     @Fork(1)
     public void bfsTopologicalOrderingMultiThreaded() {
-        BFS.parallelTopologicalSort(graph, 1L, xc);
+        BFS.parallelPath(graph, 1L, xc);
     }
 
     @Benchmark
     @Fork(1)
     public void bfsTopologicalOrdering() {
-        BFS.topologicalSort(graph, 1L);
+        BFS.path(graph, 1L);
     }
 
     public static void main(String[] args) throws RunnerException {

diff --git a/src/test/scala/uk/co/odinconsultants/bitset/AtomicBitSetSpec.scala b/src/test/scala/uk/co/odinconsultants/bitset/AtomicBitSetSpec.scala
@@ -16,7 +16,7 @@ class AtomicBitSetSpec extends WordSpec with Matchers {
       val propSmallInteger = forAll(smallInteger) { n =>
         val toTest = new AtomicBitSet(n)
         for (i <- 0 to n) toTest.set(i.toLong)
-        toTest.isEverythingSet()
+        toTest.isEverythingSet
       }
     }
   }

diff --git a/src/test/scala/uk/co/odinconsultants/graph/search/BFSSpec.scala b/src/test/scala/uk/co/odinconsultants/graph/search/BFSSpec.scala
@@ -6,7 +6,7 @@ import org.scalatest.{Matchers, WordSpec}
 import uk.co.odinconsultants.bitset.AtomicBitSet
 import uk.co.odinconsultants.graph.impl.AdjacencyListGraph.asString
 import uk.co.odinconsultants.graph.impl.GraphGenerator._
-import uk.co.odinconsultants.graph.search.BFS.{search, parallelTopologicalSort}
+import uk.co.odinconsultants.graph.search.BFS.{search, parallelPath}
 
 import scala.concurrent.ExecutionContext
 
@@ -29,7 +29,7 @@ class BFSSpec extends WordSpec with Matchers {
   "Strongly-connected component graph" should {
     "have topological sort corresponding to its leaders" in new GraphFixture {
       implicit val xc     = ExecutionContext.global
-      val sortedVertices  = parallelTopologicalSort(graph, 1)
+      val sortedVertices  = parallelPath(graph, 1)
 
       withClue(asString(graph) + sortedVertices.groupBy(x => x).filter(_._2.size > 1)) {
         sortedVertices.toSet should have size sortedVertices.size