Fixing the toStrings

Author: dwalend

README.md

@@ -108,7 +108,7 @@ These are typically very straightforward to create. The decorator semirings list
 
     convertEdgeToLabelFunc:(Node,Node,ArcLabel)=>Label
 
-These methods also allow for an optional extraNodes Seq. This Seq can contain both extra nodes and any nodes that already exist in the edges, and can control the ordering of the algorithm's output.
+These methods also allow for an optional nodes Seq. This Seq can contain both extra nodes and any nodes that already exist in the edges, and can control the ordering of the algorithm's output.
 
 FloydWarshall, Dijkstra, and Brandes each also include a method that takes an IndexedDigraph implementation, mutable for FloydWarshall. If you use this method then you are responsible for creating the labelDigraph correctly. I included it primarily for computational efficiency, and for a future lazy evaluator for Dijkstra's method.  
 

src/main/scala/net/walend/graph/AdjacencyLabelDigraph.scala

@@ -126,7 +126,7 @@ class AdjacencyLabelDigraph[Node,Label](outNodes:Vector[Node], //provides the ma
   }
 
   override def toString:String = {
-    s"$inNodes $edges"
+    s"${this.getClass.getSimpleName}(edges = $edges,nodes = $outNodes,noEdgeExistsValue = $noEdgeExistsLabel)"
   }
 }
 
@@ -136,10 +136,10 @@ class AdjacencyLabelDigraph[Node,Label](outNodes:Vector[Node], //provides the ma
 object AdjacencyLabelDigraph{
 
   def apply[Node,Label](edges:GenTraversable[(Node,Node,Label)] = Seq.empty,
-                       extraNodes:GenSeq[Node] = Seq.empty,
+                       nodes:GenSeq[Node] = Seq.empty,
                        noEdgeExistsValue:Label = null) = {
 
-    val nodeValues:Vector[Node] = (extraNodes ++ edges.map(_._1) ++ edges.map(_._2)).distinct.to[Vector]
+    val nodeValues:Vector[Node] = (nodes ++ edges.map(_._1) ++ edges.map(_._2)).distinct.to[Vector]
 
     val successorMap:GenMap[Node,GenTraversable[(Node,Node,Label)]] = edges.groupBy(_._1)
     val predecessorMap:GenMap[Node,GenTraversable[(Node,Node,Label)]] = edges.groupBy(_._2)

src/main/scala/net/walend/graph/MatrixLabelDigraph.scala

@@ -61,7 +61,6 @@ class MatrixLabelDigraph[Node,Label](outNodes:Vector[Node], //provides the maste
         case _ => false
       }
     }
-
   }
 
   /**
@@ -142,6 +141,9 @@ class MatrixLabelDigraph[Node,Label](outNodes:Vector[Node], //provides the maste
    */
   override def label(i: Int, j: Int): Label = edgeMatrix(i)(j)
 
+  override def toString:String = {
+    s"${this.getClass.getSimpleName}(edges = $edges,nodes = $outNodes,noEdgeExistsValue = $noEdgeExistsLabel)"
+  }
 }
 
 object MatrixLabelDigraph{
@@ -150,10 +152,10 @@ object MatrixLabelDigraph{
    * O(n ln(n) + en)
    */
   def apply[Node,Label](edges:GenTraversable[(Node,Node,Label)] = Seq.empty,
-                       extraNodes:GenSeq[Node] = Seq.empty,
+                       nodes:GenSeq[Node] = Seq.empty,
                        noEdgeExistsValue:Label = null) = {
 
-    val nodeValues:Vector[Node] = (extraNodes ++ edges.map(_._1) ++ edges.map(_._2)).distinct.to[Vector]
+    val nodeValues:Vector[Node] = (nodes ++ edges.map(_._1) ++ edges.map(_._2)).distinct.to[Vector]
 
     val size = nodeValues.size