graphs 0.1.6-x86-linux → 0.1.7-x86-linux

data/lib/graph.rb

@@ -65,7 +65,15 @@ class Graph
             @attrs == other.attrs
         end
 
+        def update(h)
+            Node.new super(h)
+        end
+
         def method_missing(method, *args, &block)
+
+            return @attrs[method.to_sym] if @attrs.has_key? method.to_sym
+            return @attrs[method.to_s] if @attrs.has_key? method.to_s
+
             @attrs.send(method, *args, &block)
         end
 
@@ -89,7 +97,15 @@ class Graph
             @attrs == other.attrs
         end
 
+        def update(h)
+            Edge.new super(h)
+        end
+
         def method_missing(method, *args, &block)
+
+            return @attrs[method.to_sym] if @attrs.has_key? method.to_sym
+            return @attrs[method.to_s] if @attrs.has_key? method.to_s
+
             @attrs.send(method, *args, &block)
         end
 
@@ -117,11 +133,14 @@ class Graph
         # @param n [Node]
         def push(n)
             if (!n.is_a?(Hash) && !n.is_a?(Node))
-                raise TypeError.new "#{n.inspect} is not an Hash or a Node!"
+                raise TypeError.new "#{n.inspect} is not an Hash nor a Node!"
             end
 
+            n = Node.new(n) if (n.is_a?(Hash))
+
             super(n.clone.update(@defaults))
         end
+
     end
 
     # An array of Edge objects
@@ -146,11 +165,14 @@ class Graph
         # @param e [Edge]
         def push(e)
             if (!e.is_a?(Hash) && !e.is_a?(Edge))
-                raise TypeError.new "#{e.inspect} is not an Hash or an Edge!"
+                raise TypeError.new "#{e.inspect} is not an Hash nor an Edge!"
             end
 
+            e = Edge.new(e) if (e.is_a?(Hash))
+
             super(e.clone.update(@defaults))
         end
+
     end
 
     attr_accessor :nodes, :edges, :attrs
@@ -313,7 +335,7 @@ class Graph
     # @see Graph#in_degree_of
     # @see Graph#out_degree_of
     def degree_of(n)
-        label = Graph::get_label_from_node(n)
+        label = Graph::get_label(n)
 
         degree = 0
 
@@ -337,7 +359,7 @@ class Graph
     # @see Graph#degree_of
     # @see Graph#out_degree_of
     def in_degree_of(n)
-        label = Graph::get_label_from_node(n)
+        label = Graph::get_label(n)
 
         degree = 0
 
@@ -358,7 +380,7 @@ class Graph
     # @see Graph#degree_of
     # @see Graph#out_degree_of
     def out_degree_of(n)
-        label = Graph::get_label_from_node(n)
+        label = Graph::get_label(n)
 
         degree = 0
 
@@ -369,36 +391,68 @@ class Graph
         degree
     end
 
-    # Return the “in degree” of the node n in the current graph, i.e. the number
-    # of edges which are directed to this node. Note that the graph must be oriented.
-    #
-    # Edges must have the 'node1' and 'node2' attributes, which must contain
-    # the 'label' attributes of nodes.
-    #
-    # @param n [Node,String] A node or a label of one
-    # @see Graph#degree_of
-    # @see Graph#out_degree_of
-    def in_degree_of(n)
-        label = Graph::get_label_from_node(n)
+    # return the first node which mach the given label in the current graph
+    # @param label [String] A node's label
+    def get_node(label)
 
-        degree = 0
+        label = Graph::get_label(label)
+
+        self.nodes.find { |n| n.label == label }
+
+    end
+
+    # return an array of the neighbours of a node in the current graph.
+    # @param n [Node,String] A node with a 'label' or :label attribute, or a string
+    def get_neighbours(n)
+
+        label = Graph::get_label(n)
+        neighbours = NodeArray.new []
 
-        # This is more efficient than in_degree_of(n)+out_degree_of(n)
-        # since it goes only once through the edges array
         self.edges.each do |e|
-            degree += 1 if (e['node2'] || e[:node2]).to_s == label
+
+            begin
+
+                l1 = e.node1
+                l2 = e.node2
+
+            rescue NoMethodError; next; end
+
+            if l2 && l1 == label
+
+                n2 = self.get_node l2
+
+                unless neighbours.include?(l2)
+
+                    neighbours.push(n2)
+
+                end
+            
+            end
+
+            if l1 && l2 == label && self.directed?
+
+                n1 = self.get_node l1
+            
+                unless neighbours.include?(n1)
+
+                    neighbours.push(n1)
+                
+                end
+            
+            end
+
         end
 
-        degree
-    end
+        neighbours
 
+    end
 
     # return the label of a node. Raise a TypeError exception if the argument
     # is not a Node nor a String object.
     # @param n [Node,String] A node with a 'label' or :label attribute, or a string
-    def Graph::get_label_from_node(n)
+    def Graph::get_label(n)
         label = n.is_a?(Node) \
-                      ? (n['label'] || n[:label]).to_s \
+                      ? n.label.to_s \
                       : n.is_a?(String) ? n : nil
 
         raise TypeError.new("#{n.inspect} must be a Node or String object.") if label.nil?

data/tests/edge_tests.rb

@@ -0,0 +1,46 @@
+#! /usr/bin/ruby1.9.1
+# -*- coding: UTF-8 -*-
+
+class Edge_test < Test::Unit::TestCase
+    
+    def setup
+        @@empty = Graph::Node.new
+        @@alice = Graph::Node.new('label' => 'Alice')
+    
+        # Alice ----> Bob
+        #   ↑          ↑
+        #   |          |
+        # Oscar -------'
+        @@sample_graph = Graph.new(
+            [
+                { 'label' => 'Alice' },
+                { 'label' => 'Bob'   },
+                { 'label' => 'Oscar' }
+            ],
+            [
+                { 'node1' => 'Alice', 'node2' => 'Bob' },
+                { :node1  => 'Oscar', 'node2' => 'Alice'},
+                { 'node1' => 'Oscar', :node2  => 'Bob'}
+            ]
+        )
+    
+    end
+
+    def test_edge_node1_attr
+        assert_equal('Alice', @@sample_graph.edges[0].node1)
+        assert_equal('Oscar', @@sample_graph.edges[1].node1)
+    end
+
+    def test_edge_node2_attr
+        assert_equal('Alice', @@sample_graph.edges[1].node2)
+        assert_equal('Bob', @@sample_graph.edges[2].node2)
+    end
+
+    def test_edge_update
+
+        e = Graph::Edge.new
+
+        assert_equal(true, e.update({}).is_a?(Graph::Edge))
+    end
+
+end

data/tests/graph_tests.rb

@@ -551,4 +551,51 @@ class Graph_test < Test::Unit::TestCase
         end
         assert_equal(false, File.exists?(f))
     end
+
+    # == Graph#get_node == #
+    
+    def test_graph_get_node_unexisting_label
+
+        n = @@sample_graph.get_node 'foobar'
+
+        assert_equal(nil, n)
+    end
+    
+    def test_graph_get_node_existing_label
+
+        g = @@sample_graph;
+
+        n = g.get_node 'foo'
+
+        assert_equal(g.nodes[0], n)
+    end
+
+    # == Graph#get_neighbours == #
+
+    def test_graph_get_neighbours_unexisting_node_label
+
+        n = @@sample_graph.get_neighbours 'moo'
+
+        assert_equal([], n)
+
+    end
+
+    def test_graph_get_neighbours_unexisting_node_object
+
+        n = @@sample_graph.get_neighbours Graph::Node.new( :label => 'moo' )
+
+        assert_equal([], n)
+
+    end
+
+    def test_graph_get_neighbours
+
+        g = @@sample_graph
+
+        n = g.get_neighbours 'foo'
+
+        assert_equal([ 'bar', 'chuck' ], n.map { |m| m.label })
+
+    end
+
 end

data/tests/node_tests.rb

@@ -81,4 +81,15 @@ class Node_test < Test::Unit::TestCase
         assert_equal(1, @@sample_graph.out_degree_of(@@alice))
     end
 
+    def test_node_label_attr
+        assert_equal('Alice', @@alice.label)
+    end
+
+    def test_node_update
+
+        n = Graph::Node.new
+
+        assert_equal(true, n.update({}).is_a?(Graph::Node))
+    end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphs
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: x86-linux
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies: []
 description: Provide functions to (un)parse GDF/JSON files and generate graphs
 email: batifon@yahoo.fr
@@ -20,10 +20,11 @@ files:
 - lib/graph.rb
 - lib/graphs/gdf.rb
 - lib/graphs/json.rb
-- tests/graph_tests.rb
 - tests/tests.rb
-- tests/node_tests.rb
+- tests/graph_tests.rb
+- tests/edge_tests.rb
 - tests/gdf_tests.rb
+- tests/node_tests.rb
 - tests/gexf_tests.rb
 - tests/json_tests.rb
 homepage: https://github.com/bfontaine/Graphs.rb
@@ -47,14 +48,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Utilities to manipulate graph files
 test_files:
-- tests/graph_tests.rb
 - tests/tests.rb
-- tests/node_tests.rb
+- tests/graph_tests.rb
+- tests/edge_tests.rb
 - tests/gdf_tests.rb
+- tests/node_tests.rb
 - tests/gexf_tests.rb
 - tests/json_tests.rb