Added hash parameter to graph initialization

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

diff --git a/lib/graph.njae/graph.rb b/lib/graph.njae/graph.rb
index e08a1ad8544d12aec4cacf3a095ca5e1e5df6aea..b1de59b324be4297ceed4ef6c1a8dd2fdfe890df 100644 (file)
--- a/lib/graph.njae/graph.rb
+++ b/lib/graph.njae/graph.rb
@@ -7,8 +7,8 @@ module GraphNjae
   # A container for all the parts of a graph.  The graph can have arbitrary attributes,
   # treated as method names.
   class Graph < OpenStruct
-    def initialize
-      super
+    def initialize(values = {})
+      super(values)
       self.edges = Array.new
       self.vertices = Array.new
       self
@@ -23,5 +23,20 @@ module GraphNjae
       end
       self
     end
-  end
+    
+    # Form a product graph of this graph and the other.
+    # Return the new graph.
+    def product(other)
+      product_graph = Graph.new
+      self.vertices.each do |v1|
+        other.vertices.each do |v2|
+          product_vertex = Vertex.new
+          product_vertex.left_node = v1
+          product_vertex.right_node = v2
+          product_graph << product_vertex
+        end
+      end
+    end
+    
+  end # class
 end