Merge branch 'master' into graph-product

[graph.njae.git] / lib / graph.njae / graph.rb

diff --git a/lib/graph.njae/graph.rb b/lib/graph.njae/graph.rb
index 09d6137f0d96edc4b6a9936ad74adac38d972a17..77b96da5fa7ea86d7b174cb7ddcedd1ebd24416e 100644 (file)
--- a/lib/graph.njae/graph.rb
+++ b/lib/graph.njae/graph.rb
@@ -35,7 +35,7 @@ module GraphNjae
     end
     
     # Form a product graph of this graph and the other.
-    # Return the new graph.
+    # Return the product graph.
     def product(other)
       product_graph = Graph.new
       self.vertices.each do |v1|
@@ -49,14 +49,18 @@ module GraphNjae
           e2_vertices = e2.vertices
           source = product_graph.vertices.find {|v| v.g1_vertex == e1_vertices[0] and v.g2_vertex == e2_vertices[0]}
           destination = product_graph.vertices.find {|v| v.g1_vertex == e1_vertices[1] and v.g2_vertex == e2_vertices[1]}
-          pe1 = product_graph.connect source, destination
+          product_graph.connect source, destination
           source = product_graph.vertices.find {|v| v.g1_vertex == e1_vertices[0] and v.g2_vertex == e2_vertices[1]}
           destination = product_graph.vertices.find {|v| v.g1_vertex == e1_vertices[1] and v.g2_vertex == e2_vertices[0]}
-          pe2 = product_graph.connect source, destination
+          product_graph.connect source, destination
         end
       end
       product_graph
     end
     
+    # Performs similarity flooding on a graph
+    def similarity_flood(&normalization)
+    end
+    
   end # class
 end