mpath_graph 0.0.1 → 0.0.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YTdmNTQ4NDUyNzgzNGE4YWE1NWZmN2E2ZDhkZDFmNTljODNhZTVlNQ==
-  data.tar.gz: !binary |-
-    YzU1MjkzOWRhZWYyNDkyMmI0MjA0MDMzNzMxZjVlOTRkNDMzZmQ0MQ==
+SHA1:
+  metadata.gz: d7b6e50d3b2aba78f3916fe417dbb9652e6c028d
+  data.tar.gz: 4e65ecd1d69aa8b692183050da44819dc63a7e56
 SHA512:
-  metadata.gz: !binary |-
-    ZDc4MTA4YzYzMDgxNzY5MzVlYzAwYzhkNmY2ZmZmY2FjMjY2MDkxOTIwOTAy
-    YWNiZjM2YmJjYTNkZjIzMTc3YzA2ZDNhNGEyZjk0YTdkOGU5Y2M0OTY4MzUw
-    YjlkNjhjMDM3OGE3ZGI3YjNhMDk2Y2ZiMzc0YmI4YzJlODJkZDk=
-  data.tar.gz: !binary |-
-    ZTU5ODFkMzI5NzQ4MDYzNjhhZGQwNTYzYjYzZmRkODYyZjc3ZTQxMzQ5Njdk
-    ZjMxMDE1MGI1NDQ5ODgwZjE0N2Y5NzdhODVjNzMwNjFhYWQ2MDVlMzI5OGRk
-    MDNhYmZlNThkMzY0ZjNiNjgzN2E5ZDVjMzQzMzgwYzA0ZTc3YmE=
+  metadata.gz: da13ccac14270b6e38af0cc5130dee05e97cf7a627b4db0a7eddd03b643b83331ede683346e1a8cb9ffaa32af039e12d23682760c5b1d9e5a74c7aabd81acb50
+  data.tar.gz: 2664b8ee4407f970234e452f968cc041fbe21be8cc02e763fdf67d62b5fd88a26c8b83125850bf1bdb19c5a75ea1f8eadcdcf42dc291cf25b8c8a14d3d83f101

data/README.md

@@ -1,6 +1,8 @@
-# MpathGraph
+# MPathGraph
+[![Gem Version](https://badge.fury.io/rb/mpath_graph.svg)](http://badge.fury.io/rb/mpath_graph)
+[![Gittip](http://img.shields.io/badge/tips-poor-yellow.svg)](https://www.gittip.com/neoriddle/)
 
-TODO: Write a gem description
+**MPathGraph** is a library to work with _m_-path graphs generated from a hamiltonian cycle in a hypercube graph.
 
 ## Installation
 
@@ -18,7 +20,8 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+- TODO: Write usage instructions here.
+- TODO: Include some chunks of code as examples.
 
 ## Contributing
 

data/lib/mpath_graph/version.rb

@@ -1,3 +1,3 @@
 module MPathGraph
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

data/lib/mpath_graph.rb

@@ -60,14 +60,15 @@ module MPathGraph
     worm         = []
     neighbors    = nil
     steps_walked = 0
-    initial      = options[:initial_vertex] || 0
-    worm_size    = options[:worm_size]      || 5
-    walk_limit   = options[:walk_limit]     || -1
-    pause        = options[:pause]          || false
-    induced_cycles_limit = options[:induced_cycles_limit]     || -1
+    options[:initial_vertex]   ||= 0
+    options[:worm_size]        ||= 5
+    options[:walk_limit]       ||= -1
+    options[:pause]            ||= false
+    options[:induced_cycles_limit] ||= -1
+    options[:print_non_cycles] ||= false
 
     # Initialize worm with initial vertex
-    worm << initial
+    worm << options[:initial_vertex]
 
     # Initialize pseudo-random number generator
     prng = Random.new
@@ -76,7 +77,7 @@ module MPathGraph
     puts ["k-path","Induced cycle","Steps walked"].to_csv
 
     # Fill worm
-    while worm.size < worm_size
+    while worm.size < options[:worm_size]
       # Find neighbors of last vertex
       neighbors = find_neighbors(worm.last, edges) unless neighbors
 
@@ -96,7 +97,7 @@ module MPathGraph
         worm << neighbors[rnd_idx]  # Append vertex
         neighbors = nil             # Clean neighbors
 
-        if worm.size == worm_size # When worm is full
+        if worm.size == options[:worm_size] # When worm is full
           steps_walked += 1       # Increment worm steps walked
 
           # Output well-formed worm
@@ -105,8 +106,8 @@ module MPathGraph
 
           # if has_cycles?(worm, edges, verbose: options[:verbose])
           if (cycle = find_cycles(worm, edges))
-            csv_row << cycle
-            csv_row << steps_walked
+            # Flush csv row data to STDIN 
+            puts [worm, cycle, steps_walked].to_csv
 
             # if options[:verbose]           # Verbose worm with cycle
             #   puts "Worm\t#{worm.inspect}"
@@ -114,24 +115,21 @@ module MPathGraph
             # end
 
             # Pause when verbose
-            # if pause
+            # if options[:pause]
             #   STDERR.puts "Press a key to continue..."
             #   STDIN.getc
             # end
 
             # Check induced cycles counter limit
-            return if induced_cycles_limit==0
-            induced_cycles_limit-=1
+            return if options[:induced_cycles_limit]==0
+            options[:induced_cycles_limit]-=1
           else
-            csv_row << nil
-            csv_row << steps_walked
+            # Flush csv row data to STDIN 
+            puts [worm, nil, steps_walked].to_csv if options[:print_non_cycles]
           end
 
-          # Flush csv row data to STDIN 
-          puts csv_row.to_csv
-
           worm.shift              # Drop first vertex in worm (as queue)
-          break if steps_walked > walk_limit && walk_limit > 0 # Stop walking
+          break if steps_walked > options[:walk_limit] && options[:walk_limit] > 0 # Stop walking
         end
       end
     end
@@ -191,4 +189,72 @@ module MPathGraph
     
     paths
   end
+
+  module OddHole
+    def self.rw_search_first(edges, options = {})
+      options[:worm_size]      ||= 5
+      return nil if edges.size < options[:worm_size]
+
+      prng = Random.new
+      rnd_idx = prng.rand(edges.size)
+      options[:initial_vertex] ||= edges[rnd_idx][rnd_idx%2]
+      worm = [options[:initial_vertex]]
+
+      while worm.size < options[:worm_size]
+        return nil if worm.empty?
+
+        neighbors = MPathGraph::find_neighbors(worm.last, edges)
+        neighbors = neighbors - worm
+
+        if neighbors.empty?
+          worm.pop
+          next
+        else
+          rnd_idx = prng.rand(neighbors.size)
+          worm << neighbors[rnd_idx]
+          neighbors = nil
+
+          if worm.size == options[:worm_size]
+            if is_an_odd_hole?(worm, edges, options[:worm_size])
+              return worm
+            else
+              worm.shift
+              next
+            end
+          end
+        end
+      end
+    end
+
+    # Given a path in a graph G, check if it is an odd-hole with an 
+    # specific size.
+    #
+    # @param path [Array<Integer>] Sequence of vertices to check.
+    # @param edges [Array<Array<Integer>>] Set of edges of graph G.
+    # @param size [Array<Array<Integer>>] Odd-hole size to search.
+    def self.is_an_odd_hole?(path, edges, size = 5)
+      raise ArgumentError, "Hole size must be at least 5" if size<5
+      raise ArgumentError, "Hole size must be odd" if size % 2 == 0
+      raise ArgumentError, "Path must have odd-hole size" if path.size != size
+
+      cycle_edge = order_uedge(path[0],path[-1])
+      return false unless edges.include?(cycle_edge)
+
+      (0..size-3).each do |i| # First vertex
+        (2..size-2).each do |j| # Offset from first vertex
+          next if i+j > size-1
+          uedge = order_uedge(path[i],path[i+j])
+          return false if edges.include?(uedge)
+        end
+      end
+
+      true
+    end
+
+    # Order entries of a tuple.
+    def self.order_uedge(v,u)
+      v < u ? [v,u] : [u,v]
+    end
+
+  end
 end

data/mpath_graph.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency 'ruby-progressbar'
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

data/test/test_mpath_graph.rb

@@ -0,0 +1,36 @@
+require 'mpath_graph'
+require 'minitest/autorun'
+require 'minitest/unit'
+
+# Author::    Israel Buitron  (mailto:ibuitron@computacion.cs.cinvestav.mx)
+class TestMPathGraphOddHole < MiniTest::Unit::TestCase
+
+  def setup
+    @oh5_e = [[1,2],[1,5],[2,3],[3,4],[4,5]]
+    @oh7_e = [[1,2],[1,7],[2,3],[3,4],[4,5],[5,6],[6,7]]
+    @g = [[1,2],[1,5],[2,3],[3,4],[4,5]]
+  end
+
+  def test_is_an_odd_hole?
+    # Test with 5-odd-hole
+    assert_raises(ArgumentError) { MPathGraph::OddHole::is_an_odd_hole?(nil, @oh5_e, 2) }
+    assert_raises(ArgumentError) { MPathGraph::OddHole::is_an_odd_hole?(nil, @oh5_e, 3) }
+    assert_raises(ArgumentError) { MPathGraph::OddHole::is_an_odd_hole?((1..6).to_a, @oh5_e, 5) }
+    refute MPathGraph::OddHole::is_an_odd_hole?([1,2,3,4,10], @oh5_e, 5) 
+    assert MPathGraph::OddHole::is_an_odd_hole?([1,2,3,4,5], @oh5_e, 5)
+
+    # Test with 7-odd-hole
+    assert MPathGraph::OddHole::is_an_odd_hole?((1..7).to_a, @oh7_e, 7)
+  end
+
+  def test_order_uedge
+    assert [1,2], MPathGraph::OddHole::order_uedge(1,2)
+    assert [1,2], MPathGraph::OddHole::order_uedge(2,1)
+    assert [1,1], MPathGraph::OddHole::order_uedge(1,1)
+  end
+
+  def test_rw_search_first
+    computed = MPathGraph::OddHole::rw_search_first(@g)
+    assert_equal [1,2,3,4,5], computed.sort
+  end
+end

metadata

@@ -1,55 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: mpath_graph
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Israel Buitron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-07-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: m-Path graphs library
@@ -59,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -67,6 +81,7 @@ files:
 - lib/mpath_graph.rb
 - lib/mpath_graph/version.rb
 - mpath_graph.gemspec
+- test/test_mpath_graph.rb
 homepage: ''
 licenses:
 - MIT
@@ -77,18 +92,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: m-Path graphs library
-test_files: []
+test_files:
+- test/test_mpath_graph.rb